Updated for 2.4.1.2 release.

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

debian/changelog

@@ -1,3 +1,28 @@
+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

debian/control.in

@@ -1,9 +1,9 @@
 Source: wxwindows=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, libpng2-dev, libtiff3g-dev, xlibmesa-gl-dev | libgl-dev, xlibmesa-glu-dev | libglu-dev, libesd0-dev
+Build-Depends: debhelper (>=2.0), flex, bison, gettext, libgtk1.2-dev, python (>=2.3), python (<<2.4), python2.3-dev, zlib1g-dev, libjpeg62-dev, libpng2-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.9.0
+Standards-Version: 3.6.1.0
 
 Package: libwxbase=V
 Architecture: any
@@ -24,7 +24,7 @@ Description: wxBase library (runtime) - non-GUI support classes of wxWindows too
 
 Package: libwxbase=V-dev
 Architecture: any
-Section: devel
+Section: libdevel
 Depends: wxwin=V-headers (= ${Source-Version}), libwxbase=V (= ${Source-Version}), libc6-dev
 Suggests: wxwin=V-doc, gettext
 Conflicts: libwxbase-dev
@@ -44,7 +44,7 @@ Description: wxBase library (development) - non-GUI support classes of wxWindows
 
 Package: libwxbase=V-dbg
 Architecture: any
-Section: devel
+Section: libdevel
 Priority: extra
 Depends: wxwin=V-headers (= ${Source-Version}), libc6-dev
 Conflicts: libwxbase-dbg
@@ -81,7 +81,7 @@ Description: wxWindows Cross-platform C++ GUI toolkit (GTK+ runtime)
 
 Package: libwxgtk=V-dev
 Architecture: any
-Section: devel
+Section: libdevel
 Depends: wxwin=V-headers (= ${Source-Version}), libwxgtk=V (= ${Source-Version}), libc6-dev
 Suggests: wxwin=V-doc, libstdc++-dev, gettext, libgl-dev
 Conflicts: libwxgtk-dev
@@ -98,7 +98,7 @@ Description: wxWindows Cross-platform C++ GUI toolkit (GTK+ development)
 
 Package: libwxgtk=V-dbg
 Architecture: any
-Section: devel
+Section: libdevel
 Priority: extra
 Depends: wxwin=V-headers (= ${Source-Version}), libc6-dev
 Conflicts: libwxgtk-dbg
@@ -116,8 +116,8 @@ Description: wxWindows Cross-platform C++ GUI toolkit (GTK+ development)
 
 Package: libwxgtk=V-python
 Architecture: any
-Section: interpreters
+Section: python
-Depends: python (>=2.2), python (<<2.3), ${shlibs:Depends}
+Depends: python (>=2.3), python (<<2.4), ${shlibs:Depends}
 Suggests: wxwin=V-doc, wxwin=V-examples, python2.2-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
@@ -144,7 +144,7 @@ Description: wxWindows Cross-platform C++ GUI toolkit (runtime contrib libs)
 
 Package: libwxgtk=V-contrib-dev
 Architecture: any
-Section: devel
+Section: libdevel
 Depends: wxwin=V-headers (= ${Source-Version}), libwxgtk=V-dev (= ${Source-Version}), libwxgtk=V-contrib (= ${Source-Version}), libc6-dev
 Conflicts: libwxgtk-contrib-dev
 Replaces: libwxgtk-contrib-dev
@@ -187,6 +187,9 @@ Description: wxWindows Cross-platform C++ GUI toolkit (i18n support)
 Package: wxwin=V-doc
 Architecture: all
 Section: doc
+Conflicts: wxwin2.2-doc wxwin-doc
+Replaces: wxwin-doc
+Provides: wxwin-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

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/rules

@@ -704,10 +704,12 @@ install-gtk-py: build-gtk-py-stamp
 		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/pycwrap.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/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/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
+
+	# This is rather bogus, its included in the main copyright file now though.
+	rm -f debian/$(package_gtk_py)/usr/lib/$(python_dir)/site-packages/wxPython/tools/XRCed/license.txt
 
 install-headers: DH_OPTIONS=-p$(package_headers)
 install-headers: install-gtk-shared-stamp