Prepare for wx2.4.3 release asap.

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

configure.in

@@ -40,7 +40,7 @@ dnl   libwx_$(TOOLKIT)-$(WX_RELEASE).so.$(WX_CURRENT).$(WX_REVISION).$(WX_AGE)
 
 WX_MAJOR_VERSION_NUMBER=2
 WX_MINOR_VERSION_NUMBER=4
-WX_RELEASE_NUMBER=2
+WX_RELEASE_NUMBER=3
 
 WX_VERSION=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER.$WX_RELEASE_NUMBER
 WX_RELEASE=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER
@@ -48,7 +48,7 @@ WX_RELEASE=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER
 WX_MSW_VERSION=$WX_MAJOR_VERSION_NUMBER$WX_MINOR_VERSION_NUMBER$WX_RELEASE_NUMBER
 
 WX_CURRENT=0
-WX_REVISION=1
+WX_REVISION=2
 WX_AGE=1
 
 

debian/changelog

@@ -1,3 +1,66 @@
+wxwindows2.4 (2.4.3) unstable; urgency=medium
+
+  * Really should be high urgency, as this resolves more licence
+    trouble found in 2.4.2.6.1, but we are well frozen and the
+    changes are extensive where not major, so I'm a little more
+    cautious of pushing this through as hard as the last upload.
+    - Much of the artwork has been replaced by images from a known
+      good source.
+    - Many files with missing or wrong licence/attribution have been
+      amended or replaced.
+    - The afm files have been removed as they are GPL and it is not
+      clear they can be (universally) distributed with wx under its
+      more relaxed licence.  We should source these via a dependency
+      on some other Debian package.  Printing with wx2.4 may be
+      affected without those files.
+      The most promising option is probably to backport the printing
+      code from 2.6 but that cannot be considered even remotely viable
+      for sarge.  My apologies to the clear-felling industry while we
+      sort this one out.
+    Many thanks to all the people who found and reported potential for
+    trouble, and who lent their support to ensure it would be fixed.
+
+  * The library package names themselves now incorporate the soname,
+    this should have been done long ago (per common best practice),
+    but this branch again feigned stability well.
+    We're going to need this for clean upgrades if more changes are
+    made after the freeze.  Provides the old package names at present
+    for compatibility with existing dependent packages, but may simply
+    conflict/replace or ignore them in future if and as required.
+    This isn't an _essential_ change for sarge, but its Havana cigar
+    sanction busting George Galloway style that I think we'll be better
+    off for having, given the evidence at hand.
+
+  * Drop support for the 'universal' builds.  In 2.4 they have always
+    been universally useless to us, no need to keep the cruft for them
+    any longer.
+  * Drop the static builds also, time is proving them worse than useless
+    and there is already sufficient danger to be found in wx build
+    combinations without encouraging trouble down that avenue too.
+
+      Neither of these two prunings affect any existing package,
+      but both are consistent with existing long term plans.
+
+ -- Ron Lee <ron@debian.org>  Fri, 20 May 2005 11:42:40 +0930
+
+wxwindows2.4 (2.4.2.6.1) unstable; urgency=high
+
+  * High urgency because this removes some source files we appear
+    not to have permssion to distribute.  Fortunately their removal
+    does not effect any of the existing package binaries.  This must
+    propagate through the archive before we freeze.  Closes: #306013
+  * Remove typo apostrophe in control.in  Closes: #268527
+  * There are no other changes in this otherwise unintended release,
+    it should have no effect on dependent packages.
+
+ -- Ron Lee <ron@debian.org>  Sun, 24 Apr 2005 01:14:56 +0930
+
+wxwindows2.4 (2.4.2.7) unstable; urgency=low
+
+  * vapourware bugfix release...
+
+ -- Ron Lee <ron@debian.org>  Thu,  2 Dec 2004 01:30:28 +1030
+
 wxwindows2.4 (2.4.2.6) unstable; urgency=high
 
   * High urgency so as not to reset the shotclock for getting wx and

debian/control.in

@@ -5,10 +5,13 @@ Build-Depends: debhelper (>=4.0), flex, bison, gettext, libgtk1.2-dev, =PY, =PY-
 Maintainer: Ron Lee <ron@debian.org>
 Standards-Version: 3.6.1.1
 
-Package: libwxbase=V
+Package: libwxbase=SOV
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}
+Conflicts: libwxbase=V
+Replaces: libwxbase=V
+Provides: libwxbase=V
 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,
@@ -25,7 +28,7 @@ Description: wxBase library (runtime) - non-GUI support classes of wxWindows too
 Package: libwxbase=V-dev
 Architecture: any
 Section: libdevel
-Depends: wxwin=V-headers (= ${Source-Version}), libwxbase=V (= ${Source-Version}), libc6-dev
+Depends: wxwin=V-headers (= ${Source-Version}), libwxbase=SOV (= ${Source-Version}), libc6-dev
 Suggests: wxwin=V-doc, gettext
 Conflicts: libwxbase-dev
 Replaces: libwxbase-dev
@@ -64,11 +67,13 @@ Description: wxBase library (debug) - non-GUI support classes of wxWindows toolk
  provides many internal checks by wxWindows itself that are not performed on
  apps compiled with the 'release version' libs in the -dev package.
 
-Package: libwxgtk=V
+Package: libwxgtk=SOV
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}
-Replaces: wxgtk2.1
+Conflicts: libwxgtk=V
+Replaces: libwxgtk=V, wxgtk2.1
+Provides: libwxgtk=V
 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
@@ -81,7 +86,7 @@ Description: wxWindows Cross-platform C++ GUI toolkit (GTK+ runtime)
 Package: libwxgtk=V-dev
 Architecture: any
 Section: libdevel
-Depends: wxwin=V-headers (= ${Source-Version}), libwxgtk=V (= ${Source-Version}), libc6-dev
+Depends: wxwin=V-headers (= ${Source-Version}), libwxgtk=SOV (= ${Source-Version}), libc6-dev
 Suggests: wxwin=V-doc, libstdc++-dev, gettext, xlibmesa-gl-dev | libgl-dev, xlibmesa-glu-dev | libglu-dev
 Conflicts: libwxgtk-dev
 Replaces: libwxgtk-dev, wxgtk2.1-dev
@@ -113,7 +118,7 @@ Description: wxWindows Cross-platform C++ GUI toolkit (GTK+ development)
  provides many internal checks by wxWindows itself that are not performed on
  apps compiled with the 'release version' libs in the -dev package.
 
-Package: libwxgtk=V-python
+Package: libwxgtk=SOV-python
 Architecture: any
 Section: python
 Depends: =PY, ${shlibs:Depends}
@@ -130,10 +135,13 @@ Description: wxWindows Cross-platform C++ GUI toolkit (wxPython binding)
  contrib libs.  If you wish to use xrced you'll also need the python-xml
  package installed.
 
-Package: libwxgtk=V-contrib
+Package: libwxgtk=SOV-contrib
 Architecture: any
 Section: libs
-Depends: libwxgtk=V (= ${Source-Version}), ${shlibs:Depends}
+Depends: libwxgtk=SOV (= ${Source-Version}), ${shlibs:Depends}
+Conflicts: libwxgtk-contrib=V
+Replaces: libwxgtk-contrib=V
+Provides: libwxgtk-contrib=V
 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
@@ -144,7 +152,7 @@ Description: wxWindows Cross-platform C++ GUI toolkit (runtime contrib libs)
 Package: libwxgtk=V-contrib-dev
 Architecture: any
 Section: libdevel
-Depends: wxwin=V-headers (= ${Source-Version}), libwxgtk=V-dev (= ${Source-Version}), libwxgtk=V-contrib (= ${Source-Version}), libc6-dev
+Depends: wxwin=V-headers (= ${Source-Version}), libwxgtk=V-dev (= ${Source-Version}), libwxgtk=SOV-contrib (= ${Source-Version}), libc6-dev
 Conflicts: libwxgtk-contrib-dev
 Replaces: libwxgtk-contrib-dev
 Provides: libwxgtk-contrib-dev
@@ -209,14 +217,14 @@ Description: wxWindows Cross-platform C++ GUI toolkit (examples)
  This package contains examples of using the wxWindows toolkit in
  C++ and with the wxPython language binding.
 
-Package: libwxgtk=V-dbg-python
+Package: libwxgtk=SOV-dbg-python
 Architecture: any
 Section: python
 Depends: =PY, ${shlibs:Depends}
 Suggests: wxwin=V-doc, wxwin=V-examples, =PY-xml
-Conflicts: libwxgtk=V-python
+Conflicts: libwxgtk=SOV-python
-Replaces: libwxgtk=V-python
+Replaces: libwxgtk=SOV-python
-Provides: libwxgtk=V-python
+Provides: libwxgtk=SOV-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
@@ -227,7 +235,7 @@ Description: wxWindows Cross-platform C++ GUI toolkit (wxPython binding)
  Unfortunately it cannot be installed at the same time as the release
  packages, but it will replace them for other applications that require
  wxPython.  You should _never_ upload packages to Debian that depend upon
- this package explicitly, use the libwxgtk=V-python package instead.
+ this package explicitly, use the libwxgtk=SOV-python package instead.
  .
  If you wish to use xrced you'll also need the python-xml package installed.
 
@@ -283,17 +291,4 @@ Provides: wxwin-headers-msw
 Description: Extra wxWindows headers for mingw32msvc-cross
  Headers required by the wxWindows mingw32msvc-cross libraries.
 
-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.
-
 

debian/rules

@@ -25,7 +25,9 @@ endif
 
 -include debian/python-version
 
-release := $(shell dpkg-parsechangelog | sed -n 's/^Source: wxwindows//p')
+release   := $(shell dpkg-parsechangelog | sed -n 's/^Source: wxwindows//p')
+soversion := $(shell grep '^WX_CURRENT=' configure.in | sed 's/WX_CURRENT=\([0-9]\+\).*/\1/')
+sorelease := $(release:%-$(DEBIAN_WXFLAVOUR)=%).$(soversion)$(addprefix -,$(DEBIAN_WXFLAVOUR))
 
 cross_host  = i586-mingw32msvc
 cross_build = $(shell ./config.guess)
@@ -34,23 +36,22 @@ config_cache       = ../config_deb.cache
 config_cache_cross = ../config_deb_cross.cache
 
 # Packages to build:
-package_wxbase_lib      = libwxbase$(release)
+package_wxbase_lib      = libwxbase$(sorelease)
 package_wxbase_dev      = libwxbase$(release)-dev
 package_wxbase_dbg      = libwxbase$(release)-dbg
-package_gtk_lib         = libwxgtk$(release)
+package_gtk_lib         = libwxgtk$(sorelease)
 package_gtk_dev         = libwxgtk$(release)-dev
 package_gtk_dbg         = libwxgtk$(release)-dbg
-package_gtk_py          = libwxgtk$(release)-python
+package_gtk_py          = libwxgtk$(sorelease)-python
-package_gtk_contrib     = libwxgtk$(release)-contrib
+package_gtk_contrib     = libwxgtk$(sorelease)-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_dbg_py      = libwxgtk$(release)-dbg-python
+package_gtk_dbg_py      = libwxgtk$(sorelease)-dbg-python
 
-package_gtk_univ        = libwxgtk$(release)-univ
 
 package_wxbase_msw_dev  = libwxbase-msw$(release)-dev
 package_wxbase_msw_dbg  = libwxbase-msw$(release)-dbg
@@ -60,10 +61,8 @@ package_headers_msw     = wxwin$(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
@@ -72,9 +71,6 @@ objdir_doc                 = docs/wxWindows-manual.html
 objdir_examples            = docs/examples
 objdir_i18n                = locale
 
-objdir_gtk_univ            = objs_gtk_univ
-objdir_univ_install        = objs_univ_install
-
 objdir_wxbase_msw_shared   = objs_wxbase_msw_sh
 objdir_wxbase_msw_static   = objs_wxbase_msw_st
 objdir_wxbase_msw_dbg      = objs_wxbase_msw_d
@@ -82,13 +78,12 @@ objdir_msw_shared          = objs_msw_sh
 objdir_msw_static          = objs_msw_st
 objdir_msw_dbg             = objs_msw_d
 
-objdirs = $(objdir_wxbase_shared) $(objdir_wxbase_static) $(objdir_wxbase_debug) \
+objdirs = $(objdir_wxbase_shared) $(objdir_wxbase_debug)                     \
-	  $(objdir_gtk_shared) $(objdir_gtk_static) $(objdir_gtk_debug)          \
+	  $(objdir_gtk_shared) $(objdir_gtk_debug)                           \
-	  $(objdir_gtk_install) $(objdir_gtk_contrib_install) $(objdir_gtk_univ) \
+	  $(objdir_gtk_install) $(objdir_gtk_contrib_install)                \
-	  $(objdir_univ_install) $(objdir_doc_cruft) $(objdir_doc)               \
+	  $(objdir_doc_cruft) $(objdir_doc) $(objdir_examples)               \
-	  $(objdir_examples)                                                     \
+	  $(objdir_wxbase_msw_shared) $(objdir_wxbase_msw_static)            \
-	  $(objdir_wxbase_msw_shared) $(objdir_wxbase_msw_static)                \
+	  $(objdir_wxbase_msw_dbg) $(objdir_msw_shared) $(objdir_msw_static) \
-	  $(objdir_wxbase_msw_dbg) $(objdir_msw_shared) $(objdir_msw_static)     \
 	  $(objdir_msw_dbg)
 
 #	note that the i18n package is actually arch indep (once built)
@@ -96,14 +91,10 @@ objdirs = $(objdir_wxbase_shared) $(objdir_wxbase_static) $(objdir_wxbase_debug)
 #	it's pulled out of the wxGTK shared lib package.
 
 # Build stamps:
-build_arch_stamps = build-wxbase-shared-stamp build-wxbase-static-stamp \
+build_arch_stamps = build-wxbase-shared-stamp build-wxbase-debug-stamp       \
-                    build-wxbase-debug-stamp build-gtk-shared-stamp \
+                    build-gtk-shared-stamp build-gtk-debug-stamp             \
-                    build-gtk-static-stamp build-gtk-debug-stamp \
+                    build-contrib-shared-stamp                               \
-                    build-contrib-shared-stamp build-contrib-static-stamp \
+		    build-gtk-py-stamp build-i18n-stamp
-                    build-gtk-py-stamp build-i18n-stamp
-
-# disable gtk-univ build, we'll  replace it with x11-univ later.
-#		  build-gtk-univ-stamp
 
 build_indep_stamps = build-examples-stamp build-doc-stamp
 
@@ -121,9 +112,6 @@ install_all_arch = install-wxbase-lib install-wxbase-dev install-wxbase-dbg \
                    install-gtk-contrib install-gtk-contrib-dev install-gtk-py \
                    install-headers install-i18n
 
-# disable gtk-univ build, we'll  replace it with x11-univ later.
-#                install-gtk-univ
-
 install_all_indep = install-examples install-doc
 
 install_all_cross = install-wxbase-msw-dev install-wxbase-msw-dbg install-msw-dev install-msw-dbg install-headers-msw
@@ -148,7 +136,8 @@ debian/python-version:
 	echo python_ver := python$(shell python -c "import sys;print sys.version[:3]") > $@
 
 debian/control: $(addprefix debian/,control.in python-version)
-	sed -e 's/=V/$(release)/g;s/=PY/$(python_ver)/g' < debian/control.in > debian/control
+	sed -e 's/=V/$(release)/g;s/=SOV/$(sorelease)/g;s/=PY/$(python_ver)/g' \
+		< debian/control.in > debian/control
 
 control-files-stamp: debian/control
 	dh_testdir
@@ -257,23 +246,6 @@ build-wxbase-shared-stamp: configure-wxbase-shared-stamp
 	cd $(objdir_wxbase_shared) && $(FAST_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			\
-				--enable-std_iostreams
-	touch $@
-
-build-wxbase-static-stamp: configure-wxbase-static-stamp
-	dh_testdir
-	cd $(objdir_wxbase_static) && $(FAST_MAKE)
-	touch $@
-
 configure-wxbase-debug-stamp:
 	dh_testdir
 	mkdir -p $(objdir_wxbase_debug)
@@ -314,28 +286,6 @@ build-gtk-shared-stamp: configure-gtk-shared-stamp
 	cd $(objdir_gtk_shared) && $(FAST_MAKE)
 	touch $@
 
-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		\
-				--enable-std_iostreams
-	touch $@
-
-build-gtk-static-stamp: configure-gtk-static-stamp
-	dh_testdir
-	cd $(objdir_gtk_static) && $(FAST_MAKE)
-	touch $@
-
 configure-gtk-debug-stamp:
 	dh_testdir
 	mkdir -p $(objdir_gtk_debug)
@@ -359,28 +309,6 @@ build-gtk-debug-stamp: configure-gtk-debug-stamp
 	cd $(objdir_gtk_debug) && $(FAST_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		\
-				--enable-std_iostreams
-	touch $@
-
-build-gtk-univ-stamp: configure-gtk-univ-stamp
-	dh_testdir
-	cd $(objdir_gtk_univ) && $(FAST_MAKE)
-	touch $@
 
 build-contrib-shared-stamp: build-gtk-shared-stamp
 	dh_testdir
@@ -389,11 +317,6 @@ build-contrib-shared-stamp: build-gtk-shared-stamp
 	cd $(objdir_gtk_shared)/contrib/utils/wxrcedit && $(FAST_MAKE)
 	touch $@
 
-build-contrib-static-stamp: build-gtk-static-stamp
-	dh_testdir
-	cd $(objdir_gtk_static)/contrib/src && $(FAST_MAKE)
-	touch $@
-
 purge-dbg-py:
 	@if [ ! -e build-gtk-py-stamp ]; then				\
 		$(MAKE) -f debian/rules clean-py;			\
@@ -526,10 +449,10 @@ build-wxbase-msw-dbg-stamp: configure-wxbase-msw-dbg-stamp
 configure-msw-shared-stamp:
 	dh_testdir
 	mkdir -p $(objdir_msw_shared)
-	cd $(objdir_msw_shared) \
+	cd $(objdir_msw_shared)						\
-		&& ../configure --prefix=/usr/$(cross_host) \
+		&& ../configure --prefix=/usr/$(cross_host)		\
-				--cache-file=$(config_cache_cross) \
+				--cache-file=$(config_cache_cross)	\
-				--host=$(cross_host) \
+				--host=$(cross_host)			\
 				--build=$(cross_build)
 	touch $@
 
@@ -541,11 +464,11 @@ build-msw-shared-stamp: configure-msw-shared-stamp
 configure-msw-static-stamp:
 	dh_testdir
 	mkdir -p $(objdir_msw_static)
-	cd $(objdir_msw_static) \
+	cd $(objdir_msw_static)						\
-		&& ../configure --prefix=/usr/$(cross_host) \
+		&& ../configure --prefix=/usr/$(cross_host)		\
-				--cache-file=$(config_cache_cross) \
+				--cache-file=$(config_cache_cross)	\
-				--host=$(cross_host) \
+				--host=$(cross_host)			\
-				--build=$(cross_build) \
+				--build=$(cross_build)			\
 				--disable-shared
 	touch $@
 
@@ -557,11 +480,11 @@ build-msw-static-stamp: configure-msw-static-stamp
 configure-msw-dbg-stamp:
 	dh_testdir
 	mkdir -p $(objdir_msw_dbg)
-	cd $(objdir_msw_dbg) \
+	cd $(objdir_msw_dbg)						\
-		&& ../configure --prefix=/usr/$(cross_host) \
+		&& ../configure --prefix=/usr/$(cross_host)		\
-				--cache-file=$(config_cache_cross) \
+				--cache-file=$(config_cache_cross)	\
-				--host=$(cross_host) \
+				--host=$(cross_host)			\
-				--build=$(cross_build) \
+				--build=$(cross_build)			\
 				--enable-debug
 	touch $@
 
@@ -615,7 +538,6 @@ clean: debian/control clean-py
 	rm -f debian/$(package_msw_dev).*
 	rm -f debian/$(package_msw_dbg).*
 	rm -f debian/$(package_headers_msw).*
-	rm -f debian/$(package_gtk_univ).*
 
 install_arch: build_arch $(install_all_arch)
 
@@ -630,14 +552,13 @@ install-wxbase-lib: build-wxbase-shared-stamp
 	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
+install-wxbase-dev: build-wxbase-shared-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
@@ -666,14 +587,13 @@ install-gtk-lib: build-gtk-shared-stamp install-gtk-shared-stamp
 	dh_install $(objdir_gtk_install)/lib/*.so.* 	usr/lib
 
 install-gtk-dev: DH_OPTIONS=-p$(package_gtk_dev)
-install-gtk-dev: build-gtk-static-stamp install-gtk-shared-stamp
+install-gtk-dev: install-gtk-shared-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
 	dh_install $(objdir_gtk_install)/bin/wxgtk-$(release)-config 	usr/bin
 	dh_install $(objdir_gtk_install)/lib/{wx,*.so} 			usr/lib
-	dh_install $(objdir_gtk_static)/lib/libwx_gtk{-,_gl}*.a 	usr/lib
 
 install-gtk-dbg: DH_OPTIONS=-p$(package_gtk_dbg)
 install-gtk-dbg: build-gtk-debug-stamp
@@ -685,16 +605,6 @@ install-gtk-dbg: build-gtk-debug-stamp
 	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
 	mkdir -p $(objdir_gtk_contrib_install)/lib
@@ -711,15 +621,13 @@ install-gtk-contrib: build-contrib-shared-stamp install-gtk-contrib-stamp
 	dh_install $(objdir_gtk_contrib_install)/lib/*.so.* 		usr/lib
 
 install-gtk-contrib-dev: DH_OPTIONS=-p$(package_gtk_contrib_dev)
-install-gtk-contrib-dev: build-contrib-static-stamp install-gtk-contrib-stamp
+install-gtk-contrib-dev: install-gtk-contrib-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k
 	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- 				\
-		   $(objdir_gtk_static)/lib/*.a 			usr/lib
 
 	dh_install $(objdir_gtk_shared)/contrib/utils/wxrc/wxrc		usr/bin
 	dh_install $(objdir_gtk_shared)/contrib/utils/wxrcedit/wxrcedit	usr/bin
@@ -752,10 +660,30 @@ install-gtk-py: build-gtk-py-stamp
 		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/helpviewer.1 \
 		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pyalacarte.1 \
 		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pyalamode.1  \
-		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pywrap.1
+		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pywrap.1     \
+		usr/share/man/man1/wxPython-tools.1 usr/share/man/man1/pywxrc.1
+
+
+install-common: DH_OPTIONS=-p$(package_common)
+install-common: install-gtk-shared-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+#	We don't need the afm metrics for gtk2, but we might need them to support
+#	the 2.4 release for a while still and any other ports we might build.
+	dh_install $(objdir_gtk_install)/share/wx	usr/share
+	dh_install $(objdir_gtk_install)/share/aclocal 	usr/share
+	dh_installman debian/wx-config.1
+
+	dh_install $(objdir_gtk_shared)/utils/wxrc/wxrc	usr/bin
+#	dh_install $(objdir_gtk_shared)/contrib/utils/wxrcedit/wxrcedit	usr/bin
+
+	dh_installman debian/wxrc-tools.1
+	dh_link usr/share/man/man1/wxrc-tools.1 usr/share/man/man1/wxrc.1
+#	dh_link usr/share/man/man1/wxrc-tools.1 usr/share/man/man1/wxrcedit.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
@@ -764,14 +692,6 @@ install-headers: install-gtk-shared-stamp
 	dh_clean -k
 	dh_installdirs
 
-# The only way to be really sure we get the univ headers correct is to install
-# them.  Do that in a scratch dirs, and move the gtk ones last, so at least
-# they win in the result of any uncaught conflict.
-
-#	cd $(objdir_gtk_univ) \
-#		&& $(MAKE) install prefix=`pwd`/../$(objdir_univ_install)/usr
-
-#	dh_movefiles --sourcedir=$(objdir_univ_install)
 	dh_install $(objdir_gtk_install)/include 	usr
 	dh_install $(objdir_gtk_install)/share/aclocal 	usr/share
 
@@ -834,8 +754,8 @@ install-wxbase-msw-dev: build-wxbase-msw-shared-stamp build-wxbase-msw-static-st
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	cp -a $(objdir_wxbase_msw_shared)/lib/* debian/$(package_wxbase_msw_dev)/usr/$(cross_host)/lib
+	dh_install $(objdir_wxbase_msw_shared)/lib/*	usr/$(cross_host)/lib
-	cp -a $(objdir_wxbase_msw_static)/lib/*.a debian/$(package_wxbase_msw_dev)/usr/$(cross_host)/lib
+	dh_install $(objdir_wxbase_msw_static)/lib/*.a	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
 
@@ -927,13 +847,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_gtk_dbg_py) -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_gtk_dbg_py) -N$(package_wxbase_msw_dev) -N$(package_wxbase_msw_dbg) -N$(package_msw_dev) -N$(package_msw_dbg) -N$(package_headers_msw)" \
 		binary-common
 
 # Build just the architecture-dependent files here.
 binary-arch: build_arch install_arch
 	$(MAKE) -f debian/rules \
-		DH_OPTIONS="-a -N$(package_gtk_dbg_py) -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_gtk_dbg_py) -N$(package_wxbase_msw_dev) -N$(package_wxbase_msw_dbg) -N$(package_msw_dev) -N$(package_msw_dbg) -N$(package_headers_msw)" \
 		binary-common
 
 # Build all packages target.
@@ -977,20 +897,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

include/wx/version.h

@@ -15,13 +15,13 @@
 // Bump-up with each new version
 #define wxMAJOR_VERSION    2
 #define wxMINOR_VERSION    4
-#define wxRELEASE_NUMBER   2
+#define wxRELEASE_NUMBER   3
-#define wxVERSION_STRING   _T("wxWindows 2.4.2")
+#define wxVERSION_STRING   _T("wxWindows 2.4.3")
 
 // These are used by src/msw/version.rc and should always be ASCII, not Unicode
 // and must be updated manually as well each time the version above changes
-#define wxVERSION_NUM_DOT_STRING   "2.4.2"
+#define wxVERSION_NUM_DOT_STRING   "2.4.3"
-#define wxVERSION_NUM_STRING       "242"
+#define wxVERSION_NUM_STRING       "243"
 
 // nothing should be updated below this line when updating the version
 

wxPython/setup.py

@@ -15,8 +15,8 @@ from distutils.command.install_data import install_data
 
 VER_MAJOR        = 2      # The first three must match wxWindows
 VER_MINOR        = 4
-VER_RELEASE      = 2
+VER_RELEASE      = 3
-VER_SUBREL       = 4       # wxPython release num for x.y.z release of wxWindows
+VER_SUBREL       = 0       # wxPython release num for x.y.z release of wxWindows
 VER_FLAGS        = ""      # release flags, such as prerelease num, unicode, etc.
 
 DESCRIPTION      = "Cross platform GUI toolkit for Python"

wxPython/src/__version__.py

@@ -1,10 +1,10 @@
 # This file was generated by setup.py...
 
-wxVERSION_STRING  = '2.4.2.4'
+wxVERSION_STRING  = '2.4.3.0'
 wxMAJOR_VERSION   = 2
 wxMINOR_VERSION   = 4
-wxRELEASE_VERSION = 2
+wxRELEASE_VERSION = 3
-wxSUBREL_VERSION  = 4
+wxSUBREL_VERSION  = 0
 
 wxVERSION = (wxMAJOR_VERSION, wxMINOR_VERSION, wxRELEASE_VERSION,
              wxSUBREL_VERSION, '')