]> git.saurik.com Git - wxWidgets.git/blobdiff - debian/rules
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Unicode compilation fix
[wxWidgets.git] / debian / rules
diff --git a/debian/rules b/debian/rules
index f5acc68e8641c6fc0a8f2f4b9fcef8f9fb58694d..18cc33a03063c49ceefa82e8e1f6017d836c994c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -40,6 +40,10 @@ DEBIAN_WXFLAVOUR := $(shell pwd | sed -e 's@.*/wxwidgets[0-9.]\+-\?\(.*\)-[0-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/')
 
 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))
+
+pydir     := usr/lib/$(python_ver)/site-packages
+wxpydir   := $(pydir)/wx-$(release)-gtk2-unicode
 
 cross_host  = i586-mingw32msvc
 cross_build = $(shell ./config.guess)
 
 cross_host  = i586-mingw32msvc
 cross_build = $(shell ./config.guess)
@@ -48,24 +52,24 @@ config_cache       = ../config_deb.cache
 config_cache_cross = ../config_deb_cross.cache
 
 # Packages to build:
 config_cache_cross = ../config_deb_cross.cache
 
 # Packages to build:
-package_gtk_lib         = libwxgtk$(release).$(soversion)
+package_gtk_lib         = libwxgtk$(sorelease)
 package_gtk_dev         = libwxgtk$(release)-dev
 package_gtk_dbg         = libwxgtk$(release)-dbg
 package_gtk_dev         = libwxgtk$(release)-dev
 package_gtk_dbg         = libwxgtk$(release)-dbg
-package_gtk_py          = libwxgtk$(release).$(soversion)-python
+package_gtk_py_lib      = libwxgtk$(sorelease)-python
+package_gtk_py          = wxpython$(sorelease)
 package_common          = wx$(release)-common
 package_headers         = wx$(release)-headers
 package_i18n            = wx$(release)-i18n
 package_doc             = wx$(release)-doc
 package_examples        = wx$(release)-examples
 
 package_common          = wx$(release)-common
 package_headers         = wx$(release)-headers
 package_i18n            = wx$(release)-i18n
 package_doc             = wx$(release)-doc
 package_examples        = wx$(release)-examples
 
-package_gtk_dbg_py      = libwxgtk$(release).$(soversion)-dbg-python
+package_gtk_dbg_py      = libwxgtk$(sorelease)-dbg-python
 package_msw_dev         = libwxmsw$(release)-dev
 package_msw_dbg         = libwxmsw$(release)-dbg
 package_headers_msw     = wx$(release)-headers-msw
 
 # Build directories:
 objdir_gtk_shared          = objs_gtk_sh
 package_msw_dev         = libwxmsw$(release)-dev
 package_msw_dbg         = libwxmsw$(release)-dbg
 package_headers_msw     = wx$(release)-headers-msw
 
 # Build directories:
 objdir_gtk_shared          = objs_gtk_sh
-objdir_gtk_static          = objs_gtk_st
 objdir_gtk_debug           = objs_gtk_d
 objdir_gtk_install         = objs_gtk_install
 objdir_doc_cruft           = objs_doc_con
 objdir_gtk_debug           = objs_gtk_d
 objdir_gtk_install         = objs_gtk_install
 objdir_doc_cruft           = objs_doc_con
@@ -78,8 +82,7 @@ objdir_msw_static          = objs_msw_st
 objdir_msw_dbg             = objs_msw_d
 objdir_msw_install         = objs_msw_install
 
 objdir_msw_dbg             = objs_msw_d
 objdir_msw_install         = objs_msw_install
 
-objdirs = $(objdir_gtk_shared) $(objdir_gtk_static) $(objdir_gtk_debug)   \
-         $(objdir_gtk_install)                                           \
+objdirs = $(objdir_gtk_shared) $(objdir_gtk_debug) $(objdir_gtk_install)  \
          $(objdir_doc_cruft) $(objdir_doc) $(objdir_examples)            \
          $(objdir_msw_shared) $(objdir_msw_static) $(objdir_msw_dbg)     \
          $(objdir_msw_install)
          $(objdir_doc_cruft) $(objdir_doc) $(objdir_examples)            \
          $(objdir_msw_shared) $(objdir_msw_static) $(objdir_msw_dbg)     \
          $(objdir_msw_install)
@@ -91,7 +94,6 @@ objdirs = $(objdir_gtk_shared) $(objdir_gtk_static) $(objdir_gtk_debug)   \
 
 # Build stamps:
 build_arch_stamps = build-gtk-shared-stamp build-gtk-shared-contrib-stamp \
 
 # Build stamps:
 build_arch_stamps = build-gtk-shared-stamp build-gtk-shared-contrib-stamp \
-                    build-gtk-static-stamp build-gtk-static-contrib-stamp \
                     build-gtk-debug-stamp build-gtk-debug-contrib-stamp   \
                     build-i18n-stamp build-gtk-py-stamp
 
                     build-gtk-debug-stamp build-gtk-debug-contrib-stamp   \
                     build-i18n-stamp build-gtk-py-stamp
 
@@ -119,8 +121,8 @@ install_all_native = $(install_all_arch) $(install_all_indep)
 install_all = $(install_all_native) $(install_all_cross)
 
 
 install_all = $(install_all_native) $(install_all_cross)
 
 
-wxconfig     := $(shell pwd)/$(objdir_gtk_shared)/wx-config
-wxconfig-dbg := $(shell pwd)/$(objdir_gtk_debug)/wx-config
+wxconfig     := $(shell pwd)/$(objdir_gtk_shared)/wx-config --no_rpath
+wxconfig-dbg := $(shell pwd)/$(objdir_gtk_debug)/wx-config --no_rpath
 
 #contrib_libs := $(subst CVS,,$(notdir $(wildcard contrib/include/wx/*)))
 
 
 #contrib_libs := $(subst CVS,,$(notdir $(wildcard contrib/include/wx/*)))
 
@@ -131,7 +133,7 @@ debian/python-version:
        echo python_ver := python$(shell python -c "import sys;print sys.version[:3]") > $@
 
 debian/control: $(addprefix debian/,control.in python-version)
        echo python_ver := python$(shell python -c "import sys;print sys.version[:3]") > $@
 
 debian/control: $(addprefix debian/,control.in python-version)
-       sed -e 's/=V/$(release)/g;s/=SO/$(soversion)/g;s/=PY/$(python_ver)/g' \
+       sed -e 's/=V/$(release)/g;s/=SOV/$(sorelease)/g;s/=PY/$(python_ver)/g' \
                < debian/control.in > debian/control
 
 control-files-stamp: debian/control
                < debian/control.in > debian/control
 
 control-files-stamp: debian/control
@@ -146,12 +148,27 @@ control-files-stamp: debian/control
                sed -e 's/=V/$(release)/g' < debian/libwxgtk-dbg.$$f         \
                        > debian/$(package_gtk_dbg).$$f;                     \
        done;
                sed -e 's/=V/$(release)/g' < debian/libwxgtk-dbg.$$f         \
                        > debian/$(package_gtk_dbg).$$f;                     \
        done;
-       @for f in dirs docs menu postinst prerm; do                          \
-               echo "generating control file $(package_gtk_py).$$f";        \
-               sed -e 's/=PY/$(python_ver)/g;s/=V/$(release)/g;s/=SO/$(soversion)/g' \
+       @for f in docs postinst prerm; do                                    \
+               echo "generating control file $(package_gtk_py_lib).$$f";    \
+               sed -e 's/=PY/$(python_ver)/g;                               \
+                       s|=WXPYDIR|$(wxpydir)|g;                             \
+                       s/=V/$(release)/g;                                   \
+                       s/=SOV/$(sorelease)/g'                               \
                        < debian/libwxgtk-python.$$f                         \
                        < debian/libwxgtk-python.$$f                         \
-                       > debian/$(package_gtk_py).$$f;                      \
+                       > debian/$(package_gtk_py_lib).$$f;                  \
        done;
        done;
+       @echo "generating control file $(package_gtk_py).menu";              \
+               sed -e 's/=SOV/$(sorelease)/g' < debian/wxpython.menu        \
+                       > debian/$(package_gtk_py).menu;
+       @for f in docs postinst; do                                          \
+               echo "generating control file $(package_gtk_dbg_py).$$f";    \
+               sed -e 's/=PY/$(python_ver)/g;s/=V/$(release)/g;s/=SOV/$(sorelease)/g' \
+                       < debian/libwxgtk-python.$$f                         \
+                       > debian/$(package_gtk_dbg_py).$$f;                  \
+       done;
+       @echo "generating control file $(package_gtk_dbg_py).prerm";         \
+               sed 's/=SOV/$(sorelease)/g' < debian/libwxgtk-dbg-python.prerm \
+                   > debian/$(package_gtk_dbg_py).prerm
        @for f in docs doc-base; do                                          \
                echo "generating control file $(package_doc).$$f";           \
                sed -e 's/=V/$(release)/g' < debian/wx-doc.$$f               \
        @for f in docs doc-base; do                                          \
                echo "generating control file $(package_doc).$$f";           \
                sed -e 's/=V/$(release)/g' < debian/wx-doc.$$f               \
@@ -161,18 +178,6 @@ control-files-stamp: debian/control
                echo "generating control file $(package_examples).$$f";      \
                cp debian/wx-examples.$$f debian/$(package_examples).$$f;    \
        done;
                echo "generating control file $(package_examples).$$f";      \
                cp debian/wx-examples.$$f debian/$(package_examples).$$f;    \
        done;
-       @for f in dirs docs postinst; do                                     \
-               echo "generating control file $(package_gtk_dbg_py).$$f";    \
-               sed -e 's/=PY/$(python_ver)/g;s/=V/$(release)/g;s/=SO/$(soversion)/g' \
-                       < debian/libwxgtk-python.$$f                         \
-                       > debian/$(package_gtk_dbg_py).$$f;                  \
-       done;
-       @for f in menu prerm; do                                             \
-               echo "generating control file $(package_gtk_dbg_py).$$f";    \
-               sed -e 's/=PY/$(python_ver)/g;s/=V/$(release)/g;s/=SO/$(soversion)/g' \
-                       < debian/libwxgtk-dbg-python.$$f                     \
-                       > debian/$(package_gtk_dbg_py).$$f;                  \
-       done;
        @for f in postinst prerm; do                                         \
                echo "generating control file $(package_msw_dev).$$f";       \
                sed -e 's/=V/$(release)/g;s/=H/$(cross_host)/g' < debian/libwxmsw-dev.$$f \
        @for f in postinst prerm; do                                         \
                echo "generating control file $(package_msw_dev).$$f";       \
                sed -e 's/=V/$(release)/g;s/=H/$(cross_host)/g' < debian/libwxmsw-dev.$$f \
@@ -211,15 +216,13 @@ configure-gtk-shared-stamp:
                                --cache-file=$(config_cache)            \
                                --with-flavour=$(DEBIAN_WXFLAVOUR)      \
                                --with-gtk                              \
                                --cache-file=$(config_cache)            \
                                --with-flavour=$(DEBIAN_WXFLAVOUR)      \
                                --with-gtk                              \
-                               --enable-gtk2                           \
-                               --enable-unicode                        \
                                --with-opengl                           \
                                --with-opengl                           \
+                               --with-gnomeprint                       \
                                --with-zlib=sys                         \
                                --with-libjpeg=sys                      \
                                --with-libpng=sys                       \
                                --with-libtiff=sys                      \
                                --with-zlib=sys                         \
                                --with-libjpeg=sys                      \
                                --with-libpng=sys                       \
                                --with-libtiff=sys                      \
-                               --enable-dynamic-loader                 \
-                               --enable-std_iostreams
+                               --enable-unicode
        touch $@
 
 build-gtk-shared-stamp: configure-gtk-shared-stamp
        touch $@
 
 build-gtk-shared-stamp: configure-gtk-shared-stamp
@@ -227,30 +230,6 @@ build-gtk-shared-stamp: configure-gtk-shared-stamp
        cd $(objdir_gtk_shared) && $(FAST_MAKE)
        touch $@
 
        cd $(objdir_gtk_shared) && $(FAST_MAKE)
        touch $@
 
-configure-gtk-static-stamp:
-       dh_testdir
-       mkdir -p $(objdir_gtk_static)
-       cd $(objdir_gtk_static) \
-               && ../configure --prefix=/usr                           \
-                               --cache-file=$(config_cache)            \
-                               --with-flavour=$(DEBIAN_WXFLAVOUR)      \
-                               --with-gtk                              \
-                               --enable-gtk2                           \
-                               --enable-unicode                        \
-                               --with-opengl                           \
-                               --disable-shared                        \
-                               --with-zlib=sys                         \
-                               --with-libjpeg=sys                      \
-                               --with-libpng=sys                       \
-                               --with-libtiff=sys                      \
-                               --enable-dynamic-loader                 \
-                               --enable-std_iostreams
-       touch $@
-
-build-gtk-static-stamp: configure-gtk-static-stamp
-       dh_testdir
-       cd $(objdir_gtk_static) && $(FAST_MAKE)
-       touch $@
 
 configure-gtk-debug-stamp:
        dh_testdir
 
 configure-gtk-debug-stamp:
        dh_testdir
@@ -260,16 +239,14 @@ configure-gtk-debug-stamp:
                                --cache-file=$(config_cache)            \
                                --with-flavour=$(DEBIAN_WXFLAVOUR)      \
                                --with-gtk                              \
                                --cache-file=$(config_cache)            \
                                --with-flavour=$(DEBIAN_WXFLAVOUR)      \
                                --with-gtk                              \
-                               --enable-gtk2                           \
-                               --enable-unicode                        \
                                --with-opengl                           \
                                --with-opengl                           \
-                               --enable-debug                          \
+                               --with-gnomeprint                       \
                                --with-zlib=sys                         \
                                --with-libjpeg=sys                      \
                                --with-libpng=sys                       \
                                --with-libtiff=sys                      \
                                --with-zlib=sys                         \
                                --with-libjpeg=sys                      \
                                --with-libpng=sys                       \
                                --with-libtiff=sys                      \
-                               --enable-dynamic-loader                 \
-                               --enable-std_iostreams
+                               --enable-debug                          \
+                               --enable-unicode
        touch $@
 
 build-gtk-debug-stamp: configure-gtk-debug-stamp
        touch $@
 
 build-gtk-debug-stamp: configure-gtk-debug-stamp
@@ -282,13 +259,8 @@ build-gtk-shared-contrib-stamp: build-gtk-shared-stamp
        dh_testdir
        cd $(objdir_gtk_shared)/contrib/src && $(FAST_MAKE)
        cd $(objdir_gtk_shared)/utils/wxrc && $(FAST_MAKE)
        dh_testdir
        cd $(objdir_gtk_shared)/contrib/src && $(FAST_MAKE)
        cd $(objdir_gtk_shared)/utils/wxrc && $(FAST_MAKE)
-       #cd $(objdir_gtk_shared)/contrib/utils/wxrcedit && $(FAST_MAKE)
        touch $@
 
        touch $@
 
-build-gtk-static-contrib-stamp: build-gtk-static-stamp
-       dh_testdir
-       cd $(objdir_gtk_static)/contrib/src && $(FAST_MAKE)
-       touch $@
 
 build-gtk-debug-contrib-stamp: build-gtk-debug-stamp
        dh_testdir
 
 build-gtk-debug-contrib-stamp: build-gtk-debug-stamp
        dh_testdir
@@ -309,7 +281,8 @@ build-gtk-py-stamp: build-gtk-shared-stamp purge-dbg-py
                && $(python_ver) ./setup.py     build                   \
                                                WX_CONFIG='$(wxconfig)' \
                                                WXPORT=gtk2             \
                && $(python_ver) ./setup.py     build                   \
                                                WX_CONFIG='$(wxconfig)' \
                                                WXPORT=gtk2             \
-                                               UNICODE=1
+                                               UNICODE=1               \
+                                               FLAVOUR=$(DEBIAN_WXFLAVOUR)
        touch $@
 
 build-doc-stamp: build-gtk-shared-stamp
        touch $@
 
 build-doc-stamp: build-gtk-shared-stamp
@@ -375,7 +348,8 @@ build-gtk-dbg-py-stamp: build-gtk-debug-stamp purge-release-py
                && $(python_ver) ./setup.py build                       \
                                            WX_CONFIG='$(wxconfig-dbg)' \
                                            WXPORT=gtk2                 \
                && $(python_ver) ./setup.py build                       \
                                            WX_CONFIG='$(wxconfig-dbg)' \
                                            WXPORT=gtk2                 \
-                                           UNICODE=1
+                                           UNICODE=1                   \
+                                           FLAVOUR=$(addsuffix -,$(DEBIAN_WXFLAVOUR))dbg
        touch $@
 
 
        touch $@
 
 
@@ -452,6 +426,7 @@ clean: debian/control clean-py
        rm -f debian/$(package_gtk_lib).*
        rm -f debian/$(package_gtk_dev).*
        rm -f debian/$(package_gtk_dbg).*
        rm -f debian/$(package_gtk_lib).*
        rm -f debian/$(package_gtk_dev).*
        rm -f debian/$(package_gtk_dbg).*
+       rm -f debian/$(package_gtk_py_lib).*
        rm -f debian/$(package_gtk_py).*
        rm -f debian/$(package_common).*
        rm -f debian/$(package_headers).*
        rm -f debian/$(package_gtk_py).*
        rm -f debian/$(package_common).*
        rm -f debian/$(package_headers).*
@@ -485,7 +460,7 @@ install-gtk-lib: install-gtk-shared-stamp
        dh_install $(objdir_gtk_install)/lib/libwx_*.so.*       usr/lib
 
 install-gtk-dev: DH_OPTIONS=-p$(package_gtk_dev)
        dh_install $(objdir_gtk_install)/lib/libwx_*.so.*       usr/lib
 
 install-gtk-dev: DH_OPTIONS=-p$(package_gtk_dev)
-install-gtk-dev: build-gtk-static-stamp build-gtk-static-contrib-stamp install-gtk-shared-stamp
+install-gtk-dev: install-gtk-shared-stamp
        dh_testdir
        dh_testroot
        dh_clean -k
        dh_testdir
        dh_testroot
        dh_clean -k
@@ -493,9 +468,6 @@ install-gtk-dev: build-gtk-static-stamp build-gtk-static-contrib-stamp install-g
        dh_install $(objdir_gtk_install)/lib/libwx_*.so         usr/lib
        dh_install $(objdir_gtk_install)/lib/wx/include         usr/lib/wx
        dh_install $(objdir_gtk_install)/lib/wx/config/gtk*     usr/lib/wx/config
        dh_install $(objdir_gtk_install)/lib/libwx_*.so         usr/lib
        dh_install $(objdir_gtk_install)/lib/wx/include         usr/lib/wx
        dh_install $(objdir_gtk_install)/lib/wx/config/gtk*     usr/lib/wx/config
-       dh_install $(objdir_gtk_static)/lib/libwx*.a            usr/lib
-       dh_install $(objdir_gtk_static)/lib/wx/include          usr/lib/wx
-       dh_install $(objdir_gtk_static)/lib/wx/config/gtk*      usr/lib/wx/config
 
 install-gtk-dbg: DH_OPTIONS=-p$(package_gtk_dbg)
 install-gtk-dbg: build-gtk-debug-stamp build-gtk-debug-contrib-stamp
 
 install-gtk-dbg: DH_OPTIONS=-p$(package_gtk_dbg)
 install-gtk-dbg: build-gtk-debug-stamp build-gtk-debug-contrib-stamp
@@ -509,21 +481,36 @@ install-gtk-dbg: build-gtk-debug-stamp build-gtk-debug-contrib-stamp
        cp debian/lintian-override debian/$(package_gtk_dbg)/usr/share/lintian/overrides/$(package_gtk_dbg)
 
 
        cp debian/lintian-override debian/$(package_gtk_dbg)/usr/share/lintian/overrides/$(package_gtk_dbg)
 
 
-install-gtk-py: DH_OPTIONS=-p$(package_gtk_py)
-install-gtk-py: build-gtk-py-stamp
+install-gtk-py-lib: DH_OPTIONS=-p$(package_gtk_py_lib)
+install-gtk-py-lib: build-gtk-py-stamp
        dh_testdir
        dh_testroot
        dh_clean -k
        dh_installdirs
        cd wxPython                                                             \
                && $(python_ver) ./setup.py install                             \
        dh_testdir
        dh_testroot
        dh_clean -k
        dh_installdirs
        cd wxPython                                                             \
                && $(python_ver) ./setup.py install                             \
-                             --prefix=`pwd`/../debian/$(package_gtk_py)/usr    \
+                             --prefix=`pwd`/../debian/$(package_gtk_py_lib)/usr \
                              WX_CONFIG='$(wxconfig)'                           \
                              WXPORT=gtk2                                       \
                              WX_CONFIG='$(wxconfig)'                           \
                              WXPORT=gtk2                                       \
-                             UNICODE=1
+                             UNICODE=1                                         \
+                             FLAVOUR=$(DEBIAN_WXFLAVOUR)
+
+       find debian/$(package_gtk_py_lib)/$(pydir) -name '*.py?' -exec rm '{}' ';'
+
+       # This is rather bogus, its included in the main copyright file now though.
+       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
+       dh_testdir
+       dh_testroot
+       dh_clean -k
+       dh_installdirs
 
 
-       find debian/$(package_gtk_py)/usr/lib/$(python_ver)/site-packages       \
-               -name '*.py?' -exec rm '{}' ';'
+       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
        dh_link usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/img2py.1     \
 
        dh_installman debian/wxPython-tools.1
        dh_link usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/img2py.1     \
@@ -535,10 +522,9 @@ install-gtk-py: build-gtk-py-stamp
                usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/helpviewer.1 \
                usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pyalacarte.1 \
                usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pyalamode.1  \
                usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/helpviewer.1 \
                usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pyalacarte.1 \
                usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pyalamode.1  \
-               usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pywrap.1
+               usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pywrap.1     \
+               usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pywxrc.1
 
 
-       # This is rather bogus, its included in the main copyright file now though.
-       rm -f debian/$(package_gtk_py)/usr/lib/$(python_ver)/site-packages/wx/tools/XRCed/license.txt
 
 install-common: DH_OPTIONS=-p$(package_common)
 install-common: install-gtk-shared-stamp
 
 install-common: DH_OPTIONS=-p$(package_common)
 install-common: install-gtk-shared-stamp
@@ -547,18 +533,12 @@ install-common: install-gtk-shared-stamp
        dh_clean -k
        dh_installdirs
 
        dh_clean -k
        dh_installdirs
 
-#      We don't need the afm metrics for gtk2, but we might need them to support
-#      the 2.4 release for a while still and any other ports we might build.
-       dh_install $(objdir_gtk_install)/share/wx       usr/share
        dh_install $(objdir_gtk_install)/share/aclocal  usr/share
        dh_installman debian/wx-config.1
 
        dh_install $(objdir_gtk_shared)/utils/wxrc/wxrc usr/bin
        dh_install $(objdir_gtk_install)/share/aclocal  usr/share
        dh_installman debian/wx-config.1
 
        dh_install $(objdir_gtk_shared)/utils/wxrc/wxrc usr/bin
-#      dh_install $(objdir_gtk_shared)/contrib/utils/wxrcedit/wxrcedit usr/bin
-
        dh_installman debian/wxrc-tools.1
        dh_link usr/share/man/man1/wxrc-tools.1 usr/share/man/man1/wxrc.1
        dh_installman debian/wxrc-tools.1
        dh_link usr/share/man/man1/wxrc-tools.1 usr/share/man/man1/wxrc.1
-#      dh_link usr/share/man/man1/wxrc-tools.1 usr/share/man/man1/wxrcedit.1
 
 
 install-headers: DH_OPTIONS=-p$(package_headers)
 
 
 install-headers: DH_OPTIONS=-p$(package_headers)
@@ -611,25 +591,14 @@ install-gtk-dbg-py: build-gtk-dbg-py-stamp
                              --prefix=`pwd`/../debian/$(package_gtk_dbg_py)/usr \
                              WX_CONFIG='$(wxconfig-dbg)'                       \
                              WXPORT=gtk2                                       \
                              --prefix=`pwd`/../debian/$(package_gtk_dbg_py)/usr \
                              WX_CONFIG='$(wxconfig-dbg)'                       \
                              WXPORT=gtk2                                       \
-                             UNICODE=1
+                             UNICODE=1                                         \
+                             FLAVOUR=$(addsuffix -,$(DEBIAN_WXFLAVOUR))dbg
 
 
-       find debian/$(package_gtk_dbg_py)/usr/lib/$(python_ver)/site-packages   \
-               -name '*.py?' -exec rm '{}' ';'
-
-       dh_installman debian/wxPython-tools.1
-       dh_link usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/img2py.1     \
-               usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/img2xpm.1    \
-               usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/img2png.1    \
-               usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pycrust.1    \
-               usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pyshell.1    \
-               usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/xrced.1      \
-               usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/helpviewer.1 \
-               usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pyalacarte.1 \
-               usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pyalamode.1  \
-               usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pywrap.1
+       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/wxPython/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)
@@ -797,7 +766,7 @@ binary-fast:control-files-stamp install-gtk-dbg install-msw-dev install-headers
         binary-gtk binary-gtk-dev binary-gtk-dbg binary-doc binary-cross \
        install install_arch install-gtk-lib install-gtk-dev            \
         install-gtk-dbg                                                \
         binary-gtk binary-gtk-dev binary-gtk-dbg binary-doc binary-cross \
        install install_arch install-gtk-lib install-gtk-dev            \
         install-gtk-dbg                                                \
-       install-gtk-py install-gtk-dbg-py                               \
+       install-gtk-py install-gtk-py-lib install-gtk-dbg-py            \
        install-common install-headers install-i18n install-doc         \
        install-examples install-msw-dev install-msw-dbg install-headers-msw
 
        install-common install-headers install-i18n install-doc         \
        install-examples install-msw-dev install-msw-dbg install-headers-msw
 
wxWidgets (Impactor)