From: Ron Lee <ron@debian.org>
Date: Fri, 16 Dec 2005 02:12:16 +0000 (+0000)
Subject: Sync changes from Debian 2.6 tree.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/8bdc493773e6bf76643e3ae1abd2c3b7ad6759a9?ds=inline

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
---

diff --git a/debian/libwxgtk-dbg-python.prerm b/debian/libwxgtk-dbg-python.prerm
deleted file mode 100644
index eda2ca44bf..0000000000
--- a/debian/libwxgtk-dbg-python.prerm
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-set -e
-
-PACKAGE="libwxgtk=SOV-dbg-python"
-dpkg --listfiles $PACKAGE | awk '$0~/\.py$/ {print $0"c\n" $0"o"}' | xargs rm -f >&2
-
-#DEBHELPER#
-
diff --git a/debian/libwxgtk-python.docs b/debian/libwxgtk-python.docs
deleted file mode 100644
index aae3f0a529..0000000000
--- a/debian/libwxgtk-python.docs
+++ /dev/null
@@ -1,4 +0,0 @@
-wxPython/docs/README.txt
-wxPython/docs/CHANGES.txt
-wxPython/docs/MigrationGuide.txt
-
diff --git a/debian/libwxgtk-python.postinst b/debian/libwxgtk-python.postinst
deleted file mode 100644
index a4b6edfbfc..0000000000
--- a/debian/libwxgtk-python.postinst
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-set -e
-
-WXPYTHONDIR="/=WXPYDIR"
-
-if [ "$1" = "configure" ]; then
-	=PY /usr/lib/=PY/compileall.py -q ${WXPYTHONDIR}
-	=PY -O /usr/lib/=PY/compileall.py -q ${WXPYTHONDIR}
-fi
-
-#DEBHELPER#
-
diff --git a/debian/libwxgtk-python.prerm b/debian/libwxgtk-python.prerm
deleted file mode 100644
index ebf7d74965..0000000000
--- a/debian/libwxgtk-python.prerm
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-set -e
-
-PACKAGE="libwxgtk=SOV-python"
-dpkg --listfiles $PACKAGE | awk '$0~/\.py$/ {print $0"c\n" $0"o"}' | xargs rm -f >&2
-
-#DEBHELPER#
-
diff --git a/debian/python-wxgtk-dbg.postinst b/debian/python-wxgtk-dbg.postinst
new file mode 100644
index 0000000000..173d5e893c
--- /dev/null
+++ b/debian/python-wxgtk-dbg.postinst
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+set -e
+
+WXPYTHONDIR="/=WXPYDIR"
+
+if [ "$1" = "configure" ]; then
+	=PY /usr/lib/=PY/compileall.py -q ${WXPYTHONDIR}
+	=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/python-wxgtk-dbg.prerm b/debian/python-wxgtk-dbg.prerm
new file mode 100644
index 0000000000..f9618753f2
--- /dev/null
+++ b/debian/python-wxgtk-dbg.prerm
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+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/python-wxgtk.docs b/debian/python-wxgtk.docs
new file mode 100644
index 0000000000..aae3f0a529
--- /dev/null
+++ b/debian/python-wxgtk.docs
@@ -0,0 +1,4 @@
+wxPython/docs/README.txt
+wxPython/docs/CHANGES.txt
+wxPython/docs/MigrationGuide.txt
+
diff --git a/debian/python-wxgtk.postinst b/debian/python-wxgtk.postinst
new file mode 100644
index 0000000000..1757ffa56e
--- /dev/null
+++ b/debian/python-wxgtk.postinst
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+set -e
+
+WXPYTHONDIR="/=WXPYDIR"
+
+if [ "$1" = "configure" ]; then
+	=PY /usr/lib/=PY/compileall.py -q ${WXPYTHONDIR}
+	=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/python-wxgtk.prerm b/debian/python-wxgtk.prerm
new file mode 100644
index 0000000000..86a40e41ff
--- /dev/null
+++ b/debian/python-wxgtk.prerm
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+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 0000000000..91a7eefc8d
--- /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 09ffee5265..0000000000
--- 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"
-