-- Ron Lee <ron@debian.org>  Thu, 19 Dec 2002 01:08:50 -0800
 
+wxwindows2.4 (2.4.2.6) unstable; urgency=high
+
+  * High urgency so as not to reset the shotclock for getting wx and
+    its deps moving into testing.  All changes since the last release
+    are superficial.
+  * Reapply HURD/K*BSD patch fragment that should not have been reverted.
+    Closes: #217726    (Make a wish, the third time is lucky so I'm told.)
+  * Updated .po files.
+
+ -- Ron Lee <ron@debian.org>  Mon,  2 Aug 2004 14:50:07 +0930
+
+wxwindows2.4 (2.4.2.5) unstable; urgency=medium
+
+  * Medium urgency to keep things moving for the libtiff fudge.
+  * Switch to dhv4, libtiff4.
+  * Fix menu quoting.
+  * Whittled down on some of the build config scripts that weren't
+    really earning their weight.
+  * Check for DISTCC_HOSTS and set the number of make -j jobs according
+    to the number of hosts it contains.
+  * Purge the .pyc from site-packages/wx too.  They are generated on
+    site at install time.
+  * Includes type correctness fix for 64bit arch's.  Closes: #197661
+  * Merged patches from Robert Millan for HURD/K*BSD support back from
+    cvs head.  Closes: #217726
+  * Store the python version we preconfigure virgin source with, then
+    people don't need the default python package installed to build
+    from source, just the packages declared in the build-deps.  Fix
+    the -python postinst to use this when byte compiling too.
+    Closes: #259128  (and fixes #258529)
+  * Added README.examples to explain that these examples are extended
+    documentation for coders, rather than trial apps for users.
+    Closes: #212894
+  * Dropped the examples from the demos subdir, the samples cover a lot
+    more ground than they used to and are generally more up to date,
+    it's also no longer hard to find a broad range of real applications
+    with source.  Provided more external pointers in the README.
+    Closes: #258530 after discussion with the submitter.  This is a bit
+    less c++ for your python, but I'm not convinced yet that either half
+    is such a burden on the other as to warrant an extra package here
+    at this stage.
+  * Fix linking of wxgtk_gl to include the proper dependency on wxgtk.
+    Remove suggestion of libgl1, by declaring the full library dependency
+    we now automatically insist on it.  Closes: #262027
+  * Include wxrc and wxrcedit in contrib-dev.  Added a simple man page
+    and a menu entry for wxrcedit.  Closes: #261811
+  * Update gl sample makefiles to use --gl-libs.  Thanks to Rich Walker
+    for picking this up.  Closes: #246169
+  * Enable the building of a libwxgtk-dbg-python package, but do not
+    build and upload it by default at this stage.  Closes: #220568
+  * Does not fix #239782, sorry.
+
+ -- Ron Lee <ron@debian.org>  Wed, 28 Jul 2004 03:21:42 +0930
+
 wxwindows2.4 (2.4.2.4) unstable; urgency=low
 
   * Modified build scripts to use pythonX.Y instead of python(>=X.Y)
 
 Source: wxwidgets=V
 Section: libs
 Priority: optional
-Build-Depends: debhelper (>=4.0), flex, bison, gettext, libgtk2.0-dev, =PY, =PY-dev, zlib1g-dev, libjpeg62-dev, libpng12-dev, libtiff3g-dev, xlibmesa-gl-dev | libgl-dev, xlibmesa-glu-dev | libglu-dev, libesd0-dev
+Build-Depends: debhelper (>=4.0), flex, bison, gettext, libgtk2.0-dev, =PY, =PY-dev, zlib1g-dev, libjpeg62-dev, libpng12-dev, libtiff4-dev, xlibmesa-gl-dev | libgl-dev, xlibmesa-glu-dev | libglu-dev, libesd0-dev
 Maintainer: Ron Lee <ron@debian.org>
-Standards-Version: 3.6.1.0
+Standards-Version: 3.6.1.1
 
 Package: libwxgtk=V
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}
-Suggests: libgl1
 Replaces: wxgtk2.1
 Description: wxWidgets Cross-platform C++ GUI toolkit (GTK+ runtime)
  wxWidgets (formerly known as wxWindows) is a class library for C++ providing
 Architecture: any
 Section: libdevel
 Depends: wx=V-headers (= ${Source-Version}), libwxgtk=V (= ${Source-Version}), libc6-dev
-Suggests: wx=V-doc, libstdc++-dev, gettext, libgl-dev
+Suggests: wxwin=V-doc, libstdc++-dev, gettext, xlibmesa-gl-dev | libgl-dev, xlibmesa-glu-dev | libglu-dev
 Conflicts: libwxgtk-dev, libwxbase-dev
 Replaces: libwxgtk-dev, libwxbase-dev, wxgtk2.1-dev
 Provides: libwxgtk-dev
 Section: python
 Depends: =PY, ${shlibs:Depends}
 Suggests: wx=V-doc, wx=V-examples, =PY-xml
-Conflicts: libwxgtk-python, python-wxwin, libwxgtk2.2-python-contrib, libwxgtk2.2-python, libwxgtk2.3-python
-Replaces: libwxgtk-python, python-wxwin, libwxgtk2.2-python-contrib, libwxgtk2.2-python, libwxgtk2.3-python
+Conflicts: libwxgtk-python, libwxgtk=V-dbg-python, python-wxwin, libwxgtk2.2-python-contrib, libwxgtk2.2-python, libwxgtk2.3-python
+Replaces: libwxgtk-python, libwxgtk=V-dbg-python, python-wxwin, libwxgtk2.2-python-contrib, libwxgtk2.2-python, libwxgtk2.3-python
 Provides: libwxgtk-python
 Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython binding)
  wxWidgets (formerly known as wxWindows) is a class library for C++ providing
  GUI components and other facilities on several popular platforms (and some
  unpopular ones as well).  For more information see http://wxwidgets.org
  .
- This package provides a Python binding to the wxGTK library and it's
+ This package provides a Python binding to the wxGTK library and its
  contrib libs.  If you wish to use xrced you'll also need the python-xml
  package installed.
 
  This package contains examples of using the wxWidgets toolkit in
  C++ and with the wxPython language binding.
 
+Package: libwxgtk=V-dbg-python
+Architecture: any
+Section: python
+Depends: =PY, ${shlibs:Depends}
+Suggests: wxwin=V-doc, wxwin=V-examples, =PY-xml
+Conflicts: libwxgtk=V-python
+Replaces: libwxgtk=V-python
+Provides: libwxgtk=V-python
+Description: wxWindows Cross-platform C++ GUI toolkit (wxPython binding)
+ wxWindows is a class library for C++ providing GUI (Graphical User
+ Interface) and other facilities on more than one platform.  Version =V
+ currently supports subsets of GTK+, Motif, and MS Windows.
+ .
+ This package provides a Python binding to the wxGTK debug library.
+ It is useful for developers as many common errors may be caught.
+ Unfortunately it cannot be installed at the same time as the release
+ packages, but it will replace them for other applications that require
+ wxPython.  You should _never_ upload packages to Debian that depend upon
+ this package explicitly, use the libwxgtk=V-python package instead.
+ .
+ If you wish to use xrced you'll also need the python-xml package installed.
+
 Package: libwxmsw=V-dev
 Architecture: i386
 Section: otherosfs
 
 #export DH_VERBOSE=1
 export DH_OPTIONS
 
-release    := $(shell dpkg-parsechangelog | sed -n 's/^Source: wxwidgets//p')
-python_ver := python$(shell python -c "import sys;print sys.version[:3]")
+ifdef DISTCC_HOSTS
+
+ #JOB_COUNT := $(shell set $${DISTCC_HOSTS} > /dev/null 2>&1 ; echo $$(($$\# + $$\#)))
+ # Nearly as fast, but doesn't raise the room temperature
+ # or saturate the build machines quite so much.
+  JOB_COUNT := $(shell set $${DISTCC_HOSTS} > /dev/null 2>&1 ; echo $$\#)
+  FAST_MAKE  = $(MAKE) -j $(JOB_COUNT)
+
+else
+
+  FAST_MAKE = $(MAKE)
+
+endif
+
+-include debian/python-version
+
+release := $(shell dpkg-parsechangelog | sed -n 's/^Source: wxwidgets//p')
 
 cross_host  = i586-mingw32msvc
 cross_build = $(shell ./config.guess)
 package_doc             = wx$(release)-doc
 package_examples        = wx$(release)-examples
 
+package_gtk_dbg_py      = libwxgtk$(release)-dbg-python
 package_msw_dev         = libwxmsw$(release)-dev
 package_msw_dbg         = libwxmsw$(release)-dbg
 package_headers_msw     = wx$(release)-headers-msw
                 --prefix=$(shell pwd)                            \
                 --exec-prefix=$(shell pwd)/$(objdir_gtk_shared)
 
+wxconfig-dbg := $(shell pwd)/$(objdir_gtk_debug)/wx-config       \
+                --prefix=$(shell pwd)                            \
+                --exec-prefix=$(shell pwd)/$(objdir_gtk_debug)
+
 contrib_libs := $(subst CVS,,$(notdir $(wildcard contrib/include/wx/*)))
 
 
 # The Rules:
 
-debian/control: debian/control.in
+debian/python-version:
+       echo python_ver := python$(shell python -c "import sys;print sys.version[:3]") > $@
+
+debian/control: $(addprefix debian/,control.in python-version)
        sed -e 's/=V/$(release)/g;s/=PY/$(python_ver)/g' < debian/control.in > debian/control
 
 control-files-stamp: debian/control
                sed -e 's/=V/$(release)/g' < debian/libwxgtk-dbg.$$f         \
                        > debian/$(package_gtk_dbg).$$f;                     \
        done;
+       @for f in menu; do \
+               echo "generating control file $(package_gtk_contrib_dev).$$f"; \
+               sed -e 's/=V/$(release)/g' < debian/libwxgtk-contrib-dev.$$f \
+                       > debian/$(package_gtk_contrib_dev).$$f; \
+       done;
        @for f in dirs docs menu postinst prerm; do                          \
                echo "generating control file $(package_gtk_py).$$f";        \
                sed -e 's/=PY/$(python_ver)/g;s/=V/$(release)/g'             \
                echo "generating control file $(package_examples).$$f";      \
                cp debian/wx-examples.$$f debian/$(package_examples).$$f;    \
        done;
+       @for f in dirs docs postinst; do                                     \
+               echo "generating control file $(package_gtk_dbg_py).$$f";    \
+               sed -e 's/=PY/$(python_ver)/g;s/=V/$(release)/g'             \
+                       < debian/libwxgtk-python.$$f                         \
+                       > debian/$(package_gtk_dbg_py).$$f;                  \
+       done;
+       @for f in menu prerm; do                                             \
+               echo "generating control file $(package_gtk_dbg_py).$$f";    \
+               sed -e 's/=PY/$(python_ver)/g;s/=V/$(release)/g'             \
+                       < debian/libwxgtk-dbg-python.$$f                     \
+                       > debian/$(package_gtk_dbg_py).$$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 \
                                --enable-gtk2                   \
                                --enable-unicode                \
                                --with-opengl                   \
-                               --enable-soname                 \
                                --with-zlib=sys                 \
                                --with-libjpeg=sys              \
                                --with-libpng=sys               \
 
 build-gtk-shared-stamp: configure-gtk-shared-stamp
        dh_testdir
-       cd $(objdir_gtk_shared) && $(MAKE)
+       cd $(objdir_gtk_shared) && $(FAST_MAKE)
        touch $@
 
 configure-gtk-static-stamp:
 
 build-gtk-static-stamp: configure-gtk-static-stamp
        dh_testdir
-       cd $(objdir_gtk_static) && $(MAKE)
+       cd $(objdir_gtk_static) && $(FAST_MAKE)
        touch $@
 
 configure-gtk-debug-stamp:
                                --enable-unicode                \
                                --with-opengl                   \
                                --enable-debug                  \
-                               --enable-soname                 \
                                --with-zlib=sys                 \
                                --with-libjpeg=sys              \
                                --with-libpng=sys               \
 
 build-gtk-debug-stamp: configure-gtk-debug-stamp
        dh_testdir
-       cd $(objdir_gtk_debug) && $(MAKE)
+       cd $(objdir_gtk_debug) && $(FAST_MAKE)
        touch $@
 
 
 build-contrib-shared-stamp: build-gtk-shared-stamp
        dh_testdir
-       cd $(objdir_gtk_shared)/contrib/src && $(MAKE)
+       cd $(objdir_gtk_shared)/contrib/src && $(FAST_MAKE)
+       cd $(objdir_gtk_shared)/contrib/utils/wxrc && $(FAST_MAKE)
+       cd $(objdir_gtk_shared)/contrib/utils/wxrcedit && $(FAST_MAKE)
        touch $@
 
 build-contrib-static-stamp: build-gtk-static-stamp
        dh_testdir
-       cd $(objdir_gtk_static)/contrib/src && $(MAKE)
+       cd $(objdir_gtk_static)/contrib/src && $(FAST_MAKE)
        touch $@
 
-build-gtk-py-stamp: build-gtk-shared-stamp
+purge-dbg-py:
+       @if [ ! -e build-gtk-py-stamp ]; then                           \
+               $(MAKE) -f debian/rules clean-py;                       \
+       fi
+       $(RM) build-gtk-dbg-py-stamp
+
+build-gtk-py-stamp: build-gtk-shared-stamp purge-dbg-py
        dh_testdir
        touch docs/lgpl.txt
        cd wxPython/include/wx                                          \
 build-doc-stamp: build-gtk-shared-stamp
        dh_testdir
        cd $(objdir_gtk_shared)/utils/tex2rtf/src \
-               && $(MAKE)
+               && $(FAST_MAKE)
        rm -rf $(objdir_doc)
        rm -rf $(objdir_doc_cruft)
        mkdir $(objdir_doc)
                && $(MAKE) allmo
        touch $@
 
+purge-release-py:
+       @if [ ! -e build-gtk-dbg-py-stamp ]; then                       \
+               $(MAKE) -f debian/rules clean-py;                       \
+       fi
+       $(RM) build-gtk-py-stamp
+
+build-gtk-dbg-py-stamp: build-gtk-debug-stamp purge-release-py
+       dh_testdir
+       touch docs/lgpl.txt
+       cd wxPython/include/wx                                          \
+               && for f in $(contrib_libs); do                         \
+                       $(RM) $$f;                                      \
+                       ln -s ../../../contrib/include/wx/$$f .;        \
+               done
+       cd wxPython \
+               && $(python_ver) ./setup.py     build                   \
+                                               WX_CONFIG='$(wxconfig-dbg)' \
+                                               WXPORT=gtk2             \
+                                               UNICODE=1
+       cd wxPython/include/wx                                          \
+               && for f in $(contrib_libs); do $(RM) $$f; done
+
+       touch $@
+
 
 configure-msw-shared-stamp:
        dh_testdir
 
 build-msw-shared-stamp: configure-msw-shared-stamp
        dh_testdir
-       cd $(objdir_msw_shared) && $(MAKE)
+       cd $(objdir_msw_shared) && $(FAST_MAKE)
        touch $@
 
 configure-msw-static-stamp:
 
 build-msw-static-stamp: configure-msw-static-stamp
        dh_testdir
-       cd $(objdir_msw_static) && $(MAKE)
+       cd $(objdir_msw_static) && $(FAST_MAKE)
        touch $@
 
 configure-msw-dbg-stamp:
 
 build-msw-dbg-stamp: configure-msw-dbg-stamp
        dh_testdir
-       cd $(objdir_msw_dbg) && $(MAKE)
+       cd $(objdir_msw_dbg) && $(FAST_MAKE)
        touch $@
 
 
-clean: debian/control
-       dh_testdir
-       dh_testroot
-
-       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
-
+clean-py:
        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
+               && rm -rf build* \
+               && rm -rf docs/xml-raw \
+               && rm -rf wx/*.py
+
+       # What to do about src/__version__.py ???
 
        cd wxPython/include/wx                                          \
                && for f in $(contrib_libs); do $(RM) $$f; done
 # its not enough by itself to get the tree properly clean again.
 #              && ./setup.py clean
 
+clean: debian/control clean-py
+       dh_testdir
+       dh_testroot
+
+       rm -rf config_deb.cache config_deb_cross.cache *-stamp $(objdirs)
+       rm -f docs/lgpl.txt
+       rm -f $(objdir_i18n)/*.mo
+
        dh_clean
        rm -f debian/$(package_gtk_lib).*
        rm -f debian/$(package_gtk_dev).*
        rm -f debian/$(package_i18n).*
        rm -f debian/$(package_doc).*
        rm -f debian/$(package_examples).*
+       rm -f debian/$(package_gtk_dbg_py).*
        rm -f debian/$(package_msw_dev).*
        rm -f debian/$(package_msw_dbg).*
        rm -f debian/$(package_headers_msw).*
        dh_install -Xlibwx_gtk2u- -Xlibwx_gtk2u_gl- \
                   $(objdir_gtk_static)/lib/*.a                 usr/lib
 
+       dh_install $(objdir_gtk_shared)/contrib/utils/wxrc/wxrc         usr/bin
+       dh_install $(objdir_gtk_shared)/contrib/utils/wxrcedit/wxrcedit usr/bin
+
+       dh_installman debian/wxrc-tools.1
+       dh_link usr/share/man/man1/wxrc-tools.1 usr/share/man/man1/wxrc.1       \
+               usr/share/man/man1/wxrc-tools.1 usr/share/man/man1/wxrcedit.1
+
 install-gtk-py: DH_OPTIONS=-p$(package_gtk_py)
 install-gtk-py: build-gtk-py-stamp
        dh_testdir
                              WXPORT=gtk2                                       \
                              UNICODE=1
 
-       find debian/$(package_gtk_py)/usr/lib/$(python_ver)/site-packages/wxPython \
+       find debian/$(package_gtk_py)/usr/lib/$(python_ver)/site-packages       \
                -name '*.py?' -exec rm '{}' ';'
 
        dh_installman debian/wxPython-tools.1
        dh_clean -k
        dh_installdirs
 
+install-gtk-dbg-py: DH_OPTIONS=-p$(package_gtk_dbg_py)
+install-gtk-dbg-py: build-gtk-dbg-py-stamp
+       dh_testdir
+       dh_testroot
+       dh_clean -k
+       dh_installdirs
+       cd wxPython                                                             \
+               && $(python_ver) ./setup.py install                             \
+                             --prefix=`pwd`/../debian/$(package_gtk_dbg_py)/usr \
+                             WX_CONFIG='$(wxconfig-dbg)'                       \
+                             WXPORT=gtk2                                       \
+                             UNICODE=1
+
+       find debian/$(package_gtk_dbg_py)/usr/lib/$(python_ver)/site-packages   \
+               -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 \
+               usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pyalacarte.1 \
+               usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pyalamode.1  \
+               usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pywrap.1
+
+       # This is rather bogus, its included in the main copyright file now though.
+       rm -f debian/$(package_gtk_dbg_py)/usr/lib/$(python_ver)/site-packages/wxPython/tools/XRCed/license.txt
+
 
 install-msw-dev: DH_OPTIONS=-p$(package_msw_dev)
 install-msw-dev: build-msw-shared-stamp build-msw-static-stamp
 
        dh_compress
        dh_fixperms
-       dh_makeshlibs -N$(package_gtk_py) -V
+
+       @# Don't do this for the dbg-py special build because dh_makeshlibs
+       @# will crap out if it is called with no packages to act on.
+       @if [ "x$(DH_OPTIONS)" != "-p$(package_gtk_dbg_py)" ]; then     \
+               echo "dh_makeshlibs -N$(package_gtk_py) -V";            \
+               dh_makeshlibs -N$(package_gtk_py) -V;                   \
+       fi
+
        dh_installdeb
        dh_shlibdeps -ldebian/$(package_gtk_lib)/usr/lib:debian/$(package_gtk_dbg)/usr/lib:debian/$(package_gtk_contrib)/usr/lib
        dh_gencontrol
 # building the arch specific package files needed to create them.
 binary-indep: build_all install
        $(MAKE) -f debian/rules \
-               DH_OPTIONS="-i -N$(package_msw_dev) -N$(package_msw_dbg) -N$(package_headers_msw)" \
+               DH_OPTIONS="-i -N$(package_gtk_dbg_py) -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
        $(MAKE) -f debian/rules \
-               DH_OPTIONS="-a -N$(package_msw_dev) -N$(package_msw_dbg) -N$(package_headers_msw)" \
+               DH_OPTIONS="-a -N$(package_gtk_dbg_py) -N$(package_msw_dev) -N$(package_msw_dbg) -N$(package_headers_msw)" \
                binary-common
 
 # Build all packages target.
                binary-common
 
 
+# Build wxPython against libwxgtk-dbg.  This package will conflict
+# with the release build one, but may be useful to some people.
+binary-dbg-py: control-files-stamp install-gtk-dbg-py
+       $(MAKE) -f debian/rules DH_OPTIONS="-p$(package_gtk_dbg_py)" binary-common
+
+
 ############################################################################
 #
 # Some rules to build a subset of the complete list of packages that can be
        $(MAKE) -f debian/rules DH_OPTIONS="-p$(package_gtk_dbg) -p$(package_msw_dev) -p$(package_headers) -p$(package_headers_msw)" binary-common
 
 
-.PHONY: build build_all build_arch clean binary-indep binary-arch binary binary-common \
+.PHONY: build build_all build_arch                                     \
+       clean clean-py purge-release-py purge-dbg-py                    \
+       binary-indep binary-arch binary binary-common                   \
         binary-gtk binary-gtk-dev binary-gtk-dbg binary-doc binary-cross \
-       install install_arch install-gtk-lib install-gtk-dev \
-        install-gtk-dbg install-gtk-contrib install-gtk-contrib-dev \
-        install-gtk-py install-headers install-i18n install-doc install-examples \
+       install install_arch install-gtk-lib install-gtk-dev            \
+        install-gtk-dbg install-gtk-contrib install-gtk-contrib-dev    \
+       install-gtk-py install-gtk-dbg-py                               \
+       install-headers install-i18n install-doc install-examples       \
        install-msw-dev install-msw-dbg install-headers-msw