diff -Nru /tmp/duoqKa6Rdn/wxwidgets2.6-2.6.3.2.1/debian/changelog /tmp/XUR4CgTfYT/wxwidgets2.6-2.6.3.2.1.1/debian/changelog --- /tmp/duoqKa6Rdn/wxwidgets2.6-2.6.3.2.1/debian/changelog 2006-05-01 04:38:42.000000000 +0000 +++ /tmp/XUR4CgTfYT/wxwidgets2.6-2.6.3.2.1.1/debian/changelog 2006-06-17 17:20:04.000000000 +0000 @@ -1,3 +1,10 @@ +wxwidgets2.6 (2.6.3.2.1.1) unstable; urgency=low + + * NMU (I love this version string for NMU's :-/). + * Convert to updated Python policy. Closes: #373410. + + -- Matthias Klose Sat, 17 Jun 2006 18:25:37 +0200 + wxwidgets2.6 (2.6.3.2.1) unstable; urgency=low * Add 'Replaces' for the wxbase packages when upgrading from diff -Nru /tmp/duoqKa6Rdn/wxwidgets2.6-2.6.3.2.1/debian/control /tmp/XUR4CgTfYT/wxwidgets2.6-2.6.3.2.1.1/debian/control --- /tmp/duoqKa6Rdn/wxwidgets2.6-2.6.3.2.1/debian/control 2006-05-01 04:39:13.000000000 +0000 +++ /tmp/XUR4CgTfYT/wxwidgets2.6-2.6.3.2.1.1/debian/control 2006-06-17 16:44:57.000000000 +0000 @@ -1,8 +1,9 @@ Source: wxwidgets2.6 Section: libs Priority: optional -Build-Depends: debhelper (>=4.0), flex, bison, gettext, libgtk2.0-dev, python2.3, python2.3-dev, zlib1g-dev, libjpeg62-dev, libpng12-dev, libtiff4-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libesd0-dev, libgnomeprintui2.2-dev +Build-Depends: debhelper (>= 5.0.37.1), flex, bison, gettext, libgtk2.0-dev, python-all-dev (>= 2.3.5-10), zlib1g-dev, libjpeg62-dev, libpng12-dev, libtiff4-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libesd0-dev, libgnomeprintui2.2-dev Maintainer: Ron Lee +XS-Python-Version: current Standards-Version: 3.7.0.0 Package: libwxbase2.6-0 @@ -107,10 +108,12 @@ Package: python-wxgtk2.6 Architecture: any Section: python -Depends: python-wxversion, python2.3, ${shlibs:Depends} +Depends: python-wxversion, ${python:Depends}, ${shlibs:Depends} Suggests: wx2.6-doc, wx2.6-examples, python2.3-xml Conflicts: libwxgtk2.6-0-python, wxpython2.6-0 Replaces: libwxgtk2.6-0-python, wxpython2.6-0 +Provides: ${python:Provides} +XB-Python-Version: ${python:Versions} 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 @@ -123,10 +126,11 @@ Package: python-wxgtk2.6-dbg Architecture: any Section: python -Depends: python-wxversion, python2.3, ${shlibs:Depends} +Depends: python-wxversion, ${python:Depends}, ${shlibs:Depends} Conflicts: python-wxgtk2.6 Replaces: python-wxgtk2.6 Provides: python-wxgtk2.6 +XB-Python-Version: ${python:Versions} Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython binding) wxWidgets is a class library for C++ providing GUI (Graphical User Interface) and other facilities on more than one platform. Version 2.6 @@ -142,8 +146,10 @@ Package: python-wxversion Architecture: all Section: python +Depends: ${python:Depends} Conflicts: wxpython2.6-0 Replaces: wxpython2.6-0 +XB-Python-Version: ${python:Versions} Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython version selector) wxWidgets (formerly known as wxWindows) is a class library for C++ providing GUI components and other facilities on several popular platforms (and some @@ -154,9 +160,10 @@ Package: python-wxtools Architecture: all Section: python -Depends: python-wxgtk2.6, ${shlibs:Depends} +Depends: python-wxgtk2.6, ${python:Depends}, ${shlibs:Depends} Conflicts: wxpython2.6-0 Replaces: wxpython2.6-0, libwxgtk2.4-python, wxpython2.4-1 +XB-Python-Version: ${python:Versions} 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 diff -Nru /tmp/duoqKa6Rdn/wxwidgets2.6-2.6.3.2.1/debian/control.in /tmp/XUR4CgTfYT/wxwidgets2.6-2.6.3.2.1.1/debian/control.in --- /tmp/duoqKa6Rdn/wxwidgets2.6-2.6.3.2.1/debian/control.in 2006-05-01 04:38:42.000000000 +0000 +++ /tmp/XUR4CgTfYT/wxwidgets2.6-2.6.3.2.1.1/debian/control.in 2006-06-17 16:43:18.000000000 +0000 @@ -1,8 +1,9 @@ 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, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libesd0-dev, libgnomeprintui2.2-dev +Build-Depends: debhelper (>= 5.0.37.1), flex, bison, gettext, libgtk2.0-dev, python-all-dev (>= 2.3.5-10), zlib1g-dev, libjpeg62-dev, libpng12-dev, libtiff4-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libesd0-dev, libgnomeprintui2.2-dev Maintainer: Ron Lee +XS-Python-Version: current Standards-Version: 3.7.0.0 Package: libwxbase=SOV @@ -107,10 +108,12 @@ Package: python-wxgtk=V Architecture: any Section: python -Depends: python-wxversion, =PY, ${shlibs:Depends} +Depends: python-wxversion, ${python:Depends}, ${shlibs:Depends} Suggests: wx=V-doc, wx=V-examples, =PY-xml Conflicts: libwxgtk2.6-0-python, wxpython2.6-0 Replaces: libwxgtk2.6-0-python, wxpython2.6-0 +Provides: ${python:Provides} +XB-Python-Version: ${python:Versions} 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 @@ -123,10 +126,11 @@ Package: python-wxgtk=V-dbg Architecture: any Section: python -Depends: python-wxversion, =PY, ${shlibs:Depends} +Depends: python-wxversion, ${python:Depends}, ${shlibs:Depends} Conflicts: python-wxgtk=V Replaces: python-wxgtk=V Provides: python-wxgtk=V +XB-Python-Version: ${python:Versions} Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython binding) wxWidgets is a class library for C++ providing GUI (Graphical User Interface) and other facilities on more than one platform. Version =V @@ -142,8 +146,10 @@ Package: python-wxversion Architecture: all Section: python +Depends: ${python:Depends} Conflicts: wxpython2.6-0 Replaces: wxpython2.6-0 +XB-Python-Version: ${python:Versions} Description: wxWidgets Cross-platform C++ GUI toolkit (wxPython version selector) wxWidgets (formerly known as wxWindows) is a class library for C++ providing GUI components and other facilities on several popular platforms (and some @@ -154,9 +160,10 @@ Package: python-wxtools Architecture: all Section: python -Depends: python-wxgtk=V, ${shlibs:Depends} +Depends: python-wxgtk=V, ${python:Depends}, ${shlibs:Depends} Conflicts: wxpython2.6-0 Replaces: wxpython2.6-0, libwxgtk2.4-python, wxpython2.4-1 +XB-Python-Version: ${python:Versions} 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 diff -Nru /tmp/duoqKa6Rdn/wxwidgets2.6-2.6.3.2.1/debian/python-wxgtk-dbg.postinst /tmp/XUR4CgTfYT/wxwidgets2.6-2.6.3.2.1.1/debian/python-wxgtk-dbg.postinst --- /tmp/duoqKa6Rdn/wxwidgets2.6-2.6.3.2.1/debian/python-wxgtk-dbg.postinst 2006-05-01 04:38:42.000000000 +0000 +++ /tmp/XUR4CgTfYT/wxwidgets2.6-2.6.3.2.1.1/debian/python-wxgtk-dbg.postinst 2006-06-17 16:38:16.000000000 +0000 @@ -2,13 +2,6 @@ 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 )) diff -Nru /tmp/duoqKa6Rdn/wxwidgets2.6-2.6.3.2.1/debian/python-wxgtk-dbg.prerm /tmp/XUR4CgTfYT/wxwidgets2.6-2.6.3.2.1.1/debian/python-wxgtk-dbg.prerm --- /tmp/duoqKa6Rdn/wxwidgets2.6-2.6.3.2.1/debian/python-wxgtk-dbg.prerm 2006-05-01 04:38:42.000000000 +0000 +++ /tmp/XUR4CgTfYT/wxwidgets2.6-2.6.3.2.1.1/debian/python-wxgtk-dbg.prerm 2006-06-17 16:39:37.000000000 +0000 @@ -2,9 +2,6 @@ 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 -Nru /tmp/duoqKa6Rdn/wxwidgets2.6-2.6.3.2.1/debian/python-wxgtk.postinst /tmp/XUR4CgTfYT/wxwidgets2.6-2.6.3.2.1.1/debian/python-wxgtk.postinst --- /tmp/duoqKa6Rdn/wxwidgets2.6-2.6.3.2.1/debian/python-wxgtk.postinst 2006-05-01 04:38:42.000000000 +0000 +++ /tmp/XUR4CgTfYT/wxwidgets2.6-2.6.3.2.1.1/debian/python-wxgtk.postinst 2006-06-17 16:39:29.000000000 +0000 @@ -2,13 +2,6 @@ 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 diff -Nru /tmp/duoqKa6Rdn/wxwidgets2.6-2.6.3.2.1/debian/python-wxgtk.prerm /tmp/XUR4CgTfYT/wxwidgets2.6-2.6.3.2.1.1/debian/python-wxgtk.prerm --- /tmp/duoqKa6Rdn/wxwidgets2.6-2.6.3.2.1/debian/python-wxgtk.prerm 2006-05-01 04:38:42.000000000 +0000 +++ /tmp/XUR4CgTfYT/wxwidgets2.6-2.6.3.2.1.1/debian/python-wxgtk.prerm 2006-06-17 16:39:14.000000000 +0000 @@ -2,9 +2,6 @@ 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 -Nru /tmp/duoqKa6Rdn/wxwidgets2.6-2.6.3.2.1/debian/rules /tmp/XUR4CgTfYT/wxwidgets2.6-2.6.3.2.1.1/debian/rules --- /tmp/duoqKa6Rdn/wxwidgets2.6-2.6.3.2.1/debian/rules 2006-05-01 04:38:42.000000000 +0000 +++ /tmp/XUR4CgTfYT/wxwidgets2.6-2.6.3.2.1.1/debian/rules 2006-06-17 16:42:45.000000000 +0000 @@ -692,6 +692,9 @@ find debian/$(package_gtk_py_lib)/$(pydir) -name '*.py?' -exec rm '{}' ';' + DH_PYCENTRAL=nomove dh_pycentral + dh_python + # This is rather bogus, its included in the main copyright file now though. rm -f debian/$(package_gtk_py_lib)/$(wxpydir)/wx/tools/XRCed/license.txt @@ -707,6 +710,8 @@ else rm debian/$(package_gtk_py_lib)/$(pydir)/wxversion.py endif + DH_PYCENTRAL=nomove dh_pycentral + dh_python install-gtk-py-tools: DH_OPTIONS=-p$(package_gtk_py_tools) install-gtk-py-tools: install-gtk-py-ver @@ -736,6 +741,9 @@ endif rm -r debian/$(package_gtk_py_lib)/usr/bin + DH_PYCENTRAL=nomove dh_pycentral + dh_python + install-gtk-py: install-gtk-py-tools @@ -817,6 +825,9 @@ # This is rather bogus, its included in the main copyright file now though. rm -f debian/$(package_gtk_dbg_py)/$(wxpydir)/wx/tools/XRCed/license.txt + DH_PYCENTRAL=nomove dh_pycentral + dh_python + install-msw-dev: DH_OPTIONS=-p$(package_msw_dev) install-msw-dev: build-msw-shared-stamp build-msw-static-stamp