Bump WX_CURRENT back to 3, this must stay the same as

wx_release_number until bakefile is fixed to unlink the
the soversion from it.  Ideally of course it should track
binary incompatible releases instead.

Update the Debian scripts to suit the new site-packages
location for wxPython.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30489 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure b/configure
index d959c71c32e26221e3a581c75d76d8f4a89c813e..9fb1e16f2247afcd4a1187586145e9d27518515a 100755 (executable)
--- a/configure
+++ b/configure
@@ -1664,9 +1664,9 @@ WX_SUBVERSION=$WX_VERSION.$wx_subrelease_number
 
 WX_MSW_VERSION=$wx_major_version_number$wx_minor_version_number$wx_release_number
 
 
 WX_MSW_VERSION=$wx_major_version_number$wx_minor_version_number$wx_release_number
 

-WX_CURRENT=4
+WX_CURRENT=3

 WX_REVISION=0
 WX_REVISION=0

-WX_AGE=1
+WX_AGE=2

 
 
 
 
 
 

diff --git a/configure.in b/configure.in
index 35904db27bc6539eaa50be529c7ef90df13130a2..d901b515e0eb97666579576e36e762b39c100f49 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -64,9 +64,9 @@ WX_SUBVERSION=$WX_VERSION.$wx_subrelease_number
 
 WX_MSW_VERSION=$wx_major_version_number$wx_minor_version_number$wx_release_number
 
 
 WX_MSW_VERSION=$wx_major_version_number$wx_minor_version_number$wx_release_number
 

-WX_CURRENT=4
+WX_CURRENT=3

 WX_REVISION=0
 WX_REVISION=0

-WX_AGE=1
+WX_AGE=2

 
 
 dnl ------------------------------------------------------------------------
 
 
 dnl ------------------------------------------------------------------------

diff --git a/debian/libwxgtk-python.postinst b/debian/libwxgtk-python.postinst
index 3787fff55372f7a90f402dbe7e2e4da401424337..a4b6edfbfc9f8e9f77a125333e967fab553d3677 100644 (file)
--- a/debian/libwxgtk-python.postinst
+++ b/debian/libwxgtk-python.postinst
@@ -2,7 +2,7 @@
 
 set -e
 
 
 set -e
 

-WXPYTHONDIR="/usr/lib/=PY/site-packages/wx-=SOV"
+WXPYTHONDIR="/=WXPYDIR"

 
 if [ "$1" = "configure" ]; then
        =PY /usr/lib/=PY/compileall.py -q ${WXPYTHONDIR}
 
 if [ "$1" = "configure" ]; then
        =PY /usr/lib/=PY/compileall.py -q ${WXPYTHONDIR}

diff --git a/debian/rules b/debian/rules
index 22c928a49c4db79c095bac27f2e4b707509ab9a5..c9ff50dae870a78234fb35bdb8f5d6e1339cdb2b 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -42,6 +42,9 @@ release   := $(shell dpkg-parsechangelog | sed -n 's/^Source: wxwidgets//p')
 soversion := $(shell grep '^WX_CURRENT=' configure.in | sed 's/WX_CURRENT=\([0-9]\+\).*/\1/')
 sorelease := $(release:%-$(DEBIAN_WXFLAVOUR)=%).$(soversion)$(addprefix -,$(DEBIAN_WXFLAVOUR))
 
 soversion := $(shell grep '^WX_CURRENT=' configure.in | sed 's/WX_CURRENT=\([0-9]\+\).*/\1/')
 sorelease := $(release:%-$(DEBIAN_WXFLAVOUR)=%).$(soversion)$(addprefix -,$(DEBIAN_WXFLAVOUR))
 

+pydir     := usr/lib/$(python_ver)/site-packages
+wxpydir   := $(pydir)/wx-$(sorelease)-gtk2-unicode
+

 cross_host  = i586-mingw32msvc
 cross_build = $(shell ./config.guess)
 
 cross_host  = i586-mingw32msvc
 cross_build = $(shell ./config.guess)
 


@@ -150,7 +153,10 @@ control-files-stamp: debian/control
        done;
        @for f in docs postinst prerm; do                                    \
                echo "generating control file $(package_gtk_py_lib).$$f";    \
        done;
        @for f in docs postinst prerm; do                                    \
                echo "generating control file $(package_gtk_py_lib).$$f";    \

-               sed -e 's/=PY/$(python_ver)/g;s/=V/$(release)/g;s/=SOV/$(sorelease)/g' \
+               sed -e 's/=PY/$(python_ver)/g;                               \
+                       s|=WXPYDIR|$(wxpydir)|g;                             \
+                       s/=V/$(release)/g;                                   \
+                       s/=SOV/$(sorelease)/g'                               \

                        < debian/libwxgtk-python.$$f                         \
                        > debian/$(package_gtk_py_lib).$$f;                  \
        done;
                        < debian/libwxgtk-python.$$f                         \
                        > debian/$(package_gtk_py_lib).$$f;                  \
        done;


@@ -525,11 +531,10 @@ install-gtk-py-lib: build-gtk-py-stamp
                              UNICODE=1                                         \
                              FLAVOUR=$(DEBIAN_WXFLAVOUR)
 
                              UNICODE=1                                         \
                              FLAVOUR=$(DEBIAN_WXFLAVOUR)
 

-       find debian/$(package_gtk_py_lib)/usr/lib/$(python_ver)/site-packages   \
-               -name '*.py?' -exec rm '{}' ';'
+       find debian/$(package_gtk_py_lib)/$(pydir) -name '*.py?' -exec rm '{}' ';'

 
        # This is rather bogus, its included in the main copyright file now though.
 
        # This is rather bogus, its included in the main copyright file now though.

-       rm -f debian/$(package_gtk_py_lib)/usr/lib/$(python_ver)/site-packages/wx-$(sorelease)-gtk2-unicode/wx/tools/XRCed/license.txt
+       rm -f debian/$(package_gtk_py_lib)/$(wxpydir)/wx/tools/XRCed/license.txt

 
 install-gtk-py: DH_OPTIONS=-p$(package_gtk_py)
 install-gtk-py: install-gtk-py-lib
 
 install-gtk-py: DH_OPTIONS=-p$(package_gtk_py)
 install-gtk-py: install-gtk-py-lib


@@ -538,9 +543,9 @@ install-gtk-py: install-gtk-py-lib
        dh_clean -k
        dh_installdirs
 
        dh_clean -k
        dh_installdirs
 

-       dh_movefiles --sourcedir=debian/$(package_gtk_py_lib) usr/bin           \
-               usr/lib/$(python_ver)/site-packages/wxversion.py                \
-               usr/lib/$(python_ver)/site-packages/wx.pth
+       dh_movefiles --sourcedir=debian/$(package_gtk_py_lib)                   \
+               usr/bin                                                         \
+               $(pydir)/{wxversion.py,wx.pth}

        rm -r debian/$(package_gtk_py_lib)/usr/bin
 
        dh_installman debian/wxPython-tools.1
        rm -r debian/$(package_gtk_py_lib)/usr/bin
 
        dh_installman debian/wxPython-tools.1


@@ -631,15 +636,11 @@ install-gtk-dbg-py: build-gtk-dbg-py-stamp
                              UNICODE=1                                         \
                              FLAVOUR=$(addsuffix -,$(DEBIAN_WXFLAVOUR))dbg
 
                              UNICODE=1                                         \
                              FLAVOUR=$(addsuffix -,$(DEBIAN_WXFLAVOUR))dbg
 

-       find debian/$(package_gtk_dbg_py)/usr/lib/$(python_ver)/site-packages   \
-               -name '*.py?' -exec rm '{}' ';'
-
-       rm -rf usr/bin                                                          \
-              usr/lib/$(python_ver)/site-packages/wxversion.py                 \
-              usr/lib/$(python_ver)/site-packages/wx.pth
+       find debian/$(package_gtk_dbg_py)/$(pydir) -name '*.py?' -exec rm '{}' ';'
+       rm -rf usr/bin $(pydir)/{wxversion.py,wx.pth}

 
        # This is rather bogus, its included in the main copyright file now though.
 
        # This is rather bogus, its included in the main copyright file now though.

-       rm -f debian/$(package_gtk_dbg_py)/usr/lib/$(python_ver)/site-packages/wx-$(sorelease)-gtk2-unicode/wx/tools/XRCed/license.txt
+       rm -f debian/$(package_gtk_dbg_py)/$(wxpydir)/wx/tools/XRCed/license.txt

 
 
 install-msw-dev: DH_OPTIONS=-p$(package_msw_dev)
 
 
 install-msw-dev: DH_OPTIONS=-p$(package_msw_dev)