merged 2.4 branch into the trunk

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

debian/changelog

@@ -1,3 +1,41 @@
+wxwindows2.3 (2.3.4) unstable; urgency=low
+
+  * 2.4.0pre1 I guess.
+  * Added -ffunction-sections for broken hppa linker. Closes: #162948
+
+ -- Ron Lee <ron@debian.org>  Mon, 18 Nov 2002 18:54:21 -0800
+
+wxwindows2.3 (2.3.3.2) unstable; urgency=low
+
+  * The one more for luck release.
+  * Debian-wise, it fixes the problem with contrib lib name clashes;
+    code-wise, lots of little issues (and a couple of big 'uns) from
+    2.3.3 -- see the more regular change or cvs logs for details...
+  * Yes, it's still the unstable branch, yes the request for testing
+    to see if we can reasonably obsolete 2.2 in post-woody debian
+    is still current, and yes we're still working toward a stable
+    2.4 release as fast as we can.   Big thanks to everyone who's
+    been patient and/or active fixing things.
+
+ -- Ron Lee <ron@debian.org>  Thu, 26 Sep 2002 17:43:05 -0700
+
+wxwindows2.3 (2.3.3.1) unstable; urgency=low
+
+  * Ok, Robin says wxPython is good to go.
+  * Since wx2.2 has crashed and burned with the new releases of
+    python and png, Could package maintainers with packages that
+    depend on wx please recompile with this package and let me
+    know if they still need 2.2 in woody?   If not I'll have them
+    removed.  There should be a 2.4 release following very soon.
+    (hah, let's see how the date on that comment testifies!)
+  * Yes, I know wxpython is missing man pages for some of its
+    scripts.  File a bug if you must, but preferably, if you know
+    what they do, attach a patch containing one.  I don't use them
+    myself or could even do more than guess what they do today.
+    Sorry, C++.
+
+ -- Ron Lee <ron@debian.org>  Thu, 19 Sep 2002 16:25:12 -0700
+
 wxwindows2.3 (2.3.3) unstable; urgency=low
 
   * The "If it sucks, You whined for it!" release.

debian/control.in

@@ -116,7 +116,7 @@ Description: wxWindows Cross-platform C++ GUI toolkit (GTK+ development)
 Package: libwxgtk=V-python
 Architecture: any
 Section: interpreters
-Depends: python (>=2.1), python (<<2.2), ${shlibs:Depends}
+Depends: python (>=2.2), python (<<2.3), ${shlibs:Depends}
 Suggests: wxwin=V-doc, wxwin=V-examples
 Conflicts: libwxgtk=V-python-contrib, python-wxwin
 Replaces: libwxgtk=V-python-contrib, python-wxwin

debian/libwxgtk-contrib-dev.files

@@ -1,12 +1,12 @@
 usr/include/wx/
-usr/lib/libcanvas.so
-usr/lib/libfl.so
-usr/lib/libgizmos.so
-usr/lib/libmmedia.so
-usr/lib/libogl.so
-usr/lib/libstc.so
-usr/lib/libwx_dcsvg.so
-usr/lib/libwx_net.so
-usr/lib/libwx_plot.so
-usr/lib/libwxxrc.so
+usr/lib/libwx_gtk_canvas-*.so
+usr/lib/libwx_gtk_dcsvg-*.so
+usr/lib/libwx_gtk_fl-*.so
+usr/lib/libwx_gtk_gizmos-*.so
+usr/lib/libwx_gtk_mmedia-*.so
+usr/lib/libwx_gtk_net-*.so
+usr/lib/libwx_gtk_ogl-*.so
+usr/lib/libwx_gtk_plot-*.so
+usr/lib/libwx_gtk_stc-*.so
+usr/lib/libwx_gtk_xrc-*.so
 

debian/rules

@@ -562,7 +562,8 @@ install-gtk-dev: build-gtk-static-stamp install-gtk-lib
 	dh_clean -k
 	dh_installdirs
 	dh_movefiles --sourcedir=debian/$(package_gtk_lib)
-	cp $(objdir_gtk_static)/lib/libwx_gtk*.a debian/$(package_gtk_dev)/usr/lib
+	cp $(objdir_gtk_static)/lib/libwx_gtk-*.a debian/$(package_gtk_dev)/usr/lib
+	cp $(objdir_gtk_static)/lib/libwx_gtk_gl-*.a debian/$(package_gtk_dev)/usr/lib
 
 install-gtk-dbg: DH_OPTIONS=-p$(package_gtk_dbg)
 install-gtk-dbg: build-gtk-debug-stamp
@@ -601,7 +602,8 @@ install-gtk-contrib-dev: build-contrib-static-stamp install-gtk-dev
 	dh_installdirs
 	dh_movefiles --sourcedir=debian/$(package_gtk_contrib)
 	cp $(objdir_gtk_static)/lib/*.a debian/$(package_gtk_contrib_dev)/usr/lib
-	rm -f debian/$(package_gtk_contrib_dev)/usr/lib/libwx_gtk*.a
+	rm -f debian/$(package_gtk_contrib_dev)/usr/lib/libwx_gtk-*.a
+	rm -f debian/$(package_gtk_contrib_dev)/usr/lib/libwx_gtk_gl-*.a
 
 install-gtk-py: DH_OPTIONS=-p$(package_gtk_py)
 install-gtk-py: build-gtk-py-stamp