From 094e328c21fce0213b884092e9812ebf250ae1f1 Mon Sep 17 00:00:00 2001 From: Ron Lee Date: Sat, 11 Jan 2003 03:50:44 +0000 Subject: [PATCH] Changes resulting from the 2.4.0 release run. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18677 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- debian/README.Debian | 8 +++--- debian/changelog | 4 +++ debian/control.in | 50 ++++++++++++++++++------------------- debian/libwxgtk-python.menu | 6 ++--- debian/rules | 14 +++++------ 5 files changed, 44 insertions(+), 38 deletions(-) diff --git a/debian/README.Debian b/debian/README.Debian index 84b7479015..1075a65747 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -27,12 +27,12 @@ wxwin-i18n message catalogs for native language support The following three 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.2 package, or + please file a bug against the wxwindows2.4 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.2 ] + http://bugs.debian.org/cgi-bin/pkgreport.cgi?pkg=wxwindows2.4 ] Oh and, please do *not* file bug reports for these packages to the Debian bts. But do feel free to email me personally @@ -44,7 +44,9 @@ 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. +libwxgtk-univ wxUniversal for Gtk. NOTE this package is obsolete + and will be replaced by wxX11 and wxX11-univ at + some future time. -- Ron Lee , Sun, 13 Feb 2000 18:40:00 +1030 diff --git a/debian/changelog b/debian/changelog index bf39308e26..2410f8b88c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,10 @@ wxwindows2.4 (2.4.0) unstable; urgency=low * Add a manpage for the wxPython scripts pointing to the pydoc docs. * Disabled generation of gtk-univ, it is a rather insensible combination now and should be replaced by x11-univ instead. + * There had to be some payoff to all the delays -- a clean gcc3.2 + transition :-) This package certainly obsoletes 2.3.3.2 and I'll + be seeking to finally have 2.2.9.2 removed as well once Audacity + is updated. -- Ron Lee Thu, 19 Dec 2002 00:50:48 -0800 diff --git a/debian/control.in b/debian/control.in index 01b3ead2d8..5a434f59f4 100644 --- a/debian/control.in +++ b/debian/control.in @@ -1,7 +1,7 @@ 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, libpng3-dev, libtiff3g-dev, libgl-dev, libesd0-dev +Build-Depends: debhelper (>=2.0), flex, bison, gettext, libgtk1.2-dev, python (>=2.2), python (<<2.3), python2.2-dev, zlib1g-dev, libjpeg62-dev, libpng3-dev, libtiff3g-dev, libgl-dev, libglu-dev, libesd0-dev Maintainer: Ron Lee Standards-Version: 3.5.8.0 @@ -18,9 +18,9 @@ Description: wxBase library (runtime) - non-GUI support classes of wxWindows too 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. It is currently - under development and may not be as stable as the gui version. + 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 @@ -117,10 +117,10 @@ Package: libwxgtk=V-python Architecture: any Section: interpreters Depends: python (>=2.2), python (<<2.3), ${shlibs:Depends} -Recommends: python2.2-xml -Suggests: wxwin=V-doc, wxwin=V-examples -Conflicts: libwxgtk=V-python-contrib, python-wxwin, libwxgtk2.2-python -Replaces: libwxgtk=V-python-contrib, python-wxwin, libwxgtk2.2-python +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 +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 @@ -139,21 +139,7 @@ Description: wxWindows Cross-platform C++ GUI toolkit (runtime contrib libs) Interface) and other facilities on more than one platform. Version =V currently supports subsets of GTK+, Motif, and MS Windows. . - This package provides the contrib libs of the wxWindows source tree - (mmedia, ogl, stc) - -Package: libwxgtk=V-univ -Architecture: any -Section: libs -Depends: wxwin=V-headers (= ${Source-Version}), libwxgtk=V (= ${Source-Version}), libgtk1.2-dev, zlib1g-dev, libjpeg62-dev, libpng-dev, libtiff3g-dev, 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. + This package provides the contrib libs from the wxWindows source tree Package: libwxgtk=V-contrib-dev Architecture: any @@ -168,7 +154,7 @@ Description: wxWindows Cross-platform C++ GUI toolkit (development contrib libs) currently supports subsets of GTK+, Motif, and MS Windows. . Install this package if you wish to compile applications that use the - contrib libs from the wxWindows source tree (mmedia, ogl, stc) + contrib libs from the wxWindows source tree. Package: wxwin=V-headers Architecture: any @@ -217,7 +203,21 @@ Description: wxWindows Cross-platform C++ GUI toolkit (examples) Interface) and other facilities on more than one platform. Version =V currently supports subsets of GTK+, Motif, and MS Windows. . - This package contains examples of using the wxWindows toolkit. + This package contains examples of using the wxWindows 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}), libgtk1.2-dev, zlib1g-dev, libjpeg62-dev, libpng-dev, libtiff3g-dev, 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 diff --git a/debian/libwxgtk-python.menu b/debian/libwxgtk-python.menu index 3d98d38f7c..a5f8285fbc 100644 --- a/debian/libwxgtk-python.menu +++ b/debian/libwxgtk-python.menu @@ -1,7 +1,7 @@ -?package(libwxgtk2.3-python):needs=X11 section=Apps/Programming\ +?package(libwxgtk=V-python):needs=X11 section=Apps/Programming\ title="pycrust" command="/usr/bin/pycrust" -?package(libwxgtk2.3-python):needs=X11 section=Apps/Programming\ +?package(libwxgtk=V-python):needs=X11 section=Apps/Programming\ title="pyshell" command="/usr/bin/pyshell" -?package(libwxgtk2.3-python):needs=X11 section=Apps/Programming\ +?package(libwxgtk=V-python):needs=X11 section=Apps/Programming\ title="xrced" command="/usr/bin/xrced" diff --git a/debian/rules b/debian/rules index cfe426fe8a..4c87dca66a 100755 --- a/debian/rules +++ b/debian/rules @@ -152,12 +152,7 @@ control-files-stamp: debian/control 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_gtk_univ).$$f"; \ - sed -e 's/=V/$(release)/g' < debian/libwxgtk-univ.$$f \ - > debian/$(package_gtk_univ).$$f; \ - done; - @for f in dirs docs files postinst prerm; do \ + @for f in dirs docs files 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; \ @@ -212,6 +207,11 @@ control-files-stamp: debian/control 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; \ + done; touch $@ build_arch: control-files-stamp $(build_arch_stamps) @@ -507,7 +507,6 @@ clean: debian/control rm -f debian/$(package_gtk_lib).* rm -f debian/$(package_gtk_dev).* rm -f debian/$(package_gtk_dbg).* - rm -f debian/$(package_gtk_univ).* rm -f debian/$(package_gtk_py).* rm -f debian/$(package_gtk_contrib).* rm -f debian/$(package_gtk_contrib_dev).* @@ -515,6 +514,7 @@ 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).* -- 2.45.2