From cbfcce261debd0f8c68d04987c9945b565bb1515 Mon Sep 17 00:00:00 2001 From: Ron Lee Date: Wed, 8 Jan 2003 07:16:59 +0000 Subject: [PATCH] Conflict with prior versions of wxPy, they can't coexist like the C++ libs can. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@18632 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- debian/README.Debian | 8 ++++--- debian/control.in | 48 ++++++++++++++++++++--------------------- debian/lintian-override | 1 - 3 files changed, 29 insertions(+), 28 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/control.in b/debian/control.in index 01b3ead2d8..efdf56c3b8 100644 --- a/debian/control.in +++ b/debian/control.in @@ -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/lintian-override b/debian/lintian-override index 060afa4161..c74e5f84fd 100644 --- a/debian/lintian-override +++ b/debian/lintian-override @@ -1,4 +1,3 @@ libwxgtk2.4-dbg: non-dev-pkg-with-shlib-symlink libwxbase2.4-dbg: non-dev-pkg-with-shlib-symlink -libwxgtk2.4-univ: non-dev-pkg-with-shlib-symlink