]> 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
compilation fix
[wxWidgets.git] / debian / rules
diff --git a/debian/rules b/debian/rules
index df58c43300fc026e9fe4fddfd87bcb0c065b3ef3..2498c5b38c89a2334371773d2400c6afc9879111 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,13 @@ export DH_COMPAT=2
 export DH_OPTIONS
 
 release:=$(shell dpkg-parsechangelog | sed -n 's/^Source: wxwindows//p')
 export DH_OPTIONS
 
 release:=$(shell dpkg-parsechangelog | sed -n 's/^Source: wxwindows//p')
+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)
 
 # Packages to build:
 package_wxbase_lib=libwxbase$(release)
@@ -23,9 +30,18 @@ package_gtk_py=libwxgtk$(release)-python
 package_gtk_contrib=libwxgtk$(release)-contrib
 package_gtk_contrib_dev=libwxgtk$(release)-contrib-dev
 package_headers=wxwin$(release)-headers
 package_gtk_contrib=libwxgtk$(release)-contrib
 package_gtk_contrib_dev=libwxgtk$(release)-contrib-dev
 package_headers=wxwin$(release)-headers
+package_i18n=wxwin$(release)-i18n
 package_doc=wxwin$(release)-doc
 package_examples=wxwin$(release)-examples
 
 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:
 objdir_wxbase_shared=objs_wxbase_sh
 objdir_wxbase_static=objs_wxbase_st
 # Build directories:
 objdir_wxbase_shared=objs_wxbase_sh
 objdir_wxbase_static=objs_wxbase_st
@@ -33,27 +49,77 @@ objdir_wxbase_debug=objs_wxbase_d
 objdir_gtk_shared=objs_gtk_sh
 objdir_gtk_static=objs_gtk_st
 objdir_gtk_debug=objs_gtk_d
 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_gtk_contrib_install=objs_gtk_contrib_install
 objdir_doc_cruft=objs_doc_con
 objdir_doc=docs/wxWindows-manual.html
 objdir_examples=docs/examples
 objdir_doc_cruft=objs_doc_con
 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) \
 objdirs=$(objdir_wxbase_shared) $(objdir_wxbase_static) $(objdir_wxbase_debug) \
-       $(objdir_gtk_shared) $(objdir_gtk_static) $(objdir_gtk_debug) \
-       $(objdir_doc) $(objdir_examples)
+       $(objdir_gtk_shared) $(objdir_gtk_static) $(objdir_gtk_debug)          \
+       $(objdir_gtk_install) $(objdir_gtk_contrib_install) $(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
+#      it's pulled out of the wxGtk shared lib package.
+
+# Build stamps:
+build_arch_stamps=build-wxbase-shared-stamp build-wxbase-static-stamp \
+                  build-wxbase-debug-stamp build-gtk-shared-stamp \
+                  build-gtk-static-stamp build-gtk-debug-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-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=build-wxbase-shared-stamp build-wxbase-static-stamp \
-             build-wxbase-debug-stamp build-gtk-shared-stamp \
-             build-gtk-static-stamp build-gtk-debug-stamp \
-             build-contrib-shared-stamp build-contrib-static-stamp \
-             build-gtk-python-stamp build-examples-stamp build-doc-stamp
+build_stamps_native=$(build_arch_stamps) $(build_indep_stamps)
+
+build_stamps=$(build_stamps_native) $(build_cross_stamps)
+
+# Install targets:
+install_all_arch=install-wxbase-lib 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
+
+# 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-wxbase-msw-dbg install-msw-dev install-msw-dbg install-headers-msw
+
+install_all_native=$(install_all_arch) $(install_all_indep)
+
+install_all=$(install_all_native) $(install_all_cross)
 
 
-install_all=install-wxbase-lib 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-doc install-examples
 
 wxconfig:=$(shell pwd)/$(objdir_gtk_shared)/wx-config \
 
 wxconfig:=$(shell pwd)/$(objdir_gtk_shared)/wx-config \
-               --prefix=$(shell pwd) \
-               --exec-prefix=$(shell pwd)/$(objdir_gtk_shared)
+                --prefix=$(shell pwd) \
+                --exec-prefix=$(shell pwd)/$(objdir_gtk_shared)
 
 
 # The Rules:
 
 
 # The Rules:
@@ -61,117 +127,186 @@ wxconfig:=$(shell pwd)/$(objdir_gtk_shared)/wx-config \
 debian/control: debian/control.in
        sed -e 's/=V/$(release)/g' < debian/control.in > debian/control
 
 debian/control: debian/control.in
        sed -e 's/=V/$(release)/g' < debian/control.in > debian/control
 
-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
-
-control-files-stamp: debian/control debian/wxwin-doc.doc-base
+control-files-stamp: debian/control
        dh_testdir
        dh_testdir
-       @for f in dirs docs postinst; do \
+       @for f in dirs postinst; do \
                echo "generating control file $(package_wxbase_lib).$$f"; \
                cp debian/libwxbase.$$f debian/$(package_wxbase_lib).$$f; \
        done;
                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 \
+       @for f in dirs links postinst prerm; do \
                echo "generating control file $(package_wxbase_dev).$$f"; \
                echo "generating control file $(package_wxbase_dev).$$f"; \
-               cp debian/libwxbase-dev.$$f debian/$(package_wxbase_dev).$$f; \
+               sed -e 's/=V/$(release)/g' < debian/libwxbase-dev.$$f \
+                       > debian/$(package_wxbase_dev).$$f; \
        done;
        done;
-       @for f in dirs docs links postinst prerm; do \
+       @for f in dirs links postinst prerm; do \
                echo "generating control file $(package_wxbase_dbg).$$f"; \
                echo "generating control file $(package_wxbase_dbg).$$f"; \
-               cp debian/libwxbase-dbg.$$f debian/$(package_wxbase_dbg).$$f; \
+               sed -e 's/=V/$(release)/g' < debian/libwxbase-dbg.$$f \
+                       > debian/$(package_wxbase_dbg).$$f; \
        done;
        done;
-       @for f in dirs docs postinst; do \
+       @for f in dirs postinst; do \
                echo "generating control file $(package_gtk_lib).$$f"; \
                cp debian/libwxgtk.$$f debian/$(package_gtk_lib).$$f; \
        done;
                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 \
+       @for f in dirs links postinst prerm; do \
                echo "generating control file $(package_gtk_dev).$$f"; \
                echo "generating control file $(package_gtk_dev).$$f"; \
-               cp debian/libwxgtk-dev.$$f debian/$(package_gtk_dev).$$f; \
+               sed -e 's/=V/$(release)/g' < debian/libwxgtk-dev.$$f \
+                       > debian/$(package_gtk_dev).$$f; \
        done;
        done;
-       @for f in dirs docs links postinst prerm; do \
+       @for f in dirs links postinst prerm; do \
                echo "generating control file $(package_gtk_dbg).$$f"; \
                echo "generating control file $(package_gtk_dbg).$$f"; \
-               cp debian/libwxgtk-dbg.$$f debian/$(package_gtk_dbg).$$f; \
+               sed -e 's/=V/$(release)/g' < debian/libwxgtk-dbg.$$f \
+                       > debian/$(package_gtk_dbg).$$f; \
        done;
        done;
-       @for f in dirs docs files postinst prerm; do \
+       @for f in dirs docs menu postinst prerm; do \
                echo "generating control file $(package_gtk_py).$$f"; \
                echo "generating control file $(package_gtk_py).$$f"; \
-               cp debian/libwxgtk-python.$$f debian/$(package_gtk_py).$$f; \
+               sed -e 's/=PY/$(python_dir)/g;s/=V/$(release)/g' < debian/libwxgtk-python.$$f \
+                       > debian/$(package_gtk_py).$$f; \
        done;
        done;
-       @for f in dirs docs postinst; do \
+       @for f in dirs postinst; do \
                echo "generating control file $(package_gtk_contrib).$$f"; \
                cp debian/libwxgtk-contrib.$$f debian/$(package_gtk_contrib).$$f; \
        done;
                echo "generating control file $(package_gtk_contrib).$$f"; \
                cp debian/libwxgtk-contrib.$$f debian/$(package_gtk_contrib).$$f; \
        done;
-       @for f in dirs docs files; do \
+       @for f in dirs; do \
                echo "generating control file $(package_gtk_contrib_dev).$$f"; \
                cp debian/libwxgtk-contrib-dev.$$f debian/$(package_gtk_contrib_dev).$$f; \
        done;
                echo "generating control file $(package_gtk_contrib_dev).$$f"; \
                cp debian/libwxgtk-contrib-dev.$$f debian/$(package_gtk_contrib_dev).$$f; \
        done;
-       @for f in dirs docs files; do \
+       @for f in dirs; do \
                echo "generating control file $(package_headers).$$f"; \
                cp debian/wxwin-headers.$$f debian/$(package_headers).$$f; \
        done;
                echo "generating control file $(package_headers).$$f"; \
                cp debian/wxwin-headers.$$f debian/$(package_headers).$$f; \
        done;
+       @for f in dirs; do \
+               echo "generating control file $(package_i18n).$$f"; \
+               cp debian/wxwin-i18n.$$f debian/$(package_i18n).$$f; \
+       done;
        @for f in dirs docs doc-base; do \
                echo "generating control file $(package_doc).$$f"; \
        @for f in dirs docs doc-base; do \
                echo "generating control file $(package_doc).$$f"; \
-               cp debian/wxwin-doc.$$f debian/$(package_doc).$$f; \
+               sed -e 's/=V/$(release)/g' < debian/wxwin-doc.$$f \
+                       > debian/$(package_doc).$$f; \
        done;
        done;
-       @for f in docs examples; do \
+       @for f in examples; do \
                echo "generating control file $(package_examples).$$f"; \
                cp debian/wxwin-examples.$$f debian/$(package_examples).$$f; \
        done;
                echo "generating control file $(package_examples).$$f"; \
                cp debian/wxwin-examples.$$f debian/$(package_examples).$$f; \
        done;
+       @for f in dirs links postinst prerm; do \
+               echo "generating control file $(package_wxbase_msw_dev).$$f"; \
+               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 \
+                       > debian/$(package_headers_msw).$$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;
        touch $@
 
        touch $@
 
-build: control-files-stamp $(build_stamps)
+build_arch: control-files-stamp $(build_arch_stamps)
+build_all: control-files-stamp $(build_stamps_native)
+
+# Really we should probably do nothing here until we know which
+# binary target is being called, but alpha builds were exploding
+# (compiler segfaults) in random places when building under fakeroot
+# from the binary-arch target.  Build all -arch files here then, and
+# let the -indep stuff fend for itself later.
+
+build: build_arch
 
 
-build-wxbase-shared-stamp:
+
+configure-wxbase-shared-stamp:
        dh_testdir
        dh_testdir
-       mkdir $(objdir_wxbase_shared)
+       mkdir -p $(objdir_wxbase_shared)
        cd $(objdir_wxbase_shared) \
                && ../configure --prefix=/usr \
        cd $(objdir_wxbase_shared) \
                && ../configure --prefix=/usr \
+                               --cache-file=$(config_cache) \
                                --disable-gui \
                                --disable-gui \
-                               --enable-burnt_name \
-                               --with-zlib=sys \
-               && $(MAKE)
+                               --enable-soname \
+                               --with-zlib=sys
+       touch $@
+
+build-wxbase-shared-stamp: configure-wxbase-shared-stamp
+       dh_testdir
+       cd $(objdir_wxbase_shared) && $(MAKE)
        touch $@
 
        touch $@
 
-build-wxbase-static-stamp:
+configure-wxbase-static-stamp:
        dh_testdir
        dh_testdir
-       mkdir $(objdir_wxbase_static)
+       mkdir -p $(objdir_wxbase_static)
        cd $(objdir_wxbase_static) \
                && ../configure --prefix=/usr \
        cd $(objdir_wxbase_static) \
                && ../configure --prefix=/usr \
+                               --cache-file=$(config_cache) \
                                --disable-gui \
                                --disable-shared \
                                --disable-gui \
                                --disable-shared \
-                               --with-zlib=sys \
-               && $(MAKE)
+                               --with-zlib=sys
+       touch $@
+
+build-wxbase-static-stamp: configure-wxbase-static-stamp
+       dh_testdir
+       cd $(objdir_wxbase_static) && $(MAKE)
        touch $@
 
        touch $@
 
-build-wxbase-debug-stamp:
+configure-wxbase-debug-stamp:
        dh_testdir
        dh_testdir
-       mkdir $(objdir_wxbase_debug)
+       mkdir -p $(objdir_wxbase_debug)
        cd $(objdir_wxbase_debug) \
                && ../configure --prefix=/usr \
        cd $(objdir_wxbase_debug) \
                && ../configure --prefix=/usr \
+                               --cache-file=$(config_cache) \
                                --disable-gui \
                                --enable-debug \
                                --disable-gui \
                                --enable-debug \
-                               --enable-burnt_name \
-                               --with-zlib=sys \
-               && $(MAKE)
+                               --enable-soname \
+                               --with-zlib=sys
        touch $@
 
        touch $@
 
-build-gtk-shared-stamp:
+build-wxbase-debug-stamp: configure-wxbase-debug-stamp
        dh_testdir
        dh_testdir
-       mkdir $(objdir_gtk_shared)
+       cd $(objdir_wxbase_debug) && $(MAKE)
+       touch $@
+
+configure-gtk-shared-stamp:
+       dh_testdir
+       mkdir -p $(objdir_gtk_shared)
        cd $(objdir_gtk_shared) \
                && ../configure --prefix=/usr \
        cd $(objdir_gtk_shared) \
                && ../configure --prefix=/usr \
+                               --cache-file=$(config_cache) \
                                --with-gtk \
                                --with-opengl \
                                --with-gtk \
                                --with-opengl \
-                               --enable-burnt_name \
+                               --enable-soname \
                                --with-zlib=sys \
                                --with-libjpeg=sys \
                                --with-libpng=sys \
                                --with-libtiff=sys \
                                --with-zlib=sys \
                                --with-libjpeg=sys \
                                --with-libpng=sys \
                                --with-libtiff=sys \
-               && $(MAKE)
+                               --enable-dynamic-loader
        touch $@
 
        touch $@
 
-build-gtk-static-stamp:
+build-gtk-shared-stamp: configure-gtk-shared-stamp
        dh_testdir
        dh_testdir
-       mkdir $(objdir_gtk_static)
+       cd $(objdir_gtk_shared) && $(MAKE)
+       touch $@
+
+configure-gtk-static-stamp:
+       dh_testdir
+       mkdir -p $(objdir_gtk_static)
        cd $(objdir_gtk_static) \
                && ../configure --prefix=/usr \
        cd $(objdir_gtk_static) \
                && ../configure --prefix=/usr \
+                               --cache-file=$(config_cache) \
                                --with-gtk \
                                --with-opengl \
                                --disable-shared \
                                --with-gtk \
                                --with-opengl \
                                --disable-shared \
@@ -179,40 +314,75 @@ build-gtk-static-stamp:
                                --with-libjpeg=sys \
                                --with-libpng=sys \
                                --with-libtiff=sys \
                                --with-libjpeg=sys \
                                --with-libpng=sys \
                                --with-libtiff=sys \
-               && $(MAKE)
+                               --enable-dynamic-loader
+       touch $@
+
+build-gtk-static-stamp: configure-gtk-static-stamp
+       dh_testdir
+       cd $(objdir_gtk_static) && $(MAKE)
        touch $@
 
        touch $@
 
-build-gtk-debug-stamp:
+configure-gtk-debug-stamp:
        dh_testdir
        dh_testdir
-       mkdir $(objdir_gtk_debug)
+       mkdir -p $(objdir_gtk_debug)
        cd $(objdir_gtk_debug) \
                && ../configure --prefix=/usr \
        cd $(objdir_gtk_debug) \
                && ../configure --prefix=/usr \
+                               --cache-file=$(config_cache) \
                                --with-gtk \
                                --with-opengl \
                                --enable-debug \
                                --with-gtk \
                                --with-opengl \
                                --enable-debug \
-                               --enable-burnt_name \
+                               --enable-soname \
                                --with-zlib=sys \
                                --with-libjpeg=sys \
                                --with-libpng=sys \
                                --with-libtiff=sys \
                                --with-zlib=sys \
                                --with-libjpeg=sys \
                                --with-libpng=sys \
                                --with-libtiff=sys \
-               && $(MAKE)
+                               --enable-dynamic-loader
+       touch $@
+
+build-gtk-debug-stamp: configure-gtk-debug-stamp
+       dh_testdir
+       cd $(objdir_gtk_debug) && $(MAKE)
+       touch $@
+
+configure-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
+       touch $@
+
+build-gtk-univ-stamp: configure-gtk-univ-stamp
+       dh_testdir
+       cd $(objdir_gtk_univ) && $(MAKE)
        touch $@
 
 build-contrib-shared-stamp: build-gtk-shared-stamp
        dh_testdir
        touch $@
 
 build-contrib-shared-stamp: build-gtk-shared-stamp
        dh_testdir
-       cd $(objdir_gtk_shared)/contrib/src && $(MAKE)
+       cd $(objdir_gtk_shared)/contrib/src \
+               && $(MAKE)
        touch $@
 
 build-contrib-static-stamp: build-gtk-static-stamp
        dh_testdir
        touch $@
 
 build-contrib-static-stamp: build-gtk-static-stamp
        dh_testdir
-       cd $(objdir_gtk_static)/contrib/src && $(MAKE)
+       cd $(objdir_gtk_static)/contrib/src \
+               && $(MAKE)
        touch $@
 
        touch $@
 
-build-gtk-python-stamp: build-gtk-shared-stamp
+build-gtk-py-stamp: build-gtk-shared-stamp
        dh_testdir
        dh_testdir
-       cd wxPython/src \
-               && touch gtk/*.cpp gtk/*.py \
-               && ../distrib/build.py -b WXDIR=../.. WXCONFIG='$(wxconfig)'
+       touch docs/lgpl.txt
+       cd wxPython \
+               && ./setup.py build IN_CVS_TREE=1 WX_CONFIG='$(wxconfig)'
        touch $@
 
 build-doc-stamp: build-gtk-shared-stamp
        touch $@
 
 build-doc-stamp: build-gtk-shared-stamp
@@ -222,7 +392,7 @@ build-doc-stamp: build-gtk-shared-stamp
        mkdir $(objdir_doc)
        mkdir $(objdir_doc_cruft)
        cd $(objdir_doc_cruft) \
        mkdir $(objdir_doc)
        mkdir $(objdir_doc_cruft)
        cd $(objdir_doc_cruft) \
-               && LD_LIBRARY_PATH=../$(objdir_gtk_shared)/lib \
+               && LD_LIBRARY_PATH=../$(objdir_gtk_shared)/lib:$(LD_LIBRARY_PATH) \
                   ../$(objdir_gtk_shared)/utils/tex2rtf/src/tex2rtf \
                   ../docs/latex/wx/manual.tex ../$(objdir_doc)/wxwin.htm -twice -html
        cp docs/latex/wx/*.gif $(objdir_doc)
                   ../$(objdir_gtk_shared)/utils/tex2rtf/src/tex2rtf \
                   ../docs/latex/wx/manual.tex ../$(objdir_doc)/wxwin.htm -twice -html
        cp docs/latex/wx/*.gif $(objdir_doc)
@@ -231,10 +401,15 @@ build-doc-stamp: build-gtk-shared-stamp
              $(objdir_doc)/wxwin.htx $(objdir_doc)/wxwin.ref
        touch $@
 
              $(objdir_doc)/wxwin.htx $(objdir_doc)/wxwin.ref
        touch $@
 
-build-examples-stamp:
+build-examples-stamp: build-gtk-shared-stamp
        dh_testdir
        dh_testdir
-       mkdir $(objdir_examples)
+       mkdir -p $(objdir_examples)
+
+       # copy all samples and the Makefile generated for libwxgtk.
        cp -a samples $(objdir_examples)
        cp -a samples $(objdir_examples)
+       rm -f $(objdir_examples)/samples/Makefile
+       cp -a $(objdir_gtk_shared)/samples/Makefile $(objdir_examples)/samples
+
        cp -a demos $(objdir_examples)
        cp -a wxPython/demo $(objdir_examples)/wxPython
        @for d in $(objdir_examples)/demos $(objdir_examples)/samples; do \
        cp -a demos $(objdir_examples)
        cp -a wxPython/demo $(objdir_examples)/wxPython
        @for d in $(objdir_examples)/demos $(objdir_examples)/samples; do \
@@ -250,11 +425,138 @@ build-examples-stamp:
        done;
        touch $@
 
        done;
        touch $@
 
+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 $@
+
+configure-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
+       touch $@
+
+build-wxbase-msw-shared-stamp: configure-wxbase-msw-shared-stamp
+       dh_testdir
+       cd $(objdir_wxbase_msw_shared) && $(MAKE)
+       touch $@
+
+configure-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_cache_cross) \
+                               --host=$(cross_host) \
+                               --build=$(cross_build) \
+                               --disable-gui \
+                               --disable-shared
+       touch $@
+
+build-wxbase-msw-static-stamp: configure-wxbase-msw-static-stamp
+       dh_testdir
+       cd $(objdir_wxbase_msw_static) && $(MAKE)
+       touch $@
+
+# Note this builds dll only, since wxmsw static debug is > 130MB !
+configure-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
+       touch $@
+
+build-wxbase-msw-dbg-stamp: configure-wxbase-msw-dbg-stamp
+       dh_testdir
+       cd $(objdir_wxbase_msw_dbg) && $(MAKE)
+       touch $@
+
+configure-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)
+       touch $@
+
+build-msw-shared-stamp: configure-msw-shared-stamp
+       dh_testdir
+       cd $(objdir_msw_shared) && $(MAKE)
+       touch $@
+
+configure-msw-static-stamp:
+       dh_testdir
+       mkdir -p $(objdir_msw_static)
+       cd $(objdir_msw_static) \
+               && ../configure --prefix=/usr/$(cross_host) \
+                               --cache-file=$(config_cache_cross) \
+                               --host=$(cross_host) \
+                               --build=$(cross_build) \
+                               --disable-shared
+       touch $@
+
+build-msw-static-stamp: configure-msw-static-stamp
+       dh_testdir
+       cd $(objdir_msw_static) && $(MAKE)
+       touch $@
+
+configure-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
+       touch $@
+
+build-msw-dbg-stamp: configure-msw-dbg-stamp
+       dh_testdir
+       cd $(objdir_msw_dbg) && $(MAKE)
+       touch $@
+
+
 clean: debian/control
        dh_testdir
        dh_testroot
 clean: debian/control
        dh_testdir
        dh_testroot
-       rm -rf control-files-stamp $(build_stamps) $(objdirs)
-       -cd wxPython/src && $(MAKE) clean
+
+       rm -rf config_deb.cache config_deb_cross.cache *-stamp $(objdirs)
+       rm -f docs/lgpl.txt
+       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).*
        dh_clean
        rm -f debian/$(package_wxbase_lib).*
        rm -f debian/$(package_wxbase_dev).*
@@ -266,10 +568,19 @@ clean: debian/control
        rm -f debian/$(package_gtk_contrib).*
        rm -f debian/$(package_gtk_contrib_dev).*
        rm -f debian/$(package_headers).*
        rm -f debian/$(package_gtk_contrib).*
        rm -f debian/$(package_gtk_contrib_dev).*
        rm -f debian/$(package_headers).*
+       rm -f debian/$(package_i18n).*
        rm -f debian/$(package_doc).*
        rm -f debian/$(package_examples).*
        rm -f debian/$(package_doc).*
        rm -f debian/$(package_examples).*
+       rm -f debian/$(package_gtk_univ).*
+       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)
 
 
-install: build $(install_all)
+install: build_all $(install_all_native)
 
 install-wxbase-lib: DH_OPTIONS=-p$(package_wxbase_lib)
 install-wxbase-lib: build-wxbase-shared-stamp
 
 install-wxbase-lib: DH_OPTIONS=-p$(package_wxbase_lib)
 install-wxbase-lib: build-wxbase-shared-stamp
@@ -277,17 +588,17 @@ install-wxbase-lib: build-wxbase-shared-stamp
        dh_testroot
        dh_clean -k
        dh_installdirs
        dh_testroot
        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/
+       dh_install $(objdir_wxbase_shared)/lib/*.so.*   usr/lib
 
 install-wxbase-dev: DH_OPTIONS=-p$(package_wxbase_dev)
 
 install-wxbase-dev: DH_OPTIONS=-p$(package_wxbase_dev)
-install-wxbase-dev: build-wxbase-static-stamp install-wxbase-lib
+install-wxbase-dev: build-wxbase-static-stamp
        dh_testdir
        dh_testroot
        dh_clean -k
        dh_installdirs
        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
+       dh_install $(objdir_wxbase_shared)/wxbase-$(release)-config     usr/bin
+       dh_install $(objdir_wxbase_shared)/lib/{wx,*.so}                usr/lib
+       dh_install $(objdir_wxbase_static)/lib/*.a                      usr/lib
 
 install-wxbase-dbg: DH_OPTIONS=-p$(package_wxbase_dbg)
 install-wxbase-dbg: build-wxbase-debug-stamp
 
 install-wxbase-dbg: DH_OPTIONS=-p$(package_wxbase_dbg)
 install-wxbase-dbg: build-wxbase-debug-stamp
@@ -295,27 +606,35 @@ install-wxbase-dbg: build-wxbase-debug-stamp
        dh_testroot
        dh_clean -k
        dh_installdirs
        dh_testroot
        dh_clean -k
        dh_installdirs
-       cp -a $(objdir_wxbase_debug)/lib/* debian/$(package_wxbase_dbg)/usr/lib
-       cp $(objdir_wxbase_debug)/wxbased-config debian/$(package_wxbase_dbg)/usr/bin/
+       dh_install $(objdir_wxbase_debug)/wxbased-$(release)-config     usr/bin
+       dh_install $(objdir_wxbase_debug)/lib                           usr
+       cp debian/lintian-override debian/$(package_wxbase_dbg)/usr/share/lintian/overrides/$(package_wxbase_dbg)
+
+install-gtk-shared-stamp:
+       dh_testdir
+       mkdir -p $(objdir_gtk_install)
+       cd $(objdir_gtk_shared) \
+               && $(MAKE) install prefix=`pwd`/../$(objdir_gtk_install)
+       touch $@
 
 install-gtk-lib: DH_OPTIONS=-p$(package_gtk_lib)
 
 install-gtk-lib: DH_OPTIONS=-p$(package_gtk_lib)
-install-gtk-lib: build-gtk-shared-stamp
+install-gtk-lib: build-gtk-shared-stamp install-gtk-shared-stamp
        dh_testdir
        dh_testroot
        dh_clean -k
        dh_installdirs 
        dh_testdir
        dh_testroot
        dh_clean -k
        dh_installdirs 
-       cd $(objdir_gtk_shared) \
-               && $(MAKE) install prefix=`pwd`/../debian/$(package_gtk_lib)/usr
-       rm -f debian/$(package_gtk_lib)/usr/bin/wx-config
+       dh_install $(objdir_gtk_install)/share/wx       usr/share
+       dh_install $(objdir_gtk_install)/lib/*.so.*     usr/lib
 
 install-gtk-dev: DH_OPTIONS=-p$(package_gtk_dev)
 
 install-gtk-dev: DH_OPTIONS=-p$(package_gtk_dev)
-install-gtk-dev: build-gtk-static-stamp install-gtk-lib
+install-gtk-dev: build-gtk-static-stamp install-gtk-shared-stamp
        dh_testdir
        dh_testroot
        dh_clean -k
        dh_installdirs
        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
+       dh_install $(objdir_gtk_install)/bin/wxgtk-$(release)-config    usr/bin
+       dh_install $(objdir_gtk_install)/lib/{wx,*.so}                  usr/lib
+       dh_install $(objdir_gtk_static)/lib/libwx_gtk{-,_gl}*.a         usr/lib
 
 install-gtk-dbg: DH_OPTIONS=-p$(package_gtk_dbg)
 install-gtk-dbg: build-gtk-debug-stamp
 
 install-gtk-dbg: DH_OPTIONS=-p$(package_gtk_dbg)
 install-gtk-dbg: build-gtk-debug-stamp
@@ -323,57 +642,95 @@ install-gtk-dbg: build-gtk-debug-stamp
        dh_testroot
        dh_clean -k
        dh_installdirs
        dh_testroot
        dh_clean -k
        dh_installdirs
-       cp -a $(objdir_gtk_debug)/lib/* debian/$(package_gtk_dbg)/usr/lib
-       cp $(objdir_gtk_debug)/wxgtkd-config debian/$(package_gtk_dbg)/usr/bin/
+       dh_install $(objdir_gtk_debug)/wxgtkd-$(release)-config         usr/bin
+       dh_install $(objdir_gtk_debug)/lib                              usr
+       cp debian/lintian-override debian/$(package_gtk_dbg)/usr/share/lintian/overrides/$(package_gtk_dbg)
 
 
-install-gtk-contrib: DH_OPTIONS=-p$(package_gtk_contrib)
-install-gtk-contrib: build-contrib-shared-stamp
+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
        dh_testdir
        dh_testroot
        dh_clean -k
        dh_installdirs
+       dh_install $(objdir_gtk_univ)/wxgtkuniv-$(release)-config       usr/bin
+       dh_install $(objdir_gtk_univ)/lib                               usr
+       cp debian/lintian-override debian/$(package_gtk_univ)/usr/share/lintian/overrides/$(package_gtk_univ)
+
+install-gtk-contrib-stamp:
+       dh_testdir
+       mkdir -p $(objdir_gtk_contrib_install)/lib
        cd $(objdir_gtk_shared)/contrib/src \
        cd $(objdir_gtk_shared)/contrib/src \
-               && $(MAKE) install prefix=`pwd`/../../../debian/$(package_gtk_contrib)/usr
+               && $(MAKE) install prefix=`pwd`/../../../$(objdir_gtk_contrib_install)
+       touch $@
+
+install-gtk-contrib: DH_OPTIONS=-p$(package_gtk_contrib)
+install-gtk-contrib: build-contrib-shared-stamp install-gtk-contrib-stamp
+       dh_testdir
+       dh_testroot
+       dh_clean -k
+       dh_installdirs
+       dh_install $(objdir_gtk_contrib_install)/lib/*.so.*     usr/lib
 
 install-gtk-contrib-dev: DH_OPTIONS=-p$(package_gtk_contrib_dev)
 
 install-gtk-contrib-dev: DH_OPTIONS=-p$(package_gtk_contrib_dev)
-install-gtk-contrib-dev: build-contrib-static-stamp install-gtk-dev
+install-gtk-contrib-dev: build-contrib-static-stamp install-gtk-contrib-stamp
        dh_testdir
        dh_testroot
        dh_clean -k
        dh_installdirs
        dh_testdir
        dh_testroot
        dh_clean -k
        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
+       dh_install $(objdir_gtk_contrib_install)/include        usr
+       dh_install $(objdir_gtk_contrib_install)/lib/*.so       usr/lib
+       dh_install -Xlibwx_gtk- -Xlibwx_gtk_gl- \
+                  $(objdir_gtk_static)/lib/*.a                 usr/lib
 
 install-gtk-py: DH_OPTIONS=-p$(package_gtk_py)
 
 install-gtk-py: DH_OPTIONS=-p$(package_gtk_py)
-install-gtk-py: build-gtk-python-stamp
+install-gtk-py: build-gtk-py-stamp
        dh_testdir
        dh_testroot
        dh_clean -k
        dh_installdirs
        dh_testdir
        dh_testroot
        dh_clean -k
        dh_installdirs
-       cd wxPython/src \
-               && ../distrib/build.py -i \
-                       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 \
+       cd wxPython \
+               && ./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 '{}' ';'
 
                -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: DH_OPTIONS=-p$(package_headers)
-install-headers: install-gtk-lib
+install-headers: install-gtk-shared-stamp
+       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_install $(objdir_gtk_install)/include        usr
+       dh_install $(objdir_gtk_install)/share/aclocal  usr/share
+
+       dh_installman debian/wx-config.1
+
+install-i18n: DH_OPTIONS=-p$(package_i18n)
+install-i18n: build-i18n-stamp install-gtk-shared-stamp
        dh_testdir
        dh_testroot
        dh_clean -k
        dh_installdirs
        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
+       dh_install $(objdir_gtk_install)/share/locale   usr/share
 
 install-doc: DH_OPTIONS=-p$(package_doc)
 install-doc: build-doc-stamp
 
 install-doc: DH_OPTIONS=-p$(package_doc)
 install-doc: build-doc-stamp
@@ -389,35 +746,120 @@ install-examples: build-examples-stamp
        dh_clean -k
        dh_installdirs
 
        dh_clean -k
        dh_installdirs
 
+install-wxbase-msw-dev: DH_OPTIONS=-p$(package_wxbase_msw_dev)
+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_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-shared-stamp build-msw-static-stamp
+       dh_testdir
+       dh_testroot
+       dh_clean -k
+       dh_installdirs
+       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
+       dh_testroot
+       dh_clean -k
+       dh_installdirs
+       @# Symlink all the headers that will be installed by the main -headers
+       @# package to where the cross compiler will expect them.
+       @for f in `ls -1 include/wx`; do \
+               ln -s /usr/include/wx/$$f debian/$(package_headers_msw)/usr/$(cross_host)/include/wx; \
+               echo "linking header /usr/include/wx/$$f"; \
+       done;
+       @# But install this lot for real.
+       rm -f debian/$(package_headers_msw)/usr/$(cross_host)/include/wx/msw
+       cp -a include/wx/msw debian/$(package_headers_msw)/usr/$(cross_host)/include/wx
+       @# and remove this cruft(?)
+       rm -f debian/$(package_headers_msw)/usr/$(cross_host)/include/wx/treelay.h
+
+
 binary-common:
 binary-common:
-       dh_testversion 1.1.17
        dh_testdir
        dh_testroot
        dh_installdocs
        dh_installchangelogs
        dh_installexamples
        dh_testdir
        dh_testroot
        dh_installdocs
        dh_installchangelogs
        dh_installexamples
+       dh_installmenu
        dh_link
        dh_link
-       dh_strip
+
+       @# 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_wxbase_msw_dbg) \
+                -N$(package_msw_dev) -N$(package_msw_dbg)
+
        dh_compress
        dh_fixperms
        dh_compress
        dh_fixperms
-       dh_makeshlibs
+       dh_makeshlibs -N$(package_gtk_py) -V
        dh_installdeb
        dh_installdeb
-       dh_shlibdeps -ldebian/$(package_gtk_lib)/usr/lib:debian/$(package_gtk_py)/usr/lib
+       dh_shlibdeps -ldebian/$(package_gtk_lib)/usr/lib
        dh_gencontrol
        dh_md5sums
        dh_builddeb
 
 # Build architecture-independent files here.
        dh_gencontrol
        dh_md5sums
        dh_builddeb
 
 # Build architecture-independent files here.
-binary-indep: build install
-       $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+# Note that you currently can't build the indep packages without first
+# 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_wxbase_msw_dbg) -N$(package_msw_dev) -N$(package_msw_dbg) -N$(package_headers_msw) -N$(package_gtk_univ)" \
+               binary-common
 
 
-# Build architecture-dependent files here.
-binary-arch: build install
-       $(MAKE) -f debian/rules DH_OPTIONS=-a 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_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
 
 
 # Build all packages target.
 binary: binary-arch binary-indep
 
+# This is a special target for building the wxMSW-cross packages.
+# It's not currently called during the official package build run
+# but may be run separately to build the extra packages.
+# There is an implied build dep on the mingw32 cross compiler 
+# 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_wxbase_msw_dbg) -p$(package_msw_dev) -p$(package_msw_dbg) -p$(package_headers_msw)" \
+               binary-common
+
 
 ############################################################################
 #
 
 ############################################################################
 #
@@ -451,15 +893,24 @@ 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-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
 
 # 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 clean binary-indep binary-arch binary binary-common binary-gtk \
-        binary-gtk-dev binary-gtk-dbg binary-wxbase binary-wxbase-dev \
-       binary-wxbase-dbg binary-doc install install-wxbase-lib \
-       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-doc install-examples
+.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 \
+       binary-wxbase-dbg binary-doc binary-cross \
+       install install_arch install-wxbase-lib \
+        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-dbg install-msw-dbg
 
 
wxWidgets (Impactor)