wxwidgets2.8 (2.8.10.1-3) debian-dir only changes

Summary

 debian/README.Debian                          |   77 
 debian/README.HowToBuild.txt                  |  177 ++
 debian/README.examples                        |   24 
 debian/README.source                          |   17 
 debian/build_all                              |   49 
 debian/changelog                              |  912 +++++++++++
 debian/compat                                 |    1 
 debian/control                                |  263 +++
 debian/control.in                             |  263 +++
 debian/copyright                              |  300 +++
 debian/gbp.conf                               |    5 
 debian/libwxbase-dbg.postinst                 |    9 
 debian/libwxbase-dbg.prerm                    |    7 
 debian/libwxbase-dev.postinst                 |    9 
 debian/libwxbase-dev.prerm                    |    7 
 debian/libwxgtk-dbg.postinst                  |    9 
 debian/libwxgtk-dbg.prerm                     |    7 
 debian/libwxgtk-dev.postinst                  |    9 
 debian/libwxgtk-dev.prerm                     |    7 
 debian/libwxmsw-dbg.postinst                  |    9 
 debian/libwxmsw-dbg.prerm                     |    7 
 debian/libwxmsw-dev.postinst                  |    9 
 debian/libwxmsw-dev.prerm                     |    7 
 debian/lintian-override.in                    |    8 
 debian/patches/CVE-2009-2369.dpatch           |   64 
 debian/patches/WX_CONFIG.dpatch               |   19 
 debian/patches/fix-FTBFS.patch                |   20 
 debian/patches/fix-bashism-in-example         |   10 
 debian/patches/fix-build-with-python2.6.patch |   22 
 debian/patches/fix-config-scripts             | 2009 ++++++++++++++++++++++++++
 debian/patches/fix-configure-on-hurd          |   42 
 debian/patches/fix-path-to-some-interpreters  |   26 
 debian/patches/fix-wxversion-help-spelling    |   13 
 debian/patches/series                         |    9 
 debian/patches/xrced_bitmaps.dpatch           |   62 
 debian/pycrust.desktop                        |    9 
 debian/pycrust.xpm                            |  145 +
 debian/pyshell.desktop                        |    9 
 debian/python-wxgtk.docs                      |    4 
 debian/python-wxgtk.postinst                  |    8 
 debian/python-wxgtk.prerm                     |    8 
 debian/python-wxtools.menu                    |    9 
 debian/repack.sh                              |   43 
 debian/rules                                  | 1074 +++++++++++++
 debian/unpack_examples.sh.in                  |   62 
 debian/watch                                  |    3 
 debian/wx-config.1                            |  157 ++
 debian/wx-doc.doc-base                        |   10 
 debian/wx-doc.docs                            |    2 
 debian/wx-examples.examples                   |    5 
 debian/wxPython-tools.1                       |   35 
 debian/wxrc-tools.1                           |   15 
 debian/xrced.desktop                          |    9 
 debian/xrced.xpm                              |   55 
 54 files changed, 6150 insertions(+)

    
download this patch

Patch contents

--- wxwidgets2.8-2.8.10.1.orig/debian/repack.sh
+++ wxwidgets2.8-2.8.10.1/debian/repack.sh
@@ -0,0 +1,43 @@
+#!/bin/sh
+# Repackage upstream source to exclude non-distributable files
+# should be called as "repack.sh --upstream-source <ver> <downloaded file>
+# (for example, via uscan)
+
+set -e
+set -u
+
+VER="$2"
+FILE="$3"
+PKG=`dpkg-parsechangelog|grep ^Source:|sed 's/^Source: //'`
+
+REPACK_DIR="$PKG-$VER.orig" # DevRef § 6.7.8.2
+
+echo -e "\nRepackaging $FILE\n"
+
+DIR=`mktemp -d ./tmpRepackXXXXXX`
+trap "rm -rf \"$DIR\"" QUIT INT EXIT
+
+# Create an extra directory to cope with rootless tarballs
+UP_BASE="$DIR/unpack"
+mkdir "$UP_BASE"
+tar xjf "$FILE" -C "$UP_BASE"
+
+if [ `ls -1 "$UP_BASE" | wc -l` -eq 1 ]; then
+	# Tarball does contain a root directory
+	UP_BASE="$UP_BASE/`ls -1 "$UP_BASE"`"
+fi
+
+## Remove stuff
+mv $UP_BASE/debian $UP_BASE/debian-upstream
+## End
+
+mv "$UP_BASE" "$DIR/$REPACK_DIR"
+
+# Using a pipe hides tar errors!
+tar cfC "$DIR/repacked.tar" "$DIR" "$REPACK_DIR"
+gzip -9 < "$DIR/repacked.tar" > "$DIR/repacked.tar.gz"
+
+FILE=$(echo $FILE | sed 's/bz2/gz/')
+mv "$DIR/repacked.tar.gz" "$FILE"
+
+echo "*** $FILE repackaged"
--- wxwidgets2.8-2.8.10.1.orig/debian/libwxmsw-dev.prerm
+++ wxwidgets2.8-2.8.10.1/debian/libwxmsw-dev.prerm
@@ -0,0 +1,7 @@
+#! /bin/sh
+set -e
+
+update-alternatives --remove wx-config /usr/lib/wx/config/=H-msw-ansi-release-=V
+
+#DEBHELPER#
+
--- wxwidgets2.8-2.8.10.1.orig/debian/python-wxgtk.docs
+++ wxwidgets2.8-2.8.10.1/debian/python-wxgtk.docs
@@ -0,0 +1,4 @@
+wxPython/docs/README.txt
+wxPython/docs/CHANGES.txt
+wxPython/docs/MigrationGuide.txt
+
--- wxwidgets2.8-2.8.10.1.orig/debian/libwxbase-dbg.prerm
+++ wxwidgets2.8-2.8.10.1/debian/libwxbase-dbg.prerm
@@ -0,0 +1,7 @@
+#! /bin/sh
+set -e
+
+update-alternatives --remove wx-config /usr/lib/wx/config/base-unicode-debug-=V
+
+#DEBHELPER#
+
--- wxwidgets2.8-2.8.10.1.orig/debian/libwxmsw-dbg.prerm
+++ wxwidgets2.8-2.8.10.1/debian/libwxmsw-dbg.prerm
@@ -0,0 +1,7 @@
+#! /bin/sh
+set -e
+
+update-alternatives --remove wx-config /usr/lib/wx/config/=H-msw-ansi-debug-=V
+
+#DEBHELPER#
+
--- wxwidgets2.8-2.8.10.1.orig/debian/gbp.conf
+++ wxwidgets2.8-2.8.10.1/debian/gbp.conf
@@ -0,0 +1,5 @@
+[DEFAULT]
+upstream-tag = v%(version)s
+debian-tag = v%(version)s
+debian-branch = debian-wx2.8
+upstream-branch = upstream-wx2.8
--- wxwidgets2.8-2.8.10.1.orig/debian/libwxbase-dev.prerm
+++ wxwidgets2.8-2.8.10.1/debian/libwxbase-dev.prerm
@@ -0,0 +1,7 @@
+#! /bin/sh
+set -e
+
+update-alternatives --remove wx-config /usr/lib/wx/config/base-unicode-release-=V
+
+#DEBHELPER#
+
--- wxwidgets2.8-2.8.10.1.orig/debian/python-wxgtk.prerm
+++ wxwidgets2.8-2.8.10.1/debian/python-wxgtk.prerm
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+set -e
+
+update-alternatives --remove wx.pth /usr/lib/wx/python/wx=V.pth
+
+#DEBHELPER#
+
--- wxwidgets2.8-2.8.10.1.orig/debian/pycrust.xpm
+++ wxwidgets2.8-2.8.10.1/debian/pycrust.xpm
@@ -0,0 +1,145 @@
+/* XPM */
+static char * pycrust_xpm[] = {
+"32 32 110 2",
+"  	c None",
+". 	c #000000",
+"+ 	c #4A2F00",
+"@ 	c #B0A07F",
+"# 	c #FFE0B0",
+"$ 	c #E0D0A0",
+"% 	c #D0B88F",
+"& 	c #BFA880",
+"* 	c #C0AF80",
+"= 	c #AF781F",
+"- 	c #AF7700",
+"; 	c #C08700",
+"> 	c #C0B08F",
+", 	c #BFA07F",
+"' 	c #C08000",
+") 	c #CF8700",
+"! 	c #CF8800",
+"~ 	c #FFE0AF",
+"{ 	c #D08F00",
+"] 	c #E0C89F",
+"^ 	c #AF906F",
+"/ 	c #AF9060",
+"( 	c #F0D8B0",
+"_ 	c #B0A780",
+": 	c #6F4700",
+"< 	c #A08F60",
+"[ 	c #C0A880",
+"} 	c #B0986F",
+"| 	c #EFD7AF",
+"1 	c #DFC090",
+"2 	c #706040",
+"3 	c #AF7000",
+"4 	c #E0CFA0",
+"5 	c #AC6C09",
+"6 	c #F0E0BF",
+"7 	c #BFA070",
+"8 	c #BF7F00",
+"9 	c #906700",
+"0 	c #A06F00",
+"a 	c #504020",
+"b 	c #A06A05",
+"c 	c #907F50",
+"d 	c #B46D0C",
+"e 	c #B07800",
+"f 	c #9F6700",
+"g 	c #EFCFA0",
+"h 	c #B09F70",
+"i 	c #7F1830",
+"j 	c #90173F",
+"k 	c #CF7810",
+"l 	c #BF6810",
+"m 	c #FFDFAF",
+"n 	c #8F004F",
+"o 	c #8F0040",
+"p 	c #8F103F",
+"q 	c #8F0F40",
+"r 	c #F0D8A0",
+"s 	c #FFE0BF",
+"t 	c #6F481F",
+"u 	c #EFD0A0",
+"v 	c #800040",
+"w 	c #6F5020",
+"x 	c #F0D7A0",
+"y 	c #6F4F1F",
+"z 	c #F0D0A0",
+"A 	c #F0D8AF",
+"B 	c #EFCF9F",
+"C 	c #70582F",
+"D 	c #6F4F10",
+"E 	c #70402F",
+"F 	c #7F3F2F",
+"G 	c #7F1F3F",
+"H 	c #7F183F",
+"I 	c #801040",
+"J 	c #800F40",
+"K 	c #800840",
+"L 	c #7F6850",
+"M 	c #EFD09F",
+"N 	c #C0A870",
+"O 	c #E0D0AF",
+"P 	c #DFC8A0",
+"Q 	c #E0D0B0",
+"R 	c #E0C8A0",
+"S 	c #DFBF8F",
+"T 	c #C0B78F",
+"U 	c #6F4810",
+"V 	c #6F381F",
+"W 	c #802F20",
+"X 	c #7F2F20",
+"Y 	c #80103F",
+"Z 	c #9F7730",
+"` 	c #DFCFAF",
+" .	c #E0D7B0",
+"..	c #DFBF90",
+"+.	c #F0DFB0",
+"@.	c #D0C7A0",
+"#.	c #705F2F",
+"$.	c #F0D7AF",
+"%.	c #FFD8A0",
+"&.	c #F0D79F",
+"*.	c #F0CF9F",
+"=.	c #7F6840",
+"-.	c #FFDFB0",
+";.	c #AF986F",
+">.	c #D0C7B0",
+",.	c #7F6730",
+"'.	c #806F4F",
+").	c #B0A77F",
+"!.	c #A09880",
+"~.	c #7F705F",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                                                                ",
+"                                              . + + .           ",
+"                                            . @ # $ % +         ",
+"                                        + + + . & # $ * +       ",
+"                                    + . = - ; + . > # $ , +     ",
+"                                . . ' = ' ) ! ) + . # ~ * .     ",
+"                            . . ' ' { ' ' { { ) { . ] # $ ^ .   ",
+"                        . . ' ' ' { { { { { { ! { + / # ( * .   ",
+"                    . . ' ' { { { { { { { { { { { { . _ # * .   ",
+"                . : ' ' { { { { { { { { { { { { { ) + < # $ [ . ",
+"            . . = { { { { { { { { { { { { { { { ) ) { + # $ } . ",
+"        . . + { { ; ! { { { { { { { { { { { { { ) ) { + | | 1 . ",
+"    . . + 2 3 { { { { { { { { { { { ) ) { ) { ) ) { { + 4 ( * . ",
+". . . . . . + + + 5 3 { { { { { { { { { { { { { { { { . 4 6 7 . ",
+". 3 8 3 8 3 8 3 9 0 5 5 + . . + . + a b 5 b b 8 8 ) ) ' + + a c ",
+". 9 9 9 9 d 9 d d 9 5 5 5 9 d 9 9 5 5 5 5 e f b b b + a 4 g h + ",
+"i j . + . . + . + k l b k d d b d d 9 d 9 5 9 5 5 5 + | | m 6 + ",
+"+ n n n n n n n o p q + + . . . . b b d b d d d 9 d + r m ~ s + ",
+"+ n n n n n n n n n n n n n n n n n n + + . . . . . t # m m u + ",
+"v n n n n n n n n n n n n n n n n n n n n n n n n n w x r m $ + ",
+"+ n n n n n n n n n n n n n n n n n n n n n n n n n y z m A $ + ",
+"+ n n n n n n n n n n n n n n n n n n n n n n n n n w z ~ B $ C ",
+": . . . D . . + + + E F G H I J K n n n n n n n n n L A ~ M * + ",
+"+ N 4 O P Q R S T * 2 + . . U + . . : V W X i J Y n Z ~ ~ x * + ",
+"+ $ $ ~ ~ ~ ~ ~ A x g `  . ...+.` @.+ + + . . #.. . . u $.$ * + ",
+"+ z $ # $ $ ~ m %.x ~ m m m m &.%.x # %.m r *.z z *.B x x $ * + ",
+"+ + + + + + =.+ @ > ] $ $ $ ~ $ -.r r %.A m ~ ~ ~ ~ ~ A $ $ ;.+ ",
+"                >.,.+ + + + + ,.+ + + + + + + + '.$ $ $ $ ).+   ",
+"                                              !.~.+ + + + ,.    "};
--- wxwidgets2.8-2.8.10.1.orig/debian/README.Debian
+++ wxwidgets2.8-2.8.10.1/debian/README.Debian
@@ -0,0 +1,77 @@
+wxwidgets for Debian
+----------------------
+
+The following packages are built from the wxWidgets CVS source.
+
+libwxbase		wxBase runtime shared libraries
+libwxbase-dev		extra files and static libs for building wxBase apps
+libwxbase-dbg		wxBase libraries built with -g and __WXDEBUG__
+
+libwxgtk		wxGTK runtime shared libraries, including selected
+			contrib libs.
+libwxgtk-dev		extra files required for building wxGTK apps
+libwxgtk-dbg		wxGTK libraries built with -g and __WXDEBUG__
+
+python-wxgtk		Python binding to wxGTK  (from 2.2.3 onward, this
+			obsoletes the libwxgtk-python-contrib package as
+			all python modules are built into a single monolith)
+python-wxversion	The wxversion.py version selector, new to wxPython2.6
+python-wxtools		The ancillary tools from the wxPython distribution.
+
+wx-common		common helper files and support applications.
+wx-headers		common header files for building wxWidgets apps
+wx-doc			HTML version of the wxWidgets manual
+wx-examples		wxWidgets and wxPython demos and samples (source)
+wx-i18n			message catalogs for native language support
+
+
+	Note that static libraries are no longer supplied in these
+	packages.  Please read, or have understood:
+	http://people.redhat.com/drepper/no_static_linking.html
+	among others before reporting this as a bug.
+
+	The following binaries can be built from the source package
+	with the mingw32 cross compiler, but are not distributed
+	as a part of the main Debian distribution.
+
+	Please do *not* file bug reports for these packages to the
+	Debian bts.  But do feel free to email me personally if you
+	find problems and/or have patches to fix them.
+
+libwxmsw-dev		mingw32-cross wxMSW libs.
+libwxmsw-dbg		mingw32-cross wxMSW (debug) libs.
+wx-headers-msw		extra headers needed for wxMSW.
+
+	You can build these extra packages using the binary-cross target
+	in debian/rules.
+
+
+	It is also possible to build a python-wxgtk-dbg package.
+	There are some limitations (like this package cannot be installed
+	concurrently with the release version), but some developers may
+	find such a thing useful in any case.  It will transparently
+	replace the release package for installed apps that depend on the
+	release package, but should NEVER be used when preparing packages
+	for upload.  This package may be created from the source using the
+	binary-dbg-py target in debian/rules.  (note that doing this will
+	also destroy any release build that exists in the same tree, they
+	cannot coexist there either yet)
+
+
+	Finally, because all of these packages can take quite some time to
+	build, the source package supports the use of distcc.  The package
+	builds will automatically parallelise to suit the number of hosts
+	you have listed in DISTCC_HOSTS.  This will work for both native
+	and cross builds of the c++ libraries, if you have the relevant
+	compilers on all your build hosts.
+	You may override that heuristic by setting the CONCURRENCY_LEVEL
+	environment variable to the number of jobs you wish make to fork.
+	That variable is also supported by the kernel-package scripts and
+	is respected for consistency here.
+
+	wxPython builds cannot be parallelised at this stage and will run
+	serially regardless of your configuration.
+
+
+ -- Ron Lee <ron@debian.org>, Sun, 13 Feb 2000 18:40:00 +1030
+
--- wxwidgets2.8-2.8.10.1.orig/debian/pycrust.desktop
+++ wxwidgets2.8-2.8.10.1/debian/pycrust.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=PyCrust
+Comment=GUI Python Shell with Filling
+Exec=/usr/bin/pycrust
+Icon=/usr/share/pixmaps/pycrust
+Terminal=false
+Type=Application
+Categories=Development;
+StartupNotify=true
--- wxwidgets2.8-2.8.10.1.orig/debian/README.source
+++ wxwidgets2.8-2.8.10.1/debian/README.source
@@ -0,0 +1,17 @@
+This package uses quilt to manage all modifications to the upstream
+source.  Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+See /usr/share/doc/quilt/README.source for a detailed explanation.
+
+-----------------------------------------------------------------------
+
+To generate the upstream tarball, use "uscan --repack --force-download".
+a script in debian/repack.sh is used to repack the upstream source
+with upstream's debian directory moved to debian-upstream.
+
+-----------------------------------------------------------------------
+
+after new upstream versions of this package are uploaded, you need to
+ask the release team to binnmu libalien-wxwidgets-perl. and then
+libwx-perl.
--- wxwidgets2.8-2.8.10.1.orig/debian/python-wxtools.menu
+++ wxwidgets2.8-2.8.10.1/debian/python-wxtools.menu
@@ -0,0 +1,9 @@
+?package(python-wxtools):needs="X11" section="Applications/Programming"\
+  title="pycrust" command="/usr/bin/pycrust"\
+  icon="/usr/share/pixmaps/pycrust.xpm"
+?package(python-wxtools):needs="X11" section="Applications/Programming"\
+  title="pyshell" command="/usr/bin/pyshell"\
+  icon="/usr/share/pixmaps/pyshell.xpm" 
+?package(python-wxtools):needs="X11" section="Applications/Programming"\
+  title="xrced" command="/usr/bin/xrced"\
+  icon="/usr/share/pixmaps/xrced.xpm"
--- wxwidgets2.8-2.8.10.1.orig/debian/python-wxgtk.postinst
+++ wxwidgets2.8-2.8.10.1/debian/python-wxgtk.postinst
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+set -e
+
+update-alternatives --install /usr/lib/wx/python/wx.pth  wx.pth	\
+			      /usr/lib/wx/python/wx=V.pth        =PRIO
+
+#DEBHELPER#
--- wxwidgets2.8-2.8.10.1.orig/debian/changelog
+++ wxwidgets2.8-2.8.10.1/debian/changelog
@@ -0,0 +1,912 @@
+wxwidgets2.8 (2.8.10.1-3) unstable; urgency=low
+
+  * rebuild against python2.6
+  * add mention of wx-config to libwxgtk2.8-dev's long description
+    (Closes: #498737)
+
+ -- Ryan Niebur <ryan@debian.org>  Wed, 27 Jan 2010 00:22:29 -0800
+
+wxwidgets2.8 (2.8.10.1-2) unstable; urgency=low
+
+  * set wx2.8-i18n Section to localization
+  * python-wxversion doesn't have to depend on 'python-wxgtk2.6 |
+    python-wxgtk2.8' (Closes: #479738)
+  * fix to install correctly under Python 2.6 (see bug #557943)
+  * make wxwidgets 2.8 the default
+  * Fix spelling errors in wxversion help (Closes: #518540)
+  * add patch, fix-build-with-python2.6, to make things get installed to
+    the correct places with the multiversion stuff
+  * add libexpat1-dev to build deps and pass --with-expat=sys to
+    configure (Closes: #560917)
+
+ -- Ryan Niebur <ryan@debian.org>  Sat, 12 Dec 2009 23:39:04 -0800
+
+wxwidgets2.8 (2.8.10.1-1) unstable; urgency=low
+
+  * Add myself to Uploaders (Closes: #539170)
+  * add a watch file
+  * New Upstream Version (Closes: #512939)
+    - fixes underscores instead of underline letters in context menu
+      in pgadmin3 (Closes: #491006)
+    - fixes Gtk-WARNINGs (Closes: #494424)
+  * remove the python-wxaddons package, wxaddons is removed upstream
+  * set maintainer to Wx Maintainers
+  * switch to quilt
+  * -dbg packages => Section: debug
+  * add Homepage fields
+  * remove reference to homepage in long descriptions
+  * depend on libgl1-mesa-dev instead of the transitional xlibmesa-gl-
+    dev
+  * s/Source-Version/binary:Version/
+  * Debian Policy 3.8.3
+  * add README.source
+  * fix lintian override handling
+  * remove bashism in d/rules (Closes: #535424)
+  * fix the doc-base file (Closes: #476254)
+  * fix bashism in useless example... (Closes: #489671)
+  * fix configure for on hurd (Closes: #512117)
+  * use the config.{sub,guess} from autotools-dev during build
+  * add shlibs:Depends to libwxgtk2.8-dbg (Closes: #553243)
+  * build without --enable-mediactrl (Closes: #493090)
+  * make python-wxgtk2.8 conflict with python-wxaddons to make sure it
+    disappears
+  * don't compress .py files
+  * add versioned build dependencies on binutils..either the version in
+    or before stable, or the version that fixed the bug
+  * no more get-orig-source (Closes: #545080)
+  * backport r61009 to fix FTBFS (Closes: #549770)
+  * remove Editra, it has its own package now
+  * fix some lintian warnings, mostly borrowed from Ubuntu
+
+ -- Ryan Niebur <ryan@debian.org>  Tue, 01 Dec 2009 22:45:38 -0800
+
+wxwidgets2.8 (2.8.7.1-2) unstable; urgency=high
+
+  * Package orphaned, change Maintainer to Debian QA Group.
+  * debian/patches/CVE-2009-2369.dpatch: Fixed Integer overflow in the
+    wxImage::Create function (CVE-2009-2369) (Closes: #537174)
+
+ -- Giuseppe Iuculano <giuseppe@iuculano.it>  Wed, 29 Jul 2009 21:03:42 +0200
+
+wxwidgets2.8 (2.8.7.1-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Applying patch by Matt Kraai to fix FTBFS when using sbuild (Closes: #489077)
+
+ -- Alexander Reichle-Schmehl <tolimar@debian.org>  Sun, 07 Sep 2008 15:09:07 +0200
+
+wxwidgets2.8 (2.8.7.1-1) unstable; urgency=low
+
+  * Upload to unstable.
+  * Set myself as the maintainer.
+  * Add Vcs-{Git,Browser} fields.
+  * Do not take over wxwidgets2.6 packages wx-common, python-wxversion,
+    python-wxtools, and python-wxaddons. Because of this, lower
+    python-wxgtk2.8's dependency on python-wxversion to 2.6 instead of 2.8.
+  * Also lower the alternative priority from 28 to 25, so that 2.6 is the
+    default for Lenny.
+
+ -- Adeodato Simó <dato@net.com.org.es>  Sun, 29 Jun 2008 18:19:48 +0200
+
+wxwidgets2.8 (2.8.7.1-0.1) experimental; urgency=low
+
+  * Upload to experimental.
+  * New upstream version, based on the upstream tarball
+    wxPython-src-2.8.7.1.tar.bz2, renamed debian to debian-upstream.
+  * Merge changes from the "upstream" 2.8.7.1-0 package (without any
+    changes to debian/changelog, which includes upstream changes).
+
+ -- Matthias Klose <doko@debian.org>  Sun, 10 Feb 2008 21:53:25 +0000
+
+wxwidgets2.8 (2.8.6.1-0ubuntu3) hardy; urgency=low
+
+  * debian/control.in: Add dpatch to the build dependencies.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 05 Feb 2008 17:05:30 +0000
+
+wxwidgets2.8 (2.8.6.1-0ubuntu2) hardy; urgency=low
+
+  * Build for all supported python versions.
+  * Move the wx.pth symlink handled by update-alternatives into
+    the python-wxversion package; adjust dependencies accordingly.
+  * Do not apply "WX_CONFIG" patch (generated file).
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 04 Feb 2008 21:44:25 +0000
+
+wxwidgets2.8 (2.8.6.1-0ubuntu1) hardy; urgency=low
+
+  * New upstream version, based on the upstream tarball
+    wxPython-src-2.8.6.1.tar.bz2, renamed debian to debian-upstream.
+  * Provide a get-orig-source target to do the repackaging.
+  * Fix "substvar-source-version-is-deprecated" lintian warnings.
+  * Remove duplicate Description field in debian/control.
+  * Add "\" at the end of line 8 in debian/python-wxtools.menu to fix
+    "bad-test-in-menu-item" lintian error.
+  * Provide .xpm icons to fix "menu-icon-not-in-xpm-format" lintian errors,
+    changed Icon field in debian/python-wxtools.menu.
+  * Fix "wrong-name-for-upstream-changelog" lintian warnings.
+  * Remove "Application;" from Categories field in debian/pycrust.desktop,
+    debian/pyshell.desktop, debian/xrced.desktop.
+  * Switch "Apps" to "Applications" in debian/python-wxtools.menu to fix
+    "menu-item-uses-apps-section" lintian warnings.
+  * Drop the icon extension from debian/pycrust.desktop,
+    debian/pyshell.desktop, debian/xrced.desktop.
+  * Add dpatch support.
+  * Add "WX_CONFIG" patch.
+  * debian/rules:
+    - added .xpm icons to install-gtk-py-tools target
+    - added "docs/changes.txt" to dh_installchangelogs in binary-common target
+    - added "\" at the end of "install-examples install-msw-dev
+      install-msw-dbg install-headers-msw" line in .PHONY
+
+ -- Devid Filoni <d.filoni@techemail.com>  Tue, 06 Nov 2007 18:25:13 +0100
+
+wxwidgets2.8 (2.8.4.0-0ubuntu3) gutsy; urgency=low
+
+  * src/gtk/settings.cpp:
+    + Patch from upstream SVN (r48002) to stop using private Gtk API which
+      results in segfaults since Gtk 2.11.6.
+      https://sourceforge.net/tracker/?func=detail&atid=109863&aid=1767485&group_id=9863
+
+ -- Sebastian Dröge <slomo@ubuntu.com>  Fri, 10 Aug 2007 13:14:08 +0200
+
+wxwidgets2.8 (2.8.4.0-0ubuntu2) gutsy; urgency=low
+
+  * src/gtk/{button,window}.cpp:
+    - Use gtk_border_free not g_free when freeing GtkBorder's.
+      Changes from upstream CVS (LP: #120278).
+
+ -- Matti Lindell <mlind@cs.joensuu.fi>  Mon, 25 Jun 2007 23:51:17 +0300
+
+wxwidgets2.8 (2.8.4.0-0ubuntu1) gutsy; urgency=low
+
+  * New upstream version, based on the upstream tarball
+    wxPython-src-2.8.4.0.tar.bz2, renamed debian to debian-upstream.
+  * Set the priority of the wx.pth alternative to 28.
+  * debian/rules: Unset DEBIAN_WX_DEFAULT_VERSION.
+  * Merge changes from the "upstream" debian packaging.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 26 May 2007 17:54:57 +0200
+
+wxwidgets2.8 (2.8.3.0-0ubuntu1) gutsy; urgency=low
+
+  * New upstream version, based on the upstream tarball
+    wxPython-src-2.8.3.0.tar.bz2, renamed debian to debian-upstream.
+
+ -- Emilio Pozuelo Monfort <pochu@ubuntu.com>  Fri, 20 Apr 2007 00:01:50 +0200
+
+wxwidgets2.8 (2.8.1.1-0ubuntu4) feisty; urgency=low
+
+  * Patched src/unix/gsocket.cpp to fix filezilla bug LP: #88897
+    Patch details are at http://
+    sf.net/tracker/index.php?func=detail&aid=1688222&group_id=9863&atid=309863
+
+ -- Adrien Cunin <adri2000@ubuntu.com>  Fri, 30 Mar 2007 22:06:40 +0200
+
+wxwidgets2.8 (2.8.1.1-0ubuntu3) feisty; urgency=low
+
+  * fixed error in header file which blocks use of -pedantic
+    (patch from CVS) (LP: #91853)
+
+ -- Jonh Wendell <wendell@ubuntu.com>  Mon, 19 Mar 2007 14:20:59 -0300
+
+wxwidgets2.8 (2.8.1.1-0ubuntu2) feisty; urgency=low
+
+  * fixed crash in wxGetUserName() in Unicode (from CVS) (LP: #35375)
+
+ -- Emmet Hikory <emmet.hikory@gmail.com>  Mon, 12 Mar 2007 09:53:59 +0900
+
+wxwidgets2.8 (2.8.1.1-0ubuntu1) feisty; urgency=low
+
+  * New upstream version, based on the upstream tarball
+    wxPython-src-2.8.1.1.tar.bz2, renamed debian to debian-upstream.
+  * TODO: wxPython header files are installed in some bogus location,
+    but not in any package (no regression from 2.6).
+
+  [ Matthias Klose ]
+
+  * Merge changes from wxwidgets2.6-2.6.3.2.1.5ubuntu5.
+  * Merge changes from the "upstream" 2.8.1.1-0 package (without any
+    changes to debian/changelog, which includes upstream changes).
+    - Update build dependencies.
+    - New package python-wxaddons.
+    - Desktop integration for pycrust, pyshell, xrced.
+  * Remove redundant dependencies on libc6-dev.
+  * Set the priority of the wx.pth alternative to 25 (instead of the
+    default 28), so that we keep wxwidgets2.6 as the default on
+    new installations.
+  * wx2.8-headers: Install wxPython header files. Ubuntu #2887.
+
+  [ Barry deFreese ]
+
+  * Python version - 2.5
+  * Bump standards to 3.7.2
+  * Debhelper/compat > 5
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 28 Feb 2007 23:33:05 +0100
+
+wxwidgets2.6 (2.6.3.2.1.5ubuntu5) feisty; urgency=low
+
+  * Build the existing -dbg package for the python-dbg build.
+  * Remove python-wxgtk-dbg installation scripts.
+  * debian/rules: Remove dh_python calls.
+  * debian/control.in: Fix name of python-xml package. Don't let the -dbg
+    package conflict with the normal build, but depend on it.
+  * Remove debian/python-version, use pyversions -d.
+  * Use the default python flags for the wxPython builds.
+  * Add build dependency on bc.
+  * Bump debhelper compatibility to v5.
+  * Set Ubuntu maintainer address.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 28 Feb 2007 22:31:31 +0100
+
+wxwidgets2.6 (2.6.3.2.1.5ubuntu4) feisty; urgency=low
+
+  * wxPython/wx/py/introspect.py: 
+    move "from __future__ import nested_scopes" to the begin of the file
+
+ -- Michael Bienia <geser@ubuntu.com>  Mon, 15 Jan 2007 17:59:40 +0100
+
+wxwidgets2.6 (2.6.3.2.1.5ubuntu3) feisty; urgency=low
+
+  * Explicitely set the hard coded python version to 2.5.
+  * Fix compilation errors with newer gcc.
+  * Fix 64bit builds with python2.5.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sun, 14 Jan 2007 11:04:14 +0000
+
+wxwidgets2.6 (2.6.3.2.1.5ubuntu2) feisty; urgency=low
+
+  * Rebuild for python2.5 as the default python version.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 12 Jan 2007 13:23:11 +0000
+
+wxwidgets2.6 (2.6.3.2.1.5ubuntu1) feisty; urgency=low
+
+  * Fix for GTK warnings in wxNotebook::DoRemovePage
+    (Closes: LP#59138)
+
+ -- Matti Lindell <mlind@cs.joensuu.fi>  Wed, 13 Dec 2006 22:35:54 +0200
+
+wxwidgets2.6 (2.6.3.2.1.5build1) feisty; urgency=low
+
+  * Rebuild for ldbl128 change on powerpc and sparc.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu,  2 Nov 2006 10:27:55 +0000
+
+wxwidgets2.6 (2.6.3.2.1.5) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Set debian/python-version to 2.4.
+  * Replace =PY with python in debian/control (python-xml was transitionned to
+    the new policy).
+
+ -- Mohammed Adnène Trojette <adn+deb@diwi.org>  Tue, 15 Aug 2006 23:44:53 +0200
+
+wxwidgets2.6 (2.6.3.2.1.4) unstable; urgency=low
+
+  * Fix 2.6.3.2.1.2, add the build dependency in debian/control.in.
+    Closes: #382951
+
+ -- Matthias Klose <doko@debian.org>  Mon, 14 Aug 2006 10:21:16 +0000
+
+wxwidgets2.6 (2.6.3.2.1.3) unstable; urgency=low
+
+  * NMU.
+  * Build for python2.4.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 14 Aug 2006 02:01:15 +0200
+
+wxwidgets2.6 (2.6.3.2.1.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Explicitely Build-Depend on python-central. Closes: #381110
+
+ -- Mohammed Adnène Trojette <adn+deb@diwi.org>  Sun,  6 Aug 2006 13:00:11 +0200
+
+wxwidgets2.6 (2.6.3.2.1.1) unstable; urgency=low
+
+  * NMU (I love this version string for NMU's :-/).
+  * Convert to updated Python policy. Closes: #373410.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 17 Jun 2006 18:25:37 +0200
+
+wxwidgets2.6 (2.6.3.2.1) unstable; urgency=low
+
+  * Add 'Replaces' for the wxbase packages when upgrading from
+    earlier than 2.6.3.2 where they split again.  Closes: #365561
+
+ -- Ron Lee <ron@debian.org>  Mon,  1 May 2006 14:02:26 +0930
+
+wxwidgets2.6 (2.6.3.2) unstable; urgency=low
+
+  * Next try for an upload candidate.
+  * Fixes FTBFS on GNU/kFreeBSD. Closes: #327638
+  * Update fr.po, thanks to Thomas Huriaux and debian-l10n-french.
+    Closes: #328966
+  * Split wxbase back into its own package, after all these years
+    and just after I drop it, someone finally has a use for it.
+    Such is life.  Closes: #333944
+  * Fixes FTBFS with new make.  If this ugly quoting is the tradeoff,
+    I'm itching to learn of the fabulous benefits...
+    Ack NMU for this from Kurt Roeckx to keep the amd64 transition
+    rolling while my x86 build machine was painfully dying.  Thanks!
+    Closes: #350695, #361443
+  * New FSF address in copyright file.
+  * Add an index.html link to the doc contents page.  Closes: #328896
+  * Fixes declarations for friends, as required by C++, and now gcc4.1.
+    Closes: #358219
+  * Add an unpack_examples script, loosely based on one submitted
+    by Richard Esplin.  Closes: #342761
+  * Disable the reserved vtable entries (again, but this time its
+    optional) to retain compatibility with the existing release
+    in the distro.
+  * Update build-deps for xorg7.
+
+ -- Ron Lee <ron@debian.org>  Fri, 14 Apr 2006 16:50:24 +0930
+
+wxwidgets2.6 (2.6.1.2-0.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Make it build using the new make.  Patch from
+    Daniel Schepler <schepler@math.berkeley.edu> (Closes: #350695)
+
+ -- Kurt Roeckx <kurt@roeckx.be>  Sun,  9 Apr 2006 14:04:34 +0200
+
+wxwidgets2.6 (2.6.1.2) unstable; urgency=low
+
+  * Fix the build_options.py created by the in tree build.
+    Closes: #324960  Thanks.
+  * Move the wx.pth alternative to its own directory where
+    it can't mess with anything else.
+  * Pull in changes to dcclient.cpp and window.cpp from HEAD
+    mostly for gtk2.8 compatibility, but fixes a couple of
+    other issues too.
+
+ -- Ron Lee <ron@debian.org>  Thu, 25 Aug 2005 18:38:31 +0930
+
+wxwidgets2.6 (2.6.1.1.1) unstable; urgency=low
+
+  * Reshuffle the wxPython packages again, to comply better with
+    the python naming policy and improve support for concurrent
+    installations.  The runtime files are now in python-wxgtk2.6-0,
+    the version selector in python-wxversion and the ancillary
+    tools in the python-wxtools package.
+
+    Many thanks to Matthias Klose <doko@ubuntu.com> for patches
+    and patient prodding to get wxpython into better shape for
+    version transitions.
+
+  * Collapse the wx-common package into an 'unversioned' one also.
+
+  * On its way back into unstable by popular demand.
+
+ -- Ron Lee <ron@debian.org>  Sun, 14 Aug 2005 21:25:34 +0930
+
+wxwidgets2.6 (2.6.1.1) experimental; urgency=low
+
+  * 2.6.2 prerelease test -- Pain for the Impatient.
+
+    Be warned, wx2.6 has still not branched off the main
+    development tree, and the API is still in flux.
+
+    This one is to see what else is wrong.
+
+  * Upload to experimental now the -c2 transition is real.
+
+ -- Ron Lee <ron@debian.org>  Thu, 23 Jun 2005 14:08:33 +0930
+
+wxwidgets2.6 (2.6.0) unstable; urgency=low
+
+  * 8 ... 9 ... 10.  Here it comes, ready or not...
+  * make install includes archive.h now.  Closes: #294998
+
+ -- Ron Lee <ron@debian.org>  Wed, 13 Apr 2005 01:15:05 +0930
+
+wxwidgets2.5 (2.5.5.1) unstable; urgency=low
+
+  * Last chance.
+  * Conflict with wxwin2.4-i18n.  Due to inertia, it really
+    does.  Sorry if you are not a gringo and want both 2.4 and
+    2.5 apps localised on the same machine.  Maybe for 2.6.1.
+    Bitch upstream if you want it fixed.
+  * Don't package the static libs anymore for wxGTK.
+    Blame drepper for encouraging their obsolescence  If you dare.
+  * Trim the configure options to reflect the new defaults.
+
+ -- Ron Lee <ron@debian.org>  Mon, 11 Apr 2005 22:43:58 +0930
+
+wxwidgets2.5 (2.5.4.0) unstable; urgency=low
+
+  * Experimental snapshot.
+  * More bakefile bogosity manually patched.  Closes: #294998
+  * Fix stray conflicts with 2.4.  Closes: #287623
+  * Fixes lack of version checking in wxPython examples.
+    Closes: #287772
+  * Fixes FTBFS on ppc.  Closes: #285186
+  * Enable gnomeprint, Closes: #284943 satisfactorily I hope.
+
+ -- Ron Lee <ron@debian.org>  Sun, 13 Feb 2005 16:52:38 +1030
+
+wxwidgets2.5 (2.5.3.3) unstable; urgency=low
+
+  * Experimental snapshot.
+
+ -- Ron Lee <ron@debian.org>  Tue,  8 Feb 2005 12:30:45 +1030
+
+wxwidgets2.5 (2.5.3.2) unstable; urgency=low
+
+  * This time, really now.
+    A snapshot that is actually ready for wider release.
+    Thanks to all who've been patient.  We know who you are.
+  * Update path to wxPython site-packages, build them with
+    --no_rpath since we will install the in tree build.
+
+ -- Ron Lee <ron@debian.org>  Thu, 11 Nov 2004 11:01:00 +1030
+
+wxwidgets2.5 (2.5.3.1) unstable; urgency=low
+
+  * Functioning concurrent installs for both the C++ libs
+    and wxPython along with legacy support for existing 2.4
+    users mean we can now safely introduce this release to
+    unstable without an adverse effect on existing users.
+
+ -- Ron Lee <ron@debian.org>  Sun, 31 Oct 2004 15:54:46 +1030
+
+wxwidgets2.5 (2.5.3.0) experimental; urgency=low
+
+  * Experimental prerelease.
+
+ -- Ron Lee <ron@debian.org>  Wed, 22 Sep 2004 03:29:56 +0930
+
+wxwidgets2.5 (2.5.2.3) experimental; urgency=low
+
+  * Greatly improved concurrent installs.  We can now install
+    a much wider range of builds without conflicting and select
+    between them without the need to go changing symlinks or
+    the suite of applications you have installed.
+  * Contrib is dead.  Long live contrib.
+    Better multi-library builds have made contrib more or less
+    obsolete.  This is the big crunch before the boom.  Everything
+    useful out of contrib has been moved back into the main package.
+    Later we will split many out again along the lines of shared
+    dependencies, so a minimal wx install really can remain minimal
+    without losing any future potential.
+
+ -- Ron Lee <ron@debian.org>  Sat, 18 Sep 2004 00:59:01 +0930
+
+wxwidgets2.5 (2.5.1.1) experimental; urgency=low
+
+  * The s/ndow/dget/g release.
+  * Yes, the name has changed and the terrorists have won again.
+    Having a name too similar to Lindows apparently makes us a
+    liability to the illusion their assailants will want to project
+    in court.  Eleven or so years of unbroken, unquestioned usage
+    was not nearly so interesting to these people as the fact we
+    were a soft target and easy to deprive of due process.
+  * wxGTK is now built with gtk2 and unicode support.
+  * wxBase is no longer a separate package, it is built with the
+    GUI libs which now depend on it.  We might split it out again
+    one day if there is a need for that.
+  * Added support for GNU/K*BSD (thanks again to Robert Millan).
+  * Non-core functionality is now provided by separate libraries
+    rather than simply being built into a single behemoth unit.
+    Of course, given the way these things work, almost none of
+    them are actually smaller, and the load time is unlikely to
+    improve either, but the logical separation may be beneficial.
+  * Removed many elements of the build scripts that are no longer
+    required due to improvements and changes elsewhere.
+  * Added README.examples for people who think these are packaged
+    as demos instead of as extended documentation.
+
+ -- Ron Lee <ron@debian.org>  Fri, 27 Feb 2004 17:00:29 +1030
+
+wxwindows2.5 (2.5.0) unstable; urgency=low
+
+  * New beginnings.  Back to development flavored chaos again.
+
+ -- 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)
+  * Removed bogus hard coded python2.2-xml.  Closes: #216182
+  * Enabled iostream support despite my opinion of this c++ 'feature'.
+    Closes: #211050
+  * Event handling for menus with bitmaps fixed.  Closes: #214788
+  * Includes fixes for wxHTTP and wxURL parsing. Closes: #211023, #213600
+
+ -- Ron Lee <ron@debian.org>  Sat, 25 Oct 2003 13:48:07 +0930
+
+wxwindows2.4 (2.4.1.2) unstable; urgency=low
+
+  * New stable release.  Closes: #198622
+  * Ack python NMU changes, Thanks Josselin!
+  * Hurd support added to configure.  Closes: #191581
+  * Fixes ctrl-tab problem with pyslsk.  Closes: #187923
+  * Fixed configure for autoconf 2.57-3.  Closes: #190755
+  * Added conflict/replace for -doc.  Closes: #202242
+
+ -- Ron Lee <ron@debian.org>  Fri, 22 Aug 2003 15:59:12 +0930
+
+wxwindows2.4 (2.4.0.8-0.1) unstable; urgency=low
+
+  * NMU for python transition.
+  * Build-depend and depend on python 2.3 (closes: #204737).
+
+ -- Josselin Mouette <joss@debian.org>  Wed, 13 Aug 2003 22:21:48 +0200
+
+wxwindows2.4 (2.4.0.9) unstable; urgency=low
+
+  * Updated package sections to suit the new taxonomy.
+  * No public release of this version.
+
+ -- Ron Lee <ron@debian.org>  Sat, 19 Apr 2003 20:13:39 -0700
+
+wxwindows2.4 (2.4.0.8) unstable; urgency=low
+
+  * The "I wish people would read the existing discussion about new releases
+    before posting 'reminder' bugs" release.  Closes: #189144
+  * Moved back to using png2.  gtk1 forces that on anything using it and
+    gtk2 support is still too flakey both in wx and dependent apps for
+    us to entertain it in a stable release.  This is a *really* messed
+    up situation for anyone trying to maintain a development machine.
+    Thank the png and gtk theme people if its a pain in your ass too.
+    Closes: #186779
+  * Add real package options to the gl build deps.  Closes: #182210
+  * Really fix the XRCed problem, unlike 2.4.0.7 ; ) Closes: #183712
+
+ -- Ron Lee <ron@debian.org>  Tue, 15 Apr 2003 18:42:54 -0700
+
+wxwindows2.4 (2.4.0.3) unstable; urgency=low
+
+  * Changed Conflict to Replaces so people can use 2.4 -dev before all
+    their 2.3 deps are gone.  Closes: #178305
+  * Added wxPy supplied 2.3 distutils to the source package, apparently the
+    standard 2.2 one is now insufficient.  This hopefully Closes: #178457
+
+ -- Ron Lee <ron@debian.org>  Mon, 27 Jan 2003 17:36:59 -0800
+
+wxwindows2.4 (2.4.0.2) unstable; urgency=low
+
+  * Added missing quantize.h to install.  Closes: #178135
+  * Removed unnecessary -dev deps.
+  * move wxwin.m4 &c out of the runtime package and conflict with earlier
+    versions that didn't.  Also nuke some empty dir cruft that slipped by.
+    Thanks for noticing the latter Josip.  Closes: #176033
+  * dinstall won't close bugs from earlier unreleased versions :(
+    see below for explanations.  Closes: #162948, #171258, #168148
+    Closes: #170748, #168250, #164557, #172390, #172447, #168887
+    Closes: #155476, #155478
+
+ -- Ron Lee <ron@debian.org>  Thu, 16 Jan 2003 16:46:31 -0800
+
+wxwindows2.4 (2.4.0) unstable; urgency=low
+
+  * The fingers crossed release.
+  * de.po typo fix.  Closes: #174084
+  * tr.po stable tree patch.  Closes: #174667
+  * Add a manpage for the wxPython scripts pointing to the pydoc docs.
+  * Disabled generation of gtk-univ, it is a rather insensible combination
+    now and should be replaced by x11-univ instead.
+  * There had to be some payoff to all the delays -- a clean gcc3.2
+    transition :-)  This package certainly obsoletes 2.3.3.2 and I'll
+    be seeking to finally have 2.2.9.2 removed as well once Audacity
+    is updated.
+
+ -- Ron Lee <ron@debian.org>  Thu, 19 Dec 2002 00:50:48 -0800
+
+wxwindows2.3 (2.3.4.1) unstable; urgency=low
+
+  * 2.4.0pre1 I guess.
+  * Added -ffunction-sections for broken hppa linker. Closes: #162948
+  * Conflict/Replace wxPython2.2.  Since its nmu these two packages
+    can no longer currently coexist.  Closes: #171258
+  * xrced.py path search fixed.  Closes: #168148, #170748
+  * Actually install all wxUniv headers to the header package.
+    Closes: #168250, #164557
+  * Robin tells me this one should be fixed in 2.3 too, I can't confirm
+    so please reopen if it's not.  Closes: #172390
+  * Added menu items for pycrust/pyshell, thanks Martin.  Closes: #172447
+  * Broken header fixed.  Closes: #168887
+
+ -- Ron Lee <ron@debian.org>  Mon, 18 Nov 2002 18:54:21 -0800
+
+wxwindows2.3 (2.3.3.2) unstable; urgency=low
+
+  * The one more for luck release.
+  * Debian-wise, it fixes the problem with contrib lib name clashes;
+    code-wise, lots of little issues (and a couple of big 'uns) from
+    2.3.3 -- see the more regular change or cvs logs for details...
+  * Yes, it's still the unstable branch, yes the request for testing
+    to see if we can reasonably obsolete 2.2 in post-woody debian
+    is still current, and yes we're still working toward a stable
+    2.4 release as fast as we can.   Big thanks to everyone who's
+    been patient and/or active fixing things.
+
+ -- Ron Lee <ron@debian.org>  Thu, 26 Sep 2002 17:43:05 -0700
+
+wxwindows2.3 (2.3.3.1) unstable; urgency=low
+
+  * Ok, Robin says wxPython is good to go.
+  * Since wx2.2 has crashed and burned with the new releases of
+    python and png, Could package maintainers with packages that
+    depend on wx please recompile with this package and let me
+    know if they still need 2.2 in woody?   If not I'll have them
+    removed.  There should be a 2.4 release following very soon.
+    (hah, let's see how the date on that comment testifies!)
+  * Yes, I know wxpython is missing man pages for some of its
+    scripts.  File a bug if you must, but preferably, if you know
+    what they do, attach a patch containing one.  I don't use them
+    myself or could even do more than guess what they do today.
+    Sorry, C++.
+
+ -- Ron Lee <ron@debian.org>  Thu, 19 Sep 2002 16:25:12 -0700
+
+wxwindows2.3 (2.3.3) unstable; urgency=low
+
+  * The "If it sucks, You whined for it!" release.
+  * It's also STILL our unstable branch, so I'll probably summarily
+    close any bugs related to that fact.  Please report bugs in
+    the code to wx-dev@lists.wxwindows.org (or the wx bug tracker on
+    SourceForge) and not the debian BTS.  They'll get to the right
+    people much faster that way.  Packaging bugs to the BTS per normal.
+    Thanks!
+    Closes: #155476, #155478
+  * New dynamic library/object loading code.
+  * Fixes several showstoppers from 2.3.2
+  * wxPython now built with python2.2
+  * Depend explicitly on libpng3-dev, hopefully that will stay the
+    right thing a little longer.  Closes: #143439
+  * Various wxPython issues all likely to be entirely different in 2.3
+    Please reopen (and/or tell Robin :) if they aren't fixed.
+    Closes: #153276, #124372, #146757, #148062, #146303
+  * Broken package managers are not my problem, unless enough people
+    think so to make it policy.  Autogenerated bugs for things like
+    this suck too, just btw.  If you're going to autogenerate menial
+    labor for people, at least autogenerate a patch to go along with
+    it.  Closes: #130971, #130989, #130992
+
+ -- Ron Lee <ron@debian.org>  Wed, 19 Dec 2001 15:41:31 -0800
+
+wxwindows2.3 (2.3.2) unstable; urgency=low
+
+  * Major Overhaul.  First serious release contender.
+
+      Added .dll's to msw-cross packages.
+      Added -dbg versions of the cross packages.
+      Added experimental -univ(gtk) package.
+      Switched to python 2.1
+
+ -- Ron Lee <ron@debian.org>  Thu, 27 Sep 2001 05:55:07 -0700
+
+wxwindows2.3 (2.3.1) unstable; urgency=low
+
+  * 2.3.1 test debs -- still not QA'd for general release yet.
+
+ -- Ron Lee <ron@debian.org>  Sun, 10 Jun 2001 20:10:36 -0700
+
+wxwindows2.3 (2.3.0) unstable; urgency=low
+
+  * Updated 2.2 build scripts for 2.3
+  * initial test builds, please do not release..
+
+ -- Ron Lee <ron@debian.org>  Sat, 27 Jan 2001 01:51:24 -0800
+
+wxwindows2.2 (2.2.9.2) unstable; urgency=high
+
+  * Fix wxPython gl bug.  Closes: #130758
+  * Add versioned build dep on the -dev package too
+    to help avoid the 'png fiasco' for packages built
+    with wx.  (Thanks Joshua)  Closes: #131355
+
+ -- Ron Lee <ron@debian.org>  Fri, 25 Jan 2002 03:11:28 -0800
+
+wxwindows2.2 (2.2.9.1) unstable; urgency=high
+
+  * recompile with libpng2..  oops.  Closes: #129762
+
+ -- Ron Lee <ron@debian.org>  Mon, 21 Jan 2002 13:20:00 -0800
+
+wxwindows2.2 (2.2.9) unstable; urgency=high
+
+  * fix for arches with unsigned char as default.
+  * high urgency because this fix really should get
+    into woody.
+    Closes: #127014
+
+ -- Ron Lee <ron@debian.org>  Mon, 31 Dec 2001 06:53:27 -0800
+
+wxwindows2.2 (2.2.8.5) unstable; urgency=low
+
+  * Add wxSIZE_T_IS defines to setup.h
+    Add automate that to my TODO list.
+
+ -- Ron Lee <ron@debian.org>  Tue, 27 Nov 2001 05:55:47 -0800
+
+wxwindows2.2 (2.2.8.4) unstable; urgency=low
+
+  * Put the (modified) size_t == ulong kludge back into sndwav.cpp
+    it's still needed until wxDataOutputStream is made 64 bit
+    friendly, which may not happen for 2.2 since it will probably
+    not be binary compatible.
+  * caps a memory leak in the jpeg handler.
+
+ -- Ron Lee <ron@debian.org>  Sun, 25 Nov 2001 11:53:59 -0800
+
+wxwindows2.2 (2.2.8.3) unstable; urgency=low
+
+  * Backported size_t test from 2.3 tree, removes the need for
+    specific tests for various 64 bit platforms including now
+    S/390 (thanks to Gerhard Tonn for the report).
+    Closes: #120768
+
+ -- Ron Lee <ron@debian.org>  Fri, 23 Nov 2001 20:53:49 -0800
+
+wxwindows2.2 (2.2.8.2) unstable; urgency=low
+
+  * python-dev doesn't get me python?  More bytes in Build-Dep then
+    I guess ...  Closes: #119954
+
+ -- Ron Lee <ron@debian.org>  Sun, 18 Nov 2001 04:28:41 -0800
+
+wxwindows2.2 (2.2.8.1) unstable; urgency=low
+
+  * Rebuild for python2.1  Closes: #119226, #118835
+
+ -- Ron Lee <ron@debian.org>  Mon, 12 Nov 2001 21:47:38 -0800
+
+wxwindows2.2 (2.2.8) unstable; urgency=medium
+
+  * Fixed bogus samples makefile. Closes: #110061
+  * Added ability to build wxMSW-cross packages, but they
+    are not built and distributed by default.
+
+      If you think such creatures belong in the archive,
+      see README.Debian
+
+  * Pruned more inapplicable files from the raw cvs source,
+    cleaned configure.in and removed the need for a common setup.h,
+    removed superfluous library links and generally tweaked things
+    so as to make adding new ports easier.
+  * added --gl-libs flag to wx-config.
+  * added wx2.4 forward compatible event macros.
+  * added build fixes for IA64 from Jeff Licquia, and fixed clean
+    rules to pick up unnoticed strays that effected NMU builds.
+    Thanks Jeff.  Closes: #101734, #104679  (fixed in NMU)
+  * Medium urgency since several other packages are waiting
+    for this to get into testing.
+
+ -- Ron Lee <ron@debian.org>  Thu, 30 Aug 2001 15:41:49 -0700
+
+wxwindows2.2 (2.2.7) unstable; urgency=medium
+
+  * The "Testing Tarantella" release.
+  * various small control (mis)behaviours corrected.
+  * added missing build-dep for gettext.
+  * updated wxPython description, Closes: #102689
+  * Never publicly released, oh well.
+
+ -- Ron Lee <ron@debian.org>  Sun, 10 Jun 2001 19:32:46 -0700
+
+wxwindows2.2 (2.2.6.1) unstable; urgency=low
+
+  * fix rules so it really doesn't build -indep for ports
+    and fixed ambiguous overload bug in mmedia contrib.
+    This time it will build on alpha for sure.  Really. :)
+    Closes: #92288
+  * added extra -dev package deps.  Closes: #91364
+
+ -- Ron Lee <ron@debian.org>  Sat,  7 Apr 2001 06:49:58 -0700
+
+wxwindows2.2 (2.2.6) unstable; urgency=low
+
+  * changed i18n package back to building during arch phase
+    so we can reap the .mo files as they are created. Closes: #86174
+  * OBCBLR Closes: #84692
+  * fix wxPython build gremlin.  Closes: #89209, #85129
+  * tweaked wx-config alternatives priority to favour the most
+    likely default use.
+  * general buglet count reduced.
+
+ -- Ron Lee <ron@debian.org>  Thu,  8 Mar 2001 21:10:07 -0800
+
+wxwindows2.2 (2.2.5.1) unstable; urgency=low
+
+  * "This One's for Dirk"  Closes: #84696
+  * 2.2.5 has known issues and will not be released for Debian.
+  * Fixed parser.y for Alpha builds (#82949)
+  * changed mesa dependency to the virtual libgl package and
+    added Conflicts for the old 2.1 packages (which are now
+    gone from woody anyway)  Closes: #80120, #70778, #70779, #70780
+  * wxPython now builds as a single unit (including contrib)
+    so removed the libwxgtk-python-contrib package
+  * updated translations
+  * new event table macro to enable code being written with 2.2
+    to be forward compatible with the changes in 2.4
+  * numerous sundry bugfixes
+
+ -- Ron Lee <ron@debian.org>  Wed, 24 Jan 2001 18:51:24 -0800
+
+wxwindows2.2 (2.2.2) unstable; urgency=low
+
+  * added missing dependancy for contrib-dev package.  Closes: #70880
+  * by popular demand, added a package with the python-contrib libs.
+  * more tweaks to deb/rules.  autodetect the python install location,
+    and cache the results of configure tests for all packages.
+  * and of course a whole stack of minor fixes in the main codebase too.
+
+ -- Ron Lee <ron@debian.org>  Tue,  5 Sep 2000 18:51:24 +0930
+
+wxwindows2.2 (2.2.1) unstable; urgency=low
+
+  * wxWin 2.2.1 stable release.
+  * First upload to deb.org after repackaging to build directly from
+    upstream cvs.
+  * still not quite lintian clean yet:
+    - wxPython lib can't be built with a proper soname yet.
+    - the -dbg packages need an override for the shlib symlink.
+    - and a couple of packages have the lib symlink 'before the
+      lib', but that's ugly to fix right now, they aren't critical
+      libs, and allegedly this will be handled by dpkg sometime soon.
+  * moved full licence text into copyright file.
+
+ -- Ron Lee <ron@debian.org>  Sun, 13 Feb 2000 18:40:00 +1030
+
+Local variables:
+mode: debian-changelog
+End:
--- wxwidgets2.8-2.8.10.1.orig/debian/README.HowToBuild.txt
+++ wxwidgets2.8-2.8.10.1/debian/README.HowToBuild.txt
@@ -0,0 +1,177 @@
+[ Note: this document is taken unmodified from the upstream debian
+  directory; it doesn't describe the procedure taken to build the
+  packages uploaded to Debian and Ubuntu.
+
+			2007-02-28, Matthias Klose <doko@ubuntu.com>
+]
+
+How to build the Debian wx packages
+===================================
+
+This file is currently just a brain dump of my experiences with
+building the Debian wx packages, based on various experimentations,
+and Googling around.  Please don't take anything said here as
+authoritative or written in stone.  Although I've been able to get
+things to work fairly reliably, I still feel pretty clueless about
+some things.
+
+
+Overview
+--------
+
+Contrary to how RPM and other packaging systems work, building Debian
+packages is done with an expanded source tree instead of using a
+tarball.  Inside the toplevel of the source tree you'll find a subdir
+named debian, and within this dir are various files used by the build.
+The most important of these are the control file and the rules file.
+The control file specifies the metadata about each package, such as
+name, description, dependencies, etc.  Interestingly, the version
+number of the current build is not in the control file as might be
+expected, but is instead taken from the changelog file.  I guess this
+is a way for debian to make sure that there is always an updated
+changelog for every release, but it is very non-intuitive to say the
+least.  The rules file is a Makefile, and is executable with a #! that
+runs make on itself.  This lets you execute commands from the toplevel
+source dir like:
+
+       ./debian/rules build
+
+While theoretically you could build the wx packages directly from your
+CVS workspace this won't work (currently) for a couple reasons.
+First, the debian/rules file is currently looking at the name of the
+toplevel source dir and extracting from it the flavour name (if
+present) for use in passing to --with-flavor configure flag.  (I'm
+considering changing how it finds this value for 2.7 so, for example,
+the debian packages could also be built from the wxPython source
+tarball...)  Second, since the build tools use the current source dir
+for creating the source package, you'll probably want to start with a
+clean source tree that has had unnecessary things removed from it.
+There is a Makefile target that will create a minimized and clean
+source tree for you, and will name it as debian/rules expects.  To use
+it go to a build dir where you've already run configure, and then run:
+
+       make debian-dist
+
+This will result in a new source tree with a name like
+wxwidgets2.7-2.7.0.0 that is located as a sibling to the toplevel of
+the current source tree.
+
+
+Environment
+-----------
+
+The various dpkg helper tools will use some environment settings to
+provide default values.  I have these set:
+
+       DEBFULLNAME='Robin Dunn'
+       DEBEMAIL=robin@alldunn.com
+       DEBSIGN_KEYID='Robin Dunn <robin@alldunn.com>'
+       DEBUILD_DPKG_BUILDPACKAGE_OPTS='-i -ICVS -I.svn'
+
+Notice the DEBSIGN_KEYID value.  If this is set (and you have a
+matching gnupg key) then the packages will be digitally signed when
+they are built.
+
+If you are building packages that you intend to be installable on
+machines other than your own, then I recommend that you either have a
+separate machine with a minimal OS install, or set up a chroot
+environment and do the builds there.  The reason for this is to
+minimize unexpected extra dependencies that the built packages will
+have because of extra things you have installed on your desktop
+system, for example OpenGL libs installed by your video card drivers.
+Using a chroot will also allow you to build packages for different
+versions of Debian (or Ubuntu) if desired.  There is a good
+description of setting up a chroot environment here:
+
+       https://wiki.ubuntu.com/DebootstrapChroot
+
+In addition to the base system packages, you'll need to install in
+the chroot environment any packages needed for building wxWidgets
+(compilers, make, autoconf, gtk and image libs, lib-dev's, python,
+python-dev, etc.)  as well as the packages listed in the next section.
+
+
+Build Packages
+--------------
+
+There are a number of helper packages that are used when building
+debian packages.  Here are some that I have in my chroot, there may be
+some others that I am not seeing at the moment:
+
+       debhelper
+       devscripts
+       dh-make
+       dpkg-dev
+       fakeroot
+       lintian
+       diff
+       patch
+
+
+Doing the Build
+---------------
+
+Ok, if you are not totally confused by this point you should have a
+minimal source tree produced by "make debian-dist" that is accessible
+by your chroot or other minimal install system. (Unless you are only
+making packages for yourself, then doing the build on in your main
+desktop environment would  be okay.)  The first step is to chdir to
+the top level of this source tree.
+
+If you haven't already you'll want to edit debian/changelog to make an
+entry for the current build.  If the version number is changing since
+the last build then you'll need a whole new section.  If you are just
+updating something in the same version then you can just get by with
+editing the current changelog entry.  The 'dch' tool can be used to
+open the file in an editor with the cursor positioned for you.  If you
+use 'dch -i' then it will create a new changelog entry for you with
+the proper syntax.  Don't forget to copy this file back to your CVS
+workspace if appropriate.
+
+Our debian/control file is generated from debian/control.in, so you
+can force it to be created now by running the following.  You may want
+to do this to verify its contents before proceeding with the build.
+
+       ./debian/rules debian/control
+
+To run just the compile/link/etc. portions of the build you can do
+this:
+
+       ./debian/rules build
+
+To also make a set of test binaries you can do this:
+
+       fakeroot ./debian/rules binary
+
+To clean up from prior builds you can do this:
+
+       fakeroot ./debian/rules clean
+
+And to automate the entire process (build, binaries, source packages,
+digital signing, etc.) you can do this:
+
+       dpkg-buildpackage -rfakeroot
+
+When finished the binary and source packages will be left in the
+parent dir of the source tree.
+
+
+Automating the process
+----------------------
+
+The script debian/build_all automates the above stepds and builds both
+wxWidgets and wxPython packages in both ANSI and Unicode modes. You should do
+the build manually at least the first time however to make sure you have all
+the prerequisites and the build doesn't fail.
+
+
+Other Sources of Information
+----------------------------
+
+http://liw.iki.fi/liw/talks/debian-packaging-tutorial.pdf
+http://women.alioth.debian.org/wiki/index.php/English/BuildingTutorial
+http://women.alioth.debian.org/wiki/index.php/English/AdvancedBuildingTips
+http://www.wiggy.net/presentations/2001/DebianWalkThrough/handouts/handouts.html
+http://www.debian.org/doc/manuals/maint-guide/index.en.html
+http://www.isotton.com/debian/docs/repository-howto/repository-howto.html
+
--- wxwidgets2.8-2.8.10.1.orig/debian/unpack_examples.sh.in
+++ wxwidgets2.8-2.8.10.1/debian/unpack_examples.sh.in
@@ -0,0 +1,62 @@
+#!/bin/bash
+#
+# Unpack compressed examples from the packaged documentation
+# into a directory where the user can compile and/or run them.
+
+WX_EXAMPLES_DIR="/usr/share/doc/wx=V-examples/examples"
+
+usage() {
+    echo "$0 [subdir [subdir] ...] dest_dir"
+    echo "    subdir   - a subdir of $WX_EXAMPLES_DIR to unpack."
+    echo "    dest_dir - location for the unpacked examples."
+    echo
+    echo "If no subdirs are supplied explicitly, all examples will be unpacked."
+    exit 1
+}
+
+if [ $# -lt 1 ]; then
+    usage
+fi 
+
+while [ $# -gt 1 ]; do
+    SUBDIRS="$SUBDIRS $1"
+    shift
+done
+
+DESTDIR="$1"
+
+if [ -e $DESTDIR ]; then
+    echo "Destination $DESTDIR already exists. Cowardly exiting."
+    exit 2
+fi
+
+if [ -z "$SUBDIRS" ]; then
+    for d in $(cd $WX_EXAMPLES_DIR 2> /dev/null && ls -d * 2> /dev/null); do
+        [ -d "$WX_EXAMPLES_DIR/$d" ] && SUBDIRS="$SUBDIRS $d"
+    done
+else
+    for d in $SUBDIRS; do
+    	if [ -d "$WX_EXAMPLES_DIR/$d" ]; then
+	    _SUBDIRS="$d"
+	else
+	    echo "Subdir $WX_EXAMPLES_DIR/$d does not exist.  Skipping."
+	fi
+    done
+    SUBDIRS="$_SUBDIRS"
+fi
+
+if [ -z "$SUBDIRS" ]; then
+    echo "Nothing to copy from $WX_EXAMPLES_DIR.  Aborting."
+    exit 1
+fi
+
+mkdir -p $DESTDIR
+for d in $SUBDIRS; do
+    echo "Copying $WX_EXAMPLES_DIR/$d to $DESTDIR"
+    cp -pr "$WX_EXAMPLES_DIR/$d" "$DESTDIR"
+done
+
+echo -n "Unpacking... "
+find $DESTDIR -name "*.gz" -exec gunzip {} \;
+echo "done."
+
--- wxwidgets2.8-2.8.10.1.orig/debian/xrced.desktop
+++ wxwidgets2.8-2.8.10.1/debian/xrced.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=XRCed
+Comment=wxPython XRC resource editor and UI designer
+Exec=/usr/bin/xrced
+Icon=/usr/share/pixmaps/xrced
+Terminal=false
+Type=Application
+Categories=Development;
+StartupNotify=true
--- wxwidgets2.8-2.8.10.1.orig/debian/build_all
+++ wxwidgets2.8-2.8.10.1/debian/build_all
@@ -0,0 +1,49 @@
+#!/bin/sh
+##############################################################################
+# Name:       debian/build_all
+# Purpose:    build both ANSI and Unicode Debian packages at once
+# Created:    2006-12-13
+# RCS-ID:     $Id: build_all,v 1.1 2006/12/13 13:14:40 VZ Exp $
+# Copyright:  (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
+# Licence:    wxWindows licence
+##############################################################################
+
+# The following variables may be defined:
+#   wx          The wxWidgets root directory (if it's unset you have to run the
+#               script from this directory)
+#   debsrc_dir  If set, suppose there are already debian sources in this dir
+
+set -e
+wx_dir=${wx-`pwd`}
+if [ ! -f $wx_dir/debian/build_all ]; then
+    echo "Please run the script from the root wx directory" >&2
+    exit 1
+fi
+
+(
+if [ -z $debsrc_dir ]; then
+    configure_dir=/tmp/wxtmp-$$
+
+    mkdir $configure_dir
+    cd $configure_dir
+    $wx_dir/configure --without-subdirs > /dev/null
+    make debian-dist > /dev/null
+    debsrc_dir=`grep 'DEBIAN_SOURCE_DIR =' Makefile | sed 's@.*/@@'`
+    cd ..
+    rm -rf $configure_dir
+fi
+
+cd $wx_dir/../$debsrc_dir
+./debian/rules debian/control
+dpkg-buildpackage -rfakeroot > /dev/null
+
+fakeroot ./debian/rules clean
+
+sed -i '/^WX_UNICODE := /s/1/0/' debian/rules
+rm debian/control
+./debian/rules debian/control
+dpkg-buildpackage -rfakeroot > /dev/null
+
+fakeroot ./debian/rules clean
+
+) 2>&1 | tee $wx_dir/debian/build.log
--- wxwidgets2.8-2.8.10.1.orig/debian/wx-doc.docs
+++ wxwidgets2.8-2.8.10.1/debian/wx-doc.docs
@@ -0,0 +1,2 @@
+docs/wx-manual.html
+
--- wxwidgets2.8-2.8.10.1.orig/debian/libwxbase-dev.postinst
+++ wxwidgets2.8-2.8.10.1/debian/libwxbase-dev.postinst
@@ -0,0 +1,9 @@
+#! /bin/sh
+set -e
+
+update-alternatives --install /usr/bin/wx-config wx-config               \
+			      /usr/lib/wx/config/base-unicode-release-=V \
+			      $(( =PRIO * 10 + 7 ))
+
+#DEBHELPER#
+
--- wxwidgets2.8-2.8.10.1.orig/debian/watch
+++ wxwidgets2.8-2.8.10.1/debian/watch
@@ -0,0 +1,3 @@
+version=3
+http://sf.net/wxpython/wxPython-src-(.*)\.tar\.bz2 debian debian/repack.sh
+
--- wxwidgets2.8-2.8.10.1.orig/debian/lintian-override.in
+++ wxwidgets2.8-2.8.10.1/debian/lintian-override.in
@@ -0,0 +1,8 @@
+libwxbase=V-dbg: non-dev-pkg-with-shlib-symlink
+libwxbase=V-dbg: package-name-doesnt-match-sonames
+libwxbase=SOV: package-name-doesnt-match-sonames
+libwxgtk=V-dbg: non-dev-pkg-with-shlib-symlink
+libwxgtk=V-dbg: package-name-doesnt-match-sonames
+libwxgtk=SOV: package-name-doesnt-match-sonames
+python-wxtools: python-script-but-no-python-dep
+
--- wxwidgets2.8-2.8.10.1.orig/debian/wx-doc.doc-base
+++ wxwidgets2.8-2.8.10.1/debian/wx-doc.doc-base
@@ -0,0 +1,10 @@
+Document: wx=V-manual
+Title: wxWidgets=V Programming Manual
+Author: The wxWidgets Cabal
+Abstract: This manual describes the wxWidgets=V cross-platform GUI toolkit.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/wx=V-doc/wx-manual.html/wx-=V-manual_contents.html
+Files: /usr/share/doc/wx=V-doc/wx-manual.html/*
+
--- wxwidgets2.8-2.8.10.1.orig/debian/libwxmsw-dev.postinst
+++ wxwidgets2.8-2.8.10.1/debian/libwxmsw-dev.postinst
@@ -0,0 +1,9 @@
+#! /bin/sh
+set -e
+
+update-alternatives --install /usr/bin/wx-config wx-config               \
+			      /usr/lib/wx/config/=H-msw-ansi-release-=V  \
+			      $(( =PRIO * 10 + 4 ))
+
+#DEBHELPER#
+
--- wxwidgets2.8-2.8.10.1.orig/debian/rules
+++ wxwidgets2.8-2.8.10.1/debian/rules
@@ -0,0 +1,1074 @@
+#!/usr/bin/make -f
+# debian/rules file to build packages from wx CVS source
+#
+# Sculpted 13/2/2000 by Ron Lee <ron@debian.org> from new and
+# variously stolen code :-)
+# It makes copious use of the debhelper utilities written by
+# Joey Hess and others.
+
+SHELL = /bin/bash
+
+#export DH_VERBOSE=1
+
+include /usr/share/pycentral-data/pycentral.mk
+include /usr/share/quilt/quilt.make
+export DH_OPTIONS
+
+# WXPYTHON_VERSION = $(shell dpkg-parsechangelog | sed -ne '/^Version: /s@Version: \(.*\)@\1@p')
+
+ifdef CONCURRENCY_LEVEL
+
+  # A user who knows what they want, that's like gold...
+  # respect their precious opinion of how much blue smoke to use.
+  JOB_COUNT := $(CONCURRENCY_LEVEL)
+
+else ifdef DISTCC_HOSTS
+
+ # Otherwise, if they have a cluster, try to put it to good use.
+  JOB_COUNT := $(shell set $${DISTCC_HOSTS} > /dev/null 2>&1 ; echo $$\#)
+
+ # Not much faster, but it might keep you warm in winter...
+ #JOB_COUNT := $(shell set $${DISTCC_HOSTS} > /dev/null 2>&1 ; echo $$(($$\# + $$\#)))
+
+endif
+
+ifdef JOB_COUNT
+  FAST_MAKE  = $(MAKE) -j $(JOB_COUNT)
+else
+  FAST_MAKE = $(MAKE)
+endif
+
+python_ver := $(shell pyversions -d)
+PYVER := $(shell pyversions -vd)
+PYVERS := $(shell pyversions -vr)
+
+
+# If another source package is to supply the common binary packages
+# for a particular Debian release, then define this variable to indicate
+# the $(release) that is expected to provide it.  Do not define it at
+# all if this is to be the default (or only) wx source package for the
+# target release.
+
+# DEBIAN_WX_DEFAULT_VERSION = 2.6
+
+
+# This will extract a flavour out of the changelog and flavour the
+# packages and binaries with it.  'Official' builds should use a
+# changelog entry with a source package of the form wxwidgets$RELEASE.
+# Flavoured builds may use wxwidgets$RELEASE-$FLAVOUR, where any
+# descriptive alphanumeric name will do for FLAVOUR.  This will allow
+# a custom build to be installed alongside the mainline ones without
+# conflict.
+DEBIAN_WXFLAVOUR := $(shell dpkg-parsechangelog | sed -ne '/^Source: /s@.*wxwidgets[0-9.]\+-\?\(.*\)@\1@p')
+
+
+wx_major_version_number := $(shell sed -n 's/^wx_major_version_number=//p' configure.in)
+wx_minor_version_number := $(shell sed -n 's/^wx_minor_version_number=//p' configure.in)
+wx_release_number       := $(shell sed -n 's/^wx_release_number=//p' configure.in)
+wx_subrelease_number    := $(shell sed -n 's/^wx_subrelease_number=//p' configure.in)
+
+##release   := $(shell dpkg-parsechangelog | sed -n 's/^Source: wxwidgets//p' | sed 's/-ansi//')
+release  := $(wx_major_version_number).$(wx_minor_version_number)
+
+# This is broken completely now by bakefiles changes.  Until we add
+# some hocus pocus to the main tree, to export these values from it
+# again, we approximate its behaviour (fairly precisely fwiw) to
+# specify $soversion below.  Re-automate if incompatible changes
+# result in it actually changing.
+#soversion := $(shell grep '^WX_CURRENT=' configure.in | sed 's/WX_CURRENT=\([0-9]\+\).*/\1/')
+soversion := 0
+sorelease := $(release:%-$(DEBIAN_WXFLAVOUR)=%)-$(soversion)$(addprefix -,$(DEBIAN_WXFLAVOUR))
+
+# In some places we use the full version number, including the micro version,
+# for the development releases (which can be incompatible for the same major
+# and minor version) but just the major.minor for the stable releases (which
+# are supposed to be compatible), this variable contains the appropriate value
+ifeq ($(shell echo `echo $(release) | sed 's/.\+\.\(.\+\)/\1/'`%2 | bc),1)
+    # development release
+    compatible_release := $(release).$(wx_release_number)
+else
+    compatible_release := $(release)
+endif
+
+# Base value for alternative priorities.
+alt_prio  := $(subst .,,$(release))
+
+pytoolkit := gtk2
+pydir     := usr/lib/$(python_ver)/$(call sitedir,$(python_ver))
+wxsubdir  := wx-$(compatible_release)-$(pytoolkit)-unicode
+wxpydir   := $(pydir)/$(wxsubdir)
+
+cross_host  := i586-mingw32msvc
+cross_build := $(shell ./config.guess)
+
+config_cache       = ../config_deb.cache
+config_cache_cross = ../config_deb_cross.cache
+
+
+# build options
+COMMON_CONFIGURE_OPTIONS = \
+    --prefix=/usr \
+    --cache-file=$(config_cache) \
+    --with-flavour=$(DEBIAN_WXFLAVOUR) \
+    --with-zlib=sys \
+    --with-expat=sys \
+    --disable-reserved_virtual \
+
+BASE_CONFIGURE_OPTIONS = $(COMMON_CONFIGURE_OPTIONS) \
+    --disable-gui \
+
+GTK_CONFIGURE_OPTIONS = $(COMMON_CONFIGURE_OPTIONS) \
+    --with-gtk \
+    --enable-sound \
+    --with-sdl \
+    --enable-display \
+    --enable-geometry \
+    --enable-graphics_ctx \
+    --with-libjpeg=sys \
+    --with-libpng=sys \
+    --with-libtiff=sys \
+#   --enable-mediactrl \
+
+PY_WX_CONFIG_OPTIONS = --version=$(release) --toolkit=$(pytoolkit) --static=no
+
+WX_UNICODE ?= 1
+WX_OPENGL := 1
+
+ifeq ($(WX_UNICODE),1)
+    COMMON_CONFIGURE_OPTIONS += --enable-unicode
+    PY_WX_CONFIG_OPTIONS += --unicode
+    PY_UNICODE="UNICODE=1"
+    wxpydir := $(pydir)/wx-$(compatible_release)-$(pytoolkit)-unicode
+
+    # for compatibility with the existing 2.6 packages, we don't use "u" in
+    # the Unicode (default) package names
+    unicode_suffix :=
+else
+    # but we do need to use something for non-Unicode packages to distinguish
+    # them
+    unicode_suffix := -ansi
+endif
+
+ifeq ($(WX_OPENGL),1)
+    GTK_CONFIGURE_OPTIONS += --with-opengl
+else
+    GTK_CONFIGURE_OPTIONS += --without-opengl
+endif
+
+# Packages to build:
+package_wxbase_lib      := libwxbase$(sorelease)$(unicode_suffix)
+package_wxbase_dev      := libwxbase$(release)$(unicode_suffix)-dev
+package_wxbase_dbg      := libwxbase$(release)$(unicode_suffix)-dbg
+
+package_gtk_lib         := libwxgtk$(sorelease)$(unicode_suffix)
+package_gtk_dev         := libwxgtk$(release)$(unicode_suffix)-dev
+package_gtk_dbg         := libwxgtk$(release)$(unicode_suffix)-dbg
+
+
+
+
+package_gtk_py_lib      := python-wxgtk$(release)$(unicode_suffix)
+package_gtk_py_ver       = python-wxversion
+package_gtk_py_tools     = python-wxtools
+
+package_headers         := wx$(release)-headers
+package_i18n            := wx$(release)-i18n
+package_doc             := wx$(release)-doc
+package_examples        := wx$(release)-examples
+package_common           = wx-common
+
+# The packages listed here are common to all wx versions, and may be provided
+# by another source package if more than one is in the release simultaneously.
+common_packages	:= $(package_common) $(package_gtk_py_ver) $(package_gtk_py_tools)
+
+
+package_gtk_dbg_py      := python-wxgtk$(release)$(unicode_suffix)-dbg
+
+
+
+package_msw_dev         := libwxmsw$(release)$(unicode_suffix)-dev
+package_msw_dbg         := libwxmsw$(release)$(unicode_suffix)-dbg
+package_headers_msw     := wx$(release)-headers-msw
+
+# The packages listed here will not be built by default.
+extra_packages := \
+		  $(package_msw_dev) $(package_msw_dbg) $(package_headers_msw)
+
+ifdef DEBIAN_WX_DEFAULT_VERSION
+
+  extra_packages += $(common_packages)
+
+endif
+
+
+# Build directories:
+objdir_wxbase_shared       = objs_wxbase_sh
+objdir_wxbase_debug        = objs_wxbase_d
+objdir_gtk_shared          = objs_gtk_sh
+objdir_gtk_debug           = objs_gtk_d
+objdir_gtk_install         = objs_gtk_install
+objdir_doc_cruft           = objs_doc_con
+objdir_doc                 = docs/wx-manual.html
+objdir_examples            = docs/examples
+objdir_i18n                = locale
+
+objdir_msw_shared          = objs_msw_sh
+objdir_msw_static          = objs_msw_st
+objdir_msw_dbg             = objs_msw_d
+objdir_msw_install         = objs_msw_install
+
+objdirs := $(objdir_wxbase_shared) $(objdir_wxbase_debug)                  \
+	   $(objdir_gtk_shared) $(objdir_gtk_debug) $(objdir_gtk_install)  \
+	   $(objdir_doc_cruft) $(objdir_doc) $(objdir_examples)            \
+	   $(objdir_msw_shared) $(objdir_msw_static) $(objdir_msw_dbg)     \
+	   $(objdir_msw_install)
+
+#	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.
+#
+#       similarly some of the wxpython packages are arch indep too, but
+#       all files for it are installed during the arch any phase.
+
+
+# Build stamps:
+build_arch_stamps = build-wxbase-shared-stamp build-wxbase-debug-stamp    \
+                    build-gtk-shared-stamp build-gtk-shared-contrib-stamp \
+                    build-gtk-debug-stamp build-gtk-debug-contrib-stamp   \
+                    build-i18n-stamp build-gtk-py-stamp build-gtk-dbg-py-stamp
+
+build_indep_stamps = build-examples-stamp build-doc-stamp
+
+build_cross_stamps = 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-headers install-i18n            \
+                   install-gtk-py install-gtk-dbg-py
+
+ifndef DEBIAN_WX_DEFAULT_VERSION
+
+  install_all_arch += install-common
+
+endif
+
+install_all_indep = install-examples install-doc
+
+install_all_cross = 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)
+
+
+# wxPython uses this to build in-tree
+wxconfig     := $(shell pwd)/$(objdir_gtk_shared)/wx-config --no_rpath
+wxconfig-dbg := $(shell pwd)/$(objdir_gtk_debug)/wx-config --no_rpath
+
+# and this after it is installed.
+py_wxconfig  := wx-config $(PY_WX_CONFIG_OPTIONS) --debug=no
+pyd_wxconfig := wx-config $(PY_WX_CONFIG_OPTIONS) --debug
+
+
+#contrib_libs := $(subst CVS,,$(notdir $(wildcard contrib/include/wx/*)))
+
+
+# The Rules:
+
+debian/control: debian/control.in
+	sed -e 's/=V/$(release)/g;s/=SOV/$(sorelease)/g;s/=PY/python/g;s/=U/$(unicode_suffix)/g'\
+		< debian/control.in > debian/control
+
+control-files-stamp: debian/control
+	dh_testdir
+	@for f in postinst prerm; do                                         \
+		echo "generating control file $(package_wxbase_dev).$$f";    \
+		sed -e  's/=V/$(release)/g;s/=PRIO/$(alt_prio)/g'            \
+			< debian/libwxbase-dev.$$f                           \
+			> debian/$(package_wxbase_dev).$$f;                  \
+	done;
+	@for f in postinst prerm; do                                         \
+		echo "generating control file $(package_wxbase_dbg).$$f";    \
+		sed -e  's/=V/$(release)/g;s/=PRIO/$(alt_prio)/g'            \
+			< debian/libwxbase-dbg.$$f                           \
+			> debian/$(package_wxbase_dbg).$$f;                  \
+	done;
+	@for f in postinst prerm; do                                         \
+		echo "generating control file $(package_gtk_dev).$$f";       \
+		sed -e  's/=V/$(release)/g;s/=PRIO/$(alt_prio)/g'            \
+			< debian/libwxgtk-dev.$$f                            \
+			> debian/$(package_gtk_dev).$$f;                     \
+	done;
+	@for f in postinst prerm; do                                         \
+		echo "generating control file $(package_gtk_dbg).$$f";       \
+		sed -e  's/=V/$(release)/g;s/=PRIO/$(alt_prio)/g'            \
+			< debian/libwxgtk-dbg.$$f                            \
+			> debian/$(package_gtk_dbg).$$f;                     \
+	done;
+	@for f in docs postinst prerm; do                                    \
+		echo "generating control file $(package_gtk_py_lib).$$f";    \
+		sed -e  's/=V/$(release)/g;s/=PRIO/$(alt_prio)/g'            \
+		    -e  's/=PY/$(python_ver)/g;'                             \
+		    -e  's|=WXPYDIR|$(wxpydir)|g;'                           \
+			< debian/python-wxgtk.$$f                            \
+			> debian/$(package_gtk_py_lib).$$f;                  \
+	done;
+	@echo "generating control file $(package_gtk_dbg_py).docs";
+	@cp debian/python-wxgtk.docs debian/$(package_gtk_dbg_py).docs;
+	@for f in docs doc-base; do                                          \
+		echo "generating control file $(package_doc).$$f";           \
+		sed -e 's/=V/$(release)/g' < debian/wx-doc.$$f               \
+			> debian/$(package_doc).$$f;                         \
+	done;
+	@for f in examples; do                                               \
+		echo "generating control file $(package_examples).$$f";      \
+		cp debian/wx-examples.$$f debian/$(package_examples).$$f;    \
+	done;
+	@for f in postinst prerm; do                                         \
+		echo "generating control file $(package_msw_dev).$$f";       \
+		sed -e  's/=V/$(release)/g;s/=PRIO/$(alt_prio)/g'            \
+		    -e	's/=H/$(cross_host)/g;'                              \
+			< debian/libwxmsw-dev.$$f                            \
+			> debian/$(package_msw_dev).$$f;                     \
+	done;
+	@for f in postinst prerm; do                                         \
+		echo "generating control file $(package_msw_dbg).$$f";       \
+		sed -e  's/=V/$(release)/g;s/=PRIO/$(alt_prio)/g'            \
+		    -e	's/=H/$(cross_host)/g;'                              \
+			< debian/libwxmsw-dbg.$$f                            \
+			> debian/$(package_msw_dbg).$$f;                     \
+	done;
+#	@echo "generating control file $(package_common).menu";              \
+#		sed -e 's/=V/$(release)/g' < debian/wx-common.menu           \
+#			> debian/$(package_common).menu;
+	@echo "generating control file lintian-override";                    \
+		sed -e  's/=V/$(release)/g;s/=SOV/$(sorelease)/g'            \
+			< debian/lintian-override.in                         \
+			> debian/lintian-override;                           \
+	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-stamp build_arch
+build-stamp: $(QUILT_STAMPFN)
+
+
+# The wx2.6 build system makes us run around in circles to get a separate
+# libwxbase.  We need to configure it here in order to get the correct
+# config files to use it alone, but there is no point building it as the
+# wxgtk build is going to do that again anyway.  We'll move the relevant
+# files out when that is done.
+
+configure-wxbase-shared-stamp:
+	dh_testdir
+	mkdir -p $(objdir_wxbase_shared)
+	cd $(objdir_wxbase_shared) \
+	    && ../configure $(BASE_CONFIGURE_OPTIONS)
+	touch $@
+
+build-wxbase-shared-stamp: configure-wxbase-shared-stamp
+	dh_testdir
+	# Nothing to build here, move along...
+	#cd $(objdir_wxbase_shared) && $(FAST_MAKE)
+	touch $@
+
+configure-wxbase-debug-stamp:
+	dh_testdir
+	mkdir -p $(objdir_wxbase_debug)
+	cd $(objdir_wxbase_debug) 					\
+	    && ../configure $(BASE_CONFIGURE_OPTIONS) --enable-debug
+	touch $@
+
+build-wxbase-debug-stamp: configure-wxbase-debug-stamp
+	dh_testdir
+	# Nothing to build here, move along...
+	#cd $(objdir_wxbase_debug) && $(FAST_MAKE)
+	touch $@
+
+configure-gtk-shared-stamp:
+	dh_testdir
+	mkdir -p $(objdir_gtk_shared)
+	cd $(objdir_gtk_shared) \
+	    && ../configure $(GTK_CONFIGURE_OPTIONS)
+	touch $@
+
+build-gtk-shared-stamp: configure-gtk-shared-stamp
+	dh_testdir
+	cd $(objdir_gtk_shared) && $(FAST_MAKE)
+	touch $@
+
+
+configure-gtk-debug-stamp:
+	dh_testdir
+	mkdir -p $(objdir_gtk_debug)
+	cd $(objdir_gtk_debug) \
+	    && ../configure $(GTK_CONFIGURE_OPTIONS) --enable-debug
+	touch $@
+
+build-gtk-debug-stamp: configure-gtk-debug-stamp
+	dh_testdir
+	cd $(objdir_gtk_debug) && $(FAST_MAKE)
+	touch $@
+
+
+build-gtk-shared-contrib-stamp: build-gtk-shared-stamp
+	dh_testdir
+	cd $(objdir_gtk_shared)/contrib/src && $(FAST_MAKE)
+	cd $(objdir_gtk_shared)/utils/wxrc && $(FAST_MAKE)
+	touch $@
+
+
+build-gtk-debug-contrib-stamp: build-gtk-debug-stamp
+	dh_testdir
+	cd $(objdir_gtk_debug)/contrib/src && $(FAST_MAKE)
+	touch $@
+
+
+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: $(PYVERS:%=build-gtk-py%-stamp) # purge-dbg-py
+	touch $@
+
+build-gtk-py%-stamp: build-gtk-shared-stamp # purge-dbg-py
+	dh_testdir
+	touch docs/lgpl.txt
+	cd wxPython \
+		&& python$* ./setup.py 	build			\
+						WX_CONFIG='$(wxconfig)'	\
+						WXPORT=$(pytoolkit)	\
+						$(PY_UNICODE)		\
+					    	FLAVOUR=$(DEBIAN_WXFLAVOUR)
+	touch $@
+
+build-doc-stamp: build-gtk-shared-stamp
+	dh_testdir
+	# the tarball may already have the generated docs in it
+	if [ ! -e docs/html/wx/index.html ]; then \
+		cd $(objdir_gtk_shared)/utils/tex2rtf/src && $(FAST_MAKE); \
+		cd -; \
+		rm -rf $(objdir_doc); \
+		rm -rf $(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)/utils/tex2rtf/src/tex2rtf           \
+		   ../docs/latex/wx/manual.tex                                 \
+		   ../$(objdir_doc)/wx$(release)-manual.html                   \
+		   -twice -html;                                               \
+		cd -; \
+		cp docs/latex/wx/*.gif $(objdir_doc); \
+		rm -rf $(objdir_doc_cruft); \
+		rm -f $(objdir_doc)/wx$(release)-manual.{con,hh*,htx,ref}; \
+	else \
+		mkdir $(objdir_doc); \
+		cp docs/html/wx/* $(objdir_doc); \
+		mv $(objdir_doc)/index.html $(objdir_doc)/wx-$(release)-manual_contents.html; \
+	fi
+	touch $@
+
+build-examples-stamp: build-gtk-shared-stamp
+	dh_testdir
+	mkdir -p $(objdir_examples)
+
+	# copy all samples and the Makefile generated for libwxgtk.
+	cp -a samples $(objdir_examples)
+	rm -f $(objdir_examples)/samples/Makefile
+	cp -a $(objdir_gtk_shared)/samples/Makefile $(objdir_examples)/samples
+
+	cd $(objdir_examples)/samples					\
+		&& find -name 'Makefile.in' -exec rm -f '{}' ';'	\
+		&& for d in $$(find -type d); do			\
+			if [ -f $$d/makefile.unx ]; then		\
+				mv $$d/makefile.unx $$d/Makefile;	\
+			fi;						\
+		done							\
+
+	cp -a wxPython/demo $(objdir_examples)/wxPython
+
+	echo "generating install_examples.sh script";
+	sed -e 's/=V/$(release)/g' < debian/unpack_examples.sh.in	\
+				   > debian/unpack_examples.sh
+	chmod 755 debian/unpack_examples.sh
+
+	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 $@
+
+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: $(PYVERS:%=build-gtk-dbg-py%-stamp) # purge-release-py
+	touch $@
+
+build-gtk-dbg-py%-stamp: build-gtk-debug-stamp # purge-release-py
+	dh_testdir
+	touch docs/lgpl.txt
+	cd wxPython							\
+		&& python$*-dbg ./setup.py build			\
+					    WX_CONFIG='$(wxconfig-dbg)' \
+					    WXPORT=$(pytoolkit)		\
+					    $(PY_UNICODE)		\
+					    FLAVOUR=$(addsuffix -,$(DEBIAN_WXFLAVOUR))dbg
+	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)			\
+				--with-flavour=$(DEBIAN_WXFLAVOUR)
+	touch $@
+
+build-msw-shared-stamp: configure-msw-shared-stamp
+	dh_testdir
+	cd $(objdir_msw_shared) && $(FAST_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)			\
+				--with-flavour=$(DEBIAN_WXFLAVOUR)	\
+				--disable-shared
+	touch $@
+
+build-msw-static-stamp: configure-msw-static-stamp
+	dh_testdir
+	cd $(objdir_msw_static) && $(FAST_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)			\
+				--with-flavour=$(DEBIAN_WXFLAVOUR)	\
+				--enable-debug
+	touch $@
+
+build-msw-dbg-stamp: configure-msw-dbg-stamp
+	dh_testdir
+	cd $(objdir_msw_dbg) && $(FAST_MAKE)
+	touch $@
+
+
+clean-py:
+	cd wxPython && \
+	    rm -rf build*/ wx/*.py build_options.py src/wx.pth wx/build/build_options.py
+
+	# What to do about src/__version__.py ???
+
+
+# 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
+
+clean: debian/control clean-py unpatch
+	dh_testdir
+	dh_testroot
+
+	rm -rf config_deb.cache config_deb_cross.cache *-stamp $(objdirs)
+
+	dh_clean
+	rm -f debian/$(package_wxbase_lib).*
+	rm -f debian/$(package_wxbase_dev).*
+	rm -f debian/$(package_wxbase_dbg).*
+	rm -f debian/$(package_gtk_lib).*
+	rm -f debian/$(package_gtk_dev).*
+	rm -f debian/$(package_gtk_dbg).*
+	rm -f debian/$(package_gtk_py_lib).*
+	rm -f debian/$(package_headers).*
+	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/lintian-override
+	rm -f debian/unpack_examples.sh
+	find -name '*.py[co]' | xargs -r rm -f
+	rm -rf include/wx-$(release)
+
+install_arch: build_arch $(install_all_arch)
+
+install: build_all $(install_all_native)
+
+install-wxbase-lib: DH_OPTIONS=-p$(package_wxbase_lib)
+install-wxbase-lib: build-wxbase-shared-stamp install-gtk-shared-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	@# No, this is not a typo, we steal these libs from the gtk build.
+	dh_install $(objdir_gtk_install)/lib/libwx_base*.so.*	usr/lib
+	dh_installdirs usr/share/lintian/overrides
+	grep ^$(package_wxbase_lib): debian/lintian-override > debian/$(package_wxbase_lib)/usr/share/lintian/overrides/$(package_wxbase_lib)
+
+install-wxbase-dev: DH_OPTIONS=-p$(package_wxbase_dev)
+install-wxbase-dev: build-wxbase-shared-stamp install-gtk-shared-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	@# No, this is not a typo, we steal these libs from the gtk build.
+	dh_install $(objdir_gtk_install)/lib/libwx_base*.so 	usr/lib
+	dh_install $(objdir_wxbase_shared)/lib/wx/include 	usr/lib/wx
+	dh_install $(objdir_wxbase_shared)/lib/wx/config/base*	usr/lib/wx/config
+
+install-wxbase-dbg: DH_OPTIONS=-p$(package_wxbase_dbg)
+install-wxbase-dbg: build-wxbase-debug-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	@# No, this is not a typo, we steal these libs from the gtk debug build.
+	dh_install $(objdir_gtk_debug)/lib/libwx_base*		usr/lib
+	dh_install $(objdir_wxbase_debug)/lib/wx/include	usr/lib/wx
+	dh_install $(objdir_wxbase_debug)/lib/wx/config/base*	usr/lib/wx/config
+	dh_installdirs usr/share/lintian/overrides
+	grep ^$(package_wxbase_dbg): debian/lintian-override > debian/$(package_wxbase_dbg)/usr/share/lintian/overrides/$(package_wxbase_dbg)
+
+install-gtk-shared-stamp: build-gtk-shared-stamp build-gtk-shared-contrib-stamp
+	dh_testdir
+	mkdir -p $(objdir_gtk_install)
+	cd $(objdir_gtk_shared) \
+		&& $(MAKE) install prefix=`pwd`/../$(objdir_gtk_install)
+	cd $(objdir_gtk_shared)/contrib/src \
+		&& $(MAKE) install prefix=`pwd`/../../../$(objdir_gtk_install)
+	touch $@
+
+install-gtk-lib: DH_OPTIONS=-p$(package_gtk_lib)
+install-gtk-lib: install-gtk-shared-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_install $(objdir_gtk_install)/lib/libwx_gtk*.so.*	usr/lib
+	dh_installdirs usr/share/lintian/overrides
+	grep ^$(package_gtk_lib): debian/lintian-override > debian/$(package_gtk_lib)/usr/share/lintian/overrides/$(package_gtk_lib)
+
+install-gtk-dev: DH_OPTIONS=-p$(package_gtk_dev)
+install-gtk-dev: install-gtk-shared-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_install $(objdir_gtk_install)/lib/libwx_gtk*.so 	usr/lib
+	dh_install $(objdir_gtk_install)/lib/wx/include 	usr/lib/wx
+	dh_install $(objdir_gtk_install)/lib/wx/config/gtk* 	usr/lib/wx/config
+
+install-gtk-dbg: DH_OPTIONS=-p$(package_gtk_dbg)
+install-gtk-dbg: build-gtk-debug-stamp build-gtk-debug-contrib-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_install $(objdir_gtk_debug)/lib/libwx_gtk*		usr/lib
+	dh_install $(objdir_gtk_debug)/lib/wx/include		usr/lib/wx
+	dh_install $(objdir_gtk_debug)/lib/wx/config/gtk*	usr/lib/wx/config
+	dh_installdirs usr/share/lintian/overrides
+	grep ^$(package_gtk_dbg): debian/lintian-override > debian/$(package_gtk_dbg)/usr/share/lintian/overrides/$(package_gtk_dbg)
+
+
+install-gtk-py-lib: DH_OPTIONS=-p$(package_gtk_py_lib)
+install-gtk-py-lib: install-gtk-py-lib-pre $(PYVERS:%=install-gtk-pylib%)
+	/bin/echo -n "$(wxsubdir)" > debian/$(package_gtk_py_lib)/usr/lib/wx/python/wx$(release).pth
+install-gtk-py-lib-pre:
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+install-gtk-pylib%: install-gtk-py-lib-pre build-gtk-py%-stamp
+	dh_testdir
+	dh_testroot
+	dh_installdirs usr/lib/wx/python
+	cd wxPython 								\
+		&& python$* ./setup.py install 				\
+			      --install-layout=deb \
+			      --prefix=`pwd`/../debian/$(package_gtk_py_lib)/usr \
+			      WX_CONFIG='$(wxconfig)'				\
+			      SYS_WX_CONFIG='$(py_wxconfig)'			\
+			      WXPORT=$(pytoolkit)				\
+			      $(PY_UNICODE)					\
+			      FLAVOUR=$(DEBIAN_WXFLAVOUR)
+
+	rm -f debian/$(package_gtk_py_lib)/usr/lib/python$*/$(call sitedir,$*)/wx.pth
+
+	find debian/$(package_gtk_py_lib)/usr/lib/python$* -name '*.py?' -exec rm '{}' ';'
+
+	# Fix image-file-in-usr-lib lintian warnings.
+	mkdir -p debian/$(package_gtk_py_lib)/usr/share/$(package_gtk_py_lib)/XRCed/plugins/
+	cp -rf debian/$(package_gtk_py_lib)/usr/lib/python$*/$(call sitedir,$*)/$(wxsubdir)/wx/tools/XRCed/plugins/bitmaps debian/$(package_gtk_py_lib)/usr/share/$(package_gtk_py_lib)/XRCed/plugins/
+	-rm -rf debian/$(package_gtk_py_lib)/usr/lib/python$*/$(call sitedir,$*)/$(wxsubdir)/wx/tools/XRCed/plugins/bitmaps
+
+	# This is rather bogus, its included in the main copyright file now though.
+	rm -f debian/$(package_gtk_py_lib)/usr/lib/python$*/$(call sitedir,$*)/$(wxsubdir)/wx/tools/XRCed/license.txt
+	# has it's own package, editra
+	rm -fr debian/$(package_gtk_py_lib)/usr/lib/python$*/$(call sitedir,$*)/$(wxsubdir)/wx/tools/Editra
+
+install-gtk-py-ver: DH_OPTIONS=-p$(package_gtk_py_ver)
+install-gtk-py-ver: install-gtk-py-lib
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+
+ifndef DEBIAN_WX_DEFAULT_VERSION
+
+	dh_movefiles --sourcedir=debian/$(package_gtk_py_lib) \
+		$(foreach pv,$(PYVERS),usr/lib/python$(pv)/$(call sitedir,$(pv))/wxversion.py)
+	for v in $(foreach pv,$(PYVERS),debian/$(package_gtk_py_ver)/usr/lib/python$(pv)/$(call sitedir,$(pv))/wx.pth); do \
+	  ln -sf ../../wx/python/wx.pth $$v; \
+	done
+else
+	rm -f debian/$(package_gtk_py_lib)/usr/lib/python*/*/wxversion.py
+endif
+
+
+
+install-gtk-py-tools: DH_OPTIONS=-p$(package_gtk_py_tools)
+install-gtk-py-tools: install-gtk-py-ver
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+
+install-gtk-py: DH_OPTIONS=-p$(package_gtk_py_tools)
+install-gtk-py: install-gtk-py-tools
+
+ifndef DEBIAN_WX_DEFAULT_VERSION
+
+	dh_movefiles --sourcedir=debian/$(package_gtk_py_lib) usr/bin
+
+	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     \
+		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pywxrc.1
+
+	rm debian/$(package_gtk_py_tools)/usr/bin/editra
+	dh_installdirs usr/share/lintian/overrides
+	grep ^$(package_gtk_py_tools): debian/lintian-override > debian/$(package_gtk_py_tools)/usr/share/lintian/overrides/$(package_gtk_py_tools)
+endif
+	mkdir -p debian/$(package_gtk_py_tools)/usr/share/pixmaps
+	mkdir -p debian/$(package_gtk_py_tools)/usr/share/applications
+
+	cp debian/pycrust.xpm                   debian/$(package_gtk_py_tools)/usr/share/pixmaps/pycrust.xpm
+	cp debian/pycrust.xpm                   debian/$(package_gtk_py_tools)/usr/share/pixmaps/pyshell.xpm
+	cp debian/xrced.xpm                     debian/$(package_gtk_py_tools)/usr/share/pixmaps/xrced.xpm
+	cp wxPython/wx/py/PyCrust_32.png        debian/$(package_gtk_py_tools)/usr/share/pixmaps/pycrust.png
+	cp wxPython/wx/py/PyCrust_32.png        debian/$(package_gtk_py_tools)/usr/share/pixmaps/pyshell.png
+	cp wxPython/wx/tools/XRCed/XRCed_32.png debian/$(package_gtk_py_tools)/usr/share/pixmaps/xrced.png
+	cp debian/pycrust.desktop               debian/$(package_gtk_py_tools)/usr/share/applications
+	cp debian/pyshell.desktop               debian/$(package_gtk_py_tools)/usr/share/applications
+	cp debian/xrced.desktop                 debian/$(package_gtk_py_tools)/usr/share/applications
+
+	rm -r debian/$(package_gtk_py_lib)/usr/bin
+
+
+install-common: DH_OPTIONS=-p$(package_common)
+install-common: install-gtk-shared-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+
+	dh_install $(objdir_gtk_install)/share/bakefile/presets usr/share/bakefile
+	dh_install $(objdir_gtk_install)/share/bakefile/presets/wx*.bkl usr/share/bakefile/presets
+
+	dh_install $(objdir_gtk_install)/share/aclocal usr/share
+	dh_installman debian/wx-config.1
+
+	dh_install $(objdir_gtk_shared)/utils/wxrc/wxrc usr/bin
+	dh_installman debian/wxrc-tools.1
+	dh_link usr/share/man/man1/wxrc-tools.1 usr/share/man/man1/wxrc.1
+
+
+install-headers: DH_OPTIONS=-p$(package_headers)
+install-headers: install-gtk-shared-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+
+# 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
+	mkdir -p debian/$(package_headers)/usr/include/wx-$(release)/wx/wxPython
+	cp -p wxPython/include/wx/wxPython/*.h \
+	    debian/$(package_headers)/usr/include/wx-$(release)/wx/wxPython/
+
+install-i18n: DH_OPTIONS=-p$(package_i18n)
+install-i18n: build-i18n-stamp install-gtk-shared-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_install $(objdir_gtk_install)/share/locale 	usr/share
+
+install-doc: DH_OPTIONS=-p$(package_doc)
+install-doc: build-doc-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+
+	@# Link this monstrosity with an overly obfuscated name
+	@# to something that both people and browsers can expect to find.
+	dh_link usr/share/doc/$(package_doc)/wx-manual.html/wx-$(release)-manual_contents.html \
+		usr/share/doc/$(package_doc)/wx-manual.html/index.html
+
+install-examples: DH_OPTIONS=-p$(package_examples)
+install-examples: build-examples-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+
+install-gtk-dbg-py: DH_OPTIONS=-p$(package_gtk_dbg_py)
+install-gtk-dbg-py: install-gtk-dbg-py-pre $(PYVERS:%=install-gtk-dbg-py%)
+install-gtk-dbg-py-pre:
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+install-gtk-dbg-py%: install-gtk-dbg-py-pre build-gtk-dbg-py%-stamp
+	dh_testdir
+	dh_testroot
+	dh_installdirs usr/lib/wx/python
+	cd wxPython 								\
+		&& python$*-dbg ./setup.py install 				\
+			      --install-layout=deb \
+			      --prefix=`pwd`/../debian/$(package_gtk_dbg_py)/usr \
+			      WX_CONFIG='$(wxconfig-dbg)'			\
+			      SYS_WX_CONFIG='$(pyd_wxconfig)'			\
+			      WXPORT=$(pytoolkit)				\
+			      $(PY_UNICODE)					\
+			      FLAVOUR=$(addsuffix -,$(DEBIAN_WXFLAVOUR))dbg
+
+	mv debian/$(package_gtk_dbg_py)/usr/lib/python$*/$(call sitedir,$*)/$(wxsubdir)-dbg \
+		debian/$(package_gtk_dbg_py)/usr/lib/python$*/$(call sitedir,$*)/$(wxsubdir)
+
+	-find debian/$(package_gtk_dbg_py) -name '*_d.so'
+	find debian/$(package_gtk_dbg_py) ! -type d ! -name '*.so' | xargs rm -f
+	find debian/$(package_gtk_dbg_py) -depth -type d -empty -exec rmdir {} \;
+
+
+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_install $(objdir_msw_shared)/lib/*.dll*		     usr/$(cross_host)/lib
+	dh_install $(objdir_msw_shared)/lib/wx/include		     usr/$(cross_host)/lib/wx
+	dh_install $(objdir_msw_shared)/lib/wx/config/$(cross_host)* usr/$(cross_host)/lib/wx/config
+	dh_install $(objdir_msw_static)/lib/*.a			     usr/$(cross_host)/lib
+	dh_install $(objdir_msw_static)/lib/wx/include		     usr/$(cross_host)/lib/wx
+	dh_install $(objdir_msw_static)/lib/wx/config/$(cross_host)* usr/$(cross_host)/lib/wx/config
+	$(cross_host)-strip --strip-debug debian/$(package_msw_dev)/usr/$(cross_host)/lib/*.a
+
+	@# As a special case for the cross packages, we link their config
+	@# under /usr as well as under the normal cross prefix.  This way
+	@# --prefix=/usr/$(cross_host) and --prefix=/usr --host=$(cross_host)
+	@# will have a congruent effect on wx-config.
+	@( for f in `ls -1 debian/$(package_msw_dev)/usr/$(cross_host)/lib/wx/config`; do \
+	      all_cfg="$${all_cfg} usr/$(cross_host)/lib/wx/config/$$f usr/lib/wx/config/$$f"; \
+	      echo "linking cross config /usr/$(cross_host)/lib/wx/config/$$f"; \
+	   done;                                                                \
+	   dh_link $${all_cfg};                                                 \
+	 )
+
+install-msw-dbg: DH_OPTIONS=-p$(package_msw_dbg)
+install-msw-dbg: build-msw-dbg-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_install $(objdir_msw_dbg)/lib/*.dll*			  usr/$(cross_host)/lib
+	dh_install $(objdir_msw_dbg)/lib/wx/include		  usr/$(cross_host)/lib/wx
+	dh_install $(objdir_msw_dbg)/lib/wx/config/$(cross_host)* usr/$(cross_host)/lib/wx/config
+	# No static lib, they're freakin' huge!
+	#$(cross_host)-strip --strip-debug debian/$(package_msw_dbg)/usr/$(cross_host)/lib/*.a
+
+	@( for f in `ls -1 debian/$(package_msw_dbg)/usr/$(cross_host)/lib/wx/config`; do \
+	      all_cfg="$${all_cfg} usr/$(cross_host)/lib/wx/config/$$f usr/lib/wx/config/$$f"; \
+	      echo "linking cross config /usr/$(cross_host)/lib/wx/config/$$f"; \
+	   done;                                                                \
+	   dh_link $${all_cfg};                                                 \
+	 )
+
+install-headers-msw: DH_OPTIONS=-p$(package_headers_msw)
+install-headers-msw:
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+
+	cd $(objdir_msw_shared) \
+		&& $(MAKE) install prefix=`pwd`/../$(objdir_msw_install)
+
+#	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 $(objdir_msw_install)/include/wx-$(release)/wx`; do  \
+	      all_h="$${all_h} usr/include/wx-$(release)/wx/$$f usr/$(cross_host)/include/wx-$(release)/wx/$$f"; \
+	      echo "linking header /usr/include/wx-$(release)/wx/$$f"; \
+	   done;                                                       \
+	   dh_link $${all_h};                                          \
+	 )
+
+#	But install this lot for real.
+	rm -f debian/$(package_headers_msw)/usr/$(cross_host)/include/wx-$(release)/wx/msw
+	dh_install $(objdir_msw_install)/include/wx-$(release)/wx/msw  usr/$(cross_host)/include/wx-$(release)/wx
+
+binary-common:
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs docs/changes.txt
+	dh_installdocs
+	dh_installexamples
+	dh_installmenu
+	dh_link
+	DH_PYCENTRAL=nomove dh_pycentral
+
+	@# Don't strip debug libs at all, and strip cross libs elsewhere
+	@# with the cross host tools until dh_strip gets smarter.
+ifneq (, $(filter -a, $(DH_OPTIONS)))
+	dh_strip -N$(package_gtk_dbg) -N$(package_wxbase_dbg) \
+		 -N$(package_msw_dev) -N$(package_msw_dbg) \
+		 -N$(package_gtk_py_lib) -N$(package_gtk_dbg_py)
+	DH_OPTIONS= dh_strip -p$(package_gtk_py_lib) --dbg-package=$(package_gtk_dbg_py) 
+endif
+	dh_compress -X.py
+	dh_fixperms
+
+	@# 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.
+ifneq ($(DH_OPTIONS),-p$(package_gtk_dbg_py))
+	dh_makeshlibs -N$(package_gtk_py_lib) -V
+endif
+
+	dh_installdeb
+	dh_shlibdeps -ldebian/$(package_wxbase_lib)/usr/lib:debian/$(package_wxbase_dbg)/usr/lib:debian/$(package_gtk_lib)/usr/lib:debian/$(package_gtk_dbg)/usr/lib
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+# 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_all install
+	$(MAKE) -f debian/rules \
+		DH_OPTIONS="-i $(addprefix -N,$(extra_packages))" \
+		binary-common
+
+# Build just the architecture-dependent files here.
+binary-arch: build_arch install_arch
+	$(MAKE) -f debian/rules \
+		DH_OPTIONS="-a $(addprefix -N,$(extra_packages))" \
+		binary-common
+	rm -rf debian/$(package_gtk_dbg_py)/usr/share/doc/$(package_gtk_dbg_py)
+	ln -s $(package_gtk_py_lib) debian/$(package_gtk_dbg_py)/usr/share/doc/$(package_gtk_dbg_py)
+
+# 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_msw_dev) -p$(package_msw_dbg) -p$(package_headers_msw)" \
+		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
+# built from CVS.  Beware that packages produced with these rules may *NOT*
+# be compatible with packages built using the 'binary' target or even with
+# Debian policy.  Do not distribute packages built with these rules, they
+# are currently useful for rapid in-house testing by developers only.
+
+DH_OPTIONS_GTK := -p$(package_wxbase_lib) -p$(package_gtk_lib) -p$(package_headers)
+
+# libwxgtk shared lib package
+binary-gtk: control-files-stamp install-gtk-lib install-wxbase-lib install-headers
+	$(MAKE) -f debian/rules DH_OPTIONS="$(DH_OPTIONS_GTK)" binary-common
+
+binary-gtk-dev: control-files-stamp install-gtk-dev install-wxbase-dev install-headers
+	$(MAKE) -f debian/rules \
+	    DH_OPTIONS="-p$(package_wxbase_dev) -p$(package_gtk_dev) $(DH_OPTIONS_GTK)" \
+	    binary-common
+
+binary-gtk-dbg: control-files-stamp install-gtk-dbg install-wxbase-dbg install-headers
+	$(MAKE) -f debian/rules \
+	    DH_OPTIONS="-p$(package_wxbase_dbg) -p$(package_gtk_dbg) -p$(package_headers)" \
+	    binary-common
+
+
+# docs package
+binary-doc: control-files-stamp install-doc
+	$(MAKE) -f debian/rules DH_OPTIONS=-p$(package_doc) binary-common
+
+binary-fast:control-files-stamp install-gtk-dbg install-msw-dev install-headers install-headers-msw
+	$(MAKE) -f debian/rules DH_OPTIONS="-p$(package_gtk_dbg) -p$(package_msw_dev) -p$(package_headers) -p$(package_headers_msw)" binary-common
+
+.PHONY: build build_all build_arch					\
+	clean clean-py purge-release-py purge-dbg-py			\
+	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 binary-dbg-py				\
+	install install_arch install-gtk-lib install-gtk-dev 		\
+        install-gtk-dbg                                             	\
+	install-gtk-py install-gtk-py-tools install-gtk-py-ver		\
+	install-gtk-py-lib install-gtk-dbg-py				\
+	install-common install-headers install-i18n install-doc         \
+	install-examples install-msw-dev install-msw-dbg install-headers-msw \
+	get-orig-source
--- wxwidgets2.8-2.8.10.1.orig/debian/wx-config.1
+++ wxwidgets2.8-2.8.10.1/debian/wx-config.1
@@ -0,0 +1,157 @@
+.TH wx\-config 1 "29 Sep 2004" "Debian GNU/Linux" "wxWidgets"
+
+.SH NAME
+wx-config \- wxWidgets configuration search and query tool
+
+.SH SYNOPSIS
+.nh
+.HP
+.B wx\-config [ OPTIONS ... ] [ LIB ... ]
+
+.SH DESCRIPTION
+.I wx\-config
+returns information about the wxWidgets libraries available on your system.
+It may be used to retrieve the information you require to build applications
+using these libraries.
+.PP
+Changing the library options you wish to use for an application previously
+involved managing alternative configurations by a system dependent means.
+It is now possible to select from any of the configurations installed
+on your system via this single tool.  You can view all available
+configurations installed in the system default prefix with the command
+.I wx\-config \-\-list
+and select from them by using the feature options described below.
+.PP
+Optional LIB arguments (comma or space separated) may be used to specify
+individually the wxWidgets component libraries that you wish to use,
+or to specify additional components not ususally included by default.
+The magic token
+.B std
+may be used to import all libraries that would be used by default if none
+were specified explicitly.
+.br
+eg.
+.I wx-config --libs std,gizmos
+.hy
+
+.SH OPTIONS
+.l
+\fIwx\-config\fP accepts the following options with no restrictions on
+their order as was required in previous releases:
+
+.SS Installed root
+These options change or query the filesystem root for the operations
+listed below.
+
+.TP 15
+.B  \-\-prefix[=PREFIX]
+Without the optional argument, the current default prefix will be
+output.  If the argument is supplied, PREFIX will be searched for
+matching configs in place of the default.  You may use both forms
+in the same command.
+.TP 15
+.B  \-\-exec\-prefix[=EXEC-PREFIX]
+Similar to \-\-prefix, but acts on the exec-prefix.  If not specified
+will default to the value of prefix.
+
+.SS Query options
+These options return information about the wxWidgets default version
+and and installed alternatives.
+.TP 15
+.B  \-\-list
+List all configs in prefix and show those that match any additional
+feature options given.
+.TP 15
+.B  \-\-release
+Output the wxWidgets release number.
+.TP 15
+.B  \-\-version\-full
+Output the wxWidgets version number in all its glory.
+.TP 15
+.B  \-\-basename
+Output the base name of the wxWidgets libraries.
+.TP 15
+.B  \-\-selected-config
+Output the signature of the selected wxWidgets library.
+This is a string of the form "port-unicode-release-version".
+
+
+.SS Feature options
+These options select features which determine which wxWidgets
+configuration to use.
+
+.TP 15
+.B  \-\-host=HOST
+Specify a (posix extended) regex of host aliases to match for cross
+compiled configurations.  eg. \-\-host=i586-mingw32msvc, \-\-host=.*
+If unspecified, the default is to match only configurations native to
+the build machine.
+.TP 15
+.B  \-\-toolkit=TOOLKIT
+Specify a (posix extended) regex of the toolkits to match.
+The toolkit is responsible for look and feel of the compiled
+application.  eg. gtk, gtk2, motif, msw.
+If unspecified the default is to prefer the system default toolkit,
+but to match any toolkit in the absence of a stricter specification.
+.TP 15
+.B  \-\-version[=VERSION]
+Without the optional argument, return the wxWidgets version.  If the
+argument is supplied it specifies a (posix extended) regex of the
+versions to match.  If unspecified the default is to prefer the system
+default version, but to match any version in the absence of a stricter
+specification.
+.TP 15
+.B  \-\-unicode[=yes|no]]
+Specify the default character type for the application.
+If unspecified, the system default will be preferred, but any type may
+match in the absence of a stricter specification.
+.TP 15
+.B  \-\-debug[=yes|no]]
+Specify whether to create a debug or release build for the application.
+If unspecified, the system default (release) will be preferred, but any
+type may match in the absence of a stricter specification.
+Debug builds should never be uploaded to Debian, but are very useful
+for finding certain common failure idioms.  You are encouraged to use
+them during active development of applications.  They are not binary
+compatible with the release libraries.
+.TP 15
+.B  \-\-static[=yes|no]]
+Specify whether to statically or dynamically link wxWidgets libraries
+into your application.  If unspecified, the system default (dynamic)
+will be preferred, but any type may match in the absence of a stricter
+specification.  Static linking is mainly useful still for cross ports
+not natively supported by Debian, and can be hazardous in conjunction
+with the gtk toolkits.  Note that static libraries are no longer supplied
+in the wxGTK packages any more.
+
+.SS Compiler options
+These options generate output required to build an application using
+a particular wxWidgets configuration.
+
+.TP 15
+.B  \-\-libs
+Output link flags required for a \fIwxWidgets\fP application.
+.TP 15
+.B  \-\-cppflags
+Output parameters required by the C preprocessor.
+.TP 15
+.B  \-\-cflags
+Output parameters required by the C compiler.
+.TP 15
+.B  \-\-cxxflags
+Output parameters required by the C++ compiler.
+.TP 15
+.B  \-\-cc
+Output the name of the C compiler \fB$(CC)\fP.
+.TP 15
+.B  \-\-cxx
+Output the name of the C++ compiler \fB$(CXX)\fP.
+.TP 15
+.B  \-\-ld
+Output the linker command.
+
+.SH COPYRIGHT
+This manpage was written by Ron Lee <ron@debian.org> for the Debian GNU/Linux
+distribution of wxWindows.  It may be freely distributed by anyone who finds
+it useful.
+
--- wxwidgets2.8-2.8.10.1.orig/debian/libwxgtk-dbg.postinst
+++ wxwidgets2.8-2.8.10.1/debian/libwxgtk-dbg.postinst
@@ -0,0 +1,9 @@
+#! /bin/sh
+set -e
+
+update-alternatives --install /usr/bin/wx-config wx-config              \
+			      /usr/lib/wx/config/gtk2-unicode-debug-=V  \
+			      $(( =PRIO * 10 + 6 ))
+
+#DEBHELPER#
+
--- wxwidgets2.8-2.8.10.1.orig/debian/wxrc-tools.1
+++ wxwidgets2.8-2.8.10.1/debian/wxrc-tools.1
@@ -0,0 +1,15 @@
+.TH wxrc\-tools 1 "30 Jul 2004" "Debian GNU/Linux" "wxWindows"
+.SH NAME
+wxrc \- command line compiler for wx xml resources.
+
+.SH DESCRIPTION
+The real documentation for this tool (what of it that exists) is available
+in the wxWindows manual, which is packaged in html format in the wx2.6-doc
+package and installed in /usr/share/doc/wx2.6-doc/wx-manual.html on Debian
+systems.
+
+.SH COPYRIGHT
+This manpage was written by Ron Lee <ron@debian.org> for the Debian GNU/Linux
+distribution of wxWindows.  It may be freely distributed by anyone insane enough
+to find it useful.
+
--- wxwidgets2.8-2.8.10.1.orig/debian/libwxgtk-dev.prerm
+++ wxwidgets2.8-2.8.10.1/debian/libwxgtk-dev.prerm
@@ -0,0 +1,7 @@
+#! /bin/sh
+set -e
+
+update-alternatives --remove wx-config /usr/lib/wx/config/gtk2-unicode-release-=V
+
+#DEBHELPER#
+
--- wxwidgets2.8-2.8.10.1.orig/debian/libwxmsw-dbg.postinst
+++ wxwidgets2.8-2.8.10.1/debian/libwxmsw-dbg.postinst
@@ -0,0 +1,9 @@
+#! /bin/sh
+set -e
+
+update-alternatives --install /usr/bin/wx-config wx-config             \
+			      /usr/lib/wx/config/=H-msw-ansi-debug-=V  \
+			      $(( =PRIO * 10 + 2 ))
+
+#DEBHELPER#
+
--- wxwidgets2.8-2.8.10.1.orig/debian/wxPython-tools.1
+++ wxwidgets2.8-2.8.10.1/debian/wxPython-tools.1
@@ -0,0 +1,35 @@
+.TH wxPython\-tools 1 "3 Jan 2003" "Debian GNU/Linux" "wxWidgets"
+.SH NAME
+img2py \- wxPython tools.
+.br
+img2png \- wxPython tools.
+.br
+img2xpm \- wxPython tools.
+.br
+pycrust \- wxPython tools.
+.br
+pyshell \- wxPython tools.
+.br
+xrced \- wxPython tools.
+.br
+helpviewer \- wxPython tools.
+.br
+pyalacarte \- wxPython tools.
+.br
+pyalamode \- wxPython tools.
+.br
+pywrap \- wxPython tools.
+.br
+pywxrc \- wxPython tools.
+
+.SH DESCRIPTION
+The real documentation for these tools is available in pydoc format.
+
+.SH SEE ALSO
+.BR pydoc (1)
+
+.SH COPYRIGHT
+This manpage was written by Ron Lee <ron@debian.org> for the Debian GNU/Linux
+distribution of wxWidgets.  It may be freely distributed by anyone insane enough
+to find it useful.
+
--- wxwidgets2.8-2.8.10.1.orig/debian/pyshell.desktop
+++ wxwidgets2.8-2.8.10.1/debian/pyshell.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=PyShell
+Comment=GUI Python Shell
+Exec=/usr/bin/pyshell
+Icon=/usr/share/pixmaps/pyshell
+Terminal=false
+Type=Application
+Categories=Development;
+StartupNotify=true
--- wxwidgets2.8-2.8.10.1.orig/debian/copyright
+++ wxwidgets2.8-2.8.10.1/debian/copyright
@@ -0,0 +1,300 @@
+This package was debianized by Ron Lee <ron@debian.org> on
+Sun, 13 Feb 2000 18:40:00 +1030.
+
+more information about wxWindows, as well as the source these debs
+are produced from can be found at http://www.wxwidgets.org/
+
+Note for Debian users:
+======================
+
+Most of the core wxWindows library is licenced under the wxWindows Library
+Licence (included below), however some additional features of the library
+may include source licenced under terms which do not include the exception
+permitting you to licence binary object code versions of works based on the
+Library under terms of your own choice.  At any time and without warning,
+newer versions of the Debian binary packages may include such code.
+
+In short, if you plan to licence apps built against these debs under terms
+compatible with the GPL or LGPL, then you have nothing to worry about.  If
+you wish to release your code under a licence which does not grant all of
+the same rights as the LGPL would assert but would be permitted under the
+terms of the exception, then you are strongly advised to either check the
+licencing terms of all components that these debs (and all future versions
+that you use) are built with, or build your own binaries of wxWindows which
+include only such code as is definitely covered by the exception.
+
+You should presume that these debs will fall under the provisions of the
+unmodified LGPL unless you can prove otherwise, however this note in no way
+alters the actual terms of the authorative licence detailed below, it is
+intended to be purely informative of the fact that the Debian binary packages
+will be built primarily with features useful to Free Software developers and
+may not be suitable "as is" for compiling software for distribution that is
+licenced incompatibly with the LGPL.  See /usr/share/common-licenses for
+the full text of the LGPL.
+
+Modifications and additions to the Library itself are encouraged to be
+placed under the wxWindows Library Licence.  We hope you find it useful.
+
+  -- Ron
+
+-----------------------------------------------------------------------------
+
+Preamble
+========
+
+The licensing of the wxWindows library is intended to protect the wxWindows
+library, its developers, and its users, so that the considerable investment
+it represents is not abused.
+
+Under the terms of the wxWindows Licence, you as a user are not
+obliged to distribute wxWindows source code with your products, if you
+distribute these products in binary form. However, you are prevented from
+restricting use of the library in source code form, or denying others the
+rights to use or distribute wxWindows library source code in the way
+intended.
+
+The wxWindows Licence establishes the copyright for the code and related
+material, and it gives you legal permission to copy, distribute and/or
+modify the library. It also asserts that no warranty is given by the authors
+for this or derived code.
+
+The core distribution of the wxWindows library contains files
+under two different licences:
+
+- Most files are distributed under the GNU Library General Public
+  Licence, version 2, with the special exception that you may create and
+  distribute object code versions built from the source code or modified
+  versions of it (even if these modified versions include code under a
+  different licence), and distribute such binaries under your own
+  terms.
+
+- Most core wxWindows manuals are made available under the "wxWindows
+  Free Documentation Licence", which allows you to distribute modified
+  versions of the manuals, such as versions documenting any modifications
+  made by you in your version of the library. However, you may not restrict
+  any third party from reincorporating your changes into the original
+  manuals.
+
+
+
+                wxWindows Library Licence, Version 3
+                ====================================
+
+  Copyright (c) 1998 Julian Smart, Robert Roebling et al
+
+  Everyone is permitted to copy and distribute verbatim copies
+  of this licence document, but changing it is not allowed.
+
+                       WXWINDOWS LIBRARY LICENCE
+     TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+  
+  This library is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Library General Public Licence as published by
+  the Free Software Foundation; either version 2 of the Licence, or (at
+  your option) any later version.
+  
+  This library is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library
+  General Public Licence for more details.
+
+  You should have received a copy of the GNU Library General Public Licence
+  along with this software, usually in a file named COPYING.LIB.  If not,
+  write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+  Boston, MA 02110-1301, USA.
+
+  EXCEPTION NOTICE
+
+  1. As a special exception, the copyright holders of this library give
+  permission for additional uses of the text contained in this release of
+  the library as licenced under the wxWindows Library Licence, applying
+  either version 3 of the Licence, or (at your option) any later version of
+  the Licence as published by the copyright holders of version 3 of the
+  Licence document.
+
+  2. The exception is that you may use, copy, link, modify and distribute
+  under the user's own terms, binary object code versions of works based
+  on the Library.
+
+  3. If you copy code from files distributed under the terms of the GNU
+  General Public Licence or the GNU Library General Public Licence into a
+  copy of this library, as this licence permits, the exception does not
+  apply to the code that you add in this way.  To avoid misleading anyone as
+  to the status of such modified files, you must delete this exception
+  notice from such code and/or adjust the licensing conditions notice
+  accordingly.
+
+  4. If you write modifications of your own for this library, it is your
+  choice whether to permit this exception to apply to your modifications. 
+  If you do not wish that, you must delete the exception notice from such
+  code and/or adjust the licensing conditions notice accordingly.
+
+
+
+                wxWindows Free Documentation Licence, Version 3
+                ===============================================
+
+  Copyright (c) 1998 Julian Smart, Robert Roebling et al
+
+  Everyone is permitted to copy and distribute verbatim copies
+  of this licence document, but changing it is not allowed.
+   
+                   WXWINDOWS FREE DOCUMENTATION LICENCE
+     TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  1. Permission is granted to make and distribute verbatim copies of this
+  manual or piece of documentation provided any copyright notice and this
+  permission notice are preserved on all copies.
+
+  2. Permission is granted to process this file or document through a
+  document processing system and, at your option and the option of any third
+  party, print the results, provided a printed document carries a copying
+  permission notice identical to this one.
+
+  3. Permission is granted to copy and distribute modified versions of this
+  manual or piece of documentation under the conditions for verbatim
+  copying, provided also that any sections describing licensing conditions
+  for this manual, such as, in particular, the GNU General Public Licence,
+  the GNU Library General Public Licence, and any wxWindows Licence are
+  included exactly as in the original, and provided that the entire
+  resulting derived work is distributed under the terms of a permission
+  notice identical to this one.
+
+  4. Permission is granted to copy and distribute translations of this
+  manual or piece of documentation into another language, under the above
+  conditions for modified versions, except that sections related to
+  licensing, including this paragraph, may also be included in translations
+  approved by the copyright holders of the respective licence documents in
+  addition to the original English.
+
+                            WARRANTY DISCLAIMER
+
+  5. BECAUSE THIS MANUAL OR PIECE OF DOCUMENTATION IS LICENSED FREE OF CHARGE,
+  THERE IS NO WARRANTY FOR IT, TO THE EXTENT PERMITTED BY APPLICABLE LAW. 
+  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER
+  PARTIES PROVIDE THIS MANUAL OR PIECE OF DOCUMENTATION "AS IS" WITHOUT
+  WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT
+  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+  PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF
+  THE MANUAL OR PIECE OF DOCUMENTATION IS WITH YOU.  SHOULD THE MANUAL OR
+  PIECE OF DOCUMENTATION PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL
+  NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  6. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL
+  ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+  REDISTRIBUTE THE MANUAL OR PIECE OF DOCUMENTATION AS PERMITTED ABOVE, BE
+  LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+  CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+  MANUAL OR PIECE OF DOCUMENTATION (INCLUDING BUT NOT LIMITED TO LOSS OF
+  DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+  PARTIES OR A FAILURE OF A PROGRAM BASED ON THE MANUAL OR PIECE OF
+  DOCUMENTATION TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR
+  OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+-----------------------------------------------------------------------------
+
+XRCed is released under the following terms:
+
+Copyright (c) 2002, Roman Rolinsky <rollrom@users.sourceforge.net>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+-----------------------------------------------------------------------------
+
+The files in ./wxPython/wx/tools/Editra/pixmaps/theme/Tango/ (which
+are not used in the resulting .debs) are licensed under the following
+terms:
+
+Creative Commons Attribution-ShareAlike 2.5 License Agreement
+
+CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE.
+
+License
+
+THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
+
+BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
+
+1. Definitions
+
+   1. "Collective Work" means a work, such as a periodical issue, anthology or encyclopedia, in which the Work in its entirety in unmodified form, along with a number of other contributions, constituting separate and independent works in themselves, are assembled into a collective whole. A work that constitutes a Collective Work will not be considered a Derivative Work (as defined below) for the purposes of this License.
+   2. "Derivative Work" means a work based upon the Work or upon the Work and other pre-existing works, such as a translation, musical arrangement, dramatization, fictionalization, motion picture version, sound recording, art reproduction, abridgment, condensation, or any other form in which the Work may be recast, transformed, or adapted, except that a work that constitutes a Collective Work will not be considered a Derivative Work for the purpose of this License. For the avoidance of doubt, where the Work is a musical composition or sound recording, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered a Derivative Work for the purpose of this License.
+   3. "Licensor" means the individual or entity that offers the Work under the terms of this License.
+   4. "Original Author" means the individual or entity who created the Work.
+   5. "Work" means the copyrightable work of authorship offered under the terms of this License.
+   6. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation.
+   7. "License Elements" means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, ShareAlike.
+
+2. Fair Use Rights. Nothing in this license is intended to reduce, limit, or restrict any rights arising from fair use, first sale or other limitations on the exclusive rights of the copyright owner under copyright law or other applicable laws.
+
+3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below:
+
+   1. to reproduce the Work, to incorporate the Work into one or more Collective Works, and to reproduce the Work as incorporated in the Collective Works;
+   2. to create and reproduce Derivative Works;
+   3. to distribute copies or phonorecords of, display publicly, perform publicly, and perform publicly by means of a digital audio transmission the Work including as incorporated in Collective Works;
+   4. to distribute copies or phonorecords of, display publicly, perform publicly, and perform publicly by means of a digital audio transmission Derivative Works.
+   5.
+
+      For the avoidance of doubt, where the work is a musical composition:
+         1. Performance Royalties Under Blanket Licenses. Licensor waives the exclusive right to collect, whether individually or via a performance rights society (e.g. ASCAP, BMI, SESAC), royalties for the public performance or public digital performance (e.g. webcast) of the Work.
+         2. Mechanical Rights and Statutory Royalties. Licensor waives the exclusive right to collect, whether individually or via a music rights society or designated agent (e.g. Harry Fox Agency), royalties for any phonorecord You create from the Work ("cover version") and distribute, subject to the compulsory license created by 17 USC Section 115 of the US Copyright Act (or the equivalent in other jurisdictions).
+   6. Webcasting Rights and Statutory Royalties. For the avoidance of doubt, where the Work is a sound recording, Licensor waives the exclusive right to collect, whether individually or via a performance-rights society (e.g. SoundExchange), royalties for the public digital performance (e.g. webcast) of the Work, subject to the compulsory license created by 17 USC Section 114 of the US Copyright Act (or the equivalent in other jurisdictions).
+
+The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. All rights not expressly granted by Licensor are hereby reserved.
+
+4. Restrictions.The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:
+
+   1. You may distribute, publicly display, publicly perform, or publicly digitally perform the Work only under the terms of this License, and You must include a copy of, or the Uniform Resource Identifier for, this License with every copy or phonorecord of the Work You distribute, publicly display, publicly perform, or publicly digitally perform. You may not offer or impose any terms on the Work that alter or restrict the terms of this License or the recipients' exercise of the rights granted hereunder. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties. You may not distribute, publicly display, publicly perform, or publicly digitally perform the Work with any technological measures that control access or use of the Work in a manner inconsistent with the terms of this License Agreement. The above applies to the Work as incorporated in a Collective Work, but this does not require the Collective Work apart from the Work itself to be made subject to the terms of this License. If You create a Collective Work, upon notice from any Licensor You must, to the extent practicable, remove from the Collective Work any credit as required by clause 4(c), as requested. If You create a Derivative Work, upon notice from any Licensor You must, to the extent practicable, remove from the Derivative Work any credit as required by clause 4(c), as requested.
+   2. You may distribute, publicly display, publicly perform, or publicly digitally perform a Derivative Work only under the terms of this License, a later version of this License with the same License Elements as this License, or a Creative Commons iCommons license that contains the same License Elements as this License (e.g. Attribution-ShareAlike 2.5 Japan). You must include a copy of, or the Uniform Resource Identifier for, this License or other license specified in the previous sentence with every copy or phonorecord of each Derivative Work You distribute, publicly display, publicly perform, or publicly digitally perform. You may not offer or impose any terms on the Derivative Works that alter or restrict the terms of this License or the recipients' exercise of the rights granted hereunder, and You must keep intact all notices that refer to this License and to the disclaimer of warranties. You may not distribute, publicly display, publicly perform, or publicly digitally perform the Derivative Work with any technological measures that control access or use of the Work in a manner inconsistent with the terms of this License Agreement. The above applies to the Derivative Work as incorporated in a Collective Work, but this does not require the Collective Work apart from the Derivative Work itself to be made subject to the terms of this License.
+   3. If you distribute, publicly display, publicly perform, or publicly digitally perform the Work or any Derivative Works or Collective Works, You must keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or (ii) if the Original Author and/or Licensor designate another party or parties (e.g. a sponsor institute, publishing entity, journal) for attribution in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; the title of the Work if supplied; to the extent reasonably practicable, the Uniform Resource Identifier, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and in the case of a Derivative Work, a credit identifying the use of the Work in the Derivative Work (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). Such credit may be implemented in any reasonable manner; provided, however, that in the case of a Derivative Work or Collective Work, at a minimum such credit will appear where any other comparable authorship credit appears and in a manner at least as prominent as such other comparable authorship credit.
+
+5. Representations, Warranties and Disclaimer
+
+UNLESS OTHERWISE AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE MATERIALS, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
+
+6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. Termination
+
+   1. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Derivative Works or Collective Works from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
+   2. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above.
+
+8. Miscellaneous
+
+   1. Each time You distribute or publicly digitally perform the Work or a Collective Work, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License.
+   2. Each time You distribute or publicly digitally perform a Derivative Work, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License.
+   3. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+   4. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.
+   5. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You.
+
+Creative Commons is not a party to this License, and makes no warranty whatsoever in connection with the Work. Creative Commons will not be liable to You or any party on any legal theory for any damages whatsoever, including without limitation any general, special, incidental or consequential damages arising in connection to this license. Notwithstanding the foregoing two (2) sentences, if Creative Commons has expressly identified itself as the Licensor hereunder, it shall have all rights and obligations of Licensor.
+
+Except for the limited purpose of indicating to the public that the Work is licensed under the CCPL, neither party will use the trademark "Creative Commons" or any related trademark or logo of Creative Commons without the prior written consent of Creative Commons. Any permitted use will be in compliance with Creative Commons' then-current trademark usage guidelines, as may be published on its website or otherwise made available upon request from time to time.
+
+Creative Commons may be contacted at http://creativecommons.org/.
+
+
+-----------------------------------------------------------------------------
+
+.orig.tar.gz file is a repacked tarball generated using
+`uscan --repack --rename --download-current-version`.
--- wxwidgets2.8-2.8.10.1.orig/debian/libwxgtk-dev.postinst
+++ wxwidgets2.8-2.8.10.1/debian/libwxgtk-dev.postinst
@@ -0,0 +1,9 @@
+#! /bin/sh
+set -e
+
+update-alternatives --install /usr/bin/wx-config wx-config                \
+			      /usr/lib/wx/config/gtk2-unicode-release-=V  \
+			      $(( =PRIO * 10 + 8 ))
+
+#DEBHELPER#
+
--- wxwidgets2.8-2.8.10.1.orig/debian/README.examples
+++ wxwidgets2.8-2.8.10.1/debian/README.examples
@@ -0,0 +1,24 @@
+
+These examples are provided as extended documentation for the wxWidgets
+package.  If you wish to actually run them rather than just browse them
+as documents you should copy them into a working directory elsewhere
+first.  Note that some of them will attempt to write to the current
+working directory, or to the home directory of the user they are run as.
+
+Some of the files have been compressed in accordance with Debian policy
+regarding documentation, you will need to uncompress such files before
+building or executing them.
+
+The unpack_examples.sh script is provided to assist with that.
+
+The examples provided here typically show a minimal implementation of
+the feature(s) they are demonstrating.  There are examples of more
+complete (mini) applications, available in the /wxPython/samples and
+/demos directories of the wxWidgets cvs repository (which is browsable
+via http://cvs.wxwidgets.org), or of course you can always apt-get the
+source of any wx using package for some less contrived examples of
+real world wx applications.
+
+  Ron
+
+
--- wxwidgets2.8-2.8.10.1.orig/debian/libwxgtk-dbg.prerm
+++ wxwidgets2.8-2.8.10.1/debian/libwxgtk-dbg.prerm
@@ -0,0 +1,7 @@
+#! /bin/sh
+set -e
+
+update-alternatives --remove wx-config /usr/lib/wx/config/gtk2-unicode-debug-=V
+
+#DEBHELPER#
+
--- wxwidgets2.8-2.8.10.1.orig/debian/control.in
+++ wxwidgets2.8-2.8.10.1/debian/control.in
@@ -0,0 +1,263 @@
+Source: wxwidgets=V
+Section: libs
+Priority: optional
+Build-Depends: debhelper (>= 5.0.37.1), flex, bison, gettext, libgtk2.0-dev,
+ python-all (>= 2.5.4-6), python-all-dev (>= 2.5.4-6), python-all-dbg (>= 2.5.4-6), python-central,
+ zlib1g-dev, libjpeg62-dev, libpng12-dev, libtiff4-dev, libsm-dev,
+ libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libesd0-dev,
+ libgnomeprintui2.2-dev, bc, quilt, autotools-dev, libexpat1-dev,
+ binutils (>= 2.19.51.20090827) | binutils (<= 2.18.1~cvs20080103-7)
+Maintainer: wxWidgets Maintainers <freewx-maint@lists.alioth.debian.org>
+Uploaders: Ryan Niebur <ryan@debian.org>, Ron Lee <ron@debian.org>
+XS-Python-Version: all
+Standards-Version: 3.8.3
+Vcs-Git: git://git.debian.org/git/freewx/wx.git
+Vcs-Browser: http://git.debian.org/?p=freewx/wx.git
+Homepage: http://www.wxwidgets.org/
+
+Package: libwxbase=SOV=U
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: wxBase library (runtime) - non-GUI support classes of wxWidgets toolkit
+ wxBase is a collection of C++ classes providing basic data structures
+ (strings, lists, arrays), powerful wxDateTime class for date manipulations,
+ portable wrappers around many OS-specific functions allowing to build the
+ same program under all supported folders, wxThread class for writing
+ multithreaded programs using either Win32 or POSIX threads and much more.
+ wxBase currently supports the following platforms: Generic Unix (Linux,
+ FreeBSD, Solaris, HP-UX, ...), win32, and BeOS.
+ .
+ This package is only useful for non-GUI apps.  It offers a subset of the
+ classes in libwx_gtk=V=U for use in console apps and daemons.  You do not need
+ this package to build or use wxWidgets GUI apps.
+
+Package: libwxbase=V=U-dev
+Architecture: any
+Section: libdevel
+Depends: wx=V-headers (= ${binary:Version}), libwxbase=SOV=U (= ${binary:Version}), libc6-dev | libc-dev
+Suggests: wx=V-doc, gettext
+Description: wxBase library (development) - non-GUI support classes of wxWidgets toolkit
+ wxBase is a collection of C++ classes providing basic data structures
+ (strings, lists, arrays), powerful wxDateTime class for date manipulations,
+ portable wrappers around many OS-specific functions allowing to build the
+ same program under all supported folders, wxThread class for writing
+ multithreaded programs using either Win32 or POSIX threads and much more.
+ wxBase currently supports the following platforms: Generic Unix (Linux,
+ FreeBSD, Solaris, HP-UX, ...), win32, and BeOS.
+ .
+ This package provides the files needed to compile apps using the wxBase
+ library.
+
+Package: libwxbase=V=U-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: wx=V-headers (= ${binary:Version}), libc6-dev
+Description: wxBase library (debug) - non-GUI support classes of wxWidgets toolkit
+ wxBase is a collection of C++ classes providing basic data structures
+ (strings, lists, arrays), powerful wxDateTime class for date manipulations,
+ portable wrappers around many OS-specific functions allowing to build the
+ same program under all supported folders, wxThread class for writing
+ multithreaded programs using either Win32 or POSIX threads and much more.
+ wxBase currently supports the following platforms: Generic Unix (Linux,
+ FreeBSD, Solaris, HP-UX, ...) win32, and BeOS.
+ .
+ This package provides a debug version of the wxBase library.  It is compiled
+ both with -g for normal debugger tracing and with the __WXDEBUG__ flag which
+ provides many internal checks by wxWidgets itself that are not performed on
+ apps compiled with the 'release version' libs in the -dev package.
+
+Package: libwxgtk=SOV=U
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: libgnomeprintui2.2-0
+Description: wxWidgets Cross-platform C++ GUI toolkit (GTK+ runtime)
+ 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 the shared libraries needed to run programs linked
+ against wxWidgets.  To use the (optional) glcanvas library you will need
+ to have Mesa or OpenGL installed.
+
+Package: libwxgtk=V=U-dev
+Architecture: any
+Section: libdevel
+Depends: wx=V-headers (= ${binary:Version}), libwxgtk=SOV=U (= ${binary:Version}), libwxbase=V=U-dev (= ${binary:Version})
+Suggests: wx-common, wx=V-doc, libstdc++-dev, gettext, libgl1-mesa-dev | xlibmesa-gl-dev | libgl-dev, xlibmesa-glu-dev | libglu-dev
+Description: wxWidgets Cross-platform C++ GUI toolkit (GTK+ development)
+ 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).
+ .
+ This package provides files needed to compile wxWidgets programs.  If you
+ want to compile apps using the (optional) glcanvas library you will need
+ to have Mesa or OpenGL installed too.
+ .
+ This package also provides the wx-config script.
+
+Package: libwxgtk=V=U-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: ${shlibs:Depends}, wx=V-headers (= ${binary:Version}), libwxbase=V=U-dbg (= ${binary:Version})
+Description: wxWidgets Cross-platform C++ GUI toolkit (GTK+ debug)
+ 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).
+ .
+ This package provides a debug version of the wxGTK library.  It is compiled
+ both with -g for normal debugger tracing and with the __WXDEBUG__ flag which
+ provides many internal checks by wxWidgets itself that are not performed on
+ apps compiled with the 'release version' libs in the -dev package.
+
+Package: python-wxgtk=V=U
+Architecture: any
+Homepage: http://www.wxpython.org/
+Section: python
+Depends: python-wxversion (>= 2.6.3.2.2-2), ${python:Depends}, ${shlibs:Depends}
+Suggests: wx=V-doc, wx=V-examples, python-xml, editra
+Conflicts: libwxgtk2.6-0-python, wxpython2.6-0, python-wxaddons
+Replaces: libwxgtk2.6-0-python, wxpython2.6-0
+Provides: ${python:Provides}
+XB-Python-Version: ${python:Versions}
+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).
+ .
+ This package provides a Python binding to the wxGTK library and the
+ wxPython runtime support libraries.  If you wish to use xrc you'll also
+ need the python-xml package installed.
+
+Package: python-wxgtk=V=U-dbg
+Homepage: http://www.wxpython.org/
+Priority: extra
+Architecture: any
+Section: debug
+Depends: python-wxgtk=V=U (= ${binary:Version}), python-dbg, ${shlibs:Depends}
+Suggests: python-xml-dbg
+Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython binding, debug version)
+ wxWidgets 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.
+ This package contains the extensions built for the Python debug interpreter.
+
+Package: python-wxversion
+Homepage: http://www.wxpython.org/
+Architecture: all
+Section: python
+Depends: ${python:Depends}
+Conflicts: wxpython2.6-0, python-wxgtk2.8 (<< 2.8.6.1-0ubuntu2), python-wxgtk2.6 (<< 2.6.3.2.2-1ubuntu2), python-wxgtk2.4 (<< 2.4.5.1.2)
+Replaces: wxpython2.6-0
+XB-Python-Version: ${python:Versions}
+Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython version selector)
+ 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).
+ .
+ This package provides the wxPython version selector.
+
+Package: python-wxtools
+Homepage: http://www.wxpython.org/
+Architecture: all
+Section: python
+Depends: python-wxgtk=V=U, ${python:Depends}
+Conflicts: wxpython2.6-0
+Replaces: wxpython2.6-0, libwxgtk2.4-python, wxpython2.4-1
+XB-Python-Version: ${python:Versions}
+Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython common files)
+ 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).
+ .
+ This package provides support utilities and common files for wxPython=V=U.
+ If you wish to use xrced you'll also need the python-xml package installed.
+
+Package: wx-common
+Architecture: any
+Section: devel
+Depends: ${shlibs:Depends}
+Conflicts: wx2.6-common
+Replaces: wxwin2.4-headers, libwxgtk2.4-contrib-dev, wx2.6-common
+Description: wxWidgets Cross-platform C++ GUI toolkit (common support files)
+ 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).
+ .
+ This package provides common support files not bound to any
+ particular wxWidgets release, such as font metrics required by some
+ ports, and miscellaneous developer aids and binary utilities.
+
+Package: wx=V-headers
+Architecture: any
+Section: devel
+Description: wxWidgets Cross-platform C++ GUI toolkit (header files)
+ 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).
+ .
+ This package provides the common header files required to build applications
+ using the wxWidgets toolkit.
+
+Package: wx=V-i18n
+Architecture: all
+Conflicts: wx-i18n, wxwin-i18n, wx2.4-i18n
+Replaces: wx-i18n, wxwin-i18n, wx2.4-i18n, wx2.5-i18n
+Provides: wx-i18n
+Section: localization
+Description: wxWidgets Cross-platform C++ GUI toolkit (i18n support)
+ 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).
+ .
+ This package provides the i18n message catalogs for wxWidgets.
+
+Package: wx=V-doc
+Architecture: all
+Section: doc
+Provides: wx-doc
+Suggests: doc-base, www-browser
+Description: wxWidgets Cross-platform C++ GUI toolkit (documentation)
+ 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).
+ .
+ This package provides a HTML version of the wxWidgets reference manual.
+
+Package: wx=V-examples
+Architecture: all
+Section: devel
+Suggests: libwxgtk=V=U-dev (= ${binary:Version}), wx=V-doc
+Description: wxWidgets Cross-platform C++ GUI toolkit (examples)
+ 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).
+ .
+ This package contains examples of using the wxWidgets toolkit in
+ C++ and with the wxPython language binding.
+
+Package: libwxmsw=V=U-dev
+Architecture: i386
+Section: otherosfs
+Depends: wx=V-headers-msw (= ${binary:Version})
+Description: wxMSW mingw32msvc-cross
+ mingw32msvc-cross wxMSW libs.
+
+Package: libwxmsw=V=U-dbg
+Architecture: i386
+Section: otherosfs
+Depends: wx=V-headers-msw (= ${binary:Version})
+Description: wxMSW mingw32msvc-cross (debug)
+ mingw32msvc-cross wxMSW libs.
+ __WXDEBUG__ version.
+
+Package: wx=V-headers-msw
+Architecture: i386
+Section: otherosfs
+Depends: wx=V-headers (= ${binary:Version})
+Description: Extra wxWidgets headers for mingw32msvc-cross
+ Headers required by the wxWidgets mingw32msvc-cross libraries.
+
--- wxwidgets2.8-2.8.10.1.orig/debian/libwxbase-dbg.postinst
+++ wxwidgets2.8-2.8.10.1/debian/libwxbase-dbg.postinst
@@ -0,0 +1,9 @@
+#! /bin/sh
+set -e
+
+update-alternatives --install /usr/bin/wx-config wx-config             \
+			      /usr/lib/wx/config/base-unicode-debug-=V \
+			      $(( =PRIO * 10 + 5 ))
+
+#DEBHELPER#
+
--- wxwidgets2.8-2.8.10.1.orig/debian/wx-examples.examples
+++ wxwidgets2.8-2.8.10.1/debian/wx-examples.examples
@@ -0,0 +1,5 @@
+debian/README.examples
+debian/unpack_examples.sh
+docs/examples/samples
+docs/examples/wxPython
+
--- wxwidgets2.8-2.8.10.1.orig/debian/compat
+++ wxwidgets2.8-2.8.10.1/debian/compat
@@ -0,0 +1 @@
+5
--- wxwidgets2.8-2.8.10.1.orig/debian/xrced.xpm
+++ wxwidgets2.8-2.8.10.1/debian/xrced.xpm
@@ -0,0 +1,55 @@
+/* XPM */
+static char * xrced_xpm[] = {
+"32 32 20 1",
+" 	c None",
+".	c #F8FCF8",
+"+	c #C0C4C0",
+"@	c #505450",
+"#	c #E0E0E0",
+"$	c #707070",
+"%	c #888C88",
+"&	c #A8A8A8",
+"*	c #383838",
+"=	c #000000",
+"-	c #181C18",
+";	c #E0E0F8",
+">	c #A8A8F8",
+",	c #0000F8",
+"'	c #7070F8",
+")	c #5054F8",
+"!	c #888CF8",
+"~	c #C0C4F8",
+"{	c #181CF8",
+"]	c #3838F8",
+"................................",
+"................................",
+".+@@#..$@+.%@@@@@%#....%@@@&....",
+"..*=$.%==..@======@...-=====$...",
+"..+=-+-=+..@=&..#==..%=@+.+==+..",
+"...*=*=@...@=&...==..@=&...@=@..",
+"...#===+...@=$&&@=$.&==.........",
+"....-==....@======#.&==.........",
+"...+===&...@=$&&*=$.&==.........",
+"..#*=@=-...@=&..&=@..@=%...*=@..",
+"..%=@.-=@..@=&..&=@..&=*+.+==...",
+".+-=+.+==#.@=&..&=*...$=====&...",
+".%@@...$@&.%@+..#@@....%@@@&....",
+"................................",
+"................................",
+".......................;>>......",
+".......................>,,......",
+".......................>,,......",
+".......................>,,......",
+".........>'))!~...;'))'>,,......",
+"........~,,,,,{...',,,,],,......",
+"........,,]>>,,).>,,'>',,,......",
+".......>,{~..),,>),]...],,......",
+".......>,,,,,,,,>),>...>,,......",
+".......>,{))))))~),>...>,,......",
+".......>,];..~>~.),'...',,......",
+".......;,,'..{,).!,,~.~,,,......",
+"........',,,,,,..;],,,,',,......",
+".........>],,>....;],,>>,,......",
+"................................",
+"................................",
+"................................"};
--- wxwidgets2.8-2.8.10.1.orig/debian/control
+++ wxwidgets2.8-2.8.10.1/debian/control
@@ -0,0 +1,263 @@
+Source: wxwidgets2.8
+Section: libs
+Priority: optional
+Build-Depends: debhelper (>= 5.0.37.1), flex, bison, gettext, libgtk2.0-dev,
+ python-all (>= 2.5.4-6), python-all-dev (>= 2.5.4-6), python-all-dbg (>= 2.5.4-6), python-central,
+ zlib1g-dev, libjpeg62-dev, libpng12-dev, libtiff4-dev, libsm-dev,
+ libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libesd0-dev,
+ libgnomeprintui2.2-dev, bc, quilt, autotools-dev, libexpat1-dev,
+ binutils (>= 2.19.51.20090827) | binutils (<= 2.18.1~cvs20080103-7)
+Maintainer: wxWidgets Maintainers <freewx-maint@lists.alioth.debian.org>
+Uploaders: Ryan Niebur <ryan@debian.org>, Ron Lee <ron@debian.org>
+XS-Python-Version: all
+Standards-Version: 3.8.3
+Vcs-Git: git://git.debian.org/git/freewx/wx.git
+Vcs-Browser: http://git.debian.org/?p=freewx/wx.git
+Homepage: http://www.wxwidgets.org/
+
+Package: libwxbase2.8-0
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: wxBase library (runtime) - non-GUI support classes of wxWidgets toolkit
+ wxBase is a collection of C++ classes providing basic data structures
+ (strings, lists, arrays), powerful wxDateTime class for date manipulations,
+ portable wrappers around many OS-specific functions allowing to build the
+ same program under all supported folders, wxThread class for writing
+ multithreaded programs using either Win32 or POSIX threads and much more.
+ wxBase currently supports the following platforms: Generic Unix (Linux,
+ FreeBSD, Solaris, HP-UX, ...), win32, and BeOS.
+ .
+ This package is only useful for non-GUI apps.  It offers a subset of the
+ classes in libwx_gtk2.8 for use in console apps and daemons.  You do not need
+ this package to build or use wxWidgets GUI apps.
+
+Package: libwxbase2.8-dev
+Architecture: any
+Section: libdevel
+Depends: wx2.8-headers (= ${binary:Version}), libwxbase2.8-0 (= ${binary:Version}), libc6-dev | libc-dev
+Suggests: wx2.8-doc, gettext
+Description: wxBase library (development) - non-GUI support classes of wxWidgets toolkit
+ wxBase is a collection of C++ classes providing basic data structures
+ (strings, lists, arrays), powerful wxDateTime class for date manipulations,
+ portable wrappers around many OS-specific functions allowing to build the
+ same program under all supported folders, wxThread class for writing
+ multithreaded programs using either Win32 or POSIX threads and much more.
+ wxBase currently supports the following platforms: Generic Unix (Linux,
+ FreeBSD, Solaris, HP-UX, ...), win32, and BeOS.
+ .
+ This package provides the files needed to compile apps using the wxBase
+ library.
+
+Package: libwxbase2.8-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: wx2.8-headers (= ${binary:Version}), libc6-dev
+Description: wxBase library (debug) - non-GUI support classes of wxWidgets toolkit
+ wxBase is a collection of C++ classes providing basic data structures
+ (strings, lists, arrays), powerful wxDateTime class for date manipulations,
+ portable wrappers around many OS-specific functions allowing to build the
+ same program under all supported folders, wxThread class for writing
+ multithreaded programs using either Win32 or POSIX threads and much more.
+ wxBase currently supports the following platforms: Generic Unix (Linux,
+ FreeBSD, Solaris, HP-UX, ...) win32, and BeOS.
+ .
+ This package provides a debug version of the wxBase library.  It is compiled
+ both with -g for normal debugger tracing and with the __WXDEBUG__ flag which
+ provides many internal checks by wxWidgets itself that are not performed on
+ apps compiled with the 'release version' libs in the -dev package.
+
+Package: libwxgtk2.8-0
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: libgnomeprintui2.2-0
+Description: wxWidgets Cross-platform C++ GUI toolkit (GTK+ runtime)
+ 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 the shared libraries needed to run programs linked
+ against wxWidgets.  To use the (optional) glcanvas library you will need
+ to have Mesa or OpenGL installed.
+
+Package: libwxgtk2.8-dev
+Architecture: any
+Section: libdevel
+Depends: wx2.8-headers (= ${binary:Version}), libwxgtk2.8-0 (= ${binary:Version}), libwxbase2.8-dev (= ${binary:Version})
+Suggests: wx-common, wx2.8-doc, libstdc++-dev, gettext, libgl1-mesa-dev | xlibmesa-gl-dev | libgl-dev, xlibmesa-glu-dev | libglu-dev
+Description: wxWidgets Cross-platform C++ GUI toolkit (GTK+ development)
+ 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).
+ .
+ This package provides files needed to compile wxWidgets programs.  If you
+ want to compile apps using the (optional) glcanvas library you will need
+ to have Mesa or OpenGL installed too.
+ .
+ This package also provides the wx-config script.
+
+Package: libwxgtk2.8-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: ${shlibs:Depends}, wx2.8-headers (= ${binary:Version}), libwxbase2.8-dbg (= ${binary:Version})
+Description: wxWidgets Cross-platform C++ GUI toolkit (GTK+ debug)
+ 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).
+ .
+ This package provides a debug version of the wxGTK library.  It is compiled
+ both with -g for normal debugger tracing and with the __WXDEBUG__ flag which
+ provides many internal checks by wxWidgets itself that are not performed on
+ apps compiled with the 'release version' libs in the -dev package.
+
+Package: python-wxgtk2.8
+Architecture: any
+Homepage: http://www.wxpython.org/
+Section: python
+Depends: python-wxversion (>= 2.6.3.2.2-2), ${python:Depends}, ${shlibs:Depends}
+Suggests: wx2.8-doc, wx2.8-examples, python-xml, editra
+Conflicts: libwxgtk2.6-0-python, wxpython2.6-0, python-wxaddons
+Replaces: libwxgtk2.6-0-python, wxpython2.6-0
+Provides: ${python:Provides}
+XB-Python-Version: ${python:Versions}
+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).
+ .
+ This package provides a Python binding to the wxGTK library and the
+ wxPython runtime support libraries.  If you wish to use xrc you'll also
+ need the python-xml package installed.
+
+Package: python-wxgtk2.8-dbg
+Homepage: http://www.wxpython.org/
+Priority: extra
+Architecture: any
+Section: debug
+Depends: python-wxgtk2.8 (= ${binary:Version}), python-dbg, ${shlibs:Depends}
+Suggests: python-xml-dbg
+Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython binding, debug version)
+ wxWidgets is a class library for C++ providing GUI (Graphical User
+ Interface) and other facilities on more than one platform.  Version 2.8
+ currently supports subsets of GTK+, Motif, and MS Windows.
+ .
+ This package provides a Python binding to the wxGTK debug library.
+ This package contains the extensions built for the Python debug interpreter.
+
+Package: python-wxversion
+Homepage: http://www.wxpython.org/
+Architecture: all
+Section: python
+Depends: ${python:Depends}
+Conflicts: wxpython2.6-0, python-wxgtk2.8 (<< 2.8.6.1-0ubuntu2), python-wxgtk2.6 (<< 2.6.3.2.2-1ubuntu2), python-wxgtk2.4 (<< 2.4.5.1.2)
+Replaces: wxpython2.6-0
+XB-Python-Version: ${python:Versions}
+Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython version selector)
+ 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).
+ .
+ This package provides the wxPython version selector.
+
+Package: python-wxtools
+Homepage: http://www.wxpython.org/
+Architecture: all
+Section: python
+Depends: python-wxgtk2.8, ${python:Depends}
+Conflicts: wxpython2.6-0
+Replaces: wxpython2.6-0, libwxgtk2.4-python, wxpython2.4-1
+XB-Python-Version: ${python:Versions}
+Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython common files)
+ 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).
+ .
+ This package provides support utilities and common files for wxPython2.8.
+ If you wish to use xrced you'll also need the python-xml package installed.
+
+Package: wx-common
+Architecture: any
+Section: devel
+Depends: ${shlibs:Depends}
+Conflicts: wx2.6-common
+Replaces: wxwin2.4-headers, libwxgtk2.4-contrib-dev, wx2.6-common
+Description: wxWidgets Cross-platform C++ GUI toolkit (common support files)
+ 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).
+ .
+ This package provides common support files not bound to any
+ particular wxWidgets release, such as font metrics required by some
+ ports, and miscellaneous developer aids and binary utilities.
+
+Package: wx2.8-headers
+Architecture: any
+Section: devel
+Description: wxWidgets Cross-platform C++ GUI toolkit (header files)
+ 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).
+ .
+ This package provides the common header files required to build applications
+ using the wxWidgets toolkit.
+
+Package: wx2.8-i18n
+Architecture: all
+Conflicts: wx-i18n, wxwin-i18n, wx2.4-i18n
+Replaces: wx-i18n, wxwin-i18n, wx2.4-i18n, wx2.5-i18n
+Provides: wx-i18n
+Section: localization
+Description: wxWidgets Cross-platform C++ GUI toolkit (i18n support)
+ 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).
+ .
+ This package provides the i18n message catalogs for wxWidgets.
+
+Package: wx2.8-doc
+Architecture: all
+Section: doc
+Provides: wx-doc
+Suggests: doc-base, www-browser
+Description: wxWidgets Cross-platform C++ GUI toolkit (documentation)
+ 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).
+ .
+ This package provides a HTML version of the wxWidgets reference manual.
+
+Package: wx2.8-examples
+Architecture: all
+Section: devel
+Suggests: libwxgtk2.8-dev (= ${binary:Version}), wx2.8-doc
+Description: wxWidgets Cross-platform C++ GUI toolkit (examples)
+ 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).
+ .
+ This package contains examples of using the wxWidgets toolkit in
+ C++ and with the wxPython language binding.
+
+Package: libwxmsw2.8-dev
+Architecture: i386
+Section: otherosfs
+Depends: wx2.8-headers-msw (= ${binary:Version})
+Description: wxMSW mingw32msvc-cross
+ mingw32msvc-cross wxMSW libs.
+
+Package: libwxmsw2.8-dbg
+Architecture: i386
+Section: otherosfs
+Depends: wx2.8-headers-msw (= ${binary:Version})
+Description: wxMSW mingw32msvc-cross (debug)
+ mingw32msvc-cross wxMSW libs.
+ __WXDEBUG__ version.
+
+Package: wx2.8-headers-msw
+Architecture: i386
+Section: otherosfs
+Depends: wx2.8-headers (= ${binary:Version})
+Description: Extra wxWidgets headers for mingw32msvc-cross
+ Headers required by the wxWidgets mingw32msvc-cross libraries.
+
--- wxwidgets2.8-2.8.10.1.orig/debian/patches/fix-config-scripts
+++ wxwidgets2.8-2.8.10.1/debian/patches/fix-config-scripts
@@ -0,0 +1,2009 @@
+so that they don't need to be updated.
+
+--- a/config.guess
++++ b/config.guess
+@@ -1,9 +1,10 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
++#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
++#   Free Software Foundation, Inc.
+ 
+-timestamp='2004-08-13'
++timestamp='2009-06-10'
+ 
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -17,13 +18,15 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+ # configuration script generated by Autoconf, you may include it under
+ # the same distribution terms that you use for the rest of that program.
+ 
++
+ # Originally written by Per Bothner <per@bothner.com>.
+ # Please send patches to <config-patches@gnu.org>.  Submit a context
+ # diff and a properly formatted ChangeLog entry.
+@@ -53,8 +56,8 @@
+ GNU config.guess ($timestamp)
+ 
+ Originally written by Per Bothner.
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+-Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
++2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ 
+ This is free software; see the source for copying conditions.  There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -66,11 +69,11 @@
+ while test $# -gt 0 ; do
+   case $1 in
+     --time-stamp | --time* | -t )
+-       echo "$timestamp" ; exit 0 ;;
++       echo "$timestamp" ; exit ;;
+     --version | -v )
+-       echo "$version" ; exit 0 ;;
++       echo "$version" ; exit ;;
+     --help | --h* | -h )
+-       echo "$usage"; exit 0 ;;
++       echo "$usage"; exit ;;
+     -- )     # Stop option processing
+        shift; break ;;
+     - )	# Use stdin as input.
+@@ -104,7 +107,7 @@
+ trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+ trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+ : ${TMPDIR=/tmp} ;
+- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
++ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+  { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+  { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+@@ -123,7 +126,7 @@
+ 	;;
+  ,,*)   CC_FOR_BUILD=$CC ;;
+  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+-esac ;'
++esac ; set_cc_for_build= ;'
+ 
+ # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+ # (ghazi@noc.rutgers.edu 1994-08-24)
+@@ -158,6 +161,7 @@
+ 	    arm*) machine=arm-unknown ;;
+ 	    sh3el) machine=shl-unknown ;;
+ 	    sh3eb) machine=sh-unknown ;;
++	    sh5el) machine=sh5le-unknown ;;
+ 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+ 	esac
+ 	# The Operating System including object format, if it has switched
+@@ -166,7 +170,7 @@
+ 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+ 		eval $set_cc_for_build
+ 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+-			| grep __ELF__ >/dev/null
++			| grep -q __ELF__
+ 		then
+ 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+ 		    # Return netbsd for either.  FIX?
+@@ -196,55 +200,23 @@
+ 	# contains redundant information, the shorter form:
+ 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+ 	echo "${machine}-${os}${release}"
+-	exit 0 ;;
+-    amd64:OpenBSD:*:*)
+-	echo x86_64-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
+-    amiga:OpenBSD:*:*)
+-	echo m68k-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
+-    cats:OpenBSD:*:*)
+-	echo arm-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
+-    hp300:OpenBSD:*:*)
+-	echo m68k-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
+-    luna88k:OpenBSD:*:*)
+-    	echo m88k-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
+-    mac68k:OpenBSD:*:*)
+-	echo m68k-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
+-    macppc:OpenBSD:*:*)
+-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
+-    mvme68k:OpenBSD:*:*)
+-	echo m68k-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
+-    mvme88k:OpenBSD:*:*)
+-	echo m88k-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
+-    mvmeppc:OpenBSD:*:*)
+-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
+-    sgi:OpenBSD:*:*)
+-	echo mips64-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
+-    sun3:OpenBSD:*:*)
+-	echo m68k-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     *:OpenBSD:*:*)
+-	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
++	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
++	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
++	exit ;;
+     *:ekkoBSD:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
++    *:SolidBSD:*:*)
++	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
++	exit ;;
+     macppc:MirBSD:*:*)
+-	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+-	exit 0 ;;
++	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
++	exit ;;
+     *:MirBSD:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     alpha:OSF1:*:*)
+ 	case $UNAME_RELEASE in
+ 	*4.0)
+@@ -297,37 +269,43 @@
+ 	# A Xn.n version is an unreleased experimental baselevel.
+ 	# 1.2 uses "1.2" for uname -r.
+ 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+-	exit 0 ;;
++	exit ;;
+     Alpha\ *:Windows_NT*:*)
+ 	# How do we know it's Interix rather than the generic POSIX subsystem?
+ 	# Should we change UNAME_MACHINE based on the output of uname instead
+ 	# of the specific Alpha model?
+ 	echo alpha-pc-interix
+-	exit 0 ;;
++	exit ;;
+     21064:Windows_NT:50:3)
+ 	echo alpha-dec-winnt3.5
+-	exit 0 ;;
++	exit ;;
+     Amiga*:UNIX_System_V:4.0:*)
+ 	echo m68k-unknown-sysv4
+-	exit 0;;
++	exit ;;
+     *:[Aa]miga[Oo][Ss]:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-amigaos
+-	exit 0 ;;
++	exit ;;
+     *:[Mm]orph[Oo][Ss]:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-morphos
+-	exit 0 ;;
++	exit ;;
+     *:OS/390:*:*)
+ 	echo i370-ibm-openedition
+-	exit 0 ;;
++	exit ;;
++    *:z/VM:*:*)
++	echo s390-ibm-zvmoe
++	exit ;;
+     *:OS400:*:*)
+         echo powerpc-ibm-os400
+-	exit 0 ;;
++	exit ;;
+     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+ 	echo arm-acorn-riscix${UNAME_RELEASE}
+-	exit 0;;
++	exit ;;
++    arm:riscos:*:*|arm:RISCOS:*:*)
++	echo arm-unknown-riscos
++	exit ;;
+     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+ 	echo hppa1.1-hitachi-hiuxmpp
+-	exit 0;;
++	exit ;;
+     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+ 	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+ 	if test "`(/bin/universe) 2>/dev/null`" = att ; then
+@@ -335,32 +313,48 @@
+ 	else
+ 		echo pyramid-pyramid-bsd
+ 	fi
+-	exit 0 ;;
++	exit ;;
+     NILE*:*:*:dcosx)
+ 	echo pyramid-pyramid-svr4
+-	exit 0 ;;
++	exit ;;
+     DRS?6000:unix:4.0:6*)
+ 	echo sparc-icl-nx6
+-	exit 0 ;;
+-    DRS?6000:UNIX_SV:4.2*:7*)
++	exit ;;
++    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
+ 	case `/usr/bin/uname -p` in
+-	    sparc) echo sparc-icl-nx7 && exit 0 ;;
++	    sparc) echo sparc-icl-nx7; exit ;;
+ 	esac ;;
++    s390x:SunOS:*:*)
++	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++	exit ;;
+     sun4H:SunOS:5.*:*)
+ 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+-	exit 0 ;;
++	exit ;;
+     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+ 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+-	exit 0 ;;
+-    i86pc:SunOS:5.*:*)
+-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+-	exit 0 ;;
++	exit ;;
++    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
++	eval $set_cc_for_build
++	SUN_ARCH="i386"
++	# If there is a compiler, see if it is configured for 64-bit objects.
++	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
++	# This test works for both compilers.
++	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
++	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
++		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
++		grep IS_64BIT_ARCH >/dev/null
++	    then
++		SUN_ARCH="x86_64"
++	    fi
++	fi
++	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++	exit ;;
+     sun4*:SunOS:6*:*)
+ 	# According to config.sub, this is the proper way to canonicalize
+ 	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
+ 	# it's likely to be more like Solaris than SunOS4.
+ 	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+-	exit 0 ;;
++	exit ;;
+     sun4*:SunOS:*:*)
+ 	case "`/usr/bin/arch -k`" in
+ 	    Series*|S4*)
+@@ -369,10 +363,10 @@
+ 	esac
+ 	# Japanese Language versions have a version number like `4.1.3-JL'.
+ 	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+-	exit 0 ;;
++	exit ;;
+     sun3*:SunOS:*:*)
+ 	echo m68k-sun-sunos${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     sun*:*:4.2BSD:*)
+ 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+ 	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+@@ -384,10 +378,10 @@
+ 		echo sparc-sun-sunos${UNAME_RELEASE}
+ 		;;
+ 	esac
+-	exit 0 ;;
++	exit ;;
+     aushp:SunOS:*:*)
+ 	echo sparc-auspex-sunos${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     # The situation for MiNT is a little confusing.  The machine name
+     # can be virtually everything (everything which is not
+     # "atarist" or "atariste" at least should have a processor
+@@ -398,40 +392,40 @@
+     # be no problem.
+     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+         echo m68k-atari-mint${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+ 	echo m68k-atari-mint${UNAME_RELEASE}
+-        exit 0 ;;
++        exit ;;
+     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+         echo m68k-atari-mint${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+         echo m68k-milan-mint${UNAME_RELEASE}
+-        exit 0 ;;
++        exit ;;
+     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+         echo m68k-hades-mint${UNAME_RELEASE}
+-        exit 0 ;;
++        exit ;;
+     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+         echo m68k-unknown-mint${UNAME_RELEASE}
+-        exit 0 ;;
++        exit ;;
+     m68k:machten:*:*)
+ 	echo m68k-apple-machten${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     powerpc:machten:*:*)
+ 	echo powerpc-apple-machten${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     RISC*:Mach:*:*)
+ 	echo mips-dec-mach_bsd4.3
+-	exit 0 ;;
++	exit ;;
+     RISC*:ULTRIX:*:*)
+ 	echo mips-dec-ultrix${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     VAX*:ULTRIX*:*:*)
+ 	echo vax-dec-ultrix${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     2020:CLIX:*:* | 2430:CLIX:*:*)
+ 	echo clipper-intergraph-clix${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     mips:*:*:UMIPS | mips:*:*:RISCos)
+ 	eval $set_cc_for_build
+ 	sed 's/^	//' << EOF >$dummy.c
+@@ -455,32 +449,33 @@
+ 	  exit (-1);
+ 	}
+ EOF
+-	$CC_FOR_BUILD -o $dummy $dummy.c \
+-	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+-	  && exit 0
++	$CC_FOR_BUILD -o $dummy $dummy.c &&
++	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
++	  SYSTEM_NAME=`$dummy $dummyarg` &&
++	    { echo "$SYSTEM_NAME"; exit; }
+ 	echo mips-mips-riscos${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     Motorola:PowerMAX_OS:*:*)
+ 	echo powerpc-motorola-powermax
+-	exit 0 ;;
++	exit ;;
+     Motorola:*:4.3:PL8-*)
+ 	echo powerpc-harris-powermax
+-	exit 0 ;;
++	exit ;;
+     Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+ 	echo powerpc-harris-powermax
+-	exit 0 ;;
++	exit ;;
+     Night_Hawk:Power_UNIX:*:*)
+ 	echo powerpc-harris-powerunix
+-	exit 0 ;;
++	exit ;;
+     m88k:CX/UX:7*:*)
+ 	echo m88k-harris-cxux7
+-	exit 0 ;;
++	exit ;;
+     m88k:*:4*:R4*)
+ 	echo m88k-motorola-sysv4
+-	exit 0 ;;
++	exit ;;
+     m88k:*:3*:R3*)
+ 	echo m88k-motorola-sysv3
+-	exit 0 ;;
++	exit ;;
+     AViiON:dgux:*:*)
+         # DG/UX returns AViiON for all architectures
+         UNAME_PROCESSOR=`/usr/bin/uname -p`
+@@ -496,29 +491,29 @@
+ 	else
+ 	    echo i586-dg-dgux${UNAME_RELEASE}
+ 	fi
+- 	exit 0 ;;
++ 	exit ;;
+     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
+ 	echo m88k-dolphin-sysv3
+-	exit 0 ;;
++	exit ;;
+     M88*:*:R3*:*)
+ 	# Delta 88k system running SVR3
+ 	echo m88k-motorola-sysv3
+-	exit 0 ;;
++	exit ;;
+     XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
+ 	echo m88k-tektronix-sysv3
+-	exit 0 ;;
++	exit ;;
+     Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
+ 	echo m68k-tektronix-bsd
+-	exit 0 ;;
++	exit ;;
+     *:IRIX*:*:*)
+ 	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+-	exit 0 ;;
++	exit ;;
+     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+-	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
+-	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
++	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
++	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
+     i*86:AIX:*:*)
+ 	echo i386-ibm-aix
+-	exit 0 ;;
++	exit ;;
+     ia64:AIX:*:*)
+ 	if [ -x /usr/bin/oslevel ] ; then
+ 		IBM_REV=`/usr/bin/oslevel`
+@@ -526,7 +521,7 @@
+ 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ 	fi
+ 	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+-	exit 0 ;;
++	exit ;;
+     *:AIX:2:3)
+ 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+ 		eval $set_cc_for_build
+@@ -541,15 +536,19 @@
+ 			exit(0);
+ 			}
+ EOF
+-		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+-		echo rs6000-ibm-aix3.2.5
++		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
++		then
++			echo "$SYSTEM_NAME"
++		else
++			echo rs6000-ibm-aix3.2.5
++		fi
+ 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+ 		echo rs6000-ibm-aix3.2.4
+ 	else
+ 		echo rs6000-ibm-aix3.2
+ 	fi
+-	exit 0 ;;
+-    *:AIX:*:[45])
++	exit ;;
++    *:AIX:*:[456])
+ 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+ 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+ 		IBM_ARCH=rs6000
+@@ -562,28 +561,28 @@
+ 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ 	fi
+ 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+-	exit 0 ;;
++	exit ;;
+     *:AIX:*:*)
+ 	echo rs6000-ibm-aix
+-	exit 0 ;;
++	exit ;;
+     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+ 	echo romp-ibm-bsd4.4
+-	exit 0 ;;
++	exit ;;
+     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
+ 	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
+-	exit 0 ;;                           # report: romp-ibm BSD 4.3
++	exit ;;                             # report: romp-ibm BSD 4.3
+     *:BOSX:*:*)
+ 	echo rs6000-bull-bosx
+-	exit 0 ;;
++	exit ;;
+     DPX/2?00:B.O.S.:*:*)
+ 	echo m68k-bull-sysv3
+-	exit 0 ;;
++	exit ;;
+     9000/[34]??:4.3bsd:1.*:*)
+ 	echo m68k-hp-bsd
+-	exit 0 ;;
++	exit ;;
+     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
+ 	echo m68k-hp-bsd4.4
+-	exit 0 ;;
++	exit ;;
+     9000/[34678]??:HP-UX:*:*)
+ 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+ 	case "${UNAME_MACHINE}" in
+@@ -645,9 +644,19 @@
+ 	esac
+ 	if [ ${HP_ARCH} = "hppa2.0w" ]
+ 	then
+-	    # avoid double evaluation of $set_cc_for_build
+-	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
+-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
++	    eval $set_cc_for_build
++
++	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
++	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
++	    # generating 64-bit code.  GNU and HP use different nomenclature:
++	    #
++	    # $ CC_FOR_BUILD=cc ./config.guess
++	    # => hppa2.0w-hp-hpux11.23
++	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
++	    # => hppa64-hp-hpux11.23
++
++	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
++		grep -q __LP64__
+ 	    then
+ 		HP_ARCH="hppa2.0w"
+ 	    else
+@@ -655,11 +664,11 @@
+ 	    fi
+ 	fi
+ 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+-	exit 0 ;;
++	exit ;;
+     ia64:HP-UX:*:*)
+ 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+ 	echo ia64-hp-hpux${HPUX_REV}
+-	exit 0 ;;
++	exit ;;
+     3050*:HI-UX:*:*)
+ 	eval $set_cc_for_build
+ 	sed 's/^	//' << EOF >$dummy.c
+@@ -687,196 +696,227 @@
+ 	  exit (0);
+ 	}
+ EOF
+-	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
++	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
++		{ echo "$SYSTEM_NAME"; exit; }
+ 	echo unknown-hitachi-hiuxwe2
+-	exit 0 ;;
++	exit ;;
+     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+ 	echo hppa1.1-hp-bsd
+-	exit 0 ;;
++	exit ;;
+     9000/8??:4.3bsd:*:*)
+ 	echo hppa1.0-hp-bsd
+-	exit 0 ;;
++	exit ;;
+     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+ 	echo hppa1.0-hp-mpeix
+-	exit 0 ;;
++	exit ;;
+     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+ 	echo hppa1.1-hp-osf
+-	exit 0 ;;
++	exit ;;
+     hp8??:OSF1:*:*)
+ 	echo hppa1.0-hp-osf
+-	exit 0 ;;
++	exit ;;
+     i*86:OSF1:*:*)
+ 	if [ -x /usr/sbin/sysversion ] ; then
+ 	    echo ${UNAME_MACHINE}-unknown-osf1mk
+ 	else
+ 	    echo ${UNAME_MACHINE}-unknown-osf1
+ 	fi
+-	exit 0 ;;
++	exit ;;
+     parisc*:Lites*:*:*)
+ 	echo hppa1.1-hp-lites
+-	exit 0 ;;
++	exit ;;
+     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+ 	echo c1-convex-bsd
+-        exit 0 ;;
++        exit ;;
+     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+ 	if getsysinfo -f scalar_acc
+ 	then echo c32-convex-bsd
+ 	else echo c2-convex-bsd
+ 	fi
+-        exit 0 ;;
++        exit ;;
+     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+ 	echo c34-convex-bsd
+-        exit 0 ;;
++        exit ;;
+     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+ 	echo c38-convex-bsd
+-        exit 0 ;;
++        exit ;;
+     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+ 	echo c4-convex-bsd
+-        exit 0 ;;
++        exit ;;
+     CRAY*Y-MP:*:*:*)
+ 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+-	exit 0 ;;
++	exit ;;
+     CRAY*[A-Z]90:*:*:*)
+ 	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+ 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+ 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+ 	      -e 's/\.[^.]*$/.X/'
+-	exit 0 ;;
++	exit ;;
+     CRAY*TS:*:*:*)
+ 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+-	exit 0 ;;
++	exit ;;
+     CRAY*T3E:*:*:*)
+ 	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+-	exit 0 ;;
++	exit ;;
+     CRAY*SV1:*:*:*)
+ 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+-	exit 0 ;;
++	exit ;;
+     *:UNICOS/mp:*:*)
+ 	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+-	exit 0 ;;
++	exit ;;
+     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+ 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+-        exit 0 ;;
++        exit ;;
+     5000:UNIX_System_V:4.*:*)
+         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+         FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+         echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+-	exit 0 ;;
++	exit ;;
+     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+ 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     sparc*:BSD/OS:*:*)
+ 	echo sparc-unknown-bsdi${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     *:BSD/OS:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     *:FreeBSD:*:*)
+-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+-	exit 0 ;;
++	case ${UNAME_MACHINE} in
++	    pc98)
++		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++	    amd64)
++		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++	    *)
++		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++	esac
++	exit ;;
+     i*:CYGWIN*:*)
+ 	echo ${UNAME_MACHINE}-pc-cygwin
+-	exit 0 ;;
+-    i*:MINGW*:*)
++	exit ;;
++    *:MINGW*:*)
+ 	echo ${UNAME_MACHINE}-pc-mingw32
+-	exit 0 ;;
++	exit ;;
++    i*:windows32*:*)
++    	# uname -m includes "-pc" on this system.
++    	echo ${UNAME_MACHINE}-mingw32
++	exit ;;
+     i*:PW*:*)
+ 	echo ${UNAME_MACHINE}-pc-pw32
+-	exit 0 ;;
+-    x86:Interix*:[34]*)
+-	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
+-	exit 0 ;;
++	exit ;;
++    *:Interix*:[3456]*)
++    	case ${UNAME_MACHINE} in
++	    x86)
++		echo i586-pc-interix${UNAME_RELEASE}
++		exit ;;
++	    EM64T | authenticamd | genuineintel)
++		echo x86_64-unknown-interix${UNAME_RELEASE}
++		exit ;;
++	    IA64)
++		echo ia64-unknown-interix${UNAME_RELEASE}
++		exit ;;
++	esac ;;
+     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+ 	echo i${UNAME_MACHINE}-pc-mks
+-	exit 0 ;;
++	exit ;;
++    8664:Windows_NT:*)
++	echo x86_64-pc-mks
++	exit ;;
+     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+ 	# How do we know it's Interix rather than the generic POSIX subsystem?
+ 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+ 	# UNAME_MACHINE based on the output of uname instead of i386?
+ 	echo i586-pc-interix
+-	exit 0 ;;
++	exit ;;
+     i*:UWIN*:*)
+ 	echo ${UNAME_MACHINE}-pc-uwin
+-	exit 0 ;;
++	exit ;;
++    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
++	echo x86_64-unknown-cygwin
++	exit ;;
+     p*:CYGWIN*:*)
+ 	echo powerpcle-unknown-cygwin
+-	exit 0 ;;
++	exit ;;
+     prep*:SunOS:5.*:*)
+ 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+-	exit 0 ;;
++	exit ;;
+     *:GNU:*:*)
+ 	# the GNU system
+ 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+-	exit 0 ;;
++	exit ;;
+     *:GNU/*:*:*)
+ 	# other systems with GNU libc and userland
+ 	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+-	exit 0 ;;
++	exit ;;
+     i*86:Minix:*:*)
+ 	echo ${UNAME_MACHINE}-pc-minix
+-	exit 0 ;;
++	exit ;;
+     arm*:Linux:*:*)
++	eval $set_cc_for_build
++	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
++	    | grep -q __ARM_EABI__
++	then
++	    echo ${UNAME_MACHINE}-unknown-linux-gnu
++	else
++	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
++	fi
++	exit ;;
++    avr32*:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+-	exit 0 ;;
++	exit ;;
+     cris:Linux:*:*)
+ 	echo cris-axis-linux-gnu
+-	exit 0 ;;
++	exit ;;
++    crisv32:Linux:*:*)
++	echo crisv32-axis-linux-gnu
++	exit ;;
++    frv:Linux:*:*)
++    	echo frv-unknown-linux-gnu
++	exit ;;
+     ia64:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+-	exit 0 ;;
++	exit ;;
+     m32r*:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+-	exit 0 ;;
++	exit ;;
+     m68*:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+-	exit 0 ;;
+-    mips:Linux:*:*)
++	exit ;;
++    mips:Linux:*:* | mips64:Linux:*:*)
+ 	eval $set_cc_for_build
+ 	sed 's/^	//' << EOF >$dummy.c
+ 	#undef CPU
+-	#undef mips
+-	#undef mipsel
++	#undef ${UNAME_MACHINE}
++	#undef ${UNAME_MACHINE}el
+ 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+-	CPU=mipsel
++	CPU=${UNAME_MACHINE}el
+ 	#else
+ 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+-	CPU=mips
++	CPU=${UNAME_MACHINE}
+ 	#else
+ 	CPU=
+ 	#endif
+ 	#endif
+ EOF
+-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+-	;;
+-    mips64:Linux:*:*)
+-	eval $set_cc_for_build
+-	sed 's/^	//' << EOF >$dummy.c
+-	#undef CPU
+-	#undef mips64
+-	#undef mips64el
+-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+-	CPU=mips64el
+-	#else
+-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+-	CPU=mips64
+-	#else
+-	CPU=
+-	#endif
+-	#endif
+-EOF
+-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
++	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
++	    /^CPU/{
++		s: ::g
++		p
++	    }'`"
++	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ 	;;
++    or32:Linux:*:*)
++	echo or32-unknown-linux-gnu
++	exit ;;
+     ppc:Linux:*:*)
+ 	echo powerpc-unknown-linux-gnu
+-	exit 0 ;;
++	exit ;;
+     ppc64:Linux:*:*)
+ 	echo powerpc64-unknown-linux-gnu
+-	exit 0 ;;
++	exit ;;
+     alpha:Linux:*:*)
+ 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+ 	  EV5)   UNAME_MACHINE=alphaev5 ;;
+@@ -887,10 +927,13 @@
+ 	  EV67)  UNAME_MACHINE=alphaev67 ;;
+ 	  EV68*) UNAME_MACHINE=alphaev68 ;;
+         esac
+-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
++	objdump --private-headers /bin/sh | grep -q ld.so.1
+ 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+-	exit 0 ;;
++	exit ;;
++    padre:Linux:*:*)
++	echo sparc-unknown-linux-gnu
++	exit ;;
+     parisc:Linux:*:* | hppa:Linux:*:*)
+ 	# Look for CPU level
+ 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+@@ -898,25 +941,31 @@
+ 	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
+ 	  *)    echo hppa-unknown-linux-gnu ;;
+ 	esac
+-	exit 0 ;;
++	exit ;;
+     parisc64:Linux:*:* | hppa64:Linux:*:*)
+ 	echo hppa64-unknown-linux-gnu
+-	exit 0 ;;
++	exit ;;
+     s390:Linux:*:* | s390x:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-ibm-linux
+-	exit 0 ;;
++	exit ;;
+     sh64*:Linux:*:*)
+     	echo ${UNAME_MACHINE}-unknown-linux-gnu
+-	exit 0 ;;
++	exit ;;
+     sh*:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+-	exit 0 ;;
++	exit ;;
+     sparc:Linux:*:* | sparc64:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+-	exit 0 ;;
++	exit ;;
++    vax:Linux:*:*)
++	echo ${UNAME_MACHINE}-dec-linux-gnu
++	exit ;;
+     x86_64:Linux:*:*)
+ 	echo x86_64-unknown-linux-gnu
+-	exit 0 ;;
++	exit ;;
++    xtensa*:Linux:*:*)
++    	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
+     i*86:Linux:*:*)
+ 	# The BFD linker knows what the default object file format is, so
+ 	# first see if it will tell us. cd to the root directory to prevent
+@@ -932,17 +981,6 @@
+ 	  elf32-i386)
+ 		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+ 		;;
+-	  a.out-i386-linux)
+-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+-		exit 0 ;;
+-	  coff-i386)
+-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+-		exit 0 ;;
+-	  "")
+-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
+-		# one that does not give us useful --help.
+-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+-		exit 0 ;;
+ 	esac
+ 	# Determine whether the default compiler is a.out or elf
+ 	eval $set_cc_for_build
+@@ -959,7 +997,7 @@
+ 	LIBC=gnulibc1
+ 	# endif
+ 	#else
+-	#ifdef __INTEL_COMPILER
++	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+ 	LIBC=gnu
+ 	#else
+ 	LIBC=gnuaout
+@@ -969,16 +1007,23 @@
+ 	LIBC=dietlibc
+ 	#endif
+ EOF
+-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+-	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
+-	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
++	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
++	    /^LIBC/{
++		s: ::g
++		p
++	    }'`"
++	test x"${LIBC}" != x && {
++		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
++		exit
++	}
++	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
+ 	;;
+     i*86:DYNIX/ptx:4*:*)
+ 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+ 	# earlier versions are messed up and put the nodename in both
+ 	# sysname and nodename.
+ 	echo i386-sequent-sysv4
+-	exit 0 ;;
++	exit ;;
+     i*86:UNIX_SV:4.2MP:2.*)
+         # Unixware is an offshoot of SVR4, but it has its own version
+         # number series starting with 2...
+@@ -986,27 +1031,27 @@
+ 	# I just have to hope.  -- rms.
+         # Use sysv4.2uw... so that sysv4* matches it.
+ 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+-	exit 0 ;;
++	exit ;;
+     i*86:OS/2:*:*)
+ 	# If we were able to find `uname', then EMX Unix compatibility
+ 	# is probably installed.
+ 	echo ${UNAME_MACHINE}-pc-os2-emx
+-	exit 0 ;;
++	exit ;;
+     i*86:XTS-300:*:STOP)
+ 	echo ${UNAME_MACHINE}-unknown-stop
+-	exit 0 ;;
++	exit ;;
+     i*86:atheos:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-atheos
+-	exit 0 ;;
+-	i*86:syllable:*:*)
++	exit ;;
++    i*86:syllable:*:*)
+ 	echo ${UNAME_MACHINE}-pc-syllable
+-	exit 0 ;;
+-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
++	exit ;;
++    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
+ 	echo i386-unknown-lynxos${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     i*86:*DOS:*:*)
+ 	echo ${UNAME_MACHINE}-pc-msdosdjgpp
+-	exit 0 ;;
++	exit ;;
+     i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
+ 	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+ 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+@@ -1014,15 +1059,16 @@
+ 	else
+ 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+ 	fi
+-	exit 0 ;;
+-    i*86:*:5:[78]*)
++	exit ;;
++    i*86:*:5:[678]*)
++    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+ 	case `/bin/uname -X | grep "^Machine"` in
+ 	    *486*)	     UNAME_MACHINE=i486 ;;
+ 	    *Pentium)	     UNAME_MACHINE=i586 ;;
+ 	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+ 	esac
+ 	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+-	exit 0 ;;
++	exit ;;
+     i*86:*:3.2:*)
+ 	if test -f /usr/options/cb.name; then
+ 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+@@ -1040,73 +1086,86 @@
+ 	else
+ 		echo ${UNAME_MACHINE}-pc-sysv32
+ 	fi
+-	exit 0 ;;
++	exit ;;
+     pc:*:*:*)
+ 	# Left here for compatibility:
+         # uname -m prints for DJGPP always 'pc', but it prints nothing about
+-        # the processor, so we play safe by assuming i386.
+-	echo i386-pc-msdosdjgpp
+-        exit 0 ;;
++        # the processor, so we play safe by assuming i586.
++	# Note: whatever this is, it MUST be the same as what config.sub
++	# prints for the "djgpp" host, or else GDB configury will decide that
++	# this is a cross-build.
++	echo i586-pc-msdosdjgpp
++        exit ;;
+     Intel:Mach:3*:*)
+ 	echo i386-pc-mach3
+-	exit 0 ;;
++	exit ;;
+     paragon:*:*:*)
+ 	echo i860-intel-osf1
+-	exit 0 ;;
++	exit ;;
+     i860:*:4.*:*) # i860-SVR4
+ 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+ 	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+ 	else # Add other i860-SVR4 vendors below as they are discovered.
+ 	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
+ 	fi
+-	exit 0 ;;
++	exit ;;
+     mini*:CTIX:SYS*5:*)
+ 	# "miniframe"
+ 	echo m68010-convergent-sysv
+-	exit 0 ;;
++	exit ;;
+     mc68k:UNIX:SYSTEM5:3.51m)
+ 	echo m68k-convergent-sysv
+-	exit 0 ;;
++	exit ;;
+     M680?0:D-NIX:5.3:*)
+ 	echo m68k-diab-dnix
+-	exit 0 ;;
++	exit ;;
+     M68*:*:R3V[5678]*:*)
+-	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
++	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
+     3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
+ 	OS_REL=''
+ 	test -r /etc/.relid \
+ 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+ 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+-	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
++	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+ 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+-	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
++	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+-          && echo i486-ncr-sysv4 && exit 0 ;;
++          && { echo i486-ncr-sysv4; exit; } ;;
++    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
++	OS_REL='.3'
++	test -r /etc/.relid \
++	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
++	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
++	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
++	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
++	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
++	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
++	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+ 	echo m68k-unknown-lynxos${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     mc68030:UNIX_System_V:4.*:*)
+ 	echo m68k-atari-sysv4
+-	exit 0 ;;
++	exit ;;
+     TSUNAMI:LynxOS:2.*:*)
+ 	echo sparc-unknown-lynxos${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     rs6000:LynxOS:2.*:*)
+ 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
+-	exit 0 ;;
+-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
++	exit ;;
++    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
+ 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     SM[BE]S:UNIX_SV:*:*)
+ 	echo mips-dde-sysv${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     RM*:ReliantUNIX-*:*:*)
+ 	echo mips-sni-sysv4
+-	exit 0 ;;
++	exit ;;
+     RM*:SINIX-*:*:*)
+ 	echo mips-sni-sysv4
+-	exit 0 ;;
++	exit ;;
+     *:SINIX-*:*:*)
+ 	if uname -p 2>/dev/null >/dev/null ; then
+ 		UNAME_MACHINE=`(uname -p) 2>/dev/null`
+@@ -1114,69 +1173,84 @@
+ 	else
+ 		echo ns32k-sni-sysv
+ 	fi
+-	exit 0 ;;
++	exit ;;
+     PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+                       # says <Richard.M.Bartel@ccMail.Census.GOV>
+         echo i586-unisys-sysv4
+-        exit 0 ;;
++        exit ;;
+     *:UNIX_System_V:4*:FTX*)
+ 	# From Gerald Hewes <hewes@openmarket.com>.
+ 	# How about differentiating between stratus architectures? -djm
+ 	echo hppa1.1-stratus-sysv4
+-	exit 0 ;;
++	exit ;;
+     *:*:*:FTX*)
+ 	# From seanf@swdc.stratus.com.
+ 	echo i860-stratus-sysv4
+-	exit 0 ;;
++	exit ;;
++    i*86:VOS:*:*)
++	# From Paul.Green@stratus.com.
++	echo ${UNAME_MACHINE}-stratus-vos
++	exit ;;
+     *:VOS:*:*)
+ 	# From Paul.Green@stratus.com.
+ 	echo hppa1.1-stratus-vos
+-	exit 0 ;;
++	exit ;;
+     mc68*:A/UX:*:*)
+ 	echo m68k-apple-aux${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     news*:NEWS-OS:6*:*)
+ 	echo mips-sony-newsos6
+-	exit 0 ;;
++	exit ;;
+     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+ 	if [ -d /usr/nec ]; then
+ 	        echo mips-nec-sysv${UNAME_RELEASE}
+ 	else
+ 	        echo mips-unknown-sysv${UNAME_RELEASE}
+ 	fi
+-        exit 0 ;;
++        exit ;;
+     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
+ 	echo powerpc-be-beos
+-	exit 0 ;;
++	exit ;;
+     BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
+ 	echo powerpc-apple-beos
+-	exit 0 ;;
++	exit ;;
+     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
+ 	echo i586-pc-beos
+-	exit 0 ;;
++	exit ;;
++    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
++	echo i586-pc-haiku
++	exit ;;
+     SX-4:SUPER-UX:*:*)
+ 	echo sx4-nec-superux${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     SX-5:SUPER-UX:*:*)
+ 	echo sx5-nec-superux${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     SX-6:SUPER-UX:*:*)
+ 	echo sx6-nec-superux${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
++    SX-7:SUPER-UX:*:*)
++	echo sx7-nec-superux${UNAME_RELEASE}
++	exit ;;
++    SX-8:SUPER-UX:*:*)
++	echo sx8-nec-superux${UNAME_RELEASE}
++	exit ;;
++    SX-8R:SUPER-UX:*:*)
++	echo sx8r-nec-superux${UNAME_RELEASE}
++	exit ;;
+     Power*:Rhapsody:*:*)
+ 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     *:Rhapsody:*:*)
+ 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     *:Darwin:*:*)
+ 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+ 	case $UNAME_PROCESSOR in
+-	    *86) UNAME_PROCESSOR=i686 ;;
+ 	    unknown) UNAME_PROCESSOR=powerpc ;;
+ 	esac
+ 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     *:procnto*:*:* | *:QNX:[0123456789]*:*)
+ 	UNAME_PROCESSOR=`uname -p`
+ 	if test "$UNAME_PROCESSOR" = "x86"; then
+@@ -1184,22 +1258,25 @@
+ 		UNAME_MACHINE=pc
+ 	fi
+ 	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     *:QNX:*:4*)
+ 	echo i386-pc-qnx
+-	exit 0 ;;
++	exit ;;
++    NSE-?:NONSTOP_KERNEL:*:*)
++	echo nse-tandem-nsk${UNAME_RELEASE}
++	exit ;;
+     NSR-?:NONSTOP_KERNEL:*:*)
+ 	echo nsr-tandem-nsk${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     *:NonStop-UX:*:*)
+ 	echo mips-compaq-nonstopux
+-	exit 0 ;;
++	exit ;;
+     BS2000:POSIX*:*:*)
+ 	echo bs2000-siemens-sysv
+-	exit 0 ;;
++	exit ;;
+     DS/*:UNIX_System_V:*:*)
+ 	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     *:Plan9:*:*)
+ 	# "uname -m" is not consistent, so use $cputype instead. 386
+ 	# is converted to i386 for consistency with other x86
+@@ -1210,38 +1287,50 @@
+ 	    UNAME_MACHINE="$cputype"
+ 	fi
+ 	echo ${UNAME_MACHINE}-unknown-plan9
+-	exit 0 ;;
++	exit ;;
+     *:TOPS-10:*:*)
+ 	echo pdp10-unknown-tops10
+-	exit 0 ;;
++	exit ;;
+     *:TENEX:*:*)
+ 	echo pdp10-unknown-tenex
+-	exit 0 ;;
++	exit ;;
+     KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
+ 	echo pdp10-dec-tops20
+-	exit 0 ;;
++	exit ;;
+     XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
+ 	echo pdp10-xkl-tops20
+-	exit 0 ;;
++	exit ;;
+     *:TOPS-20:*:*)
+ 	echo pdp10-unknown-tops20
+-	exit 0 ;;
++	exit ;;
+     *:ITS:*:*)
+ 	echo pdp10-unknown-its
+-	exit 0 ;;
++	exit ;;
+     SEI:*:*:SEIUX)
+         echo mips-sei-seiux${UNAME_RELEASE}
+-	exit 0 ;;
++	exit ;;
+     *:DragonFly:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+-	exit 0 ;;
++	exit ;;
+     *:*VMS:*:*)
+     	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+ 	case "${UNAME_MACHINE}" in
+-	    A*) echo alpha-dec-vms && exit 0 ;;
+-	    I*) echo ia64-dec-vms && exit 0 ;;
+-	    V*) echo vax-dec-vms && exit 0 ;;
+-	esac
++	    A*) echo alpha-dec-vms ; exit ;;
++	    I*) echo ia64-dec-vms ; exit ;;
++	    V*) echo vax-dec-vms ; exit ;;
++	esac ;;
++    *:XENIX:*:SysV)
++	echo i386-pc-xenix
++	exit ;;
++    i*86:skyos:*:*)
++	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
++	exit ;;
++    i*86:rdos:*:*)
++	echo ${UNAME_MACHINE}-pc-rdos
++	exit ;;
++    i*86:AROS:*:*)
++	echo ${UNAME_MACHINE}-pc-aros
++	exit ;;
+ esac
+ 
+ #echo '(No uname command or uname output not recognized.)' 1>&2
+@@ -1273,7 +1362,7 @@
+ #endif
+ 
+ #if defined (__arm) && defined (__acorn) && defined (__unix)
+-  printf ("arm-acorn-riscix"); exit (0);
++  printf ("arm-acorn-riscix\n"); exit (0);
+ #endif
+ 
+ #if defined (hp300) && !defined (hpux)
+@@ -1362,11 +1451,12 @@
+ }
+ EOF
+ 
+-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
++$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
++	{ echo "$SYSTEM_NAME"; exit; }
+ 
+ # Apollos put the system type in the environment.
+ 
+-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
++test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
+ 
+ # Convex versions that predate uname can use getsysinfo(1)
+ 
+@@ -1375,22 +1465,22 @@
+     case `getsysinfo -f cpu_type` in
+     c1*)
+ 	echo c1-convex-bsd
+-	exit 0 ;;
++	exit ;;
+     c2*)
+ 	if getsysinfo -f scalar_acc
+ 	then echo c32-convex-bsd
+ 	else echo c2-convex-bsd
+ 	fi
+-	exit 0 ;;
++	exit ;;
+     c34*)
+ 	echo c34-convex-bsd
+-	exit 0 ;;
++	exit ;;
+     c38*)
+ 	echo c38-convex-bsd
+-	exit 0 ;;
++	exit ;;
+     c4*)
+ 	echo c4-convex-bsd
+-	exit 0 ;;
++	exit ;;
+     esac
+ fi
+ 
+@@ -1401,7 +1491,9 @@
+ the operating system you are using. It is advised that you
+ download the most up to date version of the config scripts from
+ 
+-    ftp://ftp.gnu.org/pub/gnu/config/
++  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
++and
++  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+ 
+ If the version you run ($0) is already up to date, please
+ send the following data and any information you think might be
+--- a/config.sub
++++ b/config.sub
+@@ -1,9 +1,10 @@
+ #! /bin/sh
+ # Configuration validation subroutine script.
+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
++#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
++#   Free Software Foundation, Inc.
+ 
+-timestamp='2004-06-24'
++timestamp='2009-06-11'
+ 
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+@@ -21,14 +22,15 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
+-
++# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
++# 02110-1301, USA.
++#
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+ # configuration script generated by Autoconf, you may include it under
+ # the same distribution terms that you use for the rest of that program.
+ 
++
+ # Please send patches to <config-patches@gnu.org>.  Submit a context
+ # diff and a properly formatted ChangeLog entry.
+ #
+@@ -70,8 +72,8 @@
+ version="\
+ GNU config.sub ($timestamp)
+ 
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+-Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
++2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ 
+ This is free software; see the source for copying conditions.  There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -83,11 +85,11 @@
+ while test $# -gt 0 ; do
+   case $1 in
+     --time-stamp | --time* | -t )
+-       echo "$timestamp" ; exit 0 ;;
++       echo "$timestamp" ; exit ;;
+     --version | -v )
+-       echo "$version" ; exit 0 ;;
++       echo "$version" ; exit ;;
+     --help | --h* | -h )
+-       echo "$usage"; exit 0 ;;
++       echo "$usage"; exit ;;
+     -- )     # Stop option processing
+        shift; break ;;
+     - )	# Use stdin as input.
+@@ -99,7 +101,7 @@
+     *local*)
+        # First pass through any local machine types.
+        echo $1
+-       exit 0;;
++       exit ;;
+ 
+     * )
+        break ;;
+@@ -118,8 +120,10 @@
+ # Here we must recognize all the valid KERNEL-OS combinations.
+ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+ case $maybe_os in
+-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
+-  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
++  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
++  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
++  kopensolaris*-gnu* | \
++  storm-chaos* | os2-emx* | rtmk-nova*)
+     os=-$maybe_os
+     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+     ;;
+@@ -149,6 +153,9 @@
+ 		os=
+ 		basic_machine=$1
+ 		;;
++        -bluegene*)
++	        os=-cnk
++		;;
+ 	-sim | -cisco | -oki | -wec | -winbond)
+ 		os=
+ 		basic_machine=$1
+@@ -170,6 +177,10 @@
+ 	-hiux*)
+ 		os=-hiuxwe2
+ 		;;
++	-sco6)
++		os=-sco5v6
++		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		;;
+ 	-sco5)
+ 		os=-sco3.2v5
+ 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+@@ -186,6 +197,10 @@
+ 		# Don't forget version if it is 3.2v4 or newer.
+ 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ 		;;
++	-sco5v6*)
++		# Don't forget version if it is 3.2v4 or newer.
++		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		;;
+ 	-sco*)
+ 		os=-sco3.2v2
+ 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+@@ -230,22 +245,28 @@
+ 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+ 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ 	| am33_2.0 \
+-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
++	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
++	| bfin \
+ 	| c4x | clipper \
+ 	| d10v | d30v | dlx | dsp16xx \
+-	| fr30 | frv \
++	| fido | fr30 | frv \
+ 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+ 	| i370 | i860 | i960 | ia64 \
+ 	| ip2k | iq2000 \
+-	| m32r | m32rle | m68000 | m68k | m88k | mcore \
++	| lm32 \
++	| m32c | m32r | m32rle | m68000 | m68k | m88k \
++	| maxq | mb | microblaze | mcore | mep | metag \
+ 	| mips | mipsbe | mipseb | mipsel | mipsle \
+ 	| mips16 \
+ 	| mips64 | mips64el \
+-	| mips64vr | mips64vrel \
++	| mips64octeon | mips64octeonel \
+ 	| mips64orion | mips64orionel \
++	| mips64r5900 | mips64r5900el \
++	| mips64vr | mips64vrel \
+ 	| mips64vr4100 | mips64vr4100el \
+ 	| mips64vr4300 | mips64vr4300el \
+ 	| mips64vr5000 | mips64vr5000el \
++	| mips64vr5900 | mips64vr5900el \
+ 	| mipsisa32 | mipsisa32el \
+ 	| mipsisa32r2 | mipsisa32r2el \
+ 	| mipsisa64 | mipsisa64el \
+@@ -254,21 +275,26 @@
+ 	| mipsisa64sr71k | mipsisa64sr71kel \
+ 	| mipstx39 | mipstx39el \
+ 	| mn10200 | mn10300 \
++	| moxie \
++	| mt \
+ 	| msp430 \
++	| nios | nios2 \
+ 	| ns16k | ns32k \
+-	| openrisc | or32 \
++	| or32 \
+ 	| pdp10 | pdp11 | pj | pjl \
+ 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+ 	| pyramid \
+-	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
++	| score \
++	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+ 	| sh64 | sh64le \
+-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
+-	| strongarm \
++	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
++	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
++	| spu | strongarm \
+ 	| tahoe | thumb | tic4x | tic80 | tron \
+ 	| v850 | v850e \
+ 	| we32k \
+-	| x86 | xscale | xstormy16 | xtensa \
+-	| z8k)
++	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
++	| z8k | z80)
+ 		basic_machine=$basic_machine-unknown
+ 		;;
+ 	m6811 | m68hc11 | m6812 | m68hc12)
+@@ -278,6 +304,9 @@
+ 		;;
+ 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+ 		;;
++	ms1)
++		basic_machine=mt-unknown
++		;;
+ 
+ 	# We use `pc' rather than `unknown'
+ 	# because (1) that's what they normally are, and
+@@ -297,28 +326,32 @@
+ 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+ 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+ 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+-	| avr-* \
+-	| bs2000-* \
++	| avr-* | avr32-* \
++	| bfin-* | bs2000-* \
+ 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+ 	| clipper-* | craynv-* | cydra-* \
+ 	| d10v-* | d30v-* | dlx-* \
+ 	| elxsi-* \
+-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
++	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+ 	| h8300-* | h8500-* \
+ 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+ 	| i*86-* | i860-* | i960-* | ia64-* \
+ 	| ip2k-* | iq2000-* \
+-	| m32r-* | m32rle-* \
++	| lm32-* \
++	| m32c-* | m32r-* | m32rle-* \
+ 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+-	| m88110-* | m88k-* | mcore-* \
++	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+ 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+ 	| mips16-* \
+ 	| mips64-* | mips64el-* \
+-	| mips64vr-* | mips64vrel-* \
++	| mips64octeon-* | mips64octeonel-* \
+ 	| mips64orion-* | mips64orionel-* \
++	| mips64r5900-* | mips64r5900el-* \
++	| mips64vr-* | mips64vrel-* \
+ 	| mips64vr4100-* | mips64vr4100el-* \
+ 	| mips64vr4300-* | mips64vr4300el-* \
+ 	| mips64vr5000-* | mips64vr5000el-* \
++	| mips64vr5900-* | mips64vr5900el-* \
+ 	| mipsisa32-* | mipsisa32el-* \
+ 	| mipsisa32r2-* | mipsisa32r2el-* \
+ 	| mipsisa64-* | mipsisa64el-* \
+@@ -327,26 +360,33 @@
+ 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+ 	| mipstx39-* | mipstx39el-* \
+ 	| mmix-* \
++	| mt-* \
+ 	| msp430-* \
++	| nios-* | nios2-* \
+ 	| none-* | np1-* | ns16k-* | ns32k-* \
+ 	| orion-* \
+ 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+ 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+ 	| pyramid-* \
+ 	| romp-* | rs6000-* \
+-	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
++	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+ 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+-	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
+-	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
++	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
++	| sparclite-* \
++	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
+ 	| tahoe-* | thumb-* \
+-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
++	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
+ 	| tron-* \
+ 	| v850-* | v850e-* | vax-* \
+ 	| we32k-* \
+-	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
+-	| xtensa-* \
++	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
++	| xstormy16-* | xtensa*-* \
+ 	| ymp-* \
+-	| z8k-*)
++	| z8k-* | z80-*)
++		;;
++	# Recognize the basic CPU types without company name, with glob match.
++	xtensa*)
++		basic_machine=$basic_machine-unknown
+ 		;;
+ 	# Recognize the various machine names and aliases which stand
+ 	# for a CPU type and a company and sometimes even an OS.
+@@ -410,6 +450,10 @@
+ 		basic_machine=m68k-apollo
+ 		os=-bsd
+ 		;;
++	aros)
++		basic_machine=i386-pc
++		os=-aros
++		;;
+ 	aux)
+ 		basic_machine=m68k-apple
+ 		os=-aux
+@@ -418,10 +462,26 @@
+ 		basic_machine=ns32k-sequent
+ 		os=-dynix
+ 		;;
++	blackfin)
++		basic_machine=bfin-unknown
++		os=-linux
++		;;
++	blackfin-*)
++		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
++		os=-linux
++		;;
++	bluegene*)
++		basic_machine=powerpc-ibm
++		os=-cnk
++		;;
+ 	c90)
+ 		basic_machine=c90-cray
+ 		os=-unicos
+ 		;;
++        cegcc)
++		basic_machine=arm-unknown
++		os=-cegcc
++		;;
+ 	convex-c1)
+ 		basic_machine=c1-convex
+ 		os=-bsd
+@@ -450,13 +510,16 @@
+ 		basic_machine=craynv-cray
+ 		os=-unicosmp
+ 		;;
+-	cr16c)
+-		basic_machine=cr16c-unknown
++	cr16)
++		basic_machine=cr16-unknown
+ 		os=-elf
+ 		;;
+ 	crds | unos)
+ 		basic_machine=m68k-crds
+ 		;;
++	crisv32 | crisv32-* | etraxfs*)
++		basic_machine=crisv32-axis
++		;;
+ 	cris | cris-* | etrax*)
+ 		basic_machine=cris-axis
+ 		;;
+@@ -486,6 +549,14 @@
+ 		basic_machine=m88k-motorola
+ 		os=-sysv3
+ 		;;
++	dicos)
++		basic_machine=i686-pc
++		os=-dicos
++		;;
++	djgpp)
++		basic_machine=i586-pc
++		os=-msdosdjgpp
++		;;
+ 	dpx20 | dpx20-*)
+ 		basic_machine=rs6000-bull
+ 		os=-bosx
+@@ -636,6 +707,14 @@
+ 		basic_machine=m68k-isi
+ 		os=-sysv
+ 		;;
++	m68knommu)
++		basic_machine=m68k-unknown
++		os=-linux
++		;;
++	m68knommu-*)
++		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
++		os=-linux
++		;;
+ 	m88k-omron*)
+ 		basic_machine=m88k-omron
+ 		;;
+@@ -651,6 +730,10 @@
+ 		basic_machine=i386-pc
+ 		os=-mingw32
+ 		;;
++	mingw32ce)
++		basic_machine=arm-unknown
++		os=-mingw32ce
++		;;
+ 	miniframe)
+ 		basic_machine=m68000-convergent
+ 		;;
+@@ -676,6 +759,9 @@
+ 		basic_machine=i386-pc
+ 		os=-msdos
+ 		;;
++	ms1-*)
++		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
++		;;
+ 	mvs)
+ 		basic_machine=i370-ibm
+ 		os=-mvs
+@@ -751,9 +837,8 @@
+ 		basic_machine=hppa1.1-oki
+ 		os=-proelf
+ 		;;
+-	or32 | or32-*)
++	openrisc | openrisc-*)
+ 		basic_machine=or32-unknown
+-		os=-coff
+ 		;;
+ 	os400)
+ 		basic_machine=powerpc-ibm
+@@ -775,6 +860,14 @@
+ 		basic_machine=i860-intel
+ 		os=-osf
+ 		;;
++	parisc)
++		basic_machine=hppa-unknown
++		os=-linux
++		;;
++	parisc-*)
++		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
++		os=-linux
++		;;
+ 	pbd)
+ 		basic_machine=sparc-tti
+ 		;;
+@@ -784,6 +877,12 @@
+ 	pc532 | pc532-*)
+ 		basic_machine=ns32k-pc532
+ 		;;
++	pc98)
++		basic_machine=i386-pc
++		;;
++	pc98-*)
++		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
+ 	pentium | p5 | k5 | k6 | nexgen | viac3)
+ 		basic_machine=i586-pc
+ 		;;
+@@ -840,6 +939,10 @@
+ 		basic_machine=i586-unknown
+ 		os=-pw32
+ 		;;
++	rdos)
++		basic_machine=i386-pc
++		os=-rdos
++		;;
+ 	rom68k)
+ 		basic_machine=m68k-rom68k
+ 		os=-coff
+@@ -866,6 +969,10 @@
+ 	sb1el)
+ 		basic_machine=mipsisa64sb1el-unknown
+ 		;;
++	sde)
++		basic_machine=mipsisa32-sde
++		os=-elf
++		;;
+ 	sei)
+ 		basic_machine=mips-sei
+ 		os=-seiux
+@@ -877,6 +984,9 @@
+ 		basic_machine=sh-hitachi
+ 		os=-hms
+ 		;;
++	sh5el)
++		basic_machine=sh5le-unknown
++		;;
+ 	sh64)
+ 		basic_machine=sh64-unknown
+ 		;;
+@@ -966,6 +1076,10 @@
+ 		basic_machine=tic6x-unknown
+ 		os=-coff
+ 		;;
++	tile*)
++		basic_machine=tile-unknown
++		os=-linux-gnu
++		;;
+ 	tx39)
+ 		basic_machine=mipstx39-unknown
+ 		;;
+@@ -1026,6 +1140,10 @@
+ 		basic_machine=hppa1.1-winbond
+ 		os=-proelf
+ 		;;
++	xbox)
++		basic_machine=i686-pc
++		os=-mingw32
++		;;
+ 	xps | xps100)
+ 		basic_machine=xps100-honeywell
+ 		;;
+@@ -1037,6 +1155,10 @@
+ 		basic_machine=z8k-unknown
+ 		os=-sim
+ 		;;
++	z80-*-coff)
++		basic_machine=z80-unknown
++		os=-sim
++		;;
+ 	none)
+ 		basic_machine=none-none
+ 		os=-none
+@@ -1075,13 +1197,10 @@
+ 	we32k)
+ 		basic_machine=we32k-att
+ 		;;
+-	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
++	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
+ 		basic_machine=sh-unknown
+ 		;;
+-	sh64)
+-		basic_machine=sh64-unknown
+-		;;
+-	sparc | sparcv8 | sparcv9 | sparcv9b)
++	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+ 		basic_machine=sparc-sun
+ 		;;
+ 	cydra)
+@@ -1148,26 +1267,30 @@
+ 	# Each alternative MUST END IN A *, to match a version number.
+ 	# -sysv* is not here because it comes later, after sysvr4.
+ 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
++	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+ 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
++	      | -kopensolaris* \
+ 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+-	      | -aos* \
++	      | -aos* | -aros* \
+ 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+ 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
++	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
++	      | -openbsd* | -solidbsd* \
+ 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+ 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+ 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+-	      | -chorusos* | -chorusrdb* \
++	      | -chorusos* | -chorusrdb* | -cegcc* \
+ 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+-	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
++	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
++	      | -uxpv* | -beos* | -mpeix* | -udk* \
+ 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+ 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+ 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+ 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+ 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
++	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
++	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
+ 	# Remember, each alternative MUST END IN *, to match a version number.
+ 		;;
+ 	-qnx*)
+@@ -1185,7 +1308,7 @@
+ 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
+ 		;;
+ 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
++	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
+ 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+ 		;;
+ 	-mac*)
+@@ -1294,6 +1417,12 @@
+ 	-kaos*)
+ 		os=-kaos
+ 		;;
++	-zvmoe)
++		os=-zvmoe
++		;;
++	-dicos*)
++		os=-dicos
++		;;
+ 	-none)
+ 		;;
+ 	*)
+@@ -1316,6 +1445,12 @@
+ # system, and we'll never get to this point.
+ 
+ case $basic_machine in
++        score-*)
++		os=-elf
++		;;
++        spu-*)
++		os=-elf
++		;;
+ 	*-acorn)
+ 		os=-riscix1.2
+ 		;;
+@@ -1325,9 +1460,9 @@
+ 	arm*-semi)
+ 		os=-aout
+ 		;;
+-    c4x-* | tic4x-*)
+-        os=-coff
+-        ;;
++        c4x-* | tic4x-*)
++        	os=-coff
++		;;
+ 	# This must come before the *-dec entry.
+ 	pdp10-*)
+ 		os=-tops20
+@@ -1353,6 +1488,9 @@
+ 	m68*-cisco)
+ 		os=-aout
+ 		;;
++        mep-*)
++		os=-elf
++		;;
+ 	mips*-cisco)
+ 		os=-elf
+ 		;;
+@@ -1371,6 +1509,9 @@
+ 	*-be)
+ 		os=-beos
+ 		;;
++	*-haiku)
++		os=-haiku
++		;;
+ 	*-ibm)
+ 		os=-aix
+ 		;;
+@@ -1479,7 +1620,7 @@
+ 			-sunos*)
+ 				vendor=sun
+ 				;;
+-			-aix*)
++			-cnk*|-aix*)
+ 				vendor=ibm
+ 				;;
+ 			-beos*)
+@@ -1542,7 +1683,7 @@
+ esac
+ 
+ echo $basic_machine$os
+-exit 0
++exit
+ 
+ # Local variables:
+ # eval: (add-hook 'write-file-hooks 'time-stamp)
--- wxwidgets2.8-2.8.10.1.orig/debian/patches/CVE-2009-2369.dpatch
+++ wxwidgets2.8-2.8.10.1/debian/patches/CVE-2009-2369.dpatch
@@ -0,0 +1,64 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## CVE-2009-2369.dpatch by Giuseppe Iuculano <giuseppe@iuculano.it>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixed Integer overflow in the wxImage::Create function (CVE-2009-2369) (#537175)
+
+@DPATCH@
+--- a/src/common/imagpng.cpp
++++ b/src/common/imagpng.cpp
+@@ -568,18 +568,16 @@
+     if (!image->Ok())
+         goto error;
+ 
+-    lines = (unsigned char **)malloc( (size_t)(height * sizeof(unsigned char *)) );
++    // initialize all line pointers to NULL to ensure that they can be safely
++    // free()d if an error occurs before all of them could be allocated
++    lines = (unsigned char **)calloc(height, sizeof(unsigned char *));
+     if ( !lines )
+         goto error;
+ 
+     for (i = 0; i < height; i++)
+     {
+         if ((lines[i] = (unsigned char *)malloc( (size_t)(width * (sizeof(unsigned char) * 4)))) == NULL)
+-        {
+-            for ( unsigned int n = 0; n < i; n++ )
+-                free( lines[n] );
+             goto error;
+-        }
+     }
+ 
+     png_read_image( png_ptr, lines );
+--- a/src/common/imagtiff.cpp
++++ b/src/common/imagtiff.cpp
+@@ -261,7 +261,6 @@
+     }
+ 
+     uint32 w, h;
+-    uint32 npixels;
+     uint32 *raster;
+ 
+     TIFFGetField( tif, TIFFTAG_IMAGEWIDTH, &w );
+@@ -275,9 +274,20 @@
+                            (samplesInfo[0] == EXTRASAMPLE_ASSOCALPHA ||
+                             samplesInfo[0] == EXTRASAMPLE_UNASSALPHA));
+ 
+-    npixels = w * h;
++    // guard against integer overflow during multiplication which could result
++    // in allocating a too small buffer and then overflowing it
++    const double bytesNeeded = (double)w * (double)h * sizeof(uint32);
++    if ( bytesNeeded >= 4294967295U /* UINT32_MAX */ )
++    {
++        if ( verbose )
++            wxLogError( _("TIFF: Image size is abnormally big.") );
++
++        TIFFClose(tif);
++
++        return false;
++    }
+ 
+-    raster = (uint32*) _TIFFmalloc( npixels * sizeof(uint32) );
++    raster = (uint32*) _TIFFmalloc( bytesNeeded );
+ 
+     if (!raster)
+     {
--- wxwidgets2.8-2.8.10.1.orig/debian/patches/fix-path-to-some-interpreters
+++ wxwidgets2.8-2.8.10.1/debian/patches/fix-path-to-some-interpreters
@@ -0,0 +1,26 @@
+useless changes to make lintian quiet
+
+--- a/wxPython/wx/tools/Editra/tests/syntax/octave.oct
++++ b/wxPython/wx/tools/Editra/tests/syntax/octave.oct
+@@ -1,4 +1,4 @@
+-#! /bin/octave -qf
++#! /usr/bin/octave -qf
+ # Syntax Highlight Test File for Octave
+ # Some comments about this file
+ 
+--- a/wxPython/wx/tools/Editra/tests/syntax/tcl_tk.tcl
++++ b/wxPython/wx/tools/Editra/tests/syntax/tcl_tk.tcl
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/wish -f
++#!/usr/bin/wish -f
+ # Syntax Highlighting Test File for TCL/TK
+ # Comments are like this
+ # Hello World in tcl/tk
+--- a/wxPython/demo/Main.py
++++ b/wxPython/demo/Main.py
+@@ -1,4 +1,4 @@
+-#!/bin/env python
++#!/usr/bin/env python
+ #----------------------------------------------------------------------------
+ # Name:         Main.py
+ # Purpose:      Testing lots of stuff, controls, window types, etc.
--- wxwidgets2.8-2.8.10.1.orig/debian/patches/series
+++ wxwidgets2.8-2.8.10.1/debian/patches/series
@@ -0,0 +1,9 @@
+fix-build-with-python2.6.patch
+fix-wxversion-help-spelling
+xrced_bitmaps.dpatch
+fix-FTBFS.patch
+fix-config-scripts
+fix-configure-on-hurd
+fix-bashism-in-example
+fix-path-to-some-interpreters
+CVE-2009-2369.dpatch
--- wxwidgets2.8-2.8.10.1.orig/debian/patches/xrced_bitmaps.dpatch
+++ wxwidgets2.8-2.8.10.1/debian/patches/xrced_bitmaps.dpatch
@@ -0,0 +1,62 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## xrced_bitmaps.dpatch by Devid Filoni <d.filoni@techemail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: load bitmaps from /usr/share/python-wxgtk2.8/XRCed/plugins/bitmaps,
+## DP: needed to fix image-file-in-usr-lib lintian warning.
+
+@DPATCH@
+--- a/wxPython/wx/tools/XRCed/component.py
++++ b/wxPython/wx/tools/XRCed/component.py
+@@ -688,7 +688,7 @@
+         if panel not in self.panels: self.panels[panel] = []
+         # Auto-select bitmap if not provided
+         if not bitmap:
+-            bmpPath = os.path.join('bitmaps', component.klass + '.png')
++            bmpPath = os.path.join('/usr/share/python-wxgtk2.8/XRCed/plugins/bitmaps', component.klass + '.png')
+             if os.path.exists(bmpPath):
+                 bitmap = wx.Bitmap(bmpPath)
+             else:
+--- a/wxPython/wx/tools/XRCed/misc/maketools.py
++++ b/wxPython/wx/tools/XRCed/misc/maketools.py
+@@ -142,23 +142,23 @@
+ 
+ def snap(evt):
+     if evt.GetId() == xrc.XRCID('snap_panels'):
+-        WCTF(app.frame_panels, 'bitmaps')
++        WCTF(app.frame_panels, '/usr/share/python-wxgtk2.8/XRCed/plugins/bitmaps')
+     elif evt.GetId() == xrc.XRCID('snap_controls'):
+-        WCTF(app.frame_controls, 'bitmaps')
++        WCTF(app.frame_controls, '/usr/share/python-wxgtk2.8/XRCed/plugins/bitmaps')
+     elif evt.GetId() == xrc.XRCID('snap_frame'):
+-        WTF(app.frame_frame, 'bitmaps/wxFrame.png')
++        WTF(app.frame_frame, '/usr/share/python-wxgtk2.8/XRCed/plugins/bitmaps/wxFrame.png')
+     elif evt.GetId() == xrc.XRCID('snap_dialog'):
+-        WTF(app.frame_dialog, 'bitmaps/wxDialog.png')
++        WTF(app.frame_dialog, '/usr/share/python-wxgtk2.8/XRCed/plugins/bitmaps/wxDialog.png')
+     elif evt.GetId() == xrc.XRCID('snap_propsheetdialog'):
+         print 'sleeping 1 sec'
+         time.sleep(1)
+-        WTF(app.frame_propsheetdialog, 'bitmaps/wxPropertySheetDialog.png')
++        WTF(app.frame_propsheetdialog, '/usr/share/python-wxgtk2.8/XRCed/plugins/bitmaps/wxPropertySheetDialog.png')
+     elif evt.GetId() == xrc.XRCID('snap_menubar'):
+-        WTFC(app.frame_menubar, 'bitmaps/wxMenuBar.png', app.frame_menubar.GetMenuBar())
++        WTFC(app.frame_menubar, '/usr/share/python-wxgtk2.8/XRCed/plugins/bitmaps/wxMenuBar.png', app.frame_menubar.GetMenuBar())
+     elif evt.GetId() == xrc.XRCID('snap_menu'):
+-        WTFC(app.frame_menubar, 'bitmaps/wxMenuBar.png')
++        WTFC(app.frame_menubar, '/usr/share/python-wxgtk2.8/XRCed/plugins/bitmaps/wxMenuBar.png')
+     elif evt.GetId() == xrc.XRCID('snap_toolbar'):
+-        WTFC(app.frame_menubar, 'bitmaps/wxToolBar.png', app.frame_menubar.GetToolBar())
++        WTFC(app.frame_menubar, '/usr/share/python-wxgtk2.8/XRCed/plugins/bitmaps/wxToolBar.png', app.frame_menubar.GetToolBar())
+ 
+ if __name__ == '__main__':
+     try: 
+@@ -192,7 +192,7 @@
+     app.frame_menubar = res.LoadFrame(main_frame, 'FRAME_ToolBar')
+     app.frame_menubar.Show()
+ 
+-    if not os.path.exists('bitmaps'): os.mkdir('bitmaps')
++    if not os.path.exists('/usr/share/python-wxgtk2.8/XRCed/plugins/bitmaps'): os.mkdir('bitmaps')
+ 
+     main_frame.Bind(wx.EVT_MENU, snap, id=xrc.XRCID('snap_panels'))
+     main_frame.Bind(wx.EVT_MENU, snap, id=xrc.XRCID('snap_controls'))
--- wxwidgets2.8-2.8.10.1.orig/debian/patches/WX_CONFIG.dpatch
+++ wxwidgets2.8-2.8.10.1/debian/patches/WX_CONFIG.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## WX_CONFIG.dpatch by Devid Filoni <d.filoni@techemail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad wxwidgets2.8-2.8.6.1~/wxPython/wx/build/build_options.py wxwidgets2.8-2.8.6.1/wxPython/wx/build/build_options.py
+--- wxwidgets2.8-2.8.6.1~/wxPython/wx/build/build_options.py	2007-10-27 01:41:07.000000000 +0200
++++ wxwidgets2.8-2.8.6.1/wxPython/wx/build/build_options.py	2007-12-09 18:19:56.000000000 +0100
+@@ -5,7 +5,7 @@
+ FLAVOUR=""
+ EP_ADD_OPTS=1
+ EP_FULL_VER=0
+-WX_CONFIG="/opt/wx/current/bin/wx-config --toolkit=gtk2 --unicode=yes --version=2.8 2>/dev/null "
++WX_CONFIG="wx-config --toolkit=gtk2 --unicode=yes --version=2.8 2>/dev/null "
+ WXPORT="gtk2"
+ MONOLITHIC=0
+ FINAL=0
--- wxwidgets2.8-2.8.10.1.orig/debian/patches/fix-build-with-python2.6.patch
+++ wxwidgets2.8-2.8.10.1/debian/patches/fix-build-with-python2.6.patch
@@ -0,0 +1,22 @@
+diff --git a/wxPython/setup.py b/wxPython/setup.py
+index d987c5d..ac1edde 100755
+--- a/wxPython/setup.py
++++ b/wxPython/setup.py
+@@ -1033,7 +1033,7 @@ if __name__ == "__main__":
+ 
+               **other_kw
+               )
+-
++        BUILD_OPTIONS['build_base'] = BUILD_BASE + "-common"
+         if not EGGing:
+             if INSTALL_MULTIVERSION:
+                 setup(name             = 'wxPython-common',
+@@ -1048,7 +1048,7 @@ if __name__ == "__main__":
+                       platforms        = PLATFORMS,
+                       classifiers      = filter(None, CLASSIFIERS.split("\n")),
+                       keywords         = KEYWORDS,
+-
++                      packages = [''],
+                       package_dir = { '': 'wxversion' },
+                       py_modules = ['wxversion'],
+ 
--- wxwidgets2.8-2.8.10.1.orig/debian/patches/fix-bashism-in-example
+++ wxwidgets2.8-2.8.10.1/debian/patches/fix-bashism-in-example
@@ -0,0 +1,10 @@
+this patch really has no purpose.
+
+--- a/wxPython/demo/b
++++ b/wxPython/demo/b
+@@ -1,4 +1,4 @@
+ #!/bin/sh
+ cd ..
+-. b $*
++./b $*
+ cd -
--- wxwidgets2.8-2.8.10.1.orig/debian/patches/fix-FTBFS.patch
+++ wxwidgets2.8-2.8.10.1/debian/patches/fix-FTBFS.patch
@@ -0,0 +1,20 @@
+http://trac.wxwidgets.org/changeset/61009
+http://trac.wxwidgets.org/ticket/10883
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=549770
+
+--- a/src/gtk/gsockgtk.cpp
++++ b/src/gtk/gsockgtk.cpp
+@@ -15,8 +15,13 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ 
++// newer versions of glib define its own GSocket but we unfortunately use this
++// name in our own (semi-)public header and so can't change it -- rename glib
++// one instead
++#define GSocket GlibGSocket
+ #include <gdk/gdk.h>
+ #include <glib.h>
++#undef GSocket
+ 
+ #include "wx/gsocket.h"
+ #include "wx/unix/gsockunx.h"
--- wxwidgets2.8-2.8.10.1.orig/debian/patches/fix-configure-on-hurd
+++ wxwidgets2.8-2.8.10.1/debian/patches/fix-configure-on-hurd
@@ -0,0 +1,42 @@
+fix build on hurd
+
+--- a/build/aclocal/bakefile.m4
++++ b/build/aclocal/bakefile.m4
+@@ -444,7 +444,7 @@
+       ;;
+ 
+       powerpc-apple-macos* | \
+-      *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | *-*-k*bsd*-gnu | \
++      *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | *-*-gnu* | *-*-k*bsd*-gnu | \
+       *-*-mirbsd* | \
+       *-*-sunos4* | \
+       *-*-osf* | \
+@@ -496,7 +496,7 @@
+ 
+     case "${BAKEFILE_HOST}" in
+       *-*-linux* | *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \
+-      *-*-k*bsd*-gnu | *-*-mirbsd* )
++      *-*-k*bsd*-gnu | *-*-mirbsd* | *-*-gnu* )
+         if test "x$SUNCXX" = "xyes"; then
+             SONAME_FLAG="-h "
+         else
+--- a/configure
++++ b/configure
+@@ -49098,7 +49098,7 @@
+       ;;
+ 
+       powerpc-apple-macos* | \
+-      *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | *-*-k*bsd*-gnu | \
++      *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | *-*-gnu* | *-*-k*bsd*-gnu | \
+       *-*-mirbsd* | \
+       *-*-sunos4* | \
+       *-*-osf* | \
+@@ -49142,7 +49142,7 @@
+ 
+     case "${BAKEFILE_HOST}" in
+       *-*-linux* | *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \
+-      *-*-k*bsd*-gnu | *-*-mirbsd* )
++      *-*-k*bsd*-gnu | *-*-mirbsd* | *-*-gnu* )
+         if test "x$SUNCXX" = "xyes"; then
+             SONAME_FLAG="-h "
+         else
--- wxwidgets2.8-2.8.10.1.orig/debian/patches/fix-wxversion-help-spelling
+++ wxwidgets2.8-2.8.10.1/debian/patches/fix-wxversion-help-spelling
@@ -0,0 +1,13 @@
+#518540
+
+--- a/wxPython/wxversion/wxversion.py
++++ b/wxPython/wxversion/wxversion.py
+@@ -91,7 +91,7 @@
+     Search for a wxPython installation that matches version.  If one
+     is found then sys.path is modified so that version will be
+     imported with a 'import wx', otherwise a VersionError exception is
+-    raised.  This funciton should only be caled once at the begining
++    raised.  This function should only be caled once at the beginning
+     of the application before wxPython is imported.
+ 
+         :param versions: Specifies the version to look for, it can