From 4f8bdcc05e36c624ac46194b2b090dae9eae6039 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Sun, 18 Jan 2009 21:16:23 +0000
Subject: [PATCH] Remove the wx-addons package

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@58208 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 debian/changelog  |  7 +++++++
 debian/control.in | 13 -------------
 debian/rules      | 18 +-----------------
 3 files changed, 8 insertions(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ebafabca18..022400f578 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+wxwidgets2.8 (2.8.9.2-0) unstable; urgency=low
+
+  * Many minor bugfixes and enhancements.
+  * removed the wx-addons package
+
+ -- Robin Dunn <robin@alldunn.com>  Thu, 15 Jan 2009 11:18:33 -0800
+
 wxwidgets2.8 (2.8.9.1-0) unstable; urgency=low
 
   * Fixed Python 2.4 compatibility problem.
diff --git a/debian/control.in b/debian/control.in
index bc2a70ba87..63e5125214 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -237,19 +237,6 @@ Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython version selector
  .
  This package provides the wxPython version selector.
 
-Package: python-wxaddons
-Architecture: all
-Section: python
-Conflicts: python-wxgtk2.6 (<< 2.6.4.0)
-Depends: ${python:Depends}, python-wxgtk=V=U
-XB-Python-Version: ${python:Versions}
-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
diff --git a/debian/rules b/debian/rules
index 261aea1759..8d7eec2338 100755
--- a/debian/rules
+++ b/debian/rules
@@ -196,13 +196,12 @@ package_common           = wx-common
 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_gtk_dbg_py      := python-wxgtk$(release)$(unicode_suffix)-dbg
 
 
 # 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) $(package_gtk_py_addons)
+common_packages	:= $(package_common) $(package_gtk_py_ver) $(package_gtk_py_tools)
 
 
 package_msw_dev         := libwxmsw$(release)$(unicode_suffix)-dev
@@ -868,21 +867,6 @@ endif
 	rm -f debian/$(package_gtk_py_lib)/usr/lib/python$*/site-packages/wxversion.py
 	rm -f debian/$(package_gtk_py_lib)/usr/lib/python$*/site-packages/wxPython_common*.egg-info
 
-ifndef DEBIAN_WX_DEFAULT_VERSION
-	@# Move files out for the wxaddons package
-	DH_OPTIONS=-p$(package_gtk_py_addons) 					\
-		dh_movefiles --sourcedir=debian/$(package_gtk_py_lib) 		\
-			usr/lib/python$*/site-packages/wxaddons
-
-	if [ -e debian/$(package_gtk_py_lib)/usr/lib/python$*/site-packages/wxaddons-$(full_version).egg-info ]; then \
-		DH_OPTIONS=-p$(package_gtk_py_addons) 				\
-			dh_movefiles --sourcedir=debian/$(package_gtk_py_lib)	\
-			usr/lib/python$*/site-packages/wxaddons-$(full_version).egg-info; \
-	fi
-endif
-	rm -rf debian/$(package_gtk_py_lib)/usr/lib/python$*/site-packages/wxaddons*
-
-
 
 install-gtk-py-tools: DH_OPTIONS=-p$(package_gtk_py_tools)
 install-gtk-py-tools: install-gtk-py-lib