diff --git a/debian/README.Debian b/debian/README.Debian
index bc3cbd2c72..5e1fe433f0 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -3,9 +3,14 @@ wxwindows for Debian
 
 The following packages are built from the wxWindows CVS source.
 
-libwxgtk		wxGTK shared library
-libwxgtk-dev		Headers and static lib for building wxGTK apps
+libwxbase		wxBase runtime shared libraries
+libwxbase-dev		extra files and static libs for building wxBase apps
+libwxgtk		wxGTK runtime shared libraries
+libwxgtk-dev		extra files and static libs for building wxGTK apps
 libwxgtk-python		Python binding to wxGTK
+wxwin-contrib		wxWin contrib runtime shared libs (built with wxGTK)
+wxwin-contrib-dev	extra files and static contrib libs for building apps
+wxwin-headers		common header files for building wxWindows apps
 wxwin-doc		HTML version of the wxWindows manual
 wxwin-examples		wxWindows and wxPython demos and samples (source)
 
diff --git a/debian/changelog b/debian/changelog
index f3e52cc244..ef181a738c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-wxwindows2.1 (2.1.15) unstable; urgency=low
+wxwindows2.1 (2.1.16) unstable; urgency=low
 
   * Repackaged to build from cvs.
 
diff --git a/debian/control.in b/debian/control.in
index edd700fed4..ed7bde3414 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -47,29 +47,32 @@ Package: libwxgtk=V
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}
+Suggests: mesag3
 Description: wxWindows Cross-platform C++ GUI toolkit (GTK+ runtime)
  wxWindows is a class library for C++ providing GUI (Graphical User
- Interface) and other facilities on more than one platform.  Version 2.1
+ Interface) and other facilities on more than one platform.  Version =V
  currently supports subsets of GTK+, Motif, and MS Windows.
  .
  This package provides the shared libraries needed to run programs linked
- against wxWindows.
+ against wxWindows.  To use the (optional) glcanvas library you will need
+ to have Mesa or OpenGL installed.
 
 Package: libwxgtk=V-dev
 Architecture: any
 Section: devel
 Depends: wxwin=V-headers (= ${Source-Version}), libwxgtk=V (= ${Source-Version}), libc6-dev
-Suggests: wxwin=V-doc, libstdc++-dev, gettext
+Suggests: wxwin=V-doc, libstdc++-dev, gettext, mesag-dev
 Conflicts: libwxgtk-dev
 Replaces: libwxgtk-dev
 Provides: libwxgtk-dev
 Description: wxWindows Cross-platform C++ GUI toolkit (GTK+ development)
  wxWindows is a class library for C++ providing GUI (Graphical User
- Interface) and other facilities on more than one platform.  Version 2.1
+ Interface) and other facilities on more than one platform.  Version =V
  currently supports subsets of GTK+, Motif, and MS Windows.
  .
- This package provides files needed to compile wxWindows programs.  It
- includes header files and static libraries.
+ This package provides files needed to compile wxWindows programs.  If you
+ want to compile apps using the (optional) glcanvas library you will need
+ to have Mesa or OpenGL installed too.
 
 Package: libwxgtk=V-python
 Architecture: any
@@ -78,7 +81,7 @@ Depends: libwxgtk=V (= ${Source-Version}), python-base (>=1.5), ${shlibs:Depends
 Suggests: wxwin=V-doc
 Description: wxWindows Cross-platform C++ GUI toolkit (Python binding)
  wxWindows is a class library for C++ providing GUI (Graphical User
- Interface) and other facilities on more than one platform.  Version 2.1
+ 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 library.
@@ -87,30 +90,28 @@ Package: wxwin=V-contrib
 Architecture: any
 Section: libs
 Depends: libwxgtk=V (= ${Source-Version}), ${shlibs:Depends}
-Suggests: mesag3
 Description: wxWindows Cross-platform C++ GUI toolkit (runtime contrib libs)
  wxWindows is a class library for C++ providing GUI (Graphical User
- Interface) and other facilities on more than one platform.  Version 2.1
+ Interface) and other facilities on more than one platform.  Version =V
  currently supports subsets of GTK+, Motif, and MS Windows.
  .
  This package provides the contrib libs of the wxWindows source tree
- (mmedia, ogl, stc, glcanvas)
+ (mmedia, ogl, stc)
 
 Package: wxwin=V-contrib-dev
 Architecture: any
 Section: devel
 Depends: wxwin=V-headers (= ${Source-Version}), libwxgtk=V-dev (= ${Source-Version}), libc6-dev
-Suggests: mesag-dev
 Conflicts: wxwin-contrib-dev
 Replaces: wxwin-contrib-dev
 Provides: wxwin-contrib-dev
 Description: wxWindows Cross-platform C++ GUI toolkit (development contrib libs)
  wxWindows is a class library for C++ providing GUI (Graphical User
- Interface) and other facilities on more than one platform.  Version 2.1
+ Interface) and other facilities on more than one platform.  Version =V
  currently supports subsets of GTK+, Motif, and MS Windows.
  .
  Install this package if you wish to compile applications that use the
- contrib libs from the wxWindows source tree (mmedia, ogl, stc, glcanvas)
+ contrib libs from the wxWindows source tree (mmedia, ogl, stc)
 
 Package: wxwin=V-headers
 Architecture: any
@@ -120,10 +121,10 @@ Replaces: wxwin-headers
 Provides: wxwin-headers
 Description: wxWindows Cross-platform C++ GUI toolkit (header files)
  wxWindows is a class library for C++ providing GUI (Graphical User
- Interface) and other facilities on more than one platform.  Version 2.1
+ Interface) and other facilities on more than one platform.  Version =V
  currently supports subsets of GTK+, Motif, and MS Windows.
  .
- This common package provides the header files required to build applications
+ This package provides the common header files required to build applications
  using the wxWindows toolkit.
 
 Package: wxwin=V-doc
@@ -132,7 +133,7 @@ Section: doc
 Suggests: doc-base, www-browser
 Description: wxWindows Cross-platform C++ GUI toolkit (documentation)
  wxWindows is a class library for C++ providing GUI (Graphical User
- Interface) and other facilities on more than one platform.  Version 2.1
+ Interface) and other facilities on more than one platform.  Version =V
  currently supports subsets of GTK+, Motif, and MS Windows.
  .
  This package provides a HTML version of the wxWindows reference manual.
@@ -143,7 +144,7 @@ Section: devel
 Suggests: libwxgtk=V-dev (= ${Source-Version}), wxwin=V-doc
 Description: wxWindows Cross-platform C++ GUI toolkit (examples)
  wxWindows is a class library for C++ providing GUI (Graphical User
- Interface) and other facilities on more than one platform.  Version 2.1
+ Interface) and other facilities on more than one platform.  Version =V
  currently supports subsets of GTK+, Motif, and MS Windows.
  .
  This package contains examples of using the wxWindows toolkit.
diff --git a/debian/libwxbase-dev.files b/debian/libwxbase-dev.files
index 60de00e333..5e667db9c3 100644
--- a/debian/libwxbase-dev.files
+++ b/debian/libwxbase-dev.files
@@ -1,4 +1,4 @@
 usr/bin/wxbase-config
 usr/lib/wx/include/wx/base/setup.h
-usr/lib/libwxbase*.so
-usr/lib/libwxbase*.a
+usr/lib/libwx_base*.so
+
diff --git a/debian/libwxbase.dirs b/debian/libwxbase.dirs
index 68457717bd..99e2a10872 100644
--- a/debian/libwxbase.dirs
+++ b/debian/libwxbase.dirs
@@ -1 +1,3 @@
+usr/bin
 usr/lib
+
diff --git a/debian/libwxbase.files b/debian/libwxbase.files
deleted file mode 100644
index 35686b0e13..0000000000
--- a/debian/libwxbase.files
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libwxbase*.so.*
diff --git a/debian/libwxgtk-dev.files b/debian/libwxgtk-dev.files
index eb1e976efc..11c13c2ee7 100644
--- a/debian/libwxgtk-dev.files
+++ b/debian/libwxgtk-dev.files
@@ -2,4 +2,5 @@ usr/bin/wxgtk-config
 usr/lib/wx/include/wx/gtk/setup.h
 usr/lib/libwx_gtk-*.so
 usr/lib/libwx_gtk.so
-usr/lib/libwx_gtk.a
+usr/lib/libwx_gtk_gl*.so
+
diff --git a/debian/libwxgtk-python.docs b/debian/libwxgtk-python.docs
index 7a7c47f4db..7795de7506 100644
--- a/debian/libwxgtk-python.docs
+++ b/debian/libwxgtk-python.docs
@@ -1,3 +1,3 @@
-utils/wxPython/README.txt
-utils/wxPython/CHANGES.txt
+wxPython/README.txt
+wxPython/CHANGES.txt
 docs/licence.txt
diff --git a/debian/libwxgtk-python.files b/debian/libwxgtk-python.files
index ac1d8ae000..33537433ce 100644
--- a/debian/libwxgtk-python.files
+++ b/debian/libwxgtk-python.files
@@ -1,2 +1,4 @@
 usr/lib/python1.5/site-packages/wxPython
-usr/lib/libwxPyHelpers.so
+usr/lib/libwxPyHelpers*.so
+usr/lib/libwxPyHelpers*.so.*
+
diff --git a/debian/libwxgtk.files b/debian/libwxgtk.files
deleted file mode 100644
index 8f5440b3ba..0000000000
--- a/debian/libwxgtk.files
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/libwx_gtk-*.so.*
-usr/share/wx
diff --git a/debian/rules b/debian/rules
index 783e9c5a3d..9271ce05e5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,20 +3,22 @@
 #
 # Sculpted 13/2/2000 by Ron Lee <ron@debian.org> from new and
 # variously stolen code :-)
-# (including a debhelper template, GNU copyright 1997 to 1999 by
-# Joey Hess, and some ideas found in the ncurses rules file that
-# I quite liked.  Thanks!)
+# It makes copious use of the debhelper utilities written by
+# Joey Hess and others.
 
 #export DH_VERBOSE=1
 export DH_COMPAT=2
+export DH_OPTIONS
 
 release:=$(shell dpkg-parsechangelog | sed -n 's/^Source: wxwindows//p')
 
 # Packages to build:
 package_wxbase_lib=libwxbase$(release)
 package_wxbase_dev=libwxbase$(release)-dev
+package_wxbase_dbg=libwxbase$(release)-dbg
 package_gtk_lib=libwxgtk$(release)
 package_gtk_dev=libwxgtk$(release)-dev
+package_gtk_dbg=libwxgtk$(release)-dbg
 package_gtk_py=libwxgtk$(release)-python
 package_contrib=wxwin$(release)-contrib
 package_contrib_dev=wxwin$(release)-contrib-dev
@@ -40,6 +42,10 @@ build_stamps=build-wxbase-shared-stamp build-wxbase-static-stamp \
              build-contrib-shared-stamp build-contrib-static-stamp \
              build-gtk-python-stamp build-examples-stamp build-doc-stamp
 
+install_all=install-wxbase-lib install-wxbase-dev install-gtk-lib \
+            install-gtk-dev install-gtk-contrib install-gtk-contrib-dev \
+            install-gtk-py install-headers install-doc install-examples
+
 wxconfig:=$(shell pwd)/$(objdir_gtk_shared)/wx-config \
 		--prefix=$(shell pwd) \
 		--exec-prefix=$(shell pwd)/$(objdir_gtk_shared)
@@ -53,7 +59,51 @@ debian/control: debian/control.in
 debian/wxwin-doc.doc-base: debian/wxwin-doc.doc-base.in
 	sed -e 's/=V/$(release)/g' < debian/wxwin-doc.doc-base.in > debian/wxwin-doc.doc-base
 
-build: debian/control debian/wxwin-doc.doc-base $(build_stamps)
+control-files-stamp: debian/control debian/wxwin-doc.doc-base
+	dh_testdir
+	@for f in dirs docs postinst; do \
+		echo "generating control file $(package_wxbase_lib).$$f"; \
+		cp debian/libwxbase.$$f debian/$(package_wxbase_lib).$$f; \
+	done;
+	@for f in dirs docs files links postinst prerm; do \
+		echo "generating control file $(package_wxbase_dev).$$f"; \
+		cp debian/libwxbase-dev.$$f debian/$(package_wxbase_dev).$$f; \
+	done;
+	@for f in dirs docs postinst; do \
+		echo "generating control file $(package_gtk_lib).$$f"; \
+		cp debian/libwxgtk.$$f debian/$(package_gtk_lib).$$f; \
+	done;
+	@for f in dirs docs files links postinst prerm; do \
+		echo "generating control file $(package_gtk_dev).$$f"; \
+		cp debian/libwxgtk-dev.$$f debian/$(package_gtk_dev).$$f; \
+	done;
+	@for f in dirs docs files postinst prerm; do \
+		echo "generating control file $(package_gtk_py).$$f"; \
+		cp debian/libwxgtk-python.$$f debian/$(package_gtk_py).$$f; \
+	done;
+	@for f in dirs docs postinst; do \
+		echo "generating control file $(package_contrib).$$f"; \
+		cp debian/wxwin-contrib.$$f debian/$(package_contrib).$$f; \
+	done;
+	@for f in dirs docs files; do \
+		echo "generating control file $(package_contrib_dev).$$f"; \
+		cp debian/wxwin-contrib-dev.$$f debian/$(package_contrib_dev).$$f; \
+	done;
+	@for f in dirs docs files; do \
+		echo "generating control file $(package_headers).$$f"; \
+		cp debian/wxwin-headers.$$f debian/$(package_headers).$$f; \
+	done;
+	@for f in dirs docs doc-base; do \
+		echo "generating control file $(package_doc).$$f"; \
+		cp debian/wxwin-doc.$$f debian/$(package_doc).$$f; \
+	done;
+	@for f in docs examples; do \
+		echo "generating control file $(package_examples).$$f"; \
+		cp debian/wxwin-examples.$$f debian/$(package_examples).$$f; \
+	done;
+	touch $@
+
+build: control-files-stamp $(build_stamps)
 
 build-wxbase-shared-stamp:
 	dh_testdir
@@ -119,14 +169,9 @@ build-contrib-static-stamp: build-gtk-static-stamp
 
 build-gtk-python-stamp: build-gtk-shared-stamp
 	dh_testdir
-	cd utils/wxPython/src \
+	cd wxPython/src \
 		&& touch gtk/*.cpp gtk/*.py \
-		&& ../distrib/build.py -b WXDIR=../../.. WXCONFIG='$(wxconfig)'
-	cd utils/wxPython/modules/html \
-		&& touch *.cpp *.py \
-		&& ../../distrib/build.py -b WXDIR=../../../.. WXCONFIG='$(wxconfig)'
-	cd utils/wxPython/modules/utils \
-		&& ../../distrib/build.py -b WXDIR=../../../.. WXCONFIG='$(wxconfig)'
+		&& ../distrib/build.py -b WXDIR=../.. WXCONFIG='$(wxconfig)'
 	touch $@
 
 build-doc-stamp: build-gtk-shared-stamp
@@ -150,7 +195,7 @@ build-examples-stamp:
 	mkdir $(objdir_examples)
 	cp -a samples $(objdir_examples)
 	cp -a demos $(objdir_examples)
-	cp -a utils/wxPython/demo $(objdir_examples)/wxPython
+	cp -a wxPython/demo $(objdir_examples)/wxPython
 	@for d in $(objdir_examples)/demos $(objdir_examples)/samples; do \
 		(cd $$d \
 			&& mv Makefile.in Makefile \
@@ -167,10 +212,8 @@ build-examples-stamp:
 clean: debian/control
 	dh_testdir
 	dh_testroot
-	rm -rf $(build_stamps) $(objdirs)
-	-cd utils/wxPython/src && $(MAKE) clean
-	-cd utils/wxPython/modules/html && $(MAKE) clean
-	-cd utils/wxPython/modules/utils && $(MAKE) clean
+	rm -rf control-files-stamp $(build_stamps) $(objdirs)
+	-cd wxPython/src && $(MAKE) clean
 	dh_clean
 	rm -f debian/$(package_wxbase_lib).*
 	rm -f debian/$(package_wxbase_dev).*
@@ -183,95 +226,113 @@ clean: debian/control
 	rm -f debian/$(package_doc).*
 	rm -f debian/$(package_examples).*
 
-install: build
+install: build $(install_all)
+
+install-wxbase-lib: DH_OPTIONS=-p$(package_wxbase_lib)
+install-wxbase-lib: build-wxbase-shared-stamp
 	dh_testdir
 	dh_testroot
-	@for f in dirs docs files postinst; do \
-		echo "generating control file $(package_wxbase_lib).$$f"; \
-		cp debian/libwxbase.$$f debian/$(package_wxbase_lib).$$f; \
-	done;
-	@for f in dirs docs files links postinst prerm; do \
-		echo "generating control file $(package_wxbase_dev).$$f"; \
-		cp debian/libwxbase-dev.$$f debian/$(package_wxbase_dev).$$f; \
-	done;
-	@for f in dirs docs files postinst; do \
-		echo "generating control file $(package_gtk_lib).$$f"; \
-		cp debian/libwxgtk.$$f debian/$(package_gtk_lib).$$f; \
-	done;
-	@for f in dirs docs files links postinst prerm; do \
-		echo "generating control file $(package_gtk_dev).$$f"; \
-		cp debian/libwxgtk-dev.$$f debian/$(package_gtk_dev).$$f; \
-	done;
-	@for f in dirs docs files postinst prerm; do \
-		echo "generating control file $(package_gtk_py).$$f"; \
-		cp debian/libwxgtk-python.$$f debian/$(package_gtk_py).$$f; \
-	done;
-	@for f in dirs docs files postinst; do \
-		echo "generating control file $(package_contrib).$$f"; \
-		cp debian/wxwin-contrib.$$f debian/$(package_contrib).$$f; \
-	done;
-	@for f in dirs docs files; do \
-		echo "generating control file $(package_contrib_dev).$$f"; \
-		cp debian/wxwin-contrib-dev.$$f debian/$(package_contrib_dev).$$f; \
-	done;
-	@for f in dirs docs files; do \
-		echo "generating control file $(package_headers).$$f"; \
-		cp debian/wxwin-headers.$$f debian/$(package_headers).$$f; \
-	done;
-	@for f in dirs docs doc-base; do \
-		echo "generating control file $(package_doc).$$f"; \
-		cp debian/wxwin-doc.$$f debian/$(package_doc).$$f; \
-	done;
-	@for f in docs examples; do \
-		echo "generating control file $(package_examples).$$f"; \
-		cp debian/wxwin-examples.$$f debian/$(package_examples).$$f; \
-	done;
 	dh_clean -k
 	dh_installdirs
+	cp -a $(objdir_wxbase_shared)/lib/* debian/$(package_wxbase_lib)/usr/lib
+	cp $(objdir_wxbase_shared)/wxbase-config debian/$(package_wxbase_lib)/usr/bin/
+
+install-wxbase-dev: DH_OPTIONS=-p$(package_wxbase_dev)
+install-wxbase-dev: build-wxbase-static-stamp install-wxbase-lib
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	dh_movefiles --sourcedir=debian/$(package_wxbase_lib)
+	cp $(objdir_wxbase_static)/lib/*.a debian/$(package_wxbase_dev)/usr/lib
+
+install-gtk-lib: DH_OPTIONS=-p$(package_gtk_lib)
+install-gtk-lib: build-gtk-shared-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs 
 	cd $(objdir_gtk_shared) \
-		&& $(MAKE) install prefix=`pwd`/../debian/tmp/usr
-	rm -f debian/tmp/usr/bin/wx-config
+		&& $(MAKE) install prefix=`pwd`/../debian/$(package_gtk_lib)/usr
+	rm -f debian/$(package_gtk_lib)/usr/bin/wx-config
+
+install-gtk-dev: DH_OPTIONS=-p$(package_gtk_dev)
+install-gtk-dev: build-gtk-static-stamp install-gtk-lib
+	dh_testdir
+	dh_testroot
+	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
+
+install-gtk-contrib: DH_OPTIONS=-p$(package_contrib)
+install-gtk-contrib: build-contrib-shared-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
 	cd $(objdir_gtk_shared)/contrib/src \
-		&& $(MAKE) install prefix=`pwd`/../../../debian/tmp/usr
-	cp $(objdir_gtk_static)/lib/*.a debian/tmp/usr/lib
-	cp -a $(objdir_wxbase_shared)/lib/* debian/tmp/usr/lib
-	cp $(objdir_wxbase_shared)/wxbase-config debian/tmp/usr/bin/
-	cp $(objdir_wxbase_static)/lib/*.a debian/tmp/usr/lib
-	cd utils/wxPython/src \
+		&& $(MAKE) install prefix=`pwd`/../../../debian/$(package_contrib)/usr
+
+install-gtk-contrib-dev: DH_OPTIONS=-p$(package_contrib_dev)
+install-gtk-contrib-dev: build-contrib-static-stamp install-gtk-dev
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	dh_movefiles --sourcedir=debian/$(package_contrib)
+	cp $(objdir_gtk_static)/lib/*.a debian/$(package_contrib_dev)/usr/lib
+	rm -f debian/$(package_contrib_dev)/usr/lib/libwx_gtk*.a
+
+install-gtk-py: DH_OPTIONS=-p$(package_gtk_py)
+install-gtk-py: build-gtk-python-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	cd wxPython/src \
 		&& ../distrib/build.py -i \
-			TARGETDIR=../../../debian/tmp/usr/lib/python1.5/site-packages/wxPython \
-			HELPERLIBDIR=../../../debian/tmp/usr/lib \
-			WXDIR=../../..
-	cd utils/wxPython/modules/html \
-		&& ../../distrib/build.py -i \
-			TARGETDIR=../../../../debian/tmp/usr/lib/python1.5/site-packages/wxPython \
-			WXDIR=../../../..
-	cd utils/wxPython/modules/utils \
-		&& ../../distrib/build.py -i \
-			TARGETDIR=../../../../debian/tmp/usr/lib/python1.5/site-packages/wxPython \
-			WXDIR=../../../..
-	rm -rf debian/tmp/usr/lib/python1.5/site-packages/wxPython/demo
-	find debian/tmp/usr/lib/python1.5/site-packages/wxPython \
+			TARGETDIR=../../debian/$(package_gtk_py)/usr/lib/python1.5/site-packages/wxPython \
+			HELPERLIBDIR=../../debian/$(package_gtk_py)/usr/lib \
+			WXDIR=../..
+	rm -rf debian/$(package_gtk_py)/usr/lib/python1.5/site-packages/wxPython/demo
+	find debian/$(package_gtk_py)/usr/lib/python1.5/site-packages/wxPython \
 		-name '*.py?' -exec rm '{}' ';'
-	dh_movefiles
 
+install-headers: DH_OPTIONS=-p$(package_headers)
+install-headers: install-gtk-lib
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	dh_movefiles --sourcedir=debian/$(package_gtk_lib)
+	dh_installmanpages \
+		ansi2knr.1 \
+		jpegtran.1 \
+		libpng.3   \
+		libpngpf.3 \
+		zlib.3     \
+		png.5
 
-# Build architecture-independent files here.
-binary-indep: build install
-# nothing to do.
+install-doc: DH_OPTIONS=-p$(package_doc)
+install-doc: build-doc-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
 
-# Build architecture-dependent files here.
-binary-arch: build install
+install-examples: DH_OPTIONS=-p$(package_examples)
+install-examples: build-examples-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+binary-common:
+	dh_testversion 1.1.17
 	dh_testdir
 	dh_testroot
 	dh_installdocs
-	dh_installmanpages -p$(package_headers) \
-		ansi2knr.1 \
-		jpegtran.1 \
-		libpng.3 \
-		libpngpf.3 \
-		zlib.3 \
-		png.5
 	dh_installchangelogs
 	dh_installexamples
 	dh_link
@@ -285,5 +346,52 @@ binary-arch: build install
 	dh_md5sums
 	dh_builddeb
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+# Build architecture-independent files here.
+binary-indep: build install
+	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
+
+# Build all packages target.
+binary: binary-arch binary-indep
+
+
+############################################################################
+#
+# Some rules to build a subset of the complete list of packages that can be
+# built from CVS.  Beware that packages produced with these rules may *NOT*
+# be compatible with packages built using the 'binary' target or even with
+# Debian policy.  Do not distribute packages built with these rules, they
+# are currently useful for rapid in-house testing by developers only.
+
+# libwxgtk shared lib package
+binary-gtk: control-files-stamp install-gtk-lib install-headers
+	$(MAKE) -f debian/rules DH_OPTIONS="-p$(package_gtk_lib) -p$(package_headers)" binary-common
+
+binary-gtk-dev: control-files-stamp install-gtk-dev install-headers
+	$(MAKE) -f debian/rules \
+	  DH_OPTIONS="-p$(package_gtk_lib) -p$(package_gtk_dev) -p$(package_headers)" \
+	  binary-common
+
+# libwxbase shared lib package
+binary-wxbase: control-files-stamp install-wxbase-lib install-headers
+	$(MAKE) -f debian/rules DH_OPTIONS="-p$(package_wxbase_lib) -p$(package_headers)" binary-common
+
+binary-wxbase-dev: control-files-stamp install-wxbase-dev install-headers
+	$(MAKE) -f debian/rules \
+	  DH_OPTIONS="-p$(package_wxbase_lib) -p$(package_wxbase_dev) -p$(package_headers)" \
+	  binary-common
+
+# docs package
+binary-doc: control-files-stamp install-doc
+	$(MAKE) -f debian/rules DH_OPTIONS=-p$(package_doc) binary-common
+
+
+.PHONY: build clean binary-indep binary-arch binary binary-common binary-gtk \
+        binary-gtk-dev binary-wxbase binary-wxbase-dev binary-doc install \
+	install-wxbase-lib install-wxbase-dev install-gtk-lib install-gtk-dev \
+	install-gtk-contrib install-gtk-contrib-dev install-gtk-py \
+	install-headers install-doc install-examples
+
diff --git a/debian/wxwin-contrib-dev.files b/debian/wxwin-contrib-dev.files
index 3855471cfc..96ed45a3df 100644
--- a/debian/wxwin-contrib-dev.files
+++ b/debian/wxwin-contrib-dev.files
@@ -1,9 +1,5 @@
-usr/lib/libmmedia.a
+usr/include/wx/
 usr/lib/libmmedia.so
-usr/lib/libogl.a
 usr/lib/libogl.so
-usr/lib/libstc.a
 usr/lib/libstc.so
-usr/lib/libwx_gtk_gl.a
-usr/lib/libwx_gtk_gl*.so
 
diff --git a/debian/wxwin-contrib.files b/debian/wxwin-contrib.files
deleted file mode 100644
index 07edd190f0..0000000000
--- a/debian/wxwin-contrib.files
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/lib/libmmedia.so.*
-usr/lib/libogl.so.*
-usr/lib/libstc.so.*
-usr/lib/libwx_gtk_gl*.so.*
-