Clean up the soversion/flavour labelling of binary runtime packages.

Split out a common wxPython package so the runtime support for it
doesn't need to conflict any more either.

Makefile.in was apparently committed from out of date bakefiles
so it is included here again too.


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

Makefile.in

@@ -1162,6 +1162,7 @@ COND_WXUSE_EXPAT_BUILTIN___wxexpat___depname = \
 @COND_TOOLKIT_WINCE@BASE_WINCE_HDR = wx/msw/wince/time.h
 @COND_TOOLKIT_WINCE@NET_WINCE_SRC = src/msw/wince/net.cpp
 @COND_TOOLKIT_WINCE@NET_WINCE_HDR = wx/msw/wince/net.h
+@COND_TOOLKIT_COCOA@OPENGL_HDR = wx/cocoa/glcanvas.h
 @COND_TOOLKIT_GTK@OPENGL_HDR = wx/gtk/glcanvas.h
 @COND_TOOLKIT_MAC@OPENGL_HDR = wx/mac/carbon/glcanvas.h
 @COND_TOOLKIT_MOTIF@OPENGL_HDR = wx/x11/glcanvas.h
@@ -6393,6 +6394,7 @@ COND_USE_SOSYMLINKS_1___gldll___so_symlinks_inst_cmd = rm -f \
 	$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf2) \
 	$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl-$(WX_RELEASE)$(HOST_SUFFIX).$(DLLIMP_SUFFIX)
 @COND_USE_SOSYMLINKS_1@__gldll___so_symlinks_inst_cmd = $(COND_USE_SOSYMLINKS_1___gldll___so_symlinks_inst_cmd)
+@COND_TOOLKIT_COCOA@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o
 @COND_TOOLKIT_GTK@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o
 @COND_TOOLKIT_MAC@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o
 @COND_TOOLKIT_MOTIF@__OPENGL_SRC_OBJECTS = gldll_glcanvas.o
@@ -6417,6 +6419,7 @@ COND_SHARED_0_USE_GUI_1_USE_OPENGL_1___gllib___depname = \
 @COND_GCC_PCH_1@__gllib_PCH_INC = -I.pch/wxprec_gllib
 @COND_GCC_PCH_1@___pch_wxprec_gllib_wx_wxprec_h_gch___depname \
 @COND_GCC_PCH_1@	= .pch/wxprec_gllib/wx/wxprec.h.gch
+@COND_TOOLKIT_COCOA@__OPENGL_SRC_OBJECTS_1 = gllib_glcanvas.o
 @COND_TOOLKIT_GTK@__OPENGL_SRC_OBJECTS_1 = gllib_glcanvas.o
 @COND_TOOLKIT_MAC@__OPENGL_SRC_OBJECTS_1 = gllib_glcanvas.o
 @COND_TOOLKIT_MOTIF@__OPENGL_SRC_OBJECTS_1 = gllib_glcanvas.o
@@ -20866,6 +20869,9 @@ xrclib_xmlrsall.o: $(srcdir)/src/xrc/xmlrsall.cpp $(XRCLIB_ODEP)
 @COND_TOOLKIT_MAC@gldll_glcanvas.o: $(srcdir)/src/mac/carbon/glcanvas.cpp $(GLDLL_ODEP)
 @COND_TOOLKIT_MAC@	$(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $<
 
+@COND_TOOLKIT_COCOA@gldll_glcanvas.o: $(srcdir)/src/cocoa/glcanvas.mm $(GLDLL_ODEP)
+@COND_TOOLKIT_COCOA@	$(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $<
+
 @COND_TOOLKIT_GTK@gldll_glcanvas.o: $(srcdir)/src/gtk/glcanvas.cpp $(GLDLL_ODEP)
 @COND_TOOLKIT_GTK@	$(CXXC) -c -o $@ $(GLDLL_CXXFLAGS) $<
 
@@ -20887,6 +20893,9 @@ xrclib_xmlrsall.o: $(srcdir)/src/xrc/xmlrsall.cpp $(XRCLIB_ODEP)
 @COND_TOOLKIT_MAC@gllib_glcanvas.o: $(srcdir)/src/mac/carbon/glcanvas.cpp $(GLLIB_ODEP)
 @COND_TOOLKIT_MAC@	$(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $<
 
+@COND_TOOLKIT_COCOA@gllib_glcanvas.o: $(srcdir)/src/cocoa/glcanvas.mm $(GLLIB_ODEP)
+@COND_TOOLKIT_COCOA@	$(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $<
+
 @COND_TOOLKIT_GTK@gllib_glcanvas.o: $(srcdir)/src/gtk/glcanvas.cpp $(GLLIB_ODEP)
 @COND_TOOLKIT_GTK@	$(CXXC) -c -o $@ $(GLLIB_CXXFLAGS) $<
 
@@ -21849,12 +21858,16 @@ UTILS_DIST: ALL_GUI_DIST
 	cp $(UTILSDIR)/emulator/docs/*.jpg $(DISTDIR)/utils/emulator/docs
 
 	mkdir $(DISTDIR)/utils/hhp2cached
-	cp $(UTILSDIR)/hhp2cached/*.* $(DISTDIR)/utils/hhp2cached
+	cp $(UTILSDIR)/hhp2cached/Makefile.in $(DISTDIR)/utils/hhp2cached
+	cp $(UTILSDIR)/hhp2cached/*.cpp $(DISTDIR)/utils/hhp2cached
+	cp $(UTILSDIR)/hhp2cached/*.rc $(DISTDIR)/utils/hhp2cached
 
 	mkdir $(DISTDIR)/utils/HelpGen
 	mkdir $(DISTDIR)/utils/HelpGen/src
 	cp $(UTILSDIR)/HelpGen/Makefile.in $(DISTDIR)/utils/HelpGen
-	cp $(UTILSDIR)/HelpGen/src/*.* $(DISTDIR)/utils/HelpGen/src
+	cp $(UTILSDIR)/HelpGen/src/Makefile.in $(DISTDIR)/utils/HelpGen/src
+	cp $(UTILSDIR)/HelpGen/src/*.h $(DISTDIR)/utils/HelpGen/src
+	cp $(UTILSDIR)/HelpGen/src/*.cpp $(DISTDIR)/utils/HelpGen/src
 
 	mkdir $(DISTDIR)/utils/helpview
 	mkdir $(DISTDIR)/utils/helpview/src
@@ -21866,6 +21879,11 @@ UTILS_DIST: ALL_GUI_DIST
 	cp $(UTILSDIR)/helpview/src/test.zip $(DISTDIR)/utils/helpview/src
 	cp $(UTILSDIR)/helpview/src/bitmaps/*.xpm $(DISTDIR)/utils/helpview/src/bitmaps
 
+	mkdir $(DISTDIR)/utils/wxrc
+	cp $(UTILSDIR)/wxrc/Makefile.in $(DISTDIR)/utils/wxrc
+	cp $(UTILSDIR)/wxrc/*.cpp $(DISTDIR)/utils/wxrc
+	cp $(UTILSDIR)/wxrc/*.rc $(DISTDIR)/utils/wxrc
+
 MISC_DIST: ALL_GUI_DIST
 	mkdir $(DISTDIR)/misc
 	mkdir $(DISTDIR)/misc/afm

debian/control.in

@@ -5,7 +5,7 @@ Build-Depends: debhelper (>=4.0), flex, bison, gettext, libgtk2.0-dev, =PY, =PY-
 Maintainer: Ron Lee <ron@debian.org>
 Standards-Version: 3.6.1.1
 
-Package: libwxgtk=V.=SO
+Package: libwxgtk=SOV
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}
@@ -21,7 +21,7 @@ Description: wxWidgets Cross-platform C++ GUI toolkit (GTK+ runtime)
 Package: libwxgtk=V-dev
 Architecture: any
 Section: libdevel
-Depends: wx=V-headers (= ${Source-Version}), libwxgtk=V.=SO (= ${Source-Version}), libc6-dev
+Depends: wx=V-headers (= ${Source-Version}), libwxgtk=SOV (= ${Source-Version}), libc6-dev
 Suggests: wx=V-common | wx-common, wx=V-doc, libstdc++-dev, gettext, xlibmesa-gl-dev | libgl-dev, xlibmesa-glu-dev | libglu-dev
 Description: wxWidgets Cross-platform C++ GUI toolkit (GTK+ development)
  wxWidgets (formerly known as wxWindows) is a class library for C++ providing
@@ -47,26 +47,54 @@ Description: wxWidgets Cross-platform C++ GUI toolkit (GTK+ development)
  provides many internal checks by wxWidgets itself that are not performed on
  apps compiled with the 'release version' libs in the -dev package.
 
-Package: libwxgtk=V.=SO-python
+Package: libwxgtk=SOV-python
 Architecture: any
 Section: python
-Depends: =PY, ${shlibs:Depends}
+Depends: wxpython, =PY, ${shlibs:Depends}
-Suggests: wx=V-doc, wx=V-examples, =PY-xml
-Conflicts: libwxgtk-python
-Replaces: libwxgtk-python
-Provides: libwxgtk-python
 Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython binding)
  wxWidgets (formerly known as wxWindows) is a class library for C++ providing
  GUI components and other facilities on several popular platforms (and some
  unpopular ones as well).  For more information see http://wxwidgets.org
  .
- This package provides a Python binding to the wxGTK library and its
+ This package provides a Python binding to the wxGTK library and the
- contrib libs.  If you wish to use xrced you'll also need the python-xml
+ wxPython runtime support libraries.  If you wish to use xrc you'll also
- package installed.
+ need the =PY-xml package installed.
+
+Package: libwxgtk=SOV-dbg-python
+Architecture: any
+Section: python
+Depends: wxpython, =PY, ${shlibs:Depends}
+Description: wxWindows Cross-platform C++ GUI toolkit (wxPython binding)
+ wxWindows is a class library for C++ providing GUI (Graphical User
+ Interface) and other facilities on more than one platform.  Version =V
+ currently supports subsets of GTK+, Motif, and MS Windows.
+ .
+ This package provides a Python binding to the wxGTK debug library.
+ It is useful for developers as many common errors may be caught, but
+ you should _never_ upload packages to Debian that depend upon this
+ package explicitly, use the libwxgtk=SOV-python package instead.
+ .
+ If you wish to use xrc you'll also need the =PY-xml package installed.
+
+Package: wxpython=SOV
+Architecture: any
+Section: python
+Depends: libwxgtk=SOV-python, =PY, ${shlibs:Depends}
+Suggests: wxwin=V-doc, wxwin=V-examples, =PY-xml
+Conflicts: wxpython
+Replaces: wxpython, libwxgtk2.4-python
+Provides: wxpython
+Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython common files)
+ wxWidgets (formerly known as wxWindows) is a class library for C++ providing
+ GUI components and other facilities on several popular platforms (and some
+ unpopular ones as well).  For more information see http://wxwidgets.org
+ .
+ This package provides support utilities and common files for wxPython=SOV.
+ If you wish to use xrced you'll also need the =PY-xml package installed.
 
 Package: wx=V-common
 Architecture: any
-Section: libs
+Section: devel
 Depends: ${shlibs:Depends}
 Conflicts: wx-common
 Replaces: wx-common, wxwin2.4-headers, libwxgtk2.4-contrib-dev
@@ -128,28 +156,6 @@ Description: wxWidgets Cross-platform C++ GUI toolkit (examples)
  This package contains examples of using the wxWidgets toolkit in
  C++ and with the wxPython language binding.
 
-Package: libwxgtk=V.=SO-dbg-python
-Architecture: any
-Section: python
-Depends: =PY, ${shlibs:Depends}
-Suggests: wxwin=V-doc, wxwin=V-examples, =PY-xml
-Conflicts: libwxgtk-python
-Replaces: libwxgtk-python
-Provides: libwxgtk-python
-Description: wxWindows Cross-platform C++ GUI toolkit (wxPython binding)
- wxWindows is a class library for C++ providing GUI (Graphical User
- Interface) and other facilities on more than one platform.  Version =V
- currently supports subsets of GTK+, Motif, and MS Windows.
- .
- This package provides a Python binding to the wxGTK debug library.
- It is useful for developers as many common errors may be caught.
- Unfortunately it cannot be installed at the same time as the release
- packages, but it will replace them for other applications that require
- wxPython.  You should _never_ upload packages to Debian that depend upon
- this package explicitly, use the libwxgtk=V.=SO-python package instead.
- .
- If you wish to use xrced you'll also need the python-xml package installed.
-
 Package: libwxmsw=V-dev
 Architecture: i386
 Section: otherosfs

debian/libwxgtk-dbg-python.menu

@@ -1,7 +0,0 @@
-?package(libwxgtk=V.=SO-dbg-python):needs="X11" section="Apps/Programming"\
-  title="pycrust" command="/usr/bin/pycrust"
-?package(libwxgtk=V.=SO-dbg-python):needs="X11" section="Apps/Programming"\
-  title="pyshell" command="/usr/bin/pyshell"
-?package(libwxgtk=V.=SO-dbg-python):needs="X11" section="Apps/Programming"\
-  title="xrced" command="/usr/bin/xrced"
-

debian/libwxgtk-dbg-python.prerm

@@ -2,7 +2,7 @@
 
 set -e
 
-PACKAGE="libwxgtk=V.=SO-dbg-python"
+PACKAGE="libwxgtk=SOV-dbg-python"
 dpkg --listfiles $PACKAGE | awk '$0~/\.py$/ {print $0"c\n" $0"o"}' | xargs rm -f >&2
 
 #DEBHELPER#

debian/libwxgtk-python.dirs

@@ -1,2 +0,0 @@
-usr/lib/=PY/site-packages/wxPython/lib
-

debian/libwxgtk-python.menu

@@ -1,7 +0,0 @@
-?package(libwxgtk=V.=SO-python):needs="X11" section="Apps/Programming"\
-  title="pycrust" command="/usr/bin/pycrust"
-?package(libwxgtk=V.=SO-python):needs="X11" section="Apps/Programming"\
-  title="pyshell" command="/usr/bin/pyshell"
-?package(libwxgtk=V.=SO-python):needs="X11" section="Apps/Programming"\
-  title="xrced" command="/usr/bin/xrced"
-

debian/libwxgtk-python.postinst

@@ -2,7 +2,7 @@
 
 set -e
 
-WXPYTHONDIR="/usr/lib/=PY/site-packages/wxPython"
+WXPYTHONDIR="/usr/lib/=PY/site-packages/wx-=SOV"
 
 if [ "$1" = "configure" ]; then
 	=PY /usr/lib/=PY/compileall.py -q ${WXPYTHONDIR}

debian/libwxgtk-python.prerm

@@ -2,7 +2,7 @@
 
 set -e
 
-PACKAGE="libwxgtk=V.=SO-python"
+PACKAGE="libwxgtk=SOV-python"
 dpkg --listfiles $PACKAGE | awk '$0~/\.py$/ {print $0"c\n" $0"o"}' | xargs rm -f >&2
 
 #DEBHELPER#

debian/rules

@@ -40,6 +40,7 @@ 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/')
+sorelease := $(release:%-$(DEBIAN_WXFLAVOUR)=%).$(soversion)$(addprefix -,$(DEBIAN_WXFLAVOUR))
 
 cross_host  = i586-mingw32msvc
 cross_build = $(shell ./config.guess)
@@ -48,17 +49,18 @@ config_cache       = ../config_deb.cache
 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_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_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
@@ -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)
-	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
@@ -146,12 +148,24 @@ control-files-stamp: debian/control
 		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                          \
+	@for f in docs postinst prerm; do                                    \
-		echo "generating control file $(package_gtk_py).$$f";        \
+		echo "generating control file $(package_gtk_py_lib).$$f";    \
-		sed -e 's/=PY/$(python_ver)/g;s/=V/$(release)/g;s/=SO/$(soversion)/g' \
+		sed -e 's/=PY/$(python_ver)/g;s/=V/$(release)/g;s/=SOV/$(sorelease)/g' \
 			< debian/libwxgtk-python.$$f                         \
-			> debian/$(package_gtk_py).$$f;                      \
+			> debian/$(package_gtk_py_lib).$$f;                  \
 	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               \
@@ -161,18 +175,6 @@ control-files-stamp: debian/control
 		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 \
@@ -309,7 +311,8 @@ build-gtk-py-stamp: build-gtk-shared-stamp purge-dbg-py
 		&& $(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
@@ -375,7 +378,8 @@ build-gtk-dbg-py-stamp: build-gtk-debug-stamp purge-release-py
 		&& $(python_ver) ./setup.py build			\
 					    WX_CONFIG='$(wxconfig-dbg)' \
 					    WXPORT=gtk2			\
-					    UNICODE=1
+					    UNICODE=1			\
+					    FLAVOUR=$(addsuffix -,$(DEBIAN_WXFLAVOUR))dbg
 	touch $@
 
 
@@ -452,6 +456,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_py_lib).*
 	rm -f debian/$(package_gtk_py).*
 	rm -f debian/$(package_common).*
 	rm -f debian/$(package_headers).*
@@ -509,22 +514,38 @@ 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)
 
 
-install-gtk-py: DH_OPTIONS=-p$(package_gtk_py)
+install-gtk-py-lib: DH_OPTIONS=-p$(package_gtk_py_lib)
-install-gtk-py: build-gtk-py-stamp
+install-gtk-py-lib: build-gtk-py-stamp
 	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					\
-			      UNICODE=1
+			      UNICODE=1						\
+			      FLAVOUR=$(DEBIAN_WXFLAVOUR)
 
-	find debian/$(package_gtk_py)/usr/lib/$(python_ver)/site-packages	\
+	find debian/$(package_gtk_py_lib)/usr/lib/$(python_ver)/site-packages	\
 		-name '*.py?' -exec rm '{}' ';'
 
+	# 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)/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
+
+	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
+	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     \
 		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/img2xpm.1    \
@@ -537,8 +558,6 @@ install-gtk-py: build-gtk-py-stamp
 		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
 
-	# 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
@@ -611,25 +630,18 @@ install-gtk-dbg-py: build-gtk-dbg-py-stamp
 			      --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
+	rm -rf usr/bin								\
-	dh_link usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/img2py.1     \
+	       usr/lib/$(python_ver)/site-packages/wxversion.py			\
-		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/img2xpm.1    \
+	       usr/lib/$(python_ver)/site-packages/wx.pth
-		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
 
 	# 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)/usr/lib/$(python_ver)/site-packages/wx-$(sorelease)/wx/tools/XRCed/license.txt
 
 
 install-msw-dev: DH_OPTIONS=-p$(package_msw_dev)
@@ -797,7 +809,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                                             	\
-	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
 

debian/wxpython.menu

@@ -0,0 +1,7 @@
+?package(wxpython=SOV):needs="X11" section="Apps/Programming"\
+  title="pycrust" command="/usr/bin/pycrust"
+?package(wxpython=SOV):needs="X11" section="Apps/Programming"\
+  title="pyshell" command="/usr/bin/pyshell"
+?package(wxpython=SOV):needs="X11" section="Apps/Programming"\
+  title="xrced" command="/usr/bin/xrced"
+