From 8bdc493773e6bf76643e3ae1abd2c3b7ad6759a9 Mon Sep 17 00:00:00 2001
From: Ron Lee <ron@debian.org>
Date: Fri, 16 Dec 2005 02:12:16 +0000
Subject: [PATCH] Sync changes from Debian 2.6 tree.

Fixes #324960, enabling config.py to handle in tree builds without
tainting build_options.py used for (later) install to some other
location.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36405 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 debian/{libwxgtk-python.postinst => python-wxgtk-dbg.postinst} | 3 +++
 debian/{libwxgtk-python.prerm => python-wxgtk-dbg.prerm}       | 4 +++-
 debian/{libwxgtk-python.docs => python-wxgtk.docs}             | 0
 debian/{libwxgtk-python.postinst => python-wxgtk.postinst}     | 3 +++
 debian/{libwxgtk-dbg-python.prerm => python-wxgtk.prerm}       | 4 +++-
 debian/python-wxtools.menu                                     | 7 +++++++
 debian/wxpython.menu                                           | 7 -------
 7 files changed, 19 insertions(+), 9 deletions(-)
 copy debian/{libwxgtk-python.postinst => python-wxgtk-dbg.postinst} (58%)
 rename debian/{libwxgtk-python.prerm => python-wxgtk-dbg.prerm} (54%)
 rename debian/{libwxgtk-python.docs => python-wxgtk.docs} (100%)
 rename debian/{libwxgtk-python.postinst => python-wxgtk.postinst} (61%)
 rename debian/{libwxgtk-dbg-python.prerm => python-wxgtk.prerm} (56%)
 create mode 100644 debian/python-wxtools.menu
 delete mode 100644 debian/wxpython.menu

diff --git a/debian/libwxgtk-python.postinst b/debian/python-wxgtk-dbg.postinst
similarity index 58%
copy from debian/libwxgtk-python.postinst
copy to debian/python-wxgtk-dbg.postinst
index a4b6edf..173d5e8 100644
--- a/debian/libwxgtk-python.postinst
+++ b/debian/python-wxgtk-dbg.postinst
@@ -9,5 +9,8 @@ if [ "$1" = "configure" ]; then
 	=PY -O /usr/lib/=PY/compileall.py -q ${WXPYTHONDIR}
 fi
 
+update-alternatives --install /usr/lib/=PY/site-packages/wx.pth  wx.pth	\
+			      /usr/lib/wx/python/wx=V-dbg.pth    $(( =PRIO - 10 ))
+
 #DEBHELPER#
 
diff --git a/debian/libwxgtk-python.prerm b/debian/python-wxgtk-dbg.prerm
similarity index 54%
rename from debian/libwxgtk-python.prerm
rename to debian/python-wxgtk-dbg.prerm
index ebf7d74..f961875 100644
--- a/debian/libwxgtk-python.prerm
+++ b/debian/python-wxgtk-dbg.prerm
@@ -2,8 +2,10 @@
 
 set -e
 
-PACKAGE="libwxgtk=SOV-python"
+PACKAGE="python-wxgtk=V-dbg"
 dpkg --listfiles $PACKAGE | awk '$0~/\.py$/ {print $0"c\n" $0"o"}' | xargs rm -f >&2
 
+update-alternatives --remove wx.pth /usr/lib/wx/python/wx=V-dbg.pth
+
 #DEBHELPER#
 
diff --git a/debian/libwxgtk-python.docs b/debian/python-wxgtk.docs
similarity index 100%
rename from debian/libwxgtk-python.docs
rename to debian/python-wxgtk.docs
diff --git a/debian/libwxgtk-python.postinst b/debian/python-wxgtk.postinst
similarity index 61%
rename from debian/libwxgtk-python.postinst
rename to debian/python-wxgtk.postinst
index a4b6edf..1757ffa 100644
--- a/debian/libwxgtk-python.postinst
+++ b/debian/python-wxgtk.postinst
@@ -9,5 +9,8 @@ if [ "$1" = "configure" ]; then
 	=PY -O /usr/lib/=PY/compileall.py -q ${WXPYTHONDIR}
 fi
 
+update-alternatives --install /usr/lib/=PY/site-packages/wx.pth  wx.pth	\
+			      /usr/lib/wx/python/wx=V.pth        =PRIO
+
 #DEBHELPER#
 
diff --git a/debian/libwxgtk-dbg-python.prerm b/debian/python-wxgtk.prerm
similarity index 56%
rename from debian/libwxgtk-dbg-python.prerm
rename to debian/python-wxgtk.prerm
index eda2ca4..86a40e4 100644
--- a/debian/libwxgtk-dbg-python.prerm
+++ b/debian/python-wxgtk.prerm
@@ -2,8 +2,10 @@
 
 set -e
 
-PACKAGE="libwxgtk=SOV-dbg-python"
+PACKAGE="python-wxgtk=V"
 dpkg --listfiles $PACKAGE | awk '$0~/\.py$/ {print $0"c\n" $0"o"}' | xargs rm -f >&2
 
+update-alternatives --remove wx.pth /usr/lib/wx/python/wx=V.pth
+
 #DEBHELPER#
 
diff --git a/debian/python-wxtools.menu b/debian/python-wxtools.menu
new file mode 100644
index 0000000..91a7eef
--- /dev/null
+++ b/debian/python-wxtools.menu
@@ -0,0 +1,7 @@
+?package(python-wxtools):needs="X11" section="Apps/Programming"\
+  title="pycrust" command="/usr/bin/pycrust"
+?package(python-wxtools):needs="X11" section="Apps/Programming"\
+  title="pyshell" command="/usr/bin/pyshell"
+?package(python-wxtools):needs="X11" section="Apps/Programming"\
+  title="xrced" command="/usr/bin/xrced"
+
diff --git a/debian/wxpython.menu b/debian/wxpython.menu
deleted file mode 100644
index 09ffee5..0000000
--- a/debian/wxpython.menu
+++ /dev/null
@@ -1,7 +0,0 @@
-?package(wxpython=SOV):needs="X11" section="Apps/Programming"\
-  title="pycrust" command="/usr/bin/pycrust"
-?package(wxpython=SOV):needs="X11" section="Apps/Programming"\
-  title="pyshell" command="/usr/bin/pyshell"
-?package(wxpython=SOV):needs="X11" section="Apps/Programming"\
-  title="xrced" command="/usr/bin/xrced"
-
-- 
2.7.4