Added trailing newline.

[wxWidgets.git] / debian / control.in

diff --git a/debian/control.in b/debian/control.in
index 2cb360693c0578902a2941e472b3b6fe01540cfa..248304493569112e598c1d604d535abe2b57c2c7 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -1,14 +1,15 @@
 Source: wxwidgets=V
 Section: libs
 Priority: optional
 Source: wxwidgets=V
 Section: libs
 Priority: optional

-Build-Depends: debhelper (>=4.0), flex, bison, gettext, libgtk2.0-dev, =PY, =PY-dev, zlib1g-dev, libjpeg62-dev, libpng12-dev, libtiff4-dev, xlibmesa-gl-dev | libgl-dev, xlibmesa-glu-dev | libglu-dev, libesd0-dev
+Build-Depends: debhelper (>=4.0), flex, bison, gettext, libgtk2.0-dev, =PY, =PY-dev, zlib1g-dev, libjpeg62-dev, libpng12-dev, libtiff4-dev, xlibmesa-gl-dev | libgl-dev, xlibmesa-glu-dev | libglu-dev, libesd0-dev, libgnomeprintui2.2-dev

 Maintainer: Ron Lee <ron@debian.org>
 Standards-Version: 3.6.1.1
 
 Maintainer: Ron Lee <ron@debian.org>
 Standards-Version: 3.6.1.1
 

-Package: libwxgtk=V.=SO
+Package: libwxgtk=SOV

 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}

+Suggests: libgnomeprintui2.2-0

 Description: wxWidgets Cross-platform C++ GUI toolkit (GTK+ runtime)
  wxWidgets (formerly known as wxWindows) is a class library for C++ providing
  GUI components and other facilities on several popular platforms (and some
 Description: wxWidgets Cross-platform C++ GUI toolkit (GTK+ runtime)
  wxWidgets (formerly known as wxWindows) is a class library for C++ providing
  GUI components and other facilities on several popular platforms (and some


@@ -21,7 +22,7 @@ Description: wxWidgets Cross-platform C++ GUI toolkit (GTK+ runtime)
 Package: libwxgtk=V-dev
 Architecture: any
 Section: libdevel
 Package: libwxgtk=V-dev
 Architecture: any
 Section: libdevel

-Depends: wx=V-headers (= ${Source-Version}), libwxgtk=V.=SO (= ${Source-Version}), libc6-dev
+Depends: wx=V-headers (= ${Source-Version}), libwxgtk=SOV (= ${Source-Version}), libc6-dev

 Suggests: wx=V-common | wx-common, wx=V-doc, libstdc++-dev, gettext, xlibmesa-gl-dev | libgl-dev, xlibmesa-glu-dev | libglu-dev
 Description: wxWidgets Cross-platform C++ GUI toolkit (GTK+ development)
  wxWidgets (formerly known as wxWindows) is a class library for C++ providing
 Suggests: wx=V-common | wx-common, wx=V-doc, libstdc++-dev, gettext, xlibmesa-gl-dev | libgl-dev, xlibmesa-glu-dev | libglu-dev
 Description: wxWidgets Cross-platform C++ GUI toolkit (GTK+ development)
  wxWidgets (formerly known as wxWindows) is a class library for C++ providing


@@ -47,29 +48,57 @@ Description: wxWidgets Cross-platform C++ GUI toolkit (GTK+ development)
  provides many internal checks by wxWidgets itself that are not performed on
  apps compiled with the 'release version' libs in the -dev package.
 
  provides many internal checks by wxWidgets itself that are not performed on
  apps compiled with the 'release version' libs in the -dev package.
 

-Package: libwxgtk=V.=SO-python
+Package: libwxgtk=SOV-python

 Architecture: any
 Section: python
 Architecture: any
 Section: python

-Depends: =PY, ${shlibs:Depends}
-Suggests: wx=V-doc, wx=V-examples, =PY-xml
-Conflicts: libwxgtk-python
-Replaces: libwxgtk-python
-Provides: libwxgtk-python
+Depends: wxpython, =PY, ${shlibs:Depends}

 Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython binding)
  wxWidgets (formerly known as wxWindows) is a class library for C++ providing
  GUI components and other facilities on several popular platforms (and some
  unpopular ones as well).  For more information see http://wxwidgets.org
  .
 Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython binding)
  wxWidgets (formerly known as wxWindows) is a class library for C++ providing
  GUI components and other facilities on several popular platforms (and some
  unpopular ones as well).  For more information see http://wxwidgets.org
  .

- This package provides a Python binding to the wxGTK library and its
- contrib libs.  If you wish to use xrced you'll also need the python-xml
- package installed.
+ This package provides a Python binding to the wxGTK library and the
+ wxPython runtime support libraries.  If you wish to use xrc you'll also
+ need the =PY-xml package installed.
+
+Package: libwxgtk=SOV-dbg-python
+Architecture: any
+Section: python
+Depends: wxpython, =PY, ${shlibs:Depends}
+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
+ currently supports subsets of GTK+, Motif, and MS Windows.
+ .
+ This package provides a Python binding to the wxGTK debug library.
+ It is useful for developers as many common errors may be caught, but
+ you should _never_ upload packages to Debian that depend upon this
+ package explicitly, use the libwxgtk=SOV-python package instead.
+ .
+ If you wish to use xrc you'll also need the =PY-xml package installed.
+
+Package: wxpython=SOV
+Architecture: any
+Section: python
+Depends: libwxgtk=SOV-python, =PY, ${shlibs:Depends}
+Suggests: wxwin=V-doc, wxwin=V-examples, =PY-xml
+Conflicts: wxpython
+Replaces: wxpython, libwxgtk2.4-python
+Provides: wxpython
+Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython common files)
+ wxWidgets (formerly known as wxWindows) is a class library for C++ providing
+ GUI components and other facilities on several popular platforms (and some
+ unpopular ones as well).  For more information see http://wxwidgets.org
+ .
+ This package provides support utilities and common files for wxPython=SOV.
+ If you wish to use xrced you'll also need the =PY-xml package installed.

 
 Package: wx=V-common
 Architecture: any
 
 Package: wx=V-common
 Architecture: any

-Section: libs
+Section: devel

 Depends: ${shlibs:Depends}
 Conflicts: wx-common
 Depends: ${shlibs:Depends}
 Conflicts: wx-common

-Replaces: wx-common
+Replaces: wx-common, wxwin2.4-headers, libwxgtk2.4-contrib-dev

 Provides: wx-common
 Description: wxWidgets Cross-platform C++ GUI toolkit (common support files)
  wxWidgets (formerly known as wxWindows) is a class library for C++ providing
 Provides: wx-common
 Description: wxWidgets Cross-platform C++ GUI toolkit (common support files)
  wxWidgets (formerly known as wxWindows) is a class library for C++ providing


@@ -128,28 +157,6 @@ Description: wxWidgets Cross-platform C++ GUI toolkit (examples)
  This package contains examples of using the wxWidgets toolkit in
  C++ and with the wxPython language binding.
 
  This package contains examples of using the wxWidgets toolkit in
  C++ and with the wxPython language binding.
 

-Package: libwxgtk=V.=SO-dbg-python
-Architecture: any
-Section: python
-Depends: =PY, ${shlibs:Depends}
-Suggests: wxwin=V-doc, wxwin=V-examples, =PY-xml
-Conflicts: libwxgtk-python
-Replaces: libwxgtk-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
- currently supports subsets of GTK+, Motif, and MS Windows.
- .
- This package provides a Python binding to the wxGTK debug library.
- It is useful for developers as many common errors may be caught.
- 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.=SO-python package instead.
- .
- If you wish to use xrced you'll also need the python-xml package installed.
-

 Package: libwxmsw=V-dev
 Architecture: i386
 Section: otherosfs
 Package: libwxmsw=V-dev
 Architecture: i386
 Section: otherosfs