fixed bug in generation of thumb scroll events

[wxWidgets.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index 8edcdbcc74358ee05e70e1fb02c7f07bec28f2b1..bc44d142a2fbe6a02ac84ed9d886e31141a59970 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -13,6 +13,12 @@ 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]")
 
 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)
 package_wxbase_dev=libwxbase$(release)-dev
 # Packages to build:
 package_wxbase_lib=libwxbase$(release)
 package_wxbase_dev=libwxbase$(release)-dev


@@ -28,6 +34,14 @@ 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


@@ -39,9 +53,21 @@ objdir_doc_cruft=objs_doc_con
 objdir_doc=docs/wxWindows-manual.html
 objdir_examples=docs/examples
 objdir_i18n=locale
 objdir_doc=docs/wxWindows-manual.html
 objdir_examples=docs/examples
 objdir_i18n=locale

+
+objdir_gtk_univ=objs_gtk_univ
+
+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_univ) \
+       $(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
 
 #      note that the i18n package is actually arch indep (once built)
 #      but must be built (and installed) during the arch any phase as


@@ -51,22 +77,34 @@ objdirs=$(objdir_wxbase_shared) $(objdir_wxbase_static) $(objdir_wxbase_debug) \
 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_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-gtk-univ-stamp \

                   build-contrib-shared-stamp build-contrib-static-stamp \
                   build-gtk-py-stamp build-i18n-stamp
 
 build_indep_stamps=build-examples-stamp build-doc-stamp
 
                   build-contrib-shared-stamp build-contrib-static-stamp \
                   build-gtk-py-stamp build-i18n-stamp
 
 build_indep_stamps=build-examples-stamp build-doc-stamp
 

-build_stamps=$(build_arch_stamps) $(build_indep_stamps)
+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)
+
+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 targets:
 install_all_arch=install-wxbase-lib install-wxbase-dev install-wxbase-dbg \
                  install-gtk-lib install-gtk-dev install-gtk-dbg \

+                 install-gtk-univ \

                  install-gtk-contrib install-gtk-contrib-dev install-gtk-py \
                  install-headers install-i18n
 
 install_all_indep=install-examples install-doc
 
                  install-gtk-contrib install-gtk-contrib-dev install-gtk-py \
                  install-headers install-i18n
 
 install_all_indep=install-examples install-doc
 

-install_all=$(install_all_arch) $(install_all_indep)
+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)

 
 
 wxconfig:=$(shell pwd)/$(objdir_gtk_shared)/wx-config \
 
 
 wxconfig:=$(shell pwd)/$(objdir_gtk_shared)/wx-config \


@@ -79,10 +117,7 @@ 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
        @for f in dirs postinst; do \
                echo "generating control file $(package_wxbase_lib).$$f"; \
        dh_testdir
        @for f in dirs postinst; do \
                echo "generating control file $(package_wxbase_lib).$$f"; \


@@ -90,11 +125,13 @@ control-files-stamp: debian/control debian/wxwin-doc.doc-base
        done;
        @for f in dirs files links postinst prerm; do \
                echo "generating control file $(package_wxbase_dev).$$f"; \
        done;
        @for f in dirs files links postinst prerm; do \
                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;
        @for f in dirs links postinst prerm; do \
                echo "generating control file $(package_wxbase_dbg).$$f"; \
        done;
        @for f in dirs links postinst prerm; do \
                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;
        @for f in dirs postinst; do \
                echo "generating control file $(package_gtk_lib).$$f"; \
        done;
        @for f in dirs postinst; do \
                echo "generating control file $(package_gtk_lib).$$f"; \


@@ -102,11 +139,18 @@ control-files-stamp: debian/control debian/wxwin-doc.doc-base
        done;
        @for f in dirs files links postinst prerm; do \
                echo "generating control file $(package_gtk_dev).$$f"; \
        done;
        @for f in dirs files links postinst prerm; do \
                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;
        @for f in dirs links postinst prerm; do \
                echo "generating control file $(package_gtk_dbg).$$f"; \
        done;
        @for f in dirs links postinst prerm; do \
                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;
+       @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"; \
        done;
        @for f in dirs docs files postinst prerm; do \
                echo "generating control file $(package_gtk_py).$$f"; \


@@ -131,36 +175,70 @@ control-files-stamp: debian/control debian/wxwin-doc.doc-base
        done;
        @for f in dirs docs doc-base; do \
                echo "generating control file $(package_doc).$$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; \
+               sed -e 's/=V/$(release)/g' < debian/wxwin-doc.$$f \
+                       > debian/$(package_doc).$$f; \

        done;
        @for f in examples; do \
                echo "generating control file $(package_examples).$$f"; \
                cp debian/wxwin-examples.$$f debian/$(package_examples).$$f; \
        done;
        done;
        @for f in examples; do \
                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;

        touch $@
 
 build_arch: control-files-stamp $(build_arch_stamps)
        touch $@
 
 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: control-files-stamp $(build_stamps)

 
 build-wxbase-shared-stamp:
        dh_testdir
 
 build-wxbase-shared-stamp:
        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_deb.cache \
+                               --cache-file=$(config_cache) \

                                --disable-gui \
                                --disable-gui \

-                               --enable-burnt_name \
+                               --enable-soname \

                                --with-zlib=sys \
                && $(MAKE)
        touch $@
 
 build-wxbase-static-stamp:
        dh_testdir
                                --with-zlib=sys \
                && $(MAKE)
        touch $@
 
 build-wxbase-static-stamp:
        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_deb.cache \
+                               --cache-file=$(config_cache) \

                                --disable-gui \
                                --disable-shared \
                                --with-zlib=sys \
                                --disable-gui \
                                --disable-shared \
                                --with-zlib=sys \


@@ -169,26 +247,26 @@ build-wxbase-static-stamp:
 
 build-wxbase-debug-stamp:
        dh_testdir
 
 build-wxbase-debug-stamp:
        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_deb.cache \
+                               --cache-file=$(config_cache) \

                                --disable-gui \
                                --enable-debug \
                                --disable-gui \
                                --enable-debug \

-                               --enable-burnt_name \
+                               --enable-soname \

                                --with-zlib=sys \
                && $(MAKE)
        touch $@
 
 build-gtk-shared-stamp:
        dh_testdir
                                --with-zlib=sys \
                && $(MAKE)
        touch $@
 
 build-gtk-shared-stamp:
        dh_testdir

-       mkdir $(objdir_gtk_shared)
+       mkdir -p $(objdir_gtk_shared)

        cd $(objdir_gtk_shared) \
                && ../configure --prefix=/usr \
        cd $(objdir_gtk_shared) \
                && ../configure --prefix=/usr \

-                               --cache-file=../config_deb.cache \
+                               --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-zlib=sys \
                                --with-libjpeg=sys \
                                --with-libpng=sys \


@@ -198,10 +276,10 @@ build-gtk-shared-stamp:
 
 build-gtk-static-stamp:
        dh_testdir
 
 build-gtk-static-stamp:
        dh_testdir

-       mkdir $(objdir_gtk_static)
+       mkdir -p $(objdir_gtk_static)

        cd $(objdir_gtk_static) \
                && ../configure --prefix=/usr \
        cd $(objdir_gtk_static) \
                && ../configure --prefix=/usr \

-                               --cache-file=../config_deb.cache \
+                               --cache-file=$(config_cache) \

                                --with-gtk \
                                --with-opengl \
                                --disable-shared \
                                --with-gtk \
                                --with-opengl \
                                --disable-shared \


@@ -214,14 +292,31 @@ build-gtk-static-stamp:
 
 build-gtk-debug-stamp:
        dh_testdir
 
 build-gtk-debug-stamp:
        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_deb.cache \
+                               --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 \
+               && $(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-zlib=sys \
                                --with-libjpeg=sys \
                                --with-libpng=sys \


@@ -255,7 +350,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)


@@ -264,10 +359,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 \


@@ -285,16 +385,109 @@ build-examples-stamp:
 
 build-i18n-stamp: build-gtk-shared-stamp
        dh_testdir
 
 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) \
        cd $(objdir_i18n) \

+               && touch *.po \

                && $(MAKE) allmo
        touch $@
 
                && $(MAKE) allmo
        touch $@
 

+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_cache_cross) \
+                               --host=$(cross_host) \
+                               --build=$(cross_build) \
+                               --disable-gui \
+                               --disable-shared \
+               && $(MAKE)
+       touch $@
+
+# 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_cache_cross) \
+                               --host=$(cross_host) \
+                               --build=$(cross_build) \
+                               --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
 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
        rm -f docs/lgpl.txt

-       cd wxPython && ./setup.py clean
+       rm -f docs/latex/wx/manual.bb
+       rm -f $(objdir_i18n)/*.mo
+
+       cd wxPython \
+               && ./setup.py clean \
+               && 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
+

        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).*


@@ -302,6 +495,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_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).*
        rm -f debian/$(package_gtk_py).*
        rm -f debian/$(package_gtk_contrib).*
        rm -f debian/$(package_gtk_contrib_dev).*


@@ -309,10 +503,15 @@ clean: debian/control
        rm -f debian/$(package_i18n).*
        rm -f debian/$(package_doc).*
        rm -f debian/$(package_examples).*
        rm -f debian/$(package_i18n).*
        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)
 
 
 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


@@ -321,7 +520,7 @@ install-wxbase-lib: build-wxbase-shared-stamp
        dh_clean -k
        dh_installdirs
        cp -a $(objdir_wxbase_shared)/lib/* debian/$(package_wxbase_lib)/usr/lib
        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/
+       cp $(objdir_wxbase_shared)/wxbase-$(release)-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
 
 install-wxbase-dev: DH_OPTIONS=-p$(package_wxbase_dev)
 install-wxbase-dev: build-wxbase-static-stamp install-wxbase-lib


@@ -339,7 +538,7 @@ install-wxbase-dbg: build-wxbase-debug-stamp
        dh_clean -k
        dh_installdirs
        cp -a $(objdir_wxbase_debug)/lib/* debian/$(package_wxbase_dbg)/usr/lib
        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/
+       cp $(objdir_wxbase_debug)/wxbased-$(release)-config debian/$(package_wxbase_dbg)/usr/bin/

        cp debian/lintian-override debian/$(package_wxbase_dbg)/usr/share/lintian/overrides/$(package_wxbase_dbg)
 
 install-gtk-lib: DH_OPTIONS=-p$(package_gtk_lib)
        cp debian/lintian-override debian/$(package_wxbase_dbg)/usr/share/lintian/overrides/$(package_wxbase_dbg)
 
 install-gtk-lib: DH_OPTIONS=-p$(package_gtk_lib)


@@ -368,9 +567,19 @@ install-gtk-dbg: build-gtk-debug-stamp
        dh_clean -k
        dh_installdirs
        cp -a $(objdir_gtk_debug)/lib/* debian/$(package_gtk_dbg)/usr/lib
        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/
+       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)
 
        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
 install-gtk-contrib: DH_OPTIONS=-p$(package_gtk_contrib)
 install-gtk-contrib: build-contrib-shared-stamp
        dh_testdir


@@ -438,6 +647,69 @@ 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:
        dh_testdir
        dh_testroot
 binary-common:
        dh_testdir
        dh_testroot


@@ -445,7 +717,13 @@ binary-common:
        dh_installchangelogs
        dh_installexamples
        dh_link
        dh_installchangelogs
        dh_installexamples
        dh_link

-       dh_strip -N$(package_gtk_dbg) -N$(package_wxbase_dbg)
+
+       @# 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_makeshlibs -N$(package_gtk_py) -V
        dh_compress
        dh_fixperms
        dh_makeshlibs -N$(package_gtk_py) -V


@@ -458,16 +736,30 @@ binary-common:
 # Build architecture-independent files here.
 # Note that you currently can't build the indep packages without first
 # building the arch specific package files needed to create them.
 # Build architecture-independent files here.
 # 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 install
-       $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+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)" \
+               binary-common

 
 # Build just the architecture-dependent files here.
 binary-arch: build_arch install_arch
 
 # Build just the architecture-dependent files here.
 binary-arch: build_arch install_arch

-       $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
+       $(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)" \
+               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
+

 
 ############################################################################
 #
 
 ############################################################################
 #


@@ -501,15 +793,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 build_arch clean binary-indep binary-arch binary 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 \
         binary-gtk binary-gtk-dev binary-gtk-dbg binary-wxbase binary-wxbase-dev \

-       binary-wxbase-dbg binary-doc install install_arch install-wxbase-lib \
+       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-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-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