Split the Python wxaddons package into its own package

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

diff --git a/debian/control.in b/debian/control.in
index 67ec70f7f665b9b962bb77a148e936c8df7b8384..bd6021998c506abd6aa981860bdd06528b03f7cc 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -148,6 +148,18 @@ Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython version selector
  .
  This package provides the wxPython version selector.
 
  .
  This package provides the wxPython version selector.
 

+Package: python-wxaddons
+Architecture: all
+Section: python
+Conflicts: python-wxgtk2.6
+Replaces:
+Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython add-on packages base)
+ 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 base Python package for 3rd party add-ons.
+

 Package: python-wxtools
 Architecture: all
 Section: python
 Package: python-wxtools
 Architecture: all
 Section: python

diff --git a/debian/rules b/debian/rules
index 6e30aa455462aa1fbdf902b8d82014ae377d99be..200fbb98769b2e4b01b2c6e48a117f0aaeac614e 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -110,6 +110,8 @@ GTK_CONFIGURE_OPTIONS = $(COMMON_CONFIGURE_OPTIONS) \
     --enable-sound \
     --with-sdl \
     --enable-display \
     --enable-sound \
     --with-sdl \
     --enable-display \

+    --enable-geometry \
+    --enable-graphics_ctx \

     --with-libjpeg=sys \
     --with-libpng=sys \
     --with-libtiff=sys \
     --with-libjpeg=sys \
     --with-libpng=sys \
     --with-libtiff=sys \


@@ -156,6 +158,7 @@ package_gtk_dbg         := libwxgtk$(release)$(unicode_suffix)-dbg
 package_gtk_py_lib      := python-wxgtk$(release)$(unicode_suffix)
 package_gtk_py_ver       = python-wxversion
 package_gtk_py_tools     = python-wxtools
 package_gtk_py_lib      := python-wxgtk$(release)$(unicode_suffix)
 package_gtk_py_ver       = python-wxversion
 package_gtk_py_tools     = python-wxtools

+package_gtk_py_addons    = python-wxaddons

 
 package_headers         := wx$(release)-headers
 package_i18n            := wx$(release)-i18n
 
 package_headers         := wx$(release)-headers
 package_i18n            := wx$(release)-i18n


@@ -165,7 +168,7 @@ package_common           = wx-common
 
 # The packages listed here are common to all wx versions, and may be provided
 # by another source package if more than one is in the release simultaneously.
 
 # The packages listed here are common to all wx versions, and may be provided
 # by another source package if more than one is in the release simultaneously.

-common_packages        := $(package_common) $(package_gtk_py_ver) $(package_gtk_py_tools)
+common_packages        := $(package_common) $(package_gtk_py_ver) $(package_gtk_py_tools) $(package_gtk_py_addons)

 
 
 package_gtk_dbg_py      := python-wxgtk$(release)$(unicode_suffix)-dbg
 
 
 package_gtk_dbg_py      := python-wxgtk$(release)$(unicode_suffix)-dbg


@@ -730,6 +733,8 @@ else
        rm debian/$(package_gtk_py_lib)/$(pydir)/wxversion.py
 endif
 
        rm debian/$(package_gtk_py_lib)/$(pydir)/wxversion.py
 endif
 

+
+

 install-gtk-py-tools: DH_OPTIONS=-p$(package_gtk_py_tools)
 install-gtk-py-tools: install-gtk-py-ver
        dh_testdir
 install-gtk-py-tools: DH_OPTIONS=-p$(package_gtk_py_tools)
 install-gtk-py-tools: install-gtk-py-ver
        dh_testdir


@@ -768,7 +773,20 @@ endif
 
        rm -r debian/$(package_gtk_py_lib)/usr/bin
 
 
        rm -r debian/$(package_gtk_py_lib)/usr/bin
 

-install-gtk-py: install-gtk-py-tools
+install-gtk-py-addons: DH_OPTIONS=-p$(package_gtk_py_addons)
+install-gtk-py-addons: install-gtk-py-tools
+       dh_testdir
+       dh_testroot
+       dh_clean -k
+ifndef DEBIAN_WX_DEFAULT_VERSION
+
+       dh_movefiles --sourcedir=debian/$(package_gtk_py_lib) $(pydir)/wxaddons
+else
+       rm -r debian/$(package_gtk_py_lib)/$(pydir)/wxaddons
+endif
+
+
+install-gtk-py: install-gtk-py-addons

 
 
 install-common: DH_OPTIONS=-p$(package_common)
 
 
 install-common: DH_OPTIONS=-p$(package_common)