Updates for debian build scripts to suit new library and tool status.

Updated config.{sub,guess} for new platform support.
Incorporated fixes to GNU/Hurd support and added GNU/K*BSD support.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26050 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

Makefile.in

@@ -17962,9 +17962,6 @@ MSW_DIST: ALL_GUI_DIST
 	cp $(MSWDIR)/*.c $(DISTDIR)/src/msw
 	cp $(MSWDIR)/*.def $(DISTDIR)/src/msw
 	cp $(MSWDIR)/ole/*.cpp $(DISTDIR)/src/msw/ole
-	cp $(MSWDIR)/wince/*.* $(DISTDIR)/src/msw/wince
-	mkdir $(DISTDIR)/contrib
-	cp -R $(WXDIR)/contrib $(DISTDIR)
 
 MSW_ZIP_TEXT_DIST: ALL_GUI_DIST
 	cp $(WXDIR)/wxWINE.spec $(DISTDIR)
@@ -18629,9 +18626,11 @@ PYTHON_DIST:
 	mkdir $(DISTDIR)/wxPython/contrib
 	mkdir $(DISTDIR)/wxPython/contrib/dllwidget
 	mkdir $(DISTDIR)/wxPython/contrib/gizmos
+	mkdir $(DISTDIR)/wxPython/contrib/gizmos/gtk
 	mkdir $(DISTDIR)/wxPython/contrib/glcanvas
 	mkdir $(DISTDIR)/wxPython/contrib/glcanvas/gtk
 	mkdir $(DISTDIR)/wxPython/contrib/ogl
+	mkdir $(DISTDIR)/wxPython/contrib/ogl/gtk
 	mkdir $(DISTDIR)/wxPython/contrib/stc
 	mkdir $(DISTDIR)/wxPython/contrib/stc/gtk
 	mkdir $(DISTDIR)/wxPython/contrib/xrc
@@ -18640,26 +18639,26 @@ PYTHON_DIST:
 	mkdir $(DISTDIR)/wxPython/demo/bmp_source
 	mkdir $(DISTDIR)/wxPython/demo/data
 	mkdir $(DISTDIR)/wxPython/demo/dllwidget
+	mkdir $(DISTDIR)/wxPython/docs
 	mkdir $(DISTDIR)/wxPython/src
 	mkdir $(DISTDIR)/wxPython/src/gtk
 	mkdir $(DISTDIR)/wxPython/scripts
 	mkdir $(DISTDIR)/wxPython/wxPython
 	mkdir $(DISTDIR)/wxPython/wxPython/lib
-	mkdir $(DISTDIR)/wxPython/wxPython/lib/PyCrust
+	mkdir $(DISTDIR)/wxPython/wxPython/lib/colourchooser
 	mkdir $(DISTDIR)/wxPython/wxPython/lib/editor
 	mkdir $(DISTDIR)/wxPython/wxPython/lib/mixins
 	mkdir $(DISTDIR)/wxPython/wxPython/tools
 	mkdir $(DISTDIR)/wxPython/wxPython/tools/XRCed
 
-	cp $(WXDIR)/wxPython/*.txt $(DISTDIR)/wxPython
 	cp $(WXDIR)/wxPython/*.py $(DISTDIR)/wxPython
-	cp $(WXDIR)/wxPython/setup.cfg $(DISTDIR)/wxPython
-	cp $(WXDIR)/wxPython/MANIFEST.in $(DISTDIR)/wxPython
 	cp $(WXDIR)/wxPython/contrib/dllwidget/*.{py,cpp,h,i} $(DISTDIR)/wxPython/contrib/dllwidget
-	cp $(WXDIR)/wxPython/contrib/gizmos/*.{py,cpp,i} $(DISTDIR)/wxPython/contrib/gizmos
+	cp $(WXDIR)/wxPython/contrib/gizmos/*.{cpp,h,i,txt} $(DISTDIR)/wxPython/contrib/gizmos
+	cp $(WXDIR)/wxPython/contrib/gizmos/gtk/*.{py,cpp} $(DISTDIR)/wxPython/contrib/gizmos/gtk
 	-cp $(WXDIR)/wxPython/contrib/glcanvas/* $(DISTDIR)/wxPython/contrib/glcanvas
 	cp $(WXDIR)/wxPython/contrib/glcanvas/gtk/glcanvas.* $(DISTDIR)/wxPython/contrib/glcanvas/gtk
-	-cp $(WXDIR)/wxPython/contrib/ogl/* $(DISTDIR)/wxPython/contrib/ogl
+	-cp $(WXDIR)/wxPython/contrib/ogl/*.{i,txt,h} $(DISTDIR)/wxPython/contrib/ogl
+	-cp $(WXDIR)/wxPython/contrib/ogl/gtk/*.{py,cpp} $(DISTDIR)/wxPython/contrib/ogl/gtk
 	-cp $(WXDIR)/wxPython/contrib/stc/* $(DISTDIR)/wxPython/contrib/stc
 	-cp $(WXDIR)/wxPython/contrib/stc/gtk/* $(DISTDIR)/wxPython/contrib/stc/gtk
 	-cp $(WXDIR)/wxPython/contrib/xrc/xrc.* $(DISTDIR)/wxPython/contrib/xrc
@@ -18674,11 +18673,10 @@ PYTHON_DIST:
 	cp $(WXDIR)/wxPython/src/gtk/*.py $(DISTDIR)/wxPython/src/gtk
 	cp $(WXDIR)/wxPython/src/gtk/*.cpp $(DISTDIR)/wxPython/src/gtk
 	cp $(WXDIR)/wxPython/wxPython/lib/*.py $(DISTDIR)/wxPython/wxPython/lib
-	cp $(WXDIR)/wxPython/wxPython/lib/PyCrust/*.py $(DISTDIR)/wxPython/wxPython/lib/PyCrust
+	cp $(WXDIR)/wxPython/wxPython/lib/colourchooser/*.py $(DISTDIR)/wxPython/wxPython/lib/colourchooser
 	cp $(WXDIR)/wxPython/wxPython/lib/editor/*.py $(DISTDIR)/wxPython/wxPython/lib/editor
 	cp $(WXDIR)/wxPython/wxPython/lib/mixins/*.py $(DISTDIR)/wxPython/wxPython/lib/mixins
 	cp $(WXDIR)/wxPython/wxPython/tools/*.py $(DISTDIR)/wxPython/wxPython/tools
-	cp $(WXDIR)/wxPython/wxPython/tools/XRCed/*.{py,ico,sh,xrc} $(DISTDIR)/wxPython/wxPython/tools/XRCed
 
 distrib_clean:
 	$(RM) -r _dist_dir
@@ -18776,8 +18774,16 @@ debian-dist: debian-native-dist debian-msw-dirs MSW_DIST
 			\( -name "makefile.*" -a ! -name "makefile.unx" \) \) \
 			-print0 | xargs -0 rm -rf
 
-	rm -rf $(WXDIR)/../wxwindows$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)
-	mv $(DISTDIR) $(WXDIR)/../wxwindows$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)
+	@# We can't get at the individual components of the version here
+	@# anymore, so strip the major and minor version out of the blob.
+
+	(								\
+	wx_version=$(WX_VERSION);					\
+	wx_release=$${wx_version%.*};					\
+	rm -rf $(WXDIR)/../wxwidgets$${wx_release}-$${wx_version};	\
+	mv $(DISTDIR) $(WXDIR)/../wxwidgets$${wx_release}-$${wx_version};\
+	)
+
 
 debian-native-dist: @GUIDIST@ UNIV_DIST MANUAL_DIST PYTHON_DIST
 

autoconf_inc.m4

@@ -2,9 +2,6 @@ dnl This macro was generated by
 dnl Bakefile 0.1.3 (http://bakefile.sourceforge.net)
 dnl Do not modify, all changes will be overwritten!
 
-
-dnl Conditions:
-
 dnl ### begin block 0_AC_BAKEFILE_PRECOMP_HEADERS ###
 AC_BAKEFILE_PRECOMP_HEADERS
 

build/bakefiles/make_dist.mk

@@ -303,9 +303,6 @@ MSW_DIST: ALL_GUI_DIST
 	cp $(MSWDIR)/*.c $(DISTDIR)/src/msw
 	cp $(MSWDIR)/*.def $(DISTDIR)/src/msw
 	cp $(MSWDIR)/ole/*.cpp $(DISTDIR)/src/msw/ole
-	cp $(MSWDIR)/wince/*.* $(DISTDIR)/src/msw/wince
-	mkdir $(DISTDIR)/contrib
-	cp -R $(WXDIR)/contrib $(DISTDIR)
 
 MSW_ZIP_TEXT_DIST: ALL_GUI_DIST
 	cp $(WXDIR)/wxWINE.spec $(DISTDIR)
@@ -970,9 +967,11 @@ PYTHON_DIST:
 	mkdir $(DISTDIR)/wxPython/contrib
 	mkdir $(DISTDIR)/wxPython/contrib/dllwidget
 	mkdir $(DISTDIR)/wxPython/contrib/gizmos
+	mkdir $(DISTDIR)/wxPython/contrib/gizmos/gtk
 	mkdir $(DISTDIR)/wxPython/contrib/glcanvas
 	mkdir $(DISTDIR)/wxPython/contrib/glcanvas/gtk
 	mkdir $(DISTDIR)/wxPython/contrib/ogl
+	mkdir $(DISTDIR)/wxPython/contrib/ogl/gtk
 	mkdir $(DISTDIR)/wxPython/contrib/stc
 	mkdir $(DISTDIR)/wxPython/contrib/stc/gtk
 	mkdir $(DISTDIR)/wxPython/contrib/xrc
@@ -981,26 +980,26 @@ PYTHON_DIST:
 	mkdir $(DISTDIR)/wxPython/demo/bmp_source
 	mkdir $(DISTDIR)/wxPython/demo/data
 	mkdir $(DISTDIR)/wxPython/demo/dllwidget
+	mkdir $(DISTDIR)/wxPython/docs
 	mkdir $(DISTDIR)/wxPython/src
 	mkdir $(DISTDIR)/wxPython/src/gtk
 	mkdir $(DISTDIR)/wxPython/scripts
 	mkdir $(DISTDIR)/wxPython/wxPython
 	mkdir $(DISTDIR)/wxPython/wxPython/lib
-	mkdir $(DISTDIR)/wxPython/wxPython/lib/PyCrust
+	mkdir $(DISTDIR)/wxPython/wxPython/lib/colourchooser
 	mkdir $(DISTDIR)/wxPython/wxPython/lib/editor
 	mkdir $(DISTDIR)/wxPython/wxPython/lib/mixins
 	mkdir $(DISTDIR)/wxPython/wxPython/tools
 	mkdir $(DISTDIR)/wxPython/wxPython/tools/XRCed
 
-	cp $(WXDIR)/wxPython/*.txt $(DISTDIR)/wxPython
 	cp $(WXDIR)/wxPython/*.py $(DISTDIR)/wxPython
-	cp $(WXDIR)/wxPython/setup.cfg $(DISTDIR)/wxPython
-	cp $(WXDIR)/wxPython/MANIFEST.in $(DISTDIR)/wxPython
 	cp $(WXDIR)/wxPython/contrib/dllwidget/*.{py,cpp,h,i} $(DISTDIR)/wxPython/contrib/dllwidget
-	cp $(WXDIR)/wxPython/contrib/gizmos/*.{py,cpp,i} $(DISTDIR)/wxPython/contrib/gizmos
+	cp $(WXDIR)/wxPython/contrib/gizmos/*.{cpp,h,i,txt} $(DISTDIR)/wxPython/contrib/gizmos
+	cp $(WXDIR)/wxPython/contrib/gizmos/gtk/*.{py,cpp} $(DISTDIR)/wxPython/contrib/gizmos/gtk
 	-cp $(WXDIR)/wxPython/contrib/glcanvas/* $(DISTDIR)/wxPython/contrib/glcanvas
 	cp $(WXDIR)/wxPython/contrib/glcanvas/gtk/glcanvas.* $(DISTDIR)/wxPython/contrib/glcanvas/gtk
-	-cp $(WXDIR)/wxPython/contrib/ogl/* $(DISTDIR)/wxPython/contrib/ogl
+	-cp $(WXDIR)/wxPython/contrib/ogl/*.{i,txt,h} $(DISTDIR)/wxPython/contrib/ogl
+	-cp $(WXDIR)/wxPython/contrib/ogl/gtk/*.{py,cpp} $(DISTDIR)/wxPython/contrib/ogl/gtk
 	-cp $(WXDIR)/wxPython/contrib/stc/* $(DISTDIR)/wxPython/contrib/stc
 	-cp $(WXDIR)/wxPython/contrib/stc/gtk/* $(DISTDIR)/wxPython/contrib/stc/gtk
 	-cp $(WXDIR)/wxPython/contrib/xrc/xrc.* $(DISTDIR)/wxPython/contrib/xrc
@@ -1015,11 +1014,10 @@ PYTHON_DIST:
 	cp $(WXDIR)/wxPython/src/gtk/*.py $(DISTDIR)/wxPython/src/gtk
 	cp $(WXDIR)/wxPython/src/gtk/*.cpp $(DISTDIR)/wxPython/src/gtk
 	cp $(WXDIR)/wxPython/wxPython/lib/*.py $(DISTDIR)/wxPython/wxPython/lib
-	cp $(WXDIR)/wxPython/wxPython/lib/PyCrust/*.py $(DISTDIR)/wxPython/wxPython/lib/PyCrust
+	cp $(WXDIR)/wxPython/wxPython/lib/colourchooser/*.py $(DISTDIR)/wxPython/wxPython/lib/colourchooser
 	cp $(WXDIR)/wxPython/wxPython/lib/editor/*.py $(DISTDIR)/wxPython/wxPython/lib/editor
 	cp $(WXDIR)/wxPython/wxPython/lib/mixins/*.py $(DISTDIR)/wxPython/wxPython/lib/mixins
 	cp $(WXDIR)/wxPython/wxPython/tools/*.py $(DISTDIR)/wxPython/wxPython/tools
-	cp $(WXDIR)/wxPython/wxPython/tools/XRCed/*.{py,ico,sh,xrc} $(DISTDIR)/wxPython/wxPython/tools/XRCed
 
 distrib_clean:
 	$(RM) -r _dist_dir
@@ -1117,8 +1115,16 @@ debian-dist: debian-native-dist debian-msw-dirs MSW_DIST
 			\( -name "makefile.*" -a ! -name "makefile.unx" \) \) \
 			-print0 | xargs -0 rm -rf
 
-	rm -rf $(WXDIR)/../wxwindows$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)
-	mv $(DISTDIR) $(WXDIR)/../wxwindows$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)
+	@# We can't get at the individual components of the version here
+	@# anymore, so strip the major and minor version out of the blob.
+
+	(								\
+	wx_version=$(WX_VERSION);					\
+	wx_release=$${wx_version%.*};					\
+	rm -rf $(WXDIR)/../wxwidgets$${wx_release}-$${wx_version};	\
+	mv $(DISTDIR) $(WXDIR)/../wxwidgets$${wx_release}-$${wx_version};\
+	)
+
 
 debian-native-dist: @GUIDIST@ UNIV_DIST MANUAL_DIST PYTHON_DIST
 

build/msw/makefile.bcc

@@ -2758,9 +2758,6 @@ clean:
 	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_bcc$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_bcc$(VENDORTAG).ils
 	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib
 	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib
-	cd ..\..\samples
-	$(MAKE) -f makefile.bcc $(MAKEARGS) clean
-	cd ..\..\..
 
 setup_h: $(SETUPHDIR)\wx ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h $(SETUPHDIR)\wx\setup.h
 

build/msw/makefile.gcc

@@ -2783,7 +2783,6 @@ clean:
 	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_gcc$(VENDORTAG).dll
 	-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.a
 	-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.a
-	$(MAKE) -C ..\..\samples -f makefile.gcc $(MAKEARGS) clean
 
 setup_h: $(SETUPHDIR)\wx ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h $(SETUPHDIR)\wx\setup.h
 

build/msw/makefile.vc

@@ -3326,9 +3326,6 @@ clean:
 	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_vc$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_vc$(VENDORTAG).pdb
 	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib
 	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib
-	cd ..\..\samples
-	$(MAKE) -f makefile.vc $(MAKEARGS) clean
-	cd $(MAKEDIR)
 
 setup_h: $(SETUPHDIR)\wx ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h $(SETUPHDIR)\wx\setup.h
 

build/msw/makefile.wat

@@ -2869,9 +2869,6 @@ clean : .SYMBOLIC
 	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl_wat$(VENDORTAG).dll
 	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib
 	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gl.lib
-	cd ..\..\samples
-	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
-	cd $(WATCOM_CWD)
 
 setup_h : .SYMBOLIC $(SETUPHDIR)\wx ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h $(SETUPHDIR)\wx\setup.h
 

config.guess

@@ -1,9 +1,9 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
-timestamp='2002-11-30'
+timestamp='2004-01-05'
 
 # 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
@@ -98,14 +98,18 @@ trap 'exit 1' 1 2 15
 # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
 # use `HOST_CC' if defined, but it is deprecated.
 
-# This shell variable is my proudest work .. or something. --bje
+# Portable tmp directory creation inspired by the Autoconf team.
 
-set_cc_for_build='tmpdir=${TMPDIR-/tmp}/config-guess-$$ ;
-(old=`umask` && umask 077 && mkdir $tmpdir && umask $old && unset old)
-   || (echo "$me: cannot create $tmpdir" >&2 && exit 1) ;
-dummy=$tmpdir/dummy ;
-files="$dummy.c $dummy.o $dummy.rel $dummy" ;
-trap '"'"'rm -f $files; rmdir $tmpdir; exit 1'"'"' 1 2 15 ;
+set_cc_for_build='
+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" ; } ||
+ { 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 ; } ;
+dummy=$tmp/dummy ;
+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
 case $CC_FOR_BUILD,$HOST_CC,$CC in
  ,,)    echo "int x;" > $dummy.c ;
 	for c in cc gcc c89 c99 ; do
@@ -113,15 +117,13 @@ case $CC_FOR_BUILD,$HOST_CC,$CC in
 	     CC_FOR_BUILD="$c"; break ;
 	  fi ;
 	done ;
-	rm -f $files ;
 	if test x"$CC_FOR_BUILD" = x ; then
 	  CC_FOR_BUILD=no_compiler_found ;
 	fi
 	;;
  ,,*)   CC_FOR_BUILD=$CC ;;
  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ;
-unset files'
+esac ;'
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 1994-08-24)
@@ -219,6 +221,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     mvmeppc:OpenBSD:*:*)
 	echo powerpc-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
+    pegasos:OpenBSD:*:*)
+	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     pmax:OpenBSD:*:*)
 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
@@ -238,68 +243,52 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	if test $UNAME_RELEASE = "V4.0"; then
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
 	fi
+	# According to Compaq, /usr/sbin/psrinfo has been available on
+	# OSF/1 and Tru64 systems produced since 1995.  I hope that
+	# covers most systems running today.  This code pipes the CPU
+	# types through head -n 1, so we only detect the type of CPU 0.
+	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
+	case "$ALPHA_CPU_TYPE" in
+	    "EV4 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV4.5 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "LCA4 (21066/21068)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV5 (21164)")
+		UNAME_MACHINE="alphaev5" ;;
+	    "EV5.6 (21164A)")
+		UNAME_MACHINE="alphaev56" ;;
+	    "EV5.6 (21164PC)")
+		UNAME_MACHINE="alphapca56" ;;
+	    "EV5.7 (21164PC)")
+		UNAME_MACHINE="alphapca57" ;;
+	    "EV6 (21264)")
+		UNAME_MACHINE="alphaev6" ;;
+	    "EV6.7 (21264A)")
+		UNAME_MACHINE="alphaev67" ;;
+	    "EV6.8CB (21264C)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8AL (21264B)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8CX (21264D)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.9A (21264/EV69A)")
+		UNAME_MACHINE="alphaev69" ;;
+	    "EV7 (21364)")
+		UNAME_MACHINE="alphaev7" ;;
+	    "EV7.9 (21364A)")
+		UNAME_MACHINE="alphaev79" ;;
+	esac
 	# A Vn.n version is a released version.
 	# A Tn.n version is a released field test version.
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
-	eval $set_cc_for_build
-	cat <<EOF >$dummy.s
-	.data
-\$Lformat:
-	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
-
-	.text
-	.globl main
-	.align 4
-	.ent main
-main:
-	.frame \$30,16,\$26,0
-	ldgp \$29,0(\$27)
-	.prologue 1
-	.long 0x47e03d80 # implver \$0
-	lda \$2,-1
-	.long 0x47e20c21 # amask \$2,\$1
-	lda \$16,\$Lformat
-	mov \$0,\$17
-	not \$1,\$18
-	jsr \$26,printf
-	ldgp \$29,0(\$26)
-	mov 0,\$16
-	jsr \$26,exit
-	.end main
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.s 2>/dev/null
-	if test "$?" = 0 ; then
-		case `$dummy` in
-			0-0)
-				UNAME_MACHINE="alpha"
-				;;
-			1-0)
-				UNAME_MACHINE="alphaev5"
-				;;
-			1-1)
-				UNAME_MACHINE="alphaev56"
-				;;
-			1-101)
-				UNAME_MACHINE="alphapca56"
-				;;
-			2-303)
-				UNAME_MACHINE="alphaev6"
-				;;
-			2-307)
-				UNAME_MACHINE="alphaev67"
-				;;
-			2-1307)
-				UNAME_MACHINE="alphaev68"
-				;;
-			3-1307)
-				UNAME_MACHINE="alphaev7"
-				;;
-		esac
-	fi
-	rm -f $dummy.s $dummy && rmdir $tmpdir
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
 	exit 0 ;;
+    Alpha*:OpenVMS:*:*)
+	echo alpha-hp-vms
+	exit 0 ;;
     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
@@ -321,6 +310,9 @@ EOF
     *:OS/390:*:*)
 	echo i370-ibm-openedition
 	exit 0 ;;
+    *:OS400:*:*)
+        echo powerpc-ibm-os400
+	exit 0 ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit 0;;
@@ -338,6 +330,9 @@ EOF
     NILE*:*:*:dcosx)
 	echo pyramid-pyramid-svr4
 	exit 0 ;;
+    DRS?6000:unix:4.0:6*)
+	echo sparc-icl-nx6
+	exit 0 ;;
     DRS?6000:UNIX_SV:4.2*:7*)
 	case `/usr/bin/uname -p` in
 	    sparc) echo sparc-icl-nx7 && exit 0 ;;
@@ -450,8 +445,7 @@ EOF
 EOF
 	$CC_FOR_BUILD -o $dummy $dummy.c \
 	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
-	rm -f $dummy.c $dummy && rmdir $tmpdir
+	  && exit 0
 	echo mips-mips-riscos${UNAME_RELEASE}
 	exit 0 ;;
     Motorola:PowerMAX_OS:*:*)
@@ -535,8 +529,7 @@ EOF
 			exit(0);
 			}
 EOF
-		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
-		rm -f $dummy.c $dummy && rmdir $tmpdir
+		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
 		echo rs6000-ibm-aix3.2.5
 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
 		echo rs6000-ibm-aix3.2.4
@@ -635,10 +628,20 @@ EOF
               }
 EOF
 		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-		    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
-		    rm -f $dummy.c $dummy && rmdir $tmpdir
+		    test -z "$HP_ARCH" && HP_ARCH=hppa
 		fi ;;
 	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
+	    then
+		HP_ARCH="hppa2.0w"
+	    else
+		HP_ARCH="hppa64"
+	    fi
+	fi
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
 	exit 0 ;;
     ia64:HP-UX:*:*)
@@ -672,8 +675,7 @@ EOF
 	  exit (0);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
-	rm -f $dummy.c $dummy && rmdir $tmpdir
+	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
 	echo unknown-hitachi-hiuxwe2
 	exit 0 ;;
     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
@@ -731,21 +733,26 @@ EOF
     CRAY*TS:*:*:*)
 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
-    CRAY*T3D:*:*:*)
-	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
     CRAY*T3E:*:*:*)
 	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
     CRAY*SV1:*:*:*)
 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
+    *:UNICOS/mp:*:*)
+	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit 0 ;;
     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 ;;
+    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 ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
 	exit 0 ;;
@@ -767,8 +774,10 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	rm -f $dummy.c && rmdir $tmpdir
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
+	# GNU/KFreeBSD systems have a "k" prefix to indicate we are using
+	# FreeBSD's kernel, but not the complete OS.
+	case ${LIBC} in gnu) kernel_only='k' ;; esac
+	echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
 	exit 0 ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
@@ -779,8 +788,8 @@ EOF
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit 0 ;;
-    x86:Interix*:3*)
-	echo i586-pc-interix3
+    x86:Interix*:[34]*)
+	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
 	exit 0 ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
@@ -801,14 +810,22 @@ EOF
 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit 0 ;;
     *:GNU:*:*)
+	# the GNU system
 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit 0 ;;
+    *: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 ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit 0 ;;
     arm*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
+    cris:Linux:*:*)
+	echo cris-axis-linux-gnu
+	exit 0 ;;
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
@@ -832,7 +849,6 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	rm -f $dummy.c && rmdir $tmpdir
 	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
 	;;
     mips64:Linux:*:*)
@@ -852,7 +868,6 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	rm -f $dummy.c && rmdir $tmpdir
 	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
 	;;
     ppc:Linux:*:*)
@@ -889,6 +904,9 @@ EOF
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit 0 ;;
+    sh64*:Linux:*:*)
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
     sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
@@ -946,9 +964,11 @@ EOF
 	LIBC=gnuaout
 	#endif
 	#endif
+	#ifdef __dietlibc__
+	LIBC=dietlibc
+	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	rm -f $dummy.c && rmdir $tmpdir
 	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
 	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
 	;;
@@ -977,6 +997,9 @@ EOF
     i*86:atheos:*:*)
 	echo ${UNAME_MACHINE}-unknown-atheos
 	exit 0 ;;
+	i*86:syllable:*:*)
+	echo ${UNAME_MACHINE}-pc-syllable
+	exit 0 ;;
     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
@@ -1048,7 +1071,7 @@ EOF
 	exit 0 ;;
     M68*:*:R3V[567]*:*)
 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*: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)
+    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)
 	OS_REL=''
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
@@ -1146,7 +1169,11 @@ EOF
 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
 	exit 0 ;;
     *:Darwin:*:*)
-	echo `uname -p`-apple-darwin${UNAME_RELEASE}
+	case `uname -p` in
+	    *86) UNAME_PROCESSOR=i686 ;;
+	    powerpc) UNAME_PROCESSOR=powerpc ;;
+	esac
+	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
 	exit 0 ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
 	UNAME_PROCESSOR=`uname -p`
@@ -1159,7 +1186,7 @@ EOF
     *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit 0 ;;
-    NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
+    NSR-?:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
 	exit 0 ;;
     *:NonStop-UX:*:*)
@@ -1200,6 +1227,12 @@ EOF
     *:ITS:*:*)
 	echo pdp10-unknown-its
 	exit 0 ;;
+    SEI:*:*:SEIUX)
+        echo mips-sei-seiux${UNAME_RELEASE}
+	exit 0 ;;
+    *:DRAGONFLY:*:*)
+	echo ${UNAME_MACHINE}-unknown-dragonfly${UNAME_RELEASE}
+	exit 0 ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1320,8 +1353,7 @@ main ()
 }
 EOF
 
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
-rm -f $dummy.c $dummy && rmdir $tmpdir
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
 
 # Apollos put the system type in the environment.
 

config.sub

@@ -1,9 +1,9 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-#   Free Software Foundation, Inc.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
-timestamp='2001-09-07'
+timestamp='2004-01-05'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -29,7 +29,8 @@ timestamp='2001-09-07'
 # 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>.
+# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff and a properly formatted ChangeLog entry.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@@ -117,7 +118,8 @@ esac
 # 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* | storm-chaos* | os2-emx* | windows32-*)
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
+  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -226,32 +228,46 @@ case $basic_machine in
 	1750a | 580 \
 	| a29k \
 	| 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 \
 	| c4x | clipper \
-	| d10v | d30v | dsp16xx \
-	| fr30 \
+	| d10v | d30v | dlx | dsp16xx \
+	| fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
+	| ip2k | iq2000 \
 	| m32r | m68000 | m68k | m88k | mcore \
-	| mips16 | mips64 | mips64el | mips64orion | mips64orionel \
-	| mips64vr4100 | mips64vr4100el | mips64vr4300 \
-	| mips64vr4300el | mips64vr5000 | mips64vr5000el \
-	| mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
-	| mipsisa32 \
+	| mips | mipsbe | mipseb | mipsel | mipsle \
+	| mips16 \
+	| mips64 | mips64el \
+	| mips64vr | mips64vrel \
+	| mips64orion | mips64orionel \
+	| mips64vr4100 | mips64vr4100el \
+	| mips64vr4300 | mips64vr4300el \
+	| mips64vr5000 | mips64vr5000el \
+	| mipsisa32 | mipsisa32el \
+	| mipsisa32r2 | mipsisa32r2el \
+	| mipsisa64 | mipsisa64el \
+	| mipsisa64r2 | mipsisa64r2el \
+	| mipsisa64sb1 | mipsisa64sb1el \
+	| mipsisa64sr71k | mipsisa64sr71kel \
+	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
+	| msp430 \
 	| ns16k | ns32k \
-	| openrisc \
+	| openrisc | or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| s390 | s390x \
-	| sh | sh[34] | sh[34]eb | shbe | shle \
-	| sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \
-	| stormy16 | strongarm \
-	| tahoe | thumb | tic80 | tron \
-	| v850 \
+	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+	| sh64 | sh64le \
+	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
+	| strongarm \
+	| tahoe | thumb | tic4x | tic80 | tron \
+	| v850 | v850e \
 	| we32k \
-	| x86 | xscale \
+	| x86 | xscale | xstormy16 | xtensa \
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
@@ -278,38 +294,56 @@ case $basic_machine in
 	580-* \
 	| a29k-* \
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alphapca5[67]-* | arc-* \
-	| arm-*  | armbe-* | armle-* | armv*-* \
+	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+	| avr-* \
 	| bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c54x-* \
-	| clipper-* | cray2-* | cydra-* \
-	| d10v-* | d30v-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+	| clipper-* | cydra-* \
+	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | fx80-* \
+	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
+	| ip2k-* | iq2000-* \
 	| m32r-* \
-	| m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \
+	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
 	| m88110-* | m88k-* | mcore-* \
-	| mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
-	| mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
-	| mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
-	| none-* | np1-* | ns16k-* | ns32k-* \
+	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+	| mips16-* \
+	| mips64-* | mips64el-* \
+	| mips64vr-* | mips64vrel-* \
+	| mips64orion-* | mips64orionel-* \
+	| mips64vr4100-* | mips64vr4100el-* \
+	| mips64vr4300-* | mips64vr4300el-* \
+	| mips64vr5000-* | mips64vr5000el-* \
+	| mipsisa32-* | mipsisa32el-* \
+	| mipsisa32r2-* | mipsisa32r2el-* \
+	| mipsisa64-* | mipsisa64el-* \
+	| mipsisa64r2-* | mipsisa64r2el-* \
+	| mipsisa64sb1-* | mipsisa64sb1el-* \
+	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+	| mipstx39-* | mipstx39el-* \
+	| msp430-* \
+	| none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| s390-* | s390x-* \
-	| sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \
-	| sparc-* | sparc64-* | sparc86x-* | sparclite-* \
-	| sparcv9-* | sparcv9b-* | stormy16-* | strongarm-* | sv1-* \
-	| t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
-	| v850-* | vax-* \
+	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
+	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+	| tahoe-* | thumb-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tron-* \
+	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xmp-* | xps100-* | xscale-* \
+	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
+	| xtensa-* \
 	| ymp-* \
 	| z8k-*)
 		;;
@@ -343,6 +377,12 @@ case $basic_machine in
 		basic_machine=a29k-none
 		os=-bsd
 		;;
+	amd64)
+		basic_machine=x86_64-pc
+		;;
+	amd64-*)
+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	amdahl)
 		basic_machine=580-amdahl
 		os=-sysv
@@ -374,6 +414,10 @@ case $basic_machine in
 		basic_machine=ns32k-sequent
 		os=-dynix
 		;;
+	c90)
+		basic_machine=c90-cray
+		os=-unicos
+		;;
 	convex-c1)
 		basic_machine=c1-convex
 		os=-bsd
@@ -394,16 +438,8 @@ case $basic_machine in
 		basic_machine=c38-convex
 		os=-bsd
 		;;
-	cray | ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	cray2)
-		basic_machine=cray2-cray
-		os=-unicos
-		;;
-	[cjt]90)
-		basic_machine=${basic_machine}-cray
+	cray | j90)
+		basic_machine=j90-cray
 		os=-unicos
 		;;
 	crds | unos)
@@ -418,6 +454,14 @@ case $basic_machine in
 	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
 		basic_machine=mips-dec
 		;;
+	decsystem10* | dec10*)
+		basic_machine=pdp10-dec
+		os=-tops10
+		;;
+	decsystem20* | dec20*)
+		basic_machine=pdp10-dec
+		os=-tops20
+		;;
 	delta | 3300 | motorola-3300 | motorola-delta \
 	      | 3300-motorola | delta-motorola)
 		basic_machine=m68k-motorola
@@ -598,14 +642,6 @@ case $basic_machine in
 		basic_machine=m68k-atari
 		os=-mint
 		;;
-	mipsel*-linux*)
-		basic_machine=mipsel-unknown
-		os=-linux-gnu
-		;;
-	mips*-linux*)
-		basic_machine=mips-unknown
-		os=-linux-gnu
-		;;
 	mips3*-*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
 		;;
@@ -620,6 +656,10 @@ case $basic_machine in
 		basic_machine=m68k-rom68k
 		os=-coff
 		;;
+	morphos)
+		basic_machine=powerpc-unknown
+		os=-morphos
+		;;
 	msdos)
 		basic_machine=i386-pc
 		os=-msdos
@@ -692,6 +732,10 @@ case $basic_machine in
 	np1)
 		basic_machine=np1-gould
 		;;
+	nv1)
+		basic_machine=nv1-cray
+		os=-unicosmp
+		;;
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
@@ -699,6 +743,14 @@ case $basic_machine in
 		basic_machine=hppa1.1-oki
 		os=-proelf
 		;;
+	or32 | or32-*)
+		basic_machine=or32-unknown
+		os=-coff
+		;;
+	os400)
+		basic_machine=powerpc-ibm
+		os=-os400
+		;;
 	OSE68000 | ose68000)
 		basic_machine=m68000-ericsson
 		os=-ose
@@ -721,49 +773,55 @@ case $basic_machine in
 	pbb)
 		basic_machine=m68k-tti
 		;;
-        pc532 | pc532-*)
+	pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
-	pentium | p5 | k5 | k6 | nexgen)
+	pentium | p5 | k5 | k6 | nexgen | viac3)
 		basic_machine=i586-pc
 		;;
-	pentiumpro | p6 | 6x86 | athlon)
+	pentiumpro | p6 | 6x86 | athlon | athlon_*)
 		basic_machine=i686-pc
 		;;
-	pentiumii | pentium2)
+	pentiumii | pentium2 | pentiumiii | pentium3)
 		basic_machine=i686-pc
 		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-*)
+	pentium4)
+		basic_machine=i786-pc
+		;;
+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pentiumpro-* | p6-* | 6x86-* | athlon-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentiumii-* | pentium2-*)
+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
+	pentium4-*)
+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	pn)
 		basic_machine=pn-gould
 		;;
 	power)	basic_machine=power-ibm
 		;;
 	ppc)	basic_machine=powerpc-unknown
-	        ;;
+		;;
 	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppcle | powerpclittle | ppc-le | powerpc-little)
 		basic_machine=powerpcle-unknown
-	        ;;
+		;;
 	ppcle-* | powerpclittle-*)
 		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppc64)	basic_machine=powerpc64-unknown
-	        ;;
+		;;
 	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
 		basic_machine=powerpc64le-unknown
-	        ;;
+		;;
 	ppc64le-* | powerpc64little-*)
 		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
@@ -784,10 +842,26 @@ case $basic_machine in
 	rtpc | rtpc-*)
 		basic_machine=romp-ibm
 		;;
+	s390 | s390-*)
+		basic_machine=s390-ibm
+		;;
+	s390x | s390x-*)
+		basic_machine=s390x-ibm
+		;;
 	sa29200)
 		basic_machine=a29k-amd
 		os=-udi
 		;;
+	sb1)
+		basic_machine=mipsisa64sb1-unknown
+		;;
+	sb1el)
+		basic_machine=mipsisa64sb1el-unknown
+		;;
+	sei)
+		basic_machine=mips-sei
+		os=-seiux
+		;;
 	sequent)
 		basic_machine=i386-sequent
 		;;
@@ -795,7 +869,10 @@ case $basic_machine in
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
-	sparclite-wrs)
+	sh64)
+		basic_machine=sh64-unknown
+		;;
+	sparclite-wrs | simso-wrs)
 		basic_machine=sparclite-wrs
 		os=-vxworks
 		;;
@@ -862,22 +939,42 @@ case $basic_machine in
 		os=-dynix
 		;;
 	t3e)
-		basic_machine=t3e-cray
+		basic_machine=alphaev5-cray
+		os=-unicos
+		;;
+	t90)
+		basic_machine=t90-cray
 		os=-unicos
 		;;
 	tic54x | c54x*)
 		basic_machine=tic54x-unknown
 		os=-coff
 		;;
+	tic55x | c55x*)
+		basic_machine=tic55x-unknown
+		os=-coff
+		;;
+	tic6x | c6x*)
+		basic_machine=tic6x-unknown
+		os=-coff
+		;;
 	tx39)
 		basic_machine=mipstx39-unknown
 		;;
 	tx39el)
 		basic_machine=mipstx39el-unknown
 		;;
+	toad1)
+		basic_machine=pdp10-xkl
+		os=-tops20
+		;;
 	tower | tower-32)
 		basic_machine=m68k-ncr
 		;;
+	tpf)
+		basic_machine=s390x-ibm
+		os=-tpf
+		;;
 	udi29k)
 		basic_machine=a29k-amd
 		os=-udi
@@ -899,8 +996,8 @@ case $basic_machine in
 		os=-vms
 		;;
 	vpp*|vx|vx-*)
-               basic_machine=f301-fujitsu
-               ;;
+		basic_machine=f301-fujitsu
+		;;
 	vxworks960)
 		basic_machine=i960-wrs
 		os=-vxworks
@@ -921,17 +1018,13 @@ case $basic_machine in
 		basic_machine=hppa1.1-winbond
 		os=-proelf
 		;;
-	windows32)
-		basic_machine=i386-pc
-		os=-windows32-msvcrt
-		;;
-	xmp)
-		basic_machine=xmp-cray
-		os=-unicos
-		;;
-        xps | xps100)
+	xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
+	ymp)
+		basic_machine=ymp-cray
+		os=-unicos
+		;;
 	z8k-*-coff)
 		basic_machine=z8k-unknown
 		os=-sim
@@ -952,13 +1045,6 @@ case $basic_machine in
 	op60c)
 		basic_machine=hppa1.1-oki
 		;;
-	mips)
-		if [ x$os = x-linux-gnu ]; then
-			basic_machine=mips-unknown
-		else
-			basic_machine=mips-mips
-		fi
-		;;
 	romp)
 		basic_machine=romp-ibm
 		;;
@@ -978,13 +1064,16 @@ case $basic_machine in
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh3 | sh4 | sh3eb | sh4eb)
+	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
+	sh64)
+		basic_machine=sh64-unknown
+		;;
 	sparc | sparcv9 | sparcv9b)
 		basic_machine=sparc-sun
 		;;
-        cydra)
+	cydra)
 		basic_machine=cydra-cydrome
 		;;
 	orion)
@@ -999,10 +1088,6 @@ case $basic_machine in
 	pmac | pmac-mpw)
 		basic_machine=powerpc-apple
 		;;
-	c4x*)
-		basic_machine=c4x-none
-		os=-coff
-		;;
 	*-unknown)
 		# Make sure to match an already-canonicalized machine name.
 		;;
@@ -1058,17 +1143,19 @@ case $os in
 	      | -aos* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
+	      | -hiux* | -386bsd* | -knetbsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \
 	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
+	      | -mingw32* | -linux-gnu* | -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*)
+	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1080,8 +1167,10 @@ case $os in
 			;;
 		esac
 		;;
+	-nto-qnx*)
+		;;
 	-nto*)
-		os=-nto-qnx
+		os=`echo $os | sed -e 's|nto|nto-qnx|'`
 		;;
 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
 	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
@@ -1090,6 +1179,9 @@ case $os in
 	-mac*)
 		os=`echo $os | sed -e 's|mac|macos|'`
 		;;
+	-linux-dietlibc)
+		os=-linux-dietlibc
+		;;
 	-linux*)
 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
 		;;
@@ -1102,6 +1194,9 @@ case $os in
 	-opened*)
 		os=-openedition
 		;;
+        -os400*)
+		os=-os400
+		;;
 	-wince*)
 		os=-wince
 		;;
@@ -1120,14 +1215,23 @@ case $os in
 	-acis*)
 		os=-aos
 		;;
+	-atheos*)
+		os=-atheos
+		;;
+	-syllable*)
+		os=-syllable
+		;;
 	-386bsd)
 		os=-bsd
 		;;
 	-ctix* | -uts*)
 		os=-sysv
 		;;
+	-nova*)
+		os=-rtmk-nova
+		;;
 	-ns2 )
-	        os=-nextstep2
+		os=-nextstep2
 		;;
 	-nsk*)
 		os=-nsk
@@ -1139,6 +1243,9 @@ case $os in
 	-sinix*)
 		os=-sysv4
 		;;
+        -tpf*)
+		os=-tpf
+		;;
 	-triton*)
 		os=-sysv3
 		;;
@@ -1166,8 +1273,14 @@ case $os in
 	-xenix)
 		os=-xenix
 		;;
-        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-	        os=-mint
+	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+		os=-mint
+		;;
+	-aros*)
+		os=-aros
+		;;
+	-kaos*)
+		os=-kaos
 		;;
 	-none)
 		;;
@@ -1200,10 +1313,14 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
+    c4x-* | tic4x-*)
+        os=-coff
+        ;;
+	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
 		;;
-        pdp11-*)
+	pdp11-*)
 		os=-none
 		;;
 	*-dec | vax-*)
@@ -1230,6 +1347,9 @@ case $basic_machine in
 	mips*-*)
 		os=-elf
 		;;
+	or32-*)
+		os=-coff
+		;;
 	*-tti)	# must be before sparc entry or we get the wrong os.
 		os=-sysv3
 		;;
@@ -1293,19 +1413,19 @@ case $basic_machine in
 	*-next)
 		os=-nextstep3
 		;;
-        *-gould)
+	*-gould)
 		os=-sysv
 		;;
-        *-highlevel)
+	*-highlevel)
 		os=-bsd
 		;;
 	*-encore)
 		os=-bsd
 		;;
-        *-sgi)
+	*-sgi)
 		os=-irix
 		;;
-        *-siemens)
+	*-siemens)
 		os=-sysv4
 		;;
 	*-masscomp)
@@ -1374,10 +1494,16 @@ case $basic_machine in
 			-mvs* | -opened*)
 				vendor=ibm
 				;;
+			-os400*)
+				vendor=ibm
+				;;
 			-ptx*)
 				vendor=sequent
 				;;
-			-vxsim* | -vxworks*)
+			-tpf*)
+				vendor=ibm
+				;;
+			-vxsim* | -vxworks* | -windiss*)
 				vendor=wrs
 				;;
 			-aux*)

configure.in

@@ -165,9 +165,8 @@ case "${host}" in
     fi
     DEFAULT_DEFAULT_wxUSE_GTK=1
   ;;
-  *-*-gnu* )
+  *-*-gnu* | *-*-k*bsd*-gnu )
     USE_GNU=1
-    AC_DEFINE(__GNU__)
     TMP=`uname -m`
     if test "x$TMP" = "xalpha"; then
       USE_ALPHA=1

debian/README.Debian

@@ -1,11 +1,7 @@
-wxwindows for Debian
+wxwidgets for Debian
 ----------------------
 
-The following packages are built from the wxWindows 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__
+The following packages are built from the wxWidgets CVS source.
 
 libwxgtk		wxGTK runtime shared libraries
 libwxgtk-dev		extra files and static libs for building wxGTK apps
@@ -15,24 +11,24 @@ libwxgtk-python		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)
 
-wxwin-contrib		wxWin contrib runtime shared libs (built with wxGTK)
-wxwin-contrib-dev	extra files and static contrib libs for building apps
+libwxgtk-contrib	wxWin contrib runtime shared libs (built with wxGTK)
+libwxgtk-contrib-dev	extra files and static contrib libs for building apps
 
-wxwin-headers		common header files for building wxWindows apps
-wxwin-doc		HTML version of the wxWindows manual
-wxwin-examples		wxWindows and wxPython demos and samples (source)
-wxwin-i18n		message catalogs for native language support
+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
 
 
-	The following three can be built from the source package
+	The following binaries can be built from the source package
 	with the mingw32 cross compiler, but are not currently
 	distributed by Debian.  If you feel that should change,
-	please file a bug against the wxwindows2.4 package, or
+	please file a bug against the wxwidgets2.5 package, or
 	append your views to a report already there if you're not
 	the first to do so.
 
 	[ you can check the current state of affairs at:
-	  http://bugs.debian.org/cgi-bin/pkgreport.cgi?pkg=wxwindows2.4 ]
+	  http://bugs.debian.org/cgi-bin/pkgreport.cgi?pkg=wxwidgets2.5 ]
 
 	Oh and, please do *not* file bug reports for these packages
 	to the Debian bts.  But do feel free to email me personally
@@ -40,13 +36,7 @@ wxwin-i18n		message catalogs for native language support
 
 libwxmsw-dev		mingw32-cross wxMSW libs.
 libwxmsw-dbg		mingw32-cross wxMSW (debug) libs.
-libwxbase-msw-dev	mingw32-cross wxBase libs.
-libwxbase-msw-dbg	mingw32-cross wxBase (debug) libs.
-wxwin-headers-msw	extra headers needed for wxMSW.
-
-libwxgtk-univ		wxUniversal for Gtk.  NOTE this package is obsolete
-			and will be replaced by wxX11 and wxX11-univ at
-			some future time.
+wx-headers-msw		extra headers needed for wxMSW.
 
 
  -- Ron Lee <ron@debian.org>, Sun, 13 Feb 2000 18:40:00 +1030

debian/changelog

@@ -1,9 +1,93 @@
+wxwidgets2.5 (2.5.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.
+  * 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.
+
+ -- 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.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

debian/compat

@@ -0,0 +1 @@
+4

debian/control.in

@@ -1,67 +1,9 @@
-Source: wxwindows=V
+Source: wxwidgets=V
 Section: libs
 Priority: optional
-Build-Depends: debhelper (>=2.0), flex, bison, gettext, libgtk1.2-dev, python (>=2.2), python (<<2.3), python2.2-dev, zlib1g-dev, libjpeg62-dev, libpng12-0-dev, libtiff3g-dev, libgl-dev, libglu-dev, libesd0-dev
+Build-Depends: debhelper (>=4.0), flex, bison, gettext, libgtk2.0-dev, =PY, =PY-dev, zlib1g-dev, libjpeg62-dev, libpng12-dev, libtiff3g-dev, xlibmesa-gl-dev | libgl-dev, xlibmesa-glu-dev | libglu-dev, libesd0-dev
 Maintainer: Ron Lee <ron@debian.org>
-Standards-Version: 3.5.8.0
-
-Package: libwxbase=V
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}
-Description: wxBase library (runtime) - non-GUI support classes of wxWindows 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 for use in console apps and daemons.  You do not need
- this package to build or use wxWindows GUI apps.
-
-Package: libwxbase=V-dev
-Architecture: any
-Section: devel
-Depends: wxwin=V-headers (= ${Source-Version}), libwxbase=V (= ${Source-Version}), libc6-dev
-Suggests: wxwin=V-doc, gettext
-Conflicts: libwxbase-dev
-Replaces: libwxbase-dev
-Provides: libwxbase-dev
-Description: wxBase library (development) - non-GUI support classes of wxWindows 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-dbg
-Architecture: any
-Section: devel
-Priority: extra
-Depends: wxwin=V-headers (= ${Source-Version}), libc6-dev
-Conflicts: libwxbase-dbg
-Replaces: libwxbase-dbg
-Provides: libwxbase-dbg
-Description: wxBase library (debug) - non-GUI support classes of wxWindows 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 wxWindows itself that are not performed on
- apps compiled with the 'release version' libs in the -dev package.
+Standards-Version: 3.6.1.0
 
 Package: libwxgtk=V
 Architecture: any
@@ -69,62 +11,62 @@ Section: libs
 Depends: ${shlibs:Depends}
 Suggests: libgl1
 Replaces: wxgtk2.1
-Description: wxWindows Cross-platform C++ GUI toolkit (GTK+ runtime)
- wxWindows is a class library for C++ providing GUI (Graphical User
- Interface) and other facilities on more than one platform.  Version =V
- currently supports subsets of GTK+, Motif, and MS Windows.
+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 wxWindows.  To use the (optional) glcanvas library you will need
+ against wxWidgets.  To use the (optional) glcanvas library you will need
  to have Mesa or OpenGL installed.
 
 Package: libwxgtk=V-dev
 Architecture: any
-Section: devel
-Depends: wxwin=V-headers (= ${Source-Version}), libwxgtk=V (= ${Source-Version}), libc6-dev
-Suggests: wxwin=V-doc, libstdc++-dev, gettext, libgl-dev
-Conflicts: libwxgtk-dev
-Replaces: libwxgtk-dev, wxgtk2.1-dev
+Section: libdevel
+Depends: wx=V-headers (= ${Source-Version}), libwxgtk=V (= ${Source-Version}), libc6-dev
+Suggests: wx=V-doc, libstdc++-dev, gettext, libgl-dev
+Conflicts: libwxgtk-dev, libwxbase-dev
+Replaces: libwxgtk-dev, libwxbase-dev, wxgtk2.1-dev
 Provides: libwxgtk-dev
-Description: wxWindows Cross-platform C++ GUI toolkit (GTK+ development)
- wxWindows is a class library for C++ providing GUI (Graphical User
- Interface) and other facilities on more than one platform.  Version =V
- currently supports subsets of GTK+, Motif, and MS Windows.
+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).  For more information see http://wxwidgets.org
  .
- This package provides files needed to compile wxWindows programs.  If you
+ 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.
 
 Package: libwxgtk=V-dbg
 Architecture: any
-Section: devel
+Section: libdevel
 Priority: extra
-Depends: wxwin=V-headers (= ${Source-Version}), libc6-dev
-Conflicts: libwxgtk-dbg
-Replaces: libwxgtk-dbg
+Depends: wx=V-headers (= ${Source-Version}), libc6-dev
+Conflicts: libwxgtk-dbg, libwxbase-dbg
+Replaces: libwxgtk-dbg, libwxbase-dbg
 Provides: libwxgtk-dbg
-Description: wxWindows Cross-platform C++ GUI toolkit (GTK+ development)
- wxWindows is a class library for C++ providing GUI (Graphical User
- Interface) and other facilities on more than one platform.  Version =V
- currently supports subsets of GTK+, Motif, and MS Windows.
+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).  For more information see http://wxwidgets.org
  .
- This package provides a debug version of the wxGtk library.  It is compiled
+ 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 wxWindows itself that are not performed on
+ 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=V-python
 Architecture: any
-Section: interpreters
-Depends: python (>=2.2), python (<<2.3), ${shlibs:Depends}
-Suggests: wxwin=V-doc, wxwin=V-examples, python2.2-xml
+Section: python
+Depends: =PY, ${shlibs:Depends}
+Suggests: wx=V-doc, wx=V-examples, =PY-xml
 Conflicts: libwxgtk-python, python-wxwin, libwxgtk2.2-python-contrib, libwxgtk2.2-python, libwxgtk2.3-python
 Replaces: libwxgtk-python, python-wxwin, libwxgtk2.2-python-contrib, libwxgtk2.2-python, libwxgtk2.3-python
 Provides: libwxgtk-python
-Description: wxWindows Cross-platform C++ GUI toolkit (wxPython binding)
- wxWindows is a class library for C++ providing GUI (Graphical User
- Interface) and other facilities on more than one platform.  Version =V
- currently supports subsets of GTK+, Motif, and MS Windows.
+Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython binding)
+ wxWidgets (formerly known as wxWindows) is a class library for C++ providing
+ GUI components and other facilities on several popular platforms (and some
+ unpopular ones as well).  For more information see http://wxwidgets.org
  .
  This package provides a Python binding to the wxGTK library and it's
  contrib libs.  If you wish to use xrced you'll also need the python-xml
@@ -133,117 +75,86 @@ Description: wxWindows Cross-platform C++ GUI toolkit (wxPython binding)
 Package: libwxgtk=V-contrib
 Architecture: any
 Section: libs
-Depends: libwxgtk=V (= ${Source-Version}), ${shlibs:Depends}
-Description: wxWindows Cross-platform C++ GUI toolkit (runtime contrib libs)
- wxWindows is a class library for C++ providing GUI (Graphical User
- Interface) and other facilities on more than one platform.  Version =V
- currently supports subsets of GTK+, Motif, and MS Windows.
+Depends: ${shlibs:Depends}
+Description: wxWidgets Cross-platform C++ GUI toolkit (runtime contrib libs)
+ 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 contrib libs from the wxWindows source tree
+ This package provides the contrib libs from the wxWidgets source tree
 
 Package: libwxgtk=V-contrib-dev
 Architecture: any
-Section: devel
-Depends: wxwin=V-headers (= ${Source-Version}), libwxgtk=V-dev (= ${Source-Version}), libwxgtk=V-contrib (= ${Source-Version}), libc6-dev
+Section: libdevel
+Depends: wx=V-headers (= ${Source-Version}), libwxgtk=V-dev (= ${Source-Version}), libwxgtk=V-contrib (= ${Source-Version}), libc6-dev
 Conflicts: libwxgtk-contrib-dev
 Replaces: libwxgtk-contrib-dev
 Provides: libwxgtk-contrib-dev
-Description: wxWindows Cross-platform C++ GUI toolkit (development contrib libs)
- wxWindows is a class library for C++ providing GUI (Graphical User
- Interface) and other facilities on more than one platform.  Version =V
- currently supports subsets of GTK+, Motif, and MS Windows.
+Description: wxWidgets Cross-platform C++ GUI toolkit (development contrib libs)
+ 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
  .
  Install this package if you wish to compile applications that use the
- contrib libs from the wxWindows source tree.
+ contrib libs from the wxWidgets source tree.
 
-Package: wxwin=V-headers
+Package: wx=V-headers
 Architecture: any
 Section: devel
-Conflicts: wxwin-headers, libwxgtk2.3
-Replaces: wxwin-headers, wxgtk2.1-dev
-Provides: wxwin-headers
-Description: wxWindows Cross-platform C++ GUI toolkit (header files)
- wxWindows is a class library for C++ providing GUI (Graphical User
- Interface) and other facilities on more than one platform.  Version =V
- currently supports subsets of GTK+, Motif, and MS Windows.
+Conflicts: wx-headers, wxwin-headers
+Replaces: wx-headers, wxwin-headers, wxgtk2.1-dev, libwxgtk2.3
+Provides: wx-headers
+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).  For more information see http://wxwidgets.org
  .
  This package provides the common header files required to build applications
- using the wxWindows toolkit.
+ using the wxWidgets toolkit.
 
-Package: wxwin=V-i18n
+Package: wx=V-i18n
 Architecture: all
 Section: libs
-Conflicts: wxwin-i18n
-Replaces: wxwin-i18n
-Provides: wxwin-i18n
-Description: wxWindows Cross-platform C++ GUI toolkit (i18n support)
- wxWindows is a class library for C++ providing GUI (Graphical User
- Interface) and other facilities on more than one platform.  Version =V
- currently supports subsets of GTK+, Motif, and MS Windows.
+Conflicts: wx-i18n, wxwin-i18n
+Replaces: wx-i18n, wxwin-i18n
+Provides: wx-i18n
+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).  For more information see http://wxwidgets.org
  .
- This package provides the i18n message catalogs for wxWindows.
+ This package provides the i18n message catalogs for wxWidgets.
 
-Package: wxwin=V-doc
+Package: wx=V-doc
 Architecture: all
 Section: doc
+Conflicts: wx-doc, wxwin2.2-doc, wxwin-doc
+Replaces: wx-doc, wxwin-doc
+Provides: wx-doc
 Suggests: doc-base, www-browser
-Description: wxWindows Cross-platform C++ GUI toolkit (documentation)
- wxWindows is a class library for C++ providing GUI (Graphical User
- Interface) and other facilities on more than one platform.  Version =V
- currently supports subsets of GTK+, Motif, and MS Windows.
+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).  For more information see http://wxwidgets.org
  .
- This package provides a HTML version of the wxWindows reference manual.
+ This package provides a HTML version of the wxWidgets reference manual.
 
-Package: wxwin=V-examples
+Package: wx=V-examples
 Architecture: all
 Section: devel
 Suggests: libwxgtk=V-dev (= ${Source-Version}), wxwin=V-doc
-Description: wxWindows Cross-platform C++ GUI toolkit (examples)
- wxWindows is a class library for C++ providing GUI (Graphical User
- Interface) and other facilities on more than one platform.  Version =V
- currently supports subsets of GTK+, Motif, and MS Windows.
+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).  For more information see http://wxwidgets.org
  .
- This package contains examples of using the wxWindows toolkit in
+ This package contains examples of using the wxWidgets toolkit in
  C++ and with the wxPython language binding.
 
-Package: libwxgtk=V-univ
-Architecture: any
-Section: libs
-Depends: wxwin=V-headers (= ${Source-Version}), libwxgtk=V (= ${Source-Version}), libc6-dev, ${shlibs:Depends}
-Suggests: wxwin=V-doc, libstdc++-dev, gettext, libgl-dev
-Description: wxWindows Cross-platform C++ GUI toolkit (wxUNIVERSAL widgets)
- wxWindows is a class library for C++ providing GUI (Graphical User
- Interface) and other facilities on more than one platform.  Version =V
- currently supports subsets of GTK+, Motif, and MS Windows.
- .
- This package is built to use the wxUNIVERSAL widget set instead of
- native gtk widgets.
-
-Package: libwxbase-msw=V-dev
-Architecture: i386
-Section: otherosfs
-Depends: wxwin=V-headers-msw (= ${Source-Version})
-Conflicts: libwxbase-msw-dev
-Replaces: libwxbase-msw-dev
-Provides: libwxbase-msw-dev
-Description: wxBase mingw32msvc-cross
- mingw32msvc-cross wxBase libs.
-
-Package: libwxbase-msw=V-dbg
-Architecture: i386
-Section: otherosfs
-Depends: wxwin=V-headers-msw (= ${Source-Version})
-Conflicts: libwxbase-msw-dbg
-Replaces: libwxbase-msw-dbg
-Provides: libwxbase-msw-dbg
-Description: wxBase mingw32msvc-cross (debug)
- mingw32msvc-cross wxBase libs.
- __WXDEBUG__ version.
-
 Package: libwxmsw=V-dev
 Architecture: i386
 Section: otherosfs
-Depends: wxwin=V-headers-msw (= ${Source-Version})
+Depends: wx=V-headers-msw (= ${Source-Version})
 Conflicts: libwxmsw-dev
 Replaces: libwxmsw-dev
 Provides: libwxmsw-dev
@@ -253,7 +164,7 @@ Description: wxMSW mingw32msvc-cross
 Package: libwxmsw=V-dbg
 Architecture: i386
 Section: otherosfs
-Depends: wxwin=V-headers-msw (= ${Source-Version})
+Depends: wx=V-headers-msw (= ${Source-Version})
 Conflicts: libwxmsw-dbg
 Replaces: libwxmsw-dbg
 Provides: libwxmsw-dbg
@@ -261,13 +172,13 @@ Description: wxMSW mingw32msvc-cross (debug)
  mingw32msvc-cross wxMSW libs.
  __WXDEBUG__ version.
 
-Package: wxwin=V-headers-msw
+Package: wx=V-headers-msw
 Architecture: i386
 Section: otherosfs
-Depends: wxwin=V-headers (= ${Source-Version})
-Conflicts: wxwin-headers-msw
-Replaces: wxwin-headers-msw
-Provides: wxwin-headers-msw
-Description: Extra wxWindows headers for mingw32msvc-cross
- Headers required by the wxWindows mingw32msvc-cross libraries.
+Depends: wx=V-headers (= ${Source-Version})
+Conflicts: wx-headers-msw, wxwin-headers-msw
+Replaces: wx-headers-msw, wxwin-headers-msw
+Provides: wx-headers-msw
+Description: Extra wxWidgets headers for mingw32msvc-cross
+ Headers required by the wxWidgets mingw32msvc-cross libraries.
 

debian/copyright

@@ -191,4 +191,32 @@ under two different licences:
   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.
+
 

debian/libwxbase-dbg.dirs

@@ -1,5 +0,0 @@
-usr/bin
-usr/lib/wx/include/based-=V/wx
-usr/share/man/man1
-usr/share/lintian/overrides
-

debian/libwxbase-dbg.links

@@ -1,2 +0,0 @@
-usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxbased-=V-config.1.gz
-

debian/libwxbase-dbg.postinst

@@ -1,11 +0,0 @@
-#! /bin/sh
-set -e
-
-update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxbased-=V-config 50
-
-if [ "$1" = "configure" ]; then
-	ldconfig
-fi
-
-#DEBHELPER#
-

debian/libwxbase-dbg.prerm

@@ -1,7 +0,0 @@
-#! /bin/sh
-set -e
-
-update-alternatives --remove wx-config /usr/bin/wxbased-=V-config
-
-#DEBHELPER#
-

debian/libwxbase-dev.dirs

@@ -1,3 +0,0 @@
-usr/bin
-usr/lib/wx/include/base-=V/wx
-usr/share/man/man1

debian/libwxbase-dev.links

@@ -1 +0,0 @@
-usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxbase-=V-config.1.gz

debian/libwxbase-dev.postinst

@@ -1,7 +0,0 @@
-#! /bin/sh
-set -e
-
-update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxbase-=V-config 60
-
-#DEBHELPER#
-

debian/libwxbase-dev.prerm

@@ -1,7 +0,0 @@
-#! /bin/sh
-set -e
-
-update-alternatives --remove wx-config /usr/bin/wxbase-=V-config
-
-#DEBHELPER#
-

debian/libwxbase-msw-dbg.dirs

@@ -1,4 +0,0 @@
-usr/bin
-usr/=H/lib/wx/include/based-=V-=H/wx
-usr/share/man/man1
-

debian/libwxbase-msw-dbg.links

@@ -1,2 +0,0 @@
-usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxbased-=V-=H-config.1.gz
-

debian/libwxbase-msw-dbg.postinst

@@ -1,7 +0,0 @@
-#! /bin/sh
-set -e
-
-update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxbased-=V-=H-config 40
-
-#DEBHELPER#
-

debian/libwxbase-msw-dbg.prerm

@@ -1,7 +0,0 @@
-#! /bin/sh
-set -e
-
-update-alternatives --remove wx-config /usr/bin/wxbased-=V-=H-config
-
-#DEBHELPER#
-

debian/libwxbase-msw-dev.dirs

@@ -1,4 +0,0 @@
-usr/bin
-usr/=H/lib/wx/include/base-=V-=H/wx
-usr/share/man/man1
-

debian/libwxbase-msw-dev.links

@@ -1,2 +0,0 @@
-usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxbase-=V-=H-config.1.gz
-

debian/libwxbase-msw-dev.postinst

@@ -1,7 +0,0 @@
-#! /bin/sh
-set -e
-
-update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxbase-=V-=H-config 40
-
-#DEBHELPER#
-

debian/libwxbase-msw-dev.prerm

@@ -1,7 +0,0 @@
-#! /bin/sh
-set -e
-
-update-alternatives --remove wx-config /usr/bin/wxbase-=V-=H-config
-
-#DEBHELPER#
-

debian/libwxbase.dirs

@@ -1,2 +0,0 @@
-usr/lib
-

debian/libwxbase.postinst

@@ -1,10 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = "configure" ]; then
-	ldconfig
-fi
-
-#DEBHELPER#
-

debian/libwxgtk-contrib-dev.dirs

@@ -1,2 +0,0 @@
-usr/lib/
-

debian/libwxgtk-contrib.dirs

@@ -1,2 +0,0 @@
-usr/lib/
-

debian/libwxgtk-contrib.postinst

@@ -1,10 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = "configure" ]; then
-	ldconfig
-fi
-
-#DEBHELPER#
-

debian/libwxgtk-dbg.dirs

@@ -1,5 +0,0 @@
-usr/bin
-usr/lib/wx/include/gtkd-=V/wx
-usr/share/man/man1
-usr/share/lintian/overrides
-

debian/libwxgtk-dbg.links

@@ -1,2 +1,2 @@
-usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxgtkd-=V-config.1.gz
+usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxgtk2d-=V-config.1.gz
 

debian/libwxgtk-dbg.postinst

@@ -1,11 +1,7 @@
 #! /bin/sh
 set -e
 
-update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxgtkd-=V-config 50
-
-if [ "$1" = "configure" ]; then
-	ldconfig
-fi
+update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxgtk2d-=V-config 50
 
 #DEBHELPER#
 

debian/libwxgtk-dbg.prerm

@@ -1,7 +1,7 @@
 #! /bin/sh
 set -e
 
-update-alternatives --remove wx-config /usr/bin/wxgtkd-=V-config
+update-alternatives --remove wx-config /usr/bin/wxgtk2d-=V-config
 
 #DEBHELPER#
 

debian/libwxgtk-dev.dirs

@@ -1,4 +0,0 @@
-usr/bin
-usr/lib/wx/include/gtk-=V/wx
-usr/share/man/man1
-

debian/libwxgtk-dev.links

@@ -1,2 +1,2 @@
-usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxgtk-=V-config.1.gz
+usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxgtk2-=V-config.1.gz
 

debian/libwxgtk-dev.postinst

@@ -1,7 +1,7 @@
 #! /bin/sh
 set -e
 
-update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxgtk-=V-config 70
+update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxgtk2-=V-config 70
 
 #DEBHELPER#
 

debian/libwxgtk-dev.prerm

@@ -1,7 +1,7 @@
 #! /bin/sh
 set -e
 
-update-alternatives --remove wx-config /usr/bin/wxgtk-=V-config
+update-alternatives --remove wx-config /usr/bin/wxgtk2-=V-config
 
 #DEBHELPER#
 

debian/libwxgtk-univ.dirs

@@ -1,5 +0,0 @@
-usr/bin
-usr/lib/wx/include/gtkuniv-=V/wx
-usr/share/man/man1
-usr/share/lintian/overrides
-

debian/libwxgtk-univ.links

@@ -1,2 +0,0 @@
-usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxgtkuniv-=V-config.1.gz
-

debian/libwxgtk-univ.postinst

@@ -1,11 +0,0 @@
-#! /bin/sh
-set -e
-
-update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxgtkuniv-=V-config 50
-
-if [ "$1" = "configure" ]; then
-	ldconfig
-fi
-
-#DEBHELPER#
-

debian/libwxgtk-univ.prerm

@@ -1,7 +0,0 @@
-#! /bin/sh
-set -e
-
-update-alternatives --remove wx-config /usr/bin/wxgtkuniv-=V-config
-
-#DEBHELPER#
-

debian/libwxgtk.dirs

@@ -1,3 +0,0 @@
-usr/lib
-usr/share
-

debian/libwxgtk.postinst

@@ -1,10 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = "configure" ]; then
-	ldconfig
-fi
-
-#DEBHELPER#
-

debian/lintian-override

@@ -1,4 +1,2 @@
 libwxgtk2.5-dbg: non-dev-pkg-with-shlib-symlink
-libwxbase2.5-dbg: non-dev-pkg-with-shlib-symlink
-libwxgtk2.5-univ: non-dev-pkg-with-shlib-symlink
 

debian/rules

@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-# debian/rules file to build packages from wxWindows CVS source
+# 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 :-)
@@ -7,215 +7,139 @@
 # Joey Hess and others.
 
 #export DH_VERBOSE=1
-export DH_COMPAT=2
 export DH_OPTIONS
 
-release:=$(shell dpkg-parsechangelog | sed -n 's/^Source: wxwindows//p')
-python_dir:=python$(shell python -c "import sys;print sys.version[:3]")
+release    := $(shell dpkg-parsechangelog | sed -n 's/^Source: wxwidgets//p')
+python_ver := python$(shell python -c "import sys;print sys.version[:3]")
 
-cross_host=i586-mingw32msvc
-cross_build=$(shell ./config.guess)
+cross_host  = i586-mingw32msvc
+cross_build = $(shell ./config.guess)
 
-config_cache=../config_deb.cache
-config_cache_cross=../config_deb_cross.cache
+config_cache       = ../config_deb.cache
+config_cache_cross = ../config_deb_cross.cache
 
 # Packages to build:
-package_wxbase_lib=libwxbase$(release)
-package_wxbase_dev=libwxbase$(release)-dev
-package_wxbase_dbg=libwxbase$(release)-dbg
-package_gtk_lib=libwxgtk$(release)
-package_gtk_dev=libwxgtk$(release)-dev
-package_gtk_dbg=libwxgtk$(release)-dbg
-package_gtk_py=libwxgtk$(release)-python
-package_gtk_contrib=libwxgtk$(release)-contrib
-package_gtk_contrib_dev=libwxgtk$(release)-contrib-dev
-package_headers=wxwin$(release)-headers
-package_i18n=wxwin$(release)-i18n
-package_doc=wxwin$(release)-doc
-package_examples=wxwin$(release)-examples
+package_gtk_lib         = libwxgtk$(release)
+package_gtk_dev         = libwxgtk$(release)-dev
+package_gtk_dbg         = libwxgtk$(release)-dbg
+package_gtk_py          = libwxgtk$(release)-python
+package_gtk_contrib     = libwxgtk$(release)-contrib
+package_gtk_contrib_dev = libwxgtk$(release)-contrib-dev
+package_headers         = wx$(release)-headers
+package_i18n            = wx$(release)-i18n
+package_doc             = wx$(release)-doc
+package_examples        = wx$(release)-examples
 
-package_gtk_univ=libwxgtk$(release)-univ
-
-package_wxbase_msw_dev=libwxbase-msw$(release)-dev
-package_wxbase_msw_dbg=libwxbase-msw$(release)-dbg
-package_msw_dev=libwxmsw$(release)-dev
-package_msw_dbg=libwxmsw$(release)-dbg
-package_headers_msw=wxwin$(release)-headers-msw
+package_msw_dev         = libwxmsw$(release)-dev
+package_msw_dbg         = libwxmsw$(release)-dbg
+package_headers_msw     = wx$(release)-headers-msw
 
 # Build directories:
-objdir_wxbase_shared=objs_wxbase_sh
-objdir_wxbase_static=objs_wxbase_st
-objdir_wxbase_debug=objs_wxbase_d
-objdir_gtk_shared=objs_gtk_sh
-objdir_gtk_static=objs_gtk_st
-objdir_gtk_debug=objs_gtk_d
-objdir_gtk_install=objs_gtk_install
-objdir_gtk_contrib_install=objs_gtk_contrib_install
-objdir_doc_cruft=objs_doc_con
-objdir_doc=docs/wxWindows-manual.html
-objdir_examples=docs/examples
-objdir_i18n=locale
+objdir_gtk_shared          = objs_gtk_sh
+objdir_gtk_static          = objs_gtk_st
+objdir_gtk_debug           = objs_gtk_d
+objdir_gtk_install         = objs_gtk_install
+objdir_gtk_contrib_install = objs_gtk_contrib_install
+objdir_doc_cruft           = objs_doc_con
+objdir_doc                 = docs/wx-manual.html
+objdir_examples            = docs/examples
+objdir_i18n                = locale
 
-objdir_gtk_univ=objs_gtk_univ
-objdir_univ_install=objs_univ_install
+objdir_msw_shared          = objs_msw_sh
+objdir_msw_static          = objs_msw_st
+objdir_msw_dbg             = objs_msw_d
 
-objdir_wxbase_msw_shared=objs_wxbase_msw_sh
-objdir_wxbase_msw_static=objs_wxbase_msw_st
-objdir_wxbase_msw_dbg=objs_wxbase_msw_d
-objdir_msw_shared=objs_msw_sh
-objdir_msw_static=objs_msw_st
-objdir_msw_dbg=objs_msw_d
-
-objdirs=$(objdir_wxbase_shared) $(objdir_wxbase_static) $(objdir_wxbase_debug) \
-	$(objdir_gtk_shared) $(objdir_gtk_static) $(objdir_gtk_debug)          \
-	$(objdir_gtk_install) $(objdir_gtk_contrib_install) $(objdir_gtk_univ) \
-	$(objdir_univ_install) $(objdir_doc_cruft) $(objdir_doc)               \
-	$(objdir_examples)                                                     \
-	$(objdir_wxbase_msw_shared) $(objdir_wxbase_msw_static)                \
-	$(objdir_wxbase_msw_dbg) $(objdir_msw_shared) $(objdir_msw_static)     \
-	$(objdir_msw_dbg)
+objdirs = $(objdir_gtk_shared) $(objdir_gtk_static) $(objdir_gtk_debug)   \
+	  $(objdir_gtk_install) $(objdir_gtk_contrib_install)             \
+	  $(objdir_doc_cruft) $(objdir_doc) $(objdir_examples)            \
+	  $(objdir_msw_shared) $(objdir_msw_static) $(objdir_msw_dbg)
 
 #	note that the i18n package is actually arch indep (once built)
 #	but must be built (and installed) during the arch any phase as
-#	it's pulled out of the wxGtk shared lib package.
+#	it's pulled out of the wxGTK shared lib package.
+
 
 # Build stamps:
-build_arch_stamps=build-wxbase-shared-stamp build-wxbase-static-stamp \
-                  build-wxbase-debug-stamp build-gtk-shared-stamp \
-                  build-gtk-static-stamp build-gtk-debug-stamp \
-                  build-contrib-shared-stamp build-contrib-static-stamp \
-                  build-gtk-py-stamp build-i18n-stamp
+build_arch_stamps = build-gtk-shared-stamp build-gtk-static-stamp         \
+                    build-gtk-debug-stamp                                 \
+                    build-contrib-shared-stamp build-contrib-static-stamp \
+                    build-i18n-stamp build-gtk-py-stamp
 
-# disable gtk-univ build, we'll  replace it with x11-univ later.
-#		  build-gtk-univ-stamp
 
-build_indep_stamps=build-examples-stamp build-doc-stamp
+build_indep_stamps  = build-examples-stamp build-doc-stamp
 
-build_cross_stamps=build-wxbase-msw-shared-stamp build-wxbase-msw-static-stamp \
-		   build-wxbase-msw-dbg-stamp build-msw-shared-stamp \
-		   build-msw-static-stamp build-msw-dbg-stamp
+build_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_native = $(build_arch_stamps) $(build_indep_stamps)
+
+build_stamps = $(build_stamps_native) $(build_cross_stamps)
 
-build_stamps=$(build_stamps_native) $(build_cross_stamps)
 
 # Install targets:
-install_all_arch=install-wxbase-lib install-wxbase-dev install-wxbase-dbg \
-                 install-gtk-lib install-gtk-dev install-gtk-dbg \
-                 install-gtk-contrib install-gtk-contrib-dev install-gtk-py \
-                 install-headers install-i18n
+install_all_arch = install-gtk-lib install-gtk-dev install-gtk-dbg        \
+                   install-gtk-contrib install-gtk-contrib-dev            \
+                   install-headers install-i18n install-gtk-py
 
-# disable gtk-univ build, we'll  replace it with x11-univ later.
-#                install-gtk-univ
+install_all_indep  = install-examples install-doc
 
-install_all_indep=install-examples install-doc
+install_all_cross  = install-msw-dev install-msw-dbg install-headers-msw
 
-install_all_cross=install-wxbase-msw-dev install-wxbase-msw-dbg install-msw-dev install-msw-dbg install-headers-msw
+install_all_native = $(install_all_arch) $(install_all_indep)
 
-install_all_native=$(install_all_arch) $(install_all_indep)
-
-install_all=$(install_all_native) $(install_all_cross)
+install_all = $(install_all_native) $(install_all_cross)
 
 
-wxconfig:=$(shell pwd)/$(objdir_gtk_shared)/wx-config \
-                --prefix=$(shell pwd) \
+wxconfig := $(shell pwd)/$(objdir_gtk_shared)/wx-config          \
+                --prefix=$(shell pwd)                            \
                 --exec-prefix=$(shell pwd)/$(objdir_gtk_shared)
 
 
 # The Rules:
 
 debian/control: debian/control.in
-	sed -e 's/=V/$(release)/g' < debian/control.in > debian/control
+	sed -e 's/=V/$(release)/g;s/=PY/$(python_ver)/g' < debian/control.in > debian/control
 
 control-files-stamp: debian/control
 	dh_testdir
-	@for f in dirs postinst; do \
-		echo "generating control file $(package_wxbase_lib).$$f"; \
-		cp debian/libwxbase.$$f debian/$(package_wxbase_lib).$$f; \
+	@for f in links postinst prerm; do                                   \
+		echo "generating control file $(package_gtk_dev).$$f";       \
+		sed -e 's/=V/$(release)/g' < debian/libwxgtk-dev.$$f         \
+			> debian/$(package_gtk_dev).$$f;                     \
 	done;
-	@for f in dirs links postinst prerm; do \
-		echo "generating control file $(package_wxbase_dev).$$f"; \
-		sed -e 's/=V/$(release)/g' < debian/libwxbase-dev.$$f \
-			> debian/$(package_wxbase_dev).$$f; \
+	@for f in links postinst prerm; do                                   \
+		echo "generating control file $(package_gtk_dbg).$$f";       \
+		sed -e 's/=V/$(release)/g' < debian/libwxgtk-dbg.$$f         \
+			> debian/$(package_gtk_dbg).$$f;                     \
 	done;
-	@for f in dirs links postinst prerm; do \
-		echo "generating control file $(package_wxbase_dbg).$$f"; \
-		sed -e 's/=V/$(release)/g' < debian/libwxbase-dbg.$$f \
-			> debian/$(package_wxbase_dbg).$$f; \
+	@for f in dirs docs menu postinst prerm; do                          \
+		echo "generating control file $(package_gtk_py).$$f";        \
+		sed -e 's/=PY/$(python_ver)/g;s/=V/$(release)/g'             \
+			< debian/libwxgtk-python.$$f                         \
+			> debian/$(package_gtk_py).$$f;                      \
 	done;
-	@for f in dirs postinst; do \
-		echo "generating control file $(package_gtk_lib).$$f"; \
-		cp debian/libwxgtk.$$f debian/$(package_gtk_lib).$$f; \
+	@for f in docs doc-base; do                                          \
+		echo "generating control file $(package_doc).$$f";           \
+		sed -e 's/=V/$(release)/g' < debian/wxwin-doc.$$f            \
+			> debian/$(package_doc).$$f;                         \
 	done;
-	@for f in dirs links postinst prerm; do \
-		echo "generating control file $(package_gtk_dev).$$f"; \
-		sed -e 's/=V/$(release)/g' < debian/libwxgtk-dev.$$f \
-			> debian/$(package_gtk_dev).$$f; \
-	done;
-	@for f in dirs links postinst prerm; do \
-		echo "generating control file $(package_gtk_dbg).$$f"; \
-		sed -e 's/=V/$(release)/g' < debian/libwxgtk-dbg.$$f \
-			> debian/$(package_gtk_dbg).$$f; \
-	done;
-	@for f in dirs docs menu postinst prerm; do \
-		echo "generating control file $(package_gtk_py).$$f"; \
-		sed -e 's/=PY/$(python_dir)/g;s/=V/$(release)/g' < debian/libwxgtk-python.$$f \
-			> debian/$(package_gtk_py).$$f; \
-	done;
-	@for f in dirs postinst; do \
-		echo "generating control file $(package_gtk_contrib).$$f"; \
-		cp debian/libwxgtk-contrib.$$f debian/$(package_gtk_contrib).$$f; \
-	done;
-	@for f in dirs; do \
-		echo "generating control file $(package_gtk_contrib_dev).$$f"; \
-		cp debian/libwxgtk-contrib-dev.$$f debian/$(package_gtk_contrib_dev).$$f; \
-	done;
-	@for f in dirs; do \
-		echo "generating control file $(package_headers).$$f"; \
-		cp debian/wxwin-headers.$$f debian/$(package_headers).$$f; \
-	done;
-	@for f in dirs; do \
-		echo "generating control file $(package_i18n).$$f"; \
-		cp debian/wxwin-i18n.$$f debian/$(package_i18n).$$f; \
-	done;
-	@for f in dirs docs doc-base; do \
-		echo "generating control file $(package_doc).$$f"; \
-		sed -e 's/=V/$(release)/g' < debian/wxwin-doc.$$f \
-			> debian/$(package_doc).$$f; \
-	done;
-	@for f in examples; do \
-		echo "generating control file $(package_examples).$$f"; \
+	@for f in examples; do                                               \
+		echo "generating control file $(package_examples).$$f";      \
 		cp debian/wxwin-examples.$$f debian/$(package_examples).$$f; \
 	done;
-	@for f in dirs links postinst prerm; do \
-		echo "generating control file $(package_wxbase_msw_dev).$$f"; \
-		sed -e 's/=V/$(release)/g;s/=H/$(cross_host)/g' < debian/libwxbase-msw-dev.$$f \
-			> debian/$(package_wxbase_msw_dev).$$f; \
-	done;
-	@for f in dirs links postinst prerm; do \
-		echo "generating control file $(package_wxbase_msw_dbg).$$f"; \
-		sed -e 's/=V/$(release)/g;s/=H/$(cross_host)/g' < debian/libwxbase-msw-dbg.$$f \
-			> debian/$(package_wxbase_msw_dbg).$$f; \
-	done;
-	@for f in dirs links postinst prerm; do \
-		echo "generating control file $(package_msw_dev).$$f"; \
+	@for f in dirs links postinst prerm; do                              \
+		echo "generating control file $(package_msw_dev).$$f";       \
 		sed -e 's/=V/$(release)/g;s/=H/$(cross_host)/g' < debian/libwxmsw-dev.$$f \
-			> debian/$(package_msw_dev).$$f; \
+			> debian/$(package_msw_dev).$$f;                     \
 	done;
-	@for f in dirs links postinst prerm; do \
-		echo "generating control file $(package_msw_dbg).$$f"; \
+	@for f in dirs links postinst prerm; do                              \
+		echo "generating control file $(package_msw_dbg).$$f";       \
 		sed -e 's/=V/$(release)/g;s/=H/$(cross_host)/g' < debian/libwxmsw-dbg.$$f \
-			> debian/$(package_msw_dbg).$$f; \
+			> debian/$(package_msw_dbg).$$f;                     \
 	done;
-	@for f in dirs; do \
-		echo "generating control file $(package_headers_msw).$$f"; \
+	@for f in dirs; do                                                   \
+		echo "generating control file $(package_headers_msw).$$f";   \
 		sed -e 's/=H/$(cross_host)/g' < debian/wxwin-headers-msw.$$f \
-			> debian/$(package_headers_msw).$$f; \
-	done;
-	@for f in dirs links postinst prerm; do \
-		echo "generating control file $(package_gtk_univ).$$f"; \
-		sed -e 's/=V/$(release)/g' < debian/libwxgtk-univ.$$f \
-			> debian/$(package_gtk_univ).$$f; \
+			> debian/$(package_headers_msw).$$f;                 \
 	done;
 	touch $@
 
@@ -231,69 +155,22 @@ build_all: control-files-stamp $(build_stamps_native)
 build: build_arch
 
 
-configure-wxbase-shared-stamp:
-	dh_testdir
-	mkdir -p $(objdir_wxbase_shared)
-	cd $(objdir_wxbase_shared) \
-		&& ../configure --prefix=/usr \
-				--cache-file=$(config_cache) \
-				--disable-gui \
-				--enable-soname \
-				--with-zlib=sys
-	touch $@
-
-build-wxbase-shared-stamp: configure-wxbase-shared-stamp
-	dh_testdir
-	cd $(objdir_wxbase_shared) && $(MAKE)
-	touch $@
-
-configure-wxbase-static-stamp:
-	dh_testdir
-	mkdir -p $(objdir_wxbase_static)
-	cd $(objdir_wxbase_static) \
-		&& ../configure --prefix=/usr \
-				--cache-file=$(config_cache) \
-				--disable-gui \
-				--disable-shared \
-				--with-zlib=sys
-	touch $@
-
-build-wxbase-static-stamp: configure-wxbase-static-stamp
-	dh_testdir
-	cd $(objdir_wxbase_static) && $(MAKE)
-	touch $@
-
-configure-wxbase-debug-stamp:
-	dh_testdir
-	mkdir -p $(objdir_wxbase_debug)
-	cd $(objdir_wxbase_debug) \
-		&& ../configure --prefix=/usr \
-				--cache-file=$(config_cache) \
-				--disable-gui \
-				--enable-debug \
-				--enable-soname \
-				--with-zlib=sys
-	touch $@
-
-build-wxbase-debug-stamp: configure-wxbase-debug-stamp
-	dh_testdir
-	cd $(objdir_wxbase_debug) && $(MAKE)
-	touch $@
-
 configure-gtk-shared-stamp:
 	dh_testdir
 	mkdir -p $(objdir_gtk_shared)
 	cd $(objdir_gtk_shared) \
-		&& ../configure --prefix=/usr \
-				--cache-file=$(config_cache) \
-				--with-gtk \
-				--with-opengl \
-				--enable-soname \
-				--with-zlib=sys \
-				--with-libjpeg=sys \
-				--with-libpng=sys \
-				--with-libtiff=sys \
-				--enable-dynamic-loader
+		&& ../configure --prefix=/usr			\
+				--cache-file=$(config_cache)	\
+				--with-gtk			\
+				--enable-gtk2			\
+				--with-opengl			\
+				--enable-soname			\
+				--with-zlib=sys			\
+				--with-libjpeg=sys		\
+				--with-libpng=sys		\
+				--with-libtiff=sys		\
+				--enable-dynamic-loader		\
+				--enable-std_iostreams
 	touch $@
 
 build-gtk-shared-stamp: configure-gtk-shared-stamp
@@ -305,16 +182,18 @@ configure-gtk-static-stamp:
 	dh_testdir
 	mkdir -p $(objdir_gtk_static)
 	cd $(objdir_gtk_static) \
-		&& ../configure --prefix=/usr \
-				--cache-file=$(config_cache) \
-				--with-gtk \
-				--with-opengl \
-				--disable-shared \
-				--with-zlib=sys \
-				--with-libjpeg=sys \
-				--with-libpng=sys \
-				--with-libtiff=sys \
-				--enable-dynamic-loader
+		&& ../configure --prefix=/usr			\
+				--cache-file=$(config_cache)	\
+				--with-gtk			\
+				--enable-gtk2			\
+				--with-opengl			\
+				--disable-shared		\
+				--with-zlib=sys			\
+				--with-libjpeg=sys		\
+				--with-libpng=sys		\
+				--with-libtiff=sys		\
+				--enable-dynamic-loader		\
+				--enable-std_iostreams
 	touch $@
 
 build-gtk-static-stamp: configure-gtk-static-stamp
@@ -326,17 +205,19 @@ configure-gtk-debug-stamp:
 	dh_testdir
 	mkdir -p $(objdir_gtk_debug)
 	cd $(objdir_gtk_debug) \
-		&& ../configure --prefix=/usr \
-				--cache-file=$(config_cache) \
-				--with-gtk \
-				--with-opengl \
-				--enable-debug \
-				--enable-soname \
-				--with-zlib=sys \
-				--with-libjpeg=sys \
-				--with-libpng=sys \
-				--with-libtiff=sys \
-				--enable-dynamic-loader
+		&& ../configure --prefix=/usr			\
+				--cache-file=$(config_cache)	\
+				--with-gtk			\
+				--enable-gtk2			\
+				--with-opengl			\
+				--enable-debug			\
+				--enable-soname			\
+				--with-zlib=sys			\
+				--with-libjpeg=sys		\
+				--with-libpng=sys		\
+				--with-libtiff=sys		\
+				--enable-dynamic-loader		\
+				--enable-std_iostreams
 	touch $@
 
 build-gtk-debug-stamp: configure-gtk-debug-stamp
@@ -344,27 +225,6 @@ build-gtk-debug-stamp: configure-gtk-debug-stamp
 	cd $(objdir_gtk_debug) && $(MAKE)
 	touch $@
 
-configure-gtk-univ-stamp:
-	dh_testdir
-	mkdir -p $(objdir_gtk_univ)
-	cd $(objdir_gtk_univ) \
-		&& ../configure --prefix=/usr \
-				--cache-file=$(config_cache) \
-				--with-gtk \
-				--with-opengl \
-				--enable-universal \
-				--enable-soname \
-				--with-zlib=sys \
-				--with-libjpeg=sys \
-				--with-libpng=sys \
-				--with-libtiff=sys \
-				--enable-dynamic-loader
-	touch $@
-
-build-gtk-univ-stamp: configure-gtk-univ-stamp
-	dh_testdir
-	cd $(objdir_gtk_univ) && $(MAKE)
-	touch $@
 
 build-contrib-shared-stamp: build-gtk-shared-stamp
 	dh_testdir
@@ -382,13 +242,14 @@ build-gtk-py-stamp: build-gtk-shared-stamp
 	dh_testdir
 	touch docs/lgpl.txt
 	cd wxPython \
-		&& ./setup.py build IN_CVS_TREE=1 WX_CONFIG='$(wxconfig)'
+		&& $(python_ver) ./setup.py build WX_CONFIG='$(wxconfig)'
 	touch $@
 
 build-doc-stamp: build-gtk-shared-stamp
 	dh_testdir
 	cd $(objdir_gtk_shared)/utils/tex2rtf/src \
 		&& $(MAKE)
+	rm -rf $(objdir_doc)
 	mkdir $(objdir_doc)
 	mkdir $(objdir_doc_cruft)
 	cd $(objdir_doc_cruft) \
@@ -436,56 +297,6 @@ build-i18n-stamp: build-gtk-shared-stamp
 		&& $(MAKE) allmo
 	touch $@
 
-configure-wxbase-msw-shared-stamp:
-	dh_testdir
-	mkdir -p $(objdir_wxbase_msw_shared)
-	cd $(objdir_wxbase_msw_shared) \
-		&& ../configure --prefix=/usr/$(cross_host) \
-				--cache-file=$(config_cache_cross) \
-				--host=$(cross_host) \
-				--build=$(cross_build) \
-				--disable-gui
-	touch $@
-
-build-wxbase-msw-shared-stamp: configure-wxbase-msw-shared-stamp
-	dh_testdir
-	cd $(objdir_wxbase_msw_shared) && $(MAKE)
-	touch $@
-
-configure-wxbase-msw-static-stamp:
-	dh_testdir
-	mkdir -p $(objdir_wxbase_msw_static)
-	cd $(objdir_wxbase_msw_static) \
-		&& ../configure --prefix=/usr/$(cross_host) \
-				--cache-file=$(config_cache_cross) \
-				--host=$(cross_host) \
-				--build=$(cross_build) \
-				--disable-gui \
-				--disable-shared
-	touch $@
-
-build-wxbase-msw-static-stamp: configure-wxbase-msw-static-stamp
-	dh_testdir
-	cd $(objdir_wxbase_msw_static) && $(MAKE)
-	touch $@
-
-# Note this builds dll only, since wxmsw static debug is > 130MB !
-configure-wxbase-msw-dbg-stamp:
-	dh_testdir
-	mkdir -p $(objdir_wxbase_msw_dbg)
-	cd $(objdir_wxbase_msw_dbg) \
-		&& ../configure --prefix=/usr/$(cross_host) \
-				--cache-file=$(config_cache_cross) \
-				--host=$(cross_host) \
-				--build=$(cross_build) \
-				--disable-gui \
-				--enable-debug
-	touch $@
-
-build-wxbase-msw-dbg-stamp: configure-wxbase-msw-dbg-stamp
-	dh_testdir
-	cd $(objdir_wxbase_msw_dbg) && $(MAKE)
-	touch $@
 
 configure-msw-shared-stamp:
 	dh_testdir
@@ -558,9 +369,6 @@ clean: debian/control
 #		&& ./setup.py clean
 
 	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).*
@@ -571,9 +379,6 @@ clean: debian/control
 	rm -f debian/$(package_i18n).*
 	rm -f debian/$(package_doc).*
 	rm -f debian/$(package_examples).*
-	rm -f debian/$(package_gtk_univ).*
-	rm -f debian/$(package_wxbase_msw_dev).*
-	rm -f debian/$(package_wxbase_msw_dbg).*
 	rm -f debian/$(package_msw_dev).*
 	rm -f debian/$(package_msw_dbg).*
 	rm -f debian/$(package_headers_msw).*
@@ -582,34 +387,6 @@ 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
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	dh_install $(objdir_wxbase_shared)/lib/*.so.* 	usr/lib
-
-install-wxbase-dev: DH_OPTIONS=-p$(package_wxbase_dev)
-install-wxbase-dev: build-wxbase-static-stamp
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	dh_install $(objdir_wxbase_shared)/wxbase-$(release)-config 	usr/bin
-	dh_install $(objdir_wxbase_shared)/lib/{wx,*.so} 		usr/lib
-	dh_install $(objdir_wxbase_static)/lib/*.a 			usr/lib
-
-install-wxbase-dbg: DH_OPTIONS=-p$(package_wxbase_dbg)
-install-wxbase-dbg: build-wxbase-debug-stamp
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	dh_install $(objdir_wxbase_debug)/wxbased-$(release)-config 	usr/bin
-	dh_install $(objdir_wxbase_debug)/lib 				usr
-	cp debian/lintian-override debian/$(package_wxbase_dbg)/usr/share/lintian/overrides/$(package_wxbase_dbg)
-
 install-gtk-shared-stamp:
 	dh_testdir
 	mkdir -p $(objdir_gtk_install)
@@ -632,29 +409,20 @@ install-gtk-dev: build-gtk-static-stamp install-gtk-shared-stamp
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	dh_install $(objdir_gtk_install)/bin/wxgtk-$(release)-config 	usr/bin
+	dh_install $(objdir_gtk_install)/bin/wxgtk2-$(release)-config 	usr/bin
 	dh_install $(objdir_gtk_install)/lib/{wx,*.so} 			usr/lib
-	dh_install $(objdir_gtk_static)/lib/libwx_gtk{-,_gl}*.a 	usr/lib
+	dh_install $(objdir_gtk_static)/lib/libwx_gtk2{-,_gl}*.a 	usr/lib
 
 install-gtk-dbg: DH_OPTIONS=-p$(package_gtk_dbg)
 install-gtk-dbg: build-gtk-debug-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	dh_installdirs
-	dh_install $(objdir_gtk_debug)/wxgtkd-$(release)-config 	usr/bin
+	dh_installdirs usr/share/lintian/overrides
+	dh_install $(objdir_gtk_debug)/wxgtk2d-$(release)-config 	usr/bin
 	dh_install $(objdir_gtk_debug)/lib 				usr
 	cp debian/lintian-override debian/$(package_gtk_dbg)/usr/share/lintian/overrides/$(package_gtk_dbg)
 
-install-gtk-univ: DH_OPTIONS=-p$(package_gtk_univ)
-install-gtk-univ: build-gtk-univ-stamp
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	dh_install $(objdir_gtk_univ)/wxgtkuniv-$(release)-config 	usr/bin
-	dh_install $(objdir_gtk_univ)/lib 				usr
-	cp debian/lintian-override debian/$(package_gtk_univ)/usr/share/lintian/overrides/$(package_gtk_univ)
 
 install-gtk-contrib-stamp:
 	dh_testdir
@@ -679,7 +447,7 @@ install-gtk-contrib-dev: build-contrib-static-stamp install-gtk-contrib-stamp
 	dh_installdirs
 	dh_install $(objdir_gtk_contrib_install)/include 	usr
 	dh_install $(objdir_gtk_contrib_install)/lib/*.so 	usr/lib
-	dh_install -Xlibwx_gtk- -Xlibwx_gtk_gl- \
+	dh_install -Xlibwx_gtk2- -Xlibwx_gtk2_gl- \
 		   $(objdir_gtk_static)/lib/*.a 		usr/lib
 
 install-gtk-py: DH_OPTIONS=-p$(package_gtk_py)
@@ -688,21 +456,28 @@ install-gtk-py: build-gtk-py-stamp
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	cd wxPython \
-		&& ./setup.py install \
-			      --prefix=`pwd`/../debian/$(package_gtk_py)/usr \
+	cd wxPython 								\
+		&& $(python_ver) ./setup.py install 				\
+			      --prefix=`pwd`/../debian/$(package_gtk_py)/usr 	\
 			      WX_CONFIG='$(wxconfig)'
-	find debian/$(package_gtk_py)/usr/lib/$(python_dir)/site-packages/wxPython \
+
+	find debian/$(package_gtk_py)/usr/lib/$(python_ver)/site-packages/wxPython \
 		-name '*.py?' -exec rm '{}' ';'
 
 	dh_installman debian/wxPython-tools.1
-	dh_link usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/img2py.1  \
-		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/img2xpm.1 \
-		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/img2png.1 \
-		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pycrust.1 \
-		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pyshell.1 \
-		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/xrced.1   \
-		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/helpviewer.1
+	dh_link usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/img2py.1     \
+		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/img2xpm.1    \
+		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/img2png.1    \
+		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pycrust.1    \
+		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pyshell.1    \
+		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/xrced.1      \
+		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/helpviewer.1 \
+		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pyalacarte.1 \
+		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pyalamode.1  \
+		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pywrap.1
+
+	# This is rather bogus, its included in the main copyright file now though.
+	rm -f debian/$(package_gtk_py)/usr/lib/$(python_ver)/site-packages/wxPython/tools/XRCed/license.txt
 
 install-headers: DH_OPTIONS=-p$(package_headers)
 install-headers: install-gtk-shared-stamp
@@ -746,27 +521,6 @@ install-examples: build-examples-stamp
 	dh_clean -k
 	dh_installdirs
 
-install-wxbase-msw-dev: DH_OPTIONS=-p$(package_wxbase_msw_dev)
-install-wxbase-msw-dev: build-wxbase-msw-shared-stamp build-wxbase-msw-static-stamp
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	cp -a $(objdir_wxbase_msw_shared)/lib/* debian/$(package_wxbase_msw_dev)/usr/$(cross_host)/lib
-	cp -a $(objdir_wxbase_msw_static)/lib/*.a debian/$(package_wxbase_msw_dev)/usr/$(cross_host)/lib
-	cp $(objdir_wxbase_msw_shared)/wxbase-$(release)-$(cross_host)-config debian/$(package_wxbase_msw_dev)/usr/bin/
-	$(cross_host)-strip --strip-debug debian/$(package_wxbase_msw_dev)/usr/$(cross_host)/lib/*.a
-
-install-wxbase-msw-dbg: DH_OPTIONS=-p$(package_wxbase_msw_dbg)
-install-wxbase-msw-dbg: build-wxbase-msw-dbg-stamp
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	cp -a $(objdir_wxbase_msw_dbg)/lib/* debian/$(package_wxbase_msw_dbg)/usr/$(cross_host)/lib
-	cp $(objdir_wxbase_msw_dbg)/wxbased-$(release)-$(cross_host)-config debian/$(package_wxbase_msw_dbg)/usr/bin/
-	# No static lib, they're freakin' huge!
-	#$(cross_host)-strip --strip-debug debian/$(package_wxbase_msw_dbg)/usr/$(cross_host)/lib/*.a
 
 install-msw-dev: DH_OPTIONS=-p$(package_msw_dev)
 install-msw-dev: build-msw-shared-stamp build-msw-static-stamp
@@ -820,15 +574,13 @@ binary-common:
 
 	@# Don't strip debug libs at all, and strip cross libs elsewhere
 	@# with the cross host tools until dh_strip gets smarter.
-	dh_strip -N$(package_gtk_dbg) -N$(package_wxbase_dbg) \
-		 -N$(package_wxbase_msw_dev) -N$(package_wxbase_msw_dbg) \
-		 -N$(package_msw_dev) -N$(package_msw_dbg)
+	dh_strip -N$(package_gtk_dbg) -N$(package_msw_dev) -N$(package_msw_dbg)
 
 	dh_compress
 	dh_fixperms
 	dh_makeshlibs -N$(package_gtk_py) -V
 	dh_installdeb
-	dh_shlibdeps -ldebian/$(package_gtk_lib)/usr/lib
+	dh_shlibdeps -ldebian/$(package_gtk_lib)/usr/lib:debian/$(package_gtk_dbg)/usr/lib
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
@@ -838,13 +590,13 @@ binary-common:
 # building the arch specific package files needed to create them.
 binary-indep: build_all install
 	$(MAKE) -f debian/rules \
-		DH_OPTIONS="-i -N$(package_wxbase_msw_dev) -N$(package_wxbase_msw_dbg) -N$(package_msw_dev) -N$(package_msw_dbg) -N$(package_headers_msw) -N$(package_gtk_univ)" \
+		DH_OPTIONS="-i -N$(package_msw_dev) -N$(package_msw_dbg) -N$(package_headers_msw)" \
 		binary-common
 
 # Build just the architecture-dependent files here.
 binary-arch: build_arch install_arch
 	$(MAKE) -f debian/rules \
-		DH_OPTIONS="-a -N$(package_wxbase_msw_dev) -N$(package_wxbase_msw_dbg) -N$(package_msw_dev) -N$(package_msw_dbg) -N$(package_headers_msw) -N$(package_gtk_univ)" \
+		DH_OPTIONS="-a -N$(package_msw_dev) -N$(package_msw_dbg) -N$(package_headers_msw)" \
 		binary-common
 
 # Build all packages target.
@@ -857,7 +609,7 @@ binary: binary-arch binary-indep
 # that is not in the control file.
 binary-cross: control-files-stamp $(install_all_cross)
 	$(MAKE) -f debian/rules \
-		DH_OPTIONS="-p$(package_wxbase_msw_dev) -p$(package_wxbase_msw_dbg) -p$(package_msw_dev) -p$(package_msw_dbg) -p$(package_headers_msw)" \
+		DH_OPTIONS="-p$(package_msw_dev) -p$(package_msw_dbg) -p$(package_headers_msw)" \
 		binary-common
 
 
@@ -881,20 +633,6 @@ binary-gtk-dev: control-files-stamp install-gtk-dev install-headers
 binary-gtk-dbg: control-files-stamp install-gtk-dbg install-headers
 	$(MAKE) -f debian/rules DH_OPTIONS="-p$(package_gtk_dbg) -p$(package_headers)" binary-common
 
-# libwxbase shared lib package
-binary-wxbase: control-files-stamp install-wxbase-lib install-headers
-	$(MAKE) -f debian/rules DH_OPTIONS="-p$(package_wxbase_lib) -p$(package_headers)" binary-common
-
-binary-wxbase-dev: control-files-stamp install-wxbase-dev install-headers
-	$(MAKE) -f debian/rules \
-	  DH_OPTIONS="-p$(package_wxbase_lib) -p$(package_wxbase_dev) -p$(package_headers)" \
-	  binary-common
-
-binary-wxbase-dbg: control-files-stamp install-wxbase-dbg install-headers
-	$(MAKE) -f debian/rules DH_OPTIONS="-p$(package_wxbase_dbg) -p$(package_headers)" binary-common
-
-binary-univ: control-files-stamp install-gtk-univ
-	$(MAKE) -f debian/rules DH_OPTIONS="-p$(package_gtk_univ)" binary-common
 
 # docs package
 binary-doc: control-files-stamp install-doc
@@ -905,12 +643,9 @@ binary-fast:control-files-stamp install-gtk-dbg install-msw-dev install-headers
 
 
 .PHONY: build build_all build_arch clean binary-indep binary-arch binary binary-common \
-        binary-gtk binary-gtk-dev binary-gtk-dbg binary-wxbase binary-wxbase-dev \
-	binary-wxbase-dbg binary-doc binary-cross \
-	install install_arch install-wxbase-lib \
-        install-wxbase-dev install-wxbase-dbg install-gtk-lib install-gtk-dev \
+        binary-gtk binary-gtk-dev binary-gtk-dbg binary-doc binary-cross \
+	install install_arch install-gtk-lib install-gtk-dev \
         install-gtk-dbg install-gtk-contrib install-gtk-contrib-dev \
         install-gtk-py install-headers install-i18n install-doc install-examples \
-	install-wxbase-msw-dev install-msw-dev install-headers-msw \
-	install-wxbase-msw-dbg install-msw-dbg
+	install-msw-dev install-msw-dbg install-headers-msw
 

debian/wxwin-doc.dirs

@@ -1 +0,0 @@
-usr/share/doc-base

debian/wxwin-doc.doc-base

@@ -1,10 +1,10 @@
-Document: wxwindows-manual
-Title: wxWindows Programming Manual
-Author: The wxWindows Cabal
-Abstract: This manual describes the wxWindows cross-platform GUI toolkit.
+Document: wx-manual
+Title: wxWidgets Programming Manual
+Author: The wxWidgets Cabal
+Abstract: This manual describes the wxWidgets cross-platform GUI toolkit.
 Section: Apps/Programming
 
 Format: HTML
-Index: /usr/share/doc/wxwin=V-doc/wxWindows-manual.html/wxwin.htm
-Files: /usr/share/doc/wxwin=V-doc/wxWindows-manual.html/*
+Index: /usr/share/doc/wx=V-doc/wx-manual.html/wxwin.htm
+Files: /usr/share/doc/wx=V-doc/wx-manual.html/*
 

debian/wxwin-doc.docs

@@ -1,2 +1,2 @@
-docs/wxWindows-manual.html
+docs/wx-manual.html
 

debian/wxwin-headers.dirs

@@ -1,3 +0,0 @@
-usr/include/wx
-usr/share/man/man1
-

debian/wxwin-i18n.dirs

@@ -1,2 +0,0 @@
-/usr/share/locale
-