X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3a922bb4bd8dbcb04e31e324648c2912e167e0cd..0ecfbbea128f8e0e1039cbde373e7d976a06a2ec:/debian/rules?ds=sidebyside

diff --git a/debian/rules b/debian/rules
index 8686835500..cfe426fe8a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,6 +16,9 @@ python_dir:=python$(shell python -c "import sys;print sys.version[:3]")
 cross_host=i586-mingw32msvc
 cross_build=$(shell ./config.guess)
 
+config_cache=../config_deb.cache
+config_cache_cross=../config_deb_cross.cache
+
 # Packages to build:
 package_wxbase_lib=libwxbase$(release)
 package_wxbase_dev=libwxbase$(release)-dev
@@ -31,8 +34,12 @@ package_i18n=wxwin$(release)-i18n
 package_doc=wxwin$(release)-doc
 package_examples=wxwin$(release)-examples
 
+package_gtk_univ=libwxgtk$(release)-univ
+
 package_wxbase_msw_dev=libwxbase-msw$(release)-dev
+package_wxbase_msw_dbg=libwxbase-msw$(release)-dbg
 package_msw_dev=libwxmsw$(release)-dev
+package_msw_dbg=libwxmsw$(release)-dbg
 package_headers_msw=wxwin$(release)-headers-msw
 
 # Build directories:
@@ -47,13 +54,21 @@ objdir_doc=docs/wxWindows-manual.html
 objdir_examples=docs/examples
 objdir_i18n=locale
 
+objdir_gtk_univ=objs_gtk_univ
+objdir_univ_install=objs_univ_install
+
+objdir_wxbase_msw_shared=objs_wxbase_msw_sh
 objdir_wxbase_msw_static=objs_wxbase_msw_st
+objdir_wxbase_msw_dbg=objs_wxbase_msw_d
+objdir_msw_shared=objs_msw_sh
 objdir_msw_static=objs_msw_st
+objdir_msw_dbg=objs_msw_d
 
 objdirs=$(objdir_wxbase_shared) $(objdir_wxbase_static) $(objdir_wxbase_debug) \
-	$(objdir_gtk_shared) $(objdir_gtk_static) $(objdir_gtk_debug) \
-	$(objdir_doc_cruft) $(objdir_doc) $(objdir_examples) \
-        $(objdir_wxbase_msw_static) $(objdir_msw_static)
+	$(objdir_gtk_shared) $(objdir_gtk_static) $(objdir_gtk_debug) $(objdir_gtk_univ) \
+	$(objdir_univ_install) $(objdir_doc_cruft) $(objdir_doc) $(objdir_examples) \
+	$(objdir_wxbase_msw_shared) $(objdir_wxbase_msw_static) $(objdir_wxbase_msw_dbg) \
+	$(objdir_msw_shared) $(objdir_msw_static) $(objdir_msw_dbg)
 
 #	note that the i18n package is actually arch indep (once built)
 #	but must be built (and installed) during the arch any phase as
@@ -66,9 +81,14 @@ build_arch_stamps=build-wxbase-shared-stamp build-wxbase-static-stamp \
                   build-contrib-shared-stamp build-contrib-static-stamp \
                   build-gtk-py-stamp build-i18n-stamp
 
+# disable gtk-univ build, we'll  replace it with x11-univ later.
+#		  build-gtk-univ-stamp
+
 build_indep_stamps=build-examples-stamp build-doc-stamp
 
-build_cross_stamps=build-wxbase-msw-dev-stamp build-msw-dev-stamp
+build_cross_stamps=build-wxbase-msw-shared-stamp build-wxbase-msw-static-stamp \
+		   build-wxbase-msw-dbg-stamp build-msw-shared-stamp \
+		   build-msw-static-stamp build-msw-dbg-stamp
 
 build_stamps_native=$(build_arch_stamps) $(build_indep_stamps)
 
@@ -80,9 +100,12 @@ install_all_arch=install-wxbase-lib install-wxbase-dev install-wxbase-dbg \
                  install-gtk-contrib install-gtk-contrib-dev install-gtk-py \
                  install-headers install-i18n
 
+# disable gtk-univ build, we'll  replace it with x11-univ later.
+#                install-gtk-univ
+
 install_all_indep=install-examples install-doc
 
-install_all_cross=install-wxbase-msw-dev install-msw-dev install-headers-msw
+install_all_cross=install-wxbase-msw-dev install-wxbase-msw-dbg install-msw-dev install-msw-dbg install-headers-msw
 
 install_all_native=$(install_all_arch) $(install_all_indep)
 
@@ -129,6 +152,11 @@ 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 links postinst prerm; do \
+		echo "generating control file $(package_gtk_univ).$$f"; \
+		sed -e 's/=V/$(release)/g' < debian/libwxgtk-univ.$$f \
+			> debian/$(package_gtk_univ).$$f; \
+	done;
 	@for f in dirs docs files postinst prerm; do \
 		echo "generating control file $(package_gtk_py).$$f"; \
 		sed -e 's/=PY/$(python_dir)/g;s/=V/$(release)/g' < debian/libwxgtk-python.$$f \
@@ -164,11 +192,21 @@ control-files-stamp: debian/control
 		sed -e 's/=V/$(release)/g;s/=H/$(cross_host)/g' < debian/libwxbase-msw-dev.$$f \
 			> debian/$(package_wxbase_msw_dev).$$f; \
 	done;
+	@for f in dirs links postinst prerm; do \
+		echo "generating control file $(package_wxbase_msw_dbg).$$f"; \
+		sed -e 's/=V/$(release)/g;s/=H/$(cross_host)/g' < debian/libwxbase-msw-dbg.$$f \
+			> debian/$(package_wxbase_msw_dbg).$$f; \
+	done;
 	@for f in dirs links 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 \
 			> debian/$(package_msw_dev).$$f; \
 	done;
+	@for f in dirs links postinst prerm; do \
+		echo "generating control file $(package_msw_dbg).$$f"; \
+		sed -e 's/=V/$(release)/g;s/=H/$(cross_host)/g' < debian/libwxmsw-dbg.$$f \
+			> debian/$(package_msw_dbg).$$f; \
+	done;
 	@for f in dirs; do \
 		echo "generating control file $(package_headers_msw).$$f"; \
 		sed -e 's/=H/$(cross_host)/g' < debian/wxwin-headers-msw.$$f \
@@ -193,7 +231,7 @@ build-wxbase-shared-stamp:
 	mkdir -p $(objdir_wxbase_shared)
 	cd $(objdir_wxbase_shared) \
 		&& ../configure --prefix=/usr \
-				--cache-file=../config_deb.cache \
+				--cache-file=$(config_cache) \
 				--disable-gui \
 				--enable-soname \
 				--with-zlib=sys \
@@ -205,7 +243,7 @@ build-wxbase-static-stamp:
 	mkdir -p $(objdir_wxbase_static)
 	cd $(objdir_wxbase_static) \
 		&& ../configure --prefix=/usr \
-				--cache-file=../config_deb.cache \
+				--cache-file=$(config_cache) \
 				--disable-gui \
 				--disable-shared \
 				--with-zlib=sys \
@@ -217,7 +255,7 @@ build-wxbase-debug-stamp:
 	mkdir -p $(objdir_wxbase_debug)
 	cd $(objdir_wxbase_debug) \
 		&& ../configure --prefix=/usr \
-				--cache-file=../config_deb.cache \
+				--cache-file=$(config_cache) \
 				--disable-gui \
 				--enable-debug \
 				--enable-soname \
@@ -230,7 +268,7 @@ build-gtk-shared-stamp:
 	mkdir -p $(objdir_gtk_shared)
 	cd $(objdir_gtk_shared) \
 		&& ../configure --prefix=/usr \
-				--cache-file=../config_deb.cache \
+				--cache-file=$(config_cache) \
 				--with-gtk \
 				--with-opengl \
 				--enable-soname \
@@ -238,6 +276,7 @@ build-gtk-shared-stamp:
 				--with-libjpeg=sys \
 				--with-libpng=sys \
 				--with-libtiff=sys \
+				--enable-dynamic-loader \
 		&& $(MAKE)
 	touch $@
 
@@ -246,7 +285,7 @@ build-gtk-static-stamp:
 	mkdir -p $(objdir_gtk_static)
 	cd $(objdir_gtk_static) \
 		&& ../configure --prefix=/usr \
-				--cache-file=../config_deb.cache \
+				--cache-file=$(config_cache) \
 				--with-gtk \
 				--with-opengl \
 				--disable-shared \
@@ -254,6 +293,7 @@ build-gtk-static-stamp:
 				--with-libjpeg=sys \
 				--with-libpng=sys \
 				--with-libtiff=sys \
+				--enable-dynamic-loader \
 		&& $(MAKE)
 	touch $@
 
@@ -262,7 +302,7 @@ build-gtk-debug-stamp:
 	mkdir -p $(objdir_gtk_debug)
 	cd $(objdir_gtk_debug) \
 		&& ../configure --prefix=/usr \
-				--cache-file=../config_deb.cache \
+				--cache-file=$(config_cache) \
 				--with-gtk \
 				--with-opengl \
 				--enable-debug \
@@ -271,6 +311,25 @@ build-gtk-debug-stamp:
 				--with-libjpeg=sys \
 				--with-libpng=sys \
 				--with-libtiff=sys \
+				--enable-dynamic-loader \
+		&& $(MAKE)
+	touch $@
+
+build-gtk-univ-stamp:
+	dh_testdir
+	mkdir -p $(objdir_gtk_univ)
+	cd $(objdir_gtk_univ) \
+		&& ../configure --prefix=/usr \
+				--cache-file=$(config_cache) \
+				--with-gtk \
+				--with-opengl \
+				--enable-universal \
+				--enable-soname \
+				--with-zlib=sys \
+				--with-libjpeg=sys \
+				--with-libpng=sys \
+				--with-libtiff=sys \
+				--enable-dynamic-loader \
 		&& $(MAKE)
 	touch $@
 
@@ -335,16 +394,33 @@ build-examples-stamp: build-gtk-shared-stamp
 
 build-i18n-stamp: build-gtk-shared-stamp
 	dh_testdir
+
+	# touch .po files first, since if they are not already up
+	# to date then _now_ is not the time to fix it.
+	# That should have been been done before cvs was tagged.
 	cd $(objdir_i18n) \
+		&& touch *.po \
 		&& $(MAKE) allmo
 	touch $@
 
-build-wxbase-msw-dev-stamp:
+build-wxbase-msw-shared-stamp:
+	dh_testdir
+	mkdir -p $(objdir_wxbase_msw_shared)
+	cd $(objdir_wxbase_msw_shared) \
+		&& ../configure --prefix=/usr/$(cross_host) \
+				--cache-file=$(config_cache_cross) \
+				--host=$(cross_host) \
+				--build=$(cross_build) \
+				--disable-gui \
+		&& $(MAKE)
+	touch $@
+
+build-wxbase-msw-static-stamp:
 	dh_testdir
 	mkdir -p $(objdir_wxbase_msw_static)
 	cd $(objdir_wxbase_msw_static) \
 		&& ../configure --prefix=/usr/$(cross_host) \
-				--cache-file=../config_deb.cache \
+				--cache-file=$(config_cache_cross) \
 				--host=$(cross_host) \
 				--build=$(cross_build) \
 				--disable-gui \
@@ -352,26 +428,78 @@ build-wxbase-msw-dev-stamp:
 		&& $(MAKE)
 	touch $@
 
-build-msw-dev-stamp:
+# Note this builds dll only, since wxmsw static debug is > 130MB !
+build-wxbase-msw-dbg-stamp:
+	dh_testdir
+	mkdir -p $(objdir_wxbase_msw_dbg)
+	cd $(objdir_wxbase_msw_dbg) \
+		&& ../configure --prefix=/usr/$(cross_host) \
+				--cache-file=$(config_cache_cross) \
+				--host=$(cross_host) \
+				--build=$(cross_build) \
+				--disable-gui \
+				--enable-debug \
+		&& $(MAKE)
+	touch $@
+
+build-msw-shared-stamp:
+	dh_testdir
+	mkdir -p $(objdir_msw_shared)
+	cd $(objdir_msw_shared) \
+		&& ../configure --prefix=/usr/$(cross_host) \
+				--cache-file=$(config_cache_cross) \
+				--host=$(cross_host) \
+				--build=$(cross_build) \
+		&& $(MAKE)
+	touch $@
+
+build-msw-static-stamp:
 	dh_testdir
 	mkdir -p $(objdir_msw_static)
 	cd $(objdir_msw_static) \
 		&& ../configure --prefix=/usr/$(cross_host) \
-				--cache-file=../config_deb.cache \
+				--cache-file=$(config_cache_cross) \
 				--host=$(cross_host) \
 				--build=$(cross_build) \
-				--with-mingw \
 				--disable-shared \
 		&& $(MAKE)
 	touch $@
 
+build-msw-dbg-stamp:
+	dh_testdir
+	mkdir -p $(objdir_msw_dbg)
+	cd $(objdir_msw_dbg) \
+		&& ../configure --prefix=/usr/$(cross_host) \
+				--cache-file=$(config_cache_cross) \
+				--host=$(cross_host) \
+				--build=$(cross_build) \
+				--enable-debug \
+		&& $(MAKE)
+	touch $@
+
 
 clean: debian/control
 	dh_testdir
 	dh_testroot
-	rm -rf config_deb.cache control-files-stamp $(build_stamps) $(objdirs)
+
+	rm -rf config_deb.cache config_deb_cross.cache control-files-stamp $(build_stamps) $(objdirs)
 	rm -f docs/lgpl.txt
-	cd wxPython && ./setup.py clean
+	rm -f docs/latex/wx/manual.bb
+	rm -f $(objdir_i18n)/*.mo
+
+	cd wxPython \
+		&& rm -rf licence \
+		&& rm -rf build \
+		&& rm -rf contrib/gizmos/contrib \
+		&& rm -rf contrib/ogl/contrib \
+		&& rm -rf contrib/stc/contrib \
+		&& rm -rf contrib/xrc/contrib \
+		&& rm -rf *.pyc
+
+# We do the equivalent of this above by removing build, unfortunately
+# its not enough by itself to get the tree properly clean again.
+#		&& ./setup.py clean
+
 	dh_clean
 	rm -f debian/$(package_wxbase_lib).*
 	rm -f debian/$(package_wxbase_dev).*
@@ -379,6 +507,7 @@ clean: debian/control
 	rm -f debian/$(package_gtk_lib).*
 	rm -f debian/$(package_gtk_dev).*
 	rm -f debian/$(package_gtk_dbg).*
+	rm -f debian/$(package_gtk_univ).*
 	rm -f debian/$(package_gtk_py).*
 	rm -f debian/$(package_gtk_contrib).*
 	rm -f debian/$(package_gtk_contrib_dev).*
@@ -387,7 +516,9 @@ clean: debian/control
 	rm -f debian/$(package_doc).*
 	rm -f debian/$(package_examples).*
 	rm -f debian/$(package_wxbase_msw_dev).*
+	rm -f debian/$(package_wxbase_msw_dbg).*
 	rm -f debian/$(package_msw_dev).*
+	rm -f debian/$(package_msw_dbg).*
 	rm -f debian/$(package_headers_msw).*
 
 install_arch: build_arch $(install_all_arch)
@@ -439,7 +570,8 @@ install-gtk-dev: build-gtk-static-stamp install-gtk-lib
 	dh_clean -k
 	dh_installdirs
 	dh_movefiles --sourcedir=debian/$(package_gtk_lib)
-	cp $(objdir_gtk_static)/lib/libwx_gtk*.a debian/$(package_gtk_dev)/usr/lib
+	cp $(objdir_gtk_static)/lib/libwx_gtk-*.a debian/$(package_gtk_dev)/usr/lib
+	cp $(objdir_gtk_static)/lib/libwx_gtk_gl-*.a debian/$(package_gtk_dev)/usr/lib
 
 install-gtk-dbg: DH_OPTIONS=-p$(package_gtk_dbg)
 install-gtk-dbg: build-gtk-debug-stamp
@@ -451,6 +583,16 @@ install-gtk-dbg: build-gtk-debug-stamp
 	cp $(objdir_gtk_debug)/wxgtkd-$(release)-config debian/$(package_gtk_dbg)/usr/bin/
 	cp debian/lintian-override debian/$(package_gtk_dbg)/usr/share/lintian/overrides/$(package_gtk_dbg)
 
+install-gtk-univ: DH_OPTIONS=-p$(package_gtk_univ)
+install-gtk-univ: build-gtk-univ-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	cp -a $(objdir_gtk_univ)/lib/* debian/$(package_gtk_univ)/usr/lib
+	cp $(objdir_gtk_univ)/wxgtkuniv-$(release)-config debian/$(package_gtk_univ)/usr/bin/
+	cp debian/lintian-override debian/$(package_gtk_univ)/usr/share/lintian/overrides/$(package_gtk_univ)
+
 install-gtk-contrib: DH_OPTIONS=-p$(package_gtk_contrib)
 install-gtk-contrib: build-contrib-shared-stamp
 	dh_testdir
@@ -468,7 +610,8 @@ install-gtk-contrib-dev: build-contrib-static-stamp install-gtk-dev
 	dh_installdirs
 	dh_movefiles --sourcedir=debian/$(package_gtk_contrib)
 	cp $(objdir_gtk_static)/lib/*.a debian/$(package_gtk_contrib_dev)/usr/lib
-	rm -f debian/$(package_gtk_contrib_dev)/usr/lib/libwx_gtk*.a
+	rm -f debian/$(package_gtk_contrib_dev)/usr/lib/libwx_gtk-*.a
+	rm -f debian/$(package_gtk_contrib_dev)/usr/lib/libwx_gtk_gl-*.a
 
 install-gtk-py: DH_OPTIONS=-p$(package_gtk_py)
 install-gtk-py: build-gtk-py-stamp
@@ -477,24 +620,39 @@ install-gtk-py: build-gtk-py-stamp
 	dh_clean -k
 	dh_installdirs
 	cd wxPython \
-		&& ./setup.py install --prefix=`pwd`/../debian/$(package_gtk_py)/usr
+		&& ./setup.py install \
+			      --prefix=`pwd`/../debian/$(package_gtk_py)/usr \
+			      WX_CONFIG='$(wxconfig)'
 	find debian/$(package_gtk_py)/usr/lib/$(python_dir)/site-packages/wxPython \
 		-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
+
 install-headers: DH_OPTIONS=-p$(package_headers)
 install-headers: install-gtk-lib
 	dh_testdir
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
+
+# The only way to be really sure we get the univ headers correct is to install
+# them.  Do that in a scratch dirs, and move the gtk ones last, so at least
+# they win in the result of any uncaught conflict.
+
+#	cd $(objdir_gtk_univ) \
+#		&& $(MAKE) install prefix=`pwd`/../$(objdir_univ_install)/usr
+
+#	dh_movefiles --sourcedir=$(objdir_univ_install)
 	dh_movefiles --sourcedir=debian/$(package_gtk_lib)
-	dh_installmanpages \
-		ansi2knr.1 \
-		jpegtran.1 \
-		libpng.3   \
-		libpngpf.3 \
-		zlib.3     \
-		png.5
+
+	dh_installman debian/wx-config.1
 
 install-i18n: DH_OPTIONS=-p$(package_i18n)
 install-i18n: build-i18n-stamp install-gtk-lib
@@ -519,25 +677,49 @@ install-examples: build-examples-stamp
 	dh_installdirs
 
 install-wxbase-msw-dev: DH_OPTIONS=-p$(package_wxbase_msw_dev)
-install-wxbase-msw-dev: build-wxbase-msw-dev-stamp
+install-wxbase-msw-dev: build-wxbase-msw-shared-stamp build-wxbase-msw-static-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	cp -a $(objdir_wxbase_msw_static)/lib/* debian/$(package_wxbase_msw_dev)/usr/$(cross_host)/lib
-	cp $(objdir_wxbase_msw_static)/wxbase-$(release)-$(cross_host)-config debian/$(package_wxbase_msw_dev)/usr/bin/
+	cp -a $(objdir_wxbase_msw_shared)/lib/* debian/$(package_wxbase_msw_dev)/usr/$(cross_host)/lib
+	cp -a $(objdir_wxbase_msw_static)/lib/*.a debian/$(package_wxbase_msw_dev)/usr/$(cross_host)/lib
+	cp $(objdir_wxbase_msw_shared)/wxbase-$(release)-$(cross_host)-config debian/$(package_wxbase_msw_dev)/usr/bin/
 	$(cross_host)-strip --strip-debug debian/$(package_wxbase_msw_dev)/usr/$(cross_host)/lib/*.a
 
+install-wxbase-msw-dbg: DH_OPTIONS=-p$(package_wxbase_msw_dbg)
+install-wxbase-msw-dbg: build-wxbase-msw-dbg-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	cp -a $(objdir_wxbase_msw_dbg)/lib/* debian/$(package_wxbase_msw_dbg)/usr/$(cross_host)/lib
+	cp $(objdir_wxbase_msw_dbg)/wxbased-$(release)-$(cross_host)-config debian/$(package_wxbase_msw_dbg)/usr/bin/
+	# No static lib, they're freakin' huge!
+	#$(cross_host)-strip --strip-debug debian/$(package_wxbase_msw_dbg)/usr/$(cross_host)/lib/*.a
+
 install-msw-dev: DH_OPTIONS=-p$(package_msw_dev)
-install-msw-dev: build-msw-dev-stamp
+install-msw-dev: build-msw-shared-stamp build-msw-static-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	cp -a $(objdir_msw_static)/lib/* debian/$(package_msw_dev)/usr/$(cross_host)/lib
-	cp $(objdir_msw_static)/wxmsw-$(release)-$(cross_host)-config debian/$(package_msw_dev)/usr/bin/
+	cp -a $(objdir_msw_shared)/lib/* debian/$(package_msw_dev)/usr/$(cross_host)/lib
+	cp -a $(objdir_msw_static)/lib/*.a debian/$(package_msw_dev)/usr/$(cross_host)/lib
+	cp $(objdir_msw_shared)/wxmsw-$(release)-$(cross_host)-config debian/$(package_msw_dev)/usr/bin/
 	$(cross_host)-strip --strip-debug debian/$(package_msw_dev)/usr/$(cross_host)/lib/*.a
 
+install-msw-dbg: DH_OPTIONS=-p$(package_msw_dbg)
+install-msw-dbg: build-msw-dbg-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	cp -a $(objdir_msw_dbg)/lib/* debian/$(package_msw_dbg)/usr/$(cross_host)/lib
+	cp $(objdir_msw_dbg)/wxmswd-$(release)-$(cross_host)-config debian/$(package_msw_dbg)/usr/bin/
+	# No static lib, they're freakin' huge!
+	#$(cross_host)-strip --strip-debug debian/$(package_msw_dbg)/usr/$(cross_host)/lib/*.a
+
 install-headers-msw: DH_OPTIONS=-p$(package_headers_msw)
 install-headers-msw:
 	dh_testdir
@@ -563,11 +745,14 @@ binary-common:
 	dh_installdocs
 	dh_installchangelogs
 	dh_installexamples
+	dh_installmenu
 	dh_link
 
 	@# Don't strip debug libs at all, and strip cross libs elsewhere
 	@# with the cross host tools until dh_strip gets smarter.
-	dh_strip -N$(package_gtk_dbg) -N$(package_wxbase_dbg) -N$(package_wxbase_msw_dev) -N$(package_msw_dev)
+	dh_strip -N$(package_gtk_dbg) -N$(package_wxbase_dbg) \
+		 -N$(package_wxbase_msw_dev) -N$(package_wxbase_msw_dbg) \
+		 -N$(package_msw_dev) -N$(package_msw_dbg)
 
 	dh_compress
 	dh_fixperms
@@ -583,14 +768,14 @@ binary-common:
 # building the arch specific package files needed to create them.
 binary-indep: build_all install
 	$(MAKE) -f debian/rules \
-	DH_OPTIONS="-i -N$(package_wxbase_msw_dev) -N$(package_msw_dev) -N$(package_headers_msw)" \
-	binary-common
+		DH_OPTIONS="-i -N$(package_wxbase_msw_dev) -N$(package_wxbase_msw_dbg) -N$(package_msw_dev) -N$(package_msw_dbg) -N$(package_headers_msw) -N$(package_gtk_univ)" \
+		binary-common
 
 # Build just the architecture-dependent files here.
 binary-arch: build_arch install_arch
 	$(MAKE) -f debian/rules \
-	DH_OPTIONS="-a -N$(package_wxbase_msw_dev) -N$(package_msw_dev) -N$(package_headers_msw)" \
-	binary-common
+		DH_OPTIONS="-a -N$(package_wxbase_msw_dev) -N$(package_wxbase_msw_dbg) -N$(package_msw_dev) -N$(package_msw_dbg) -N$(package_headers_msw) -N$(package_gtk_univ)" \
+		binary-common
 
 # Build all packages target.
 binary: binary-arch binary-indep
@@ -602,8 +787,8 @@ binary: binary-arch binary-indep
 # that is not in the control file.
 binary-cross: control-files-stamp $(install_all_cross)
 	$(MAKE) -f debian/rules \
-	DH_OPTIONS="-p$(package_wxbase_msw_dev) -p$(package_msw_dev) -p$(package_headers_msw)" \
-	binary-common
+		DH_OPTIONS="-p$(package_wxbase_msw_dev) -p$(package_wxbase_msw_dbg) -p$(package_msw_dev) -p$(package_msw_dbg) -p$(package_headers_msw)" \
+		binary-common
 
 
 ############################################################################
@@ -638,10 +823,16 @@ binary-wxbase-dev: control-files-stamp install-wxbase-dev install-headers
 binary-wxbase-dbg: control-files-stamp install-wxbase-dbg install-headers
 	$(MAKE) -f debian/rules DH_OPTIONS="-p$(package_wxbase_dbg) -p$(package_headers)" binary-common
 
+binary-univ: control-files-stamp install-gtk-univ
+	$(MAKE) -f debian/rules DH_OPTIONS="-p$(package_gtk_univ)" binary-common
+
 # docs package
 binary-doc: control-files-stamp install-doc
 	$(MAKE) -f debian/rules DH_OPTIONS=-p$(package_doc) binary-common
 
+binary-fast:control-files-stamp install-gtk-dbg install-msw-dev install-headers install-headers-msw
+	$(MAKE) -f debian/rules DH_OPTIONS="-p$(package_gtk_dbg) -p$(package_msw_dev) -p$(package_headers) -p$(package_headers_msw)" binary-common
+
 
 .PHONY: build build_all build_arch clean binary-indep binary-arch binary binary-common \
         binary-gtk binary-gtk-dev binary-gtk-dbg binary-wxbase binary-wxbase-dev \
@@ -650,5 +841,6 @@ binary-doc: control-files-stamp install-doc
         install-wxbase-dev install-wxbase-dbg install-gtk-lib install-gtk-dev \
         install-gtk-dbg install-gtk-contrib install-gtk-contrib-dev \
         install-gtk-py install-headers install-i18n install-doc install-examples \
-	install-wxbase-msw-dev install-msw-dev install-headers-msw
+	install-wxbase-msw-dev install-msw-dev install-headers-msw \
+	install-wxbase-msw-dbg install-msw-dbg