r15868 - in /desktop/unstable/gnome-menus/debian: changelog control control.in python-gmenu.postinst rules

[joss at users.alioth.debian.org]

Author: joss
Date: Tue May  6 19:27:22 2008
New Revision: 15868

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15868
Log:
* Move the .po updating process from the clean target to the update-po 
  target.
* Switch to python-support.
* python-gmenu.postinst: work around python-central not removing the 
  old files during upgrades.

Added:
    desktop/unstable/gnome-menus/debian/python-gmenu.postinst
Modified:
    desktop/unstable/gnome-menus/debian/changelog
    desktop/unstable/gnome-menus/debian/control
    desktop/unstable/gnome-menus/debian/control.in
    desktop/unstable/gnome-menus/debian/rules

Modified: desktop/unstable/gnome-menus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/changelog?rev=15868&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/changelog (original)
+++ desktop/unstable/gnome-menus/debian/changelog Tue May  6 19:27:22 2008
@@ -5,6 +5,11 @@
     avoid issues when the user or another menu system displays these 
     entries elsewhere. Closes: #479761.
   * Fix capitalization of Python in the description.
+  * Move the .po updating process from the clean target to the update-po 
+    target.
+  * Switch to python-support.
+  * python-gmenu.postinst: work around python-central not removing the 
+    old files during upgrades.
 
  -- Josselin Mouette <joss at debian.org>  Tue, 06 May 2008 20:52:16 +0200
 

Modified: desktop/unstable/gnome-menus/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/control?rev=15868&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/control (original)
+++ desktop/unstable/gnome-menus/debian/control Tue May  6 19:27:22 2008
@@ -10,7 +10,7 @@
                libxml-parser-perl,
                gnome-pkg-tools,
                dpkg-dev (>= 1.13.19),
-               python-central (>= 0.5),
+               python-support (>= 0.6),
                quilt,
                intltool
 Standards-Version: 3.7.3

Modified: desktop/unstable/gnome-menus/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/control.in?rev=15868&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/control.in (original)
+++ desktop/unstable/gnome-menus/debian/control.in Tue May  6 19:27:22 2008
@@ -10,7 +10,7 @@
                libxml-parser-perl,
                gnome-pkg-tools,
                dpkg-dev (>= 1.13.19),
-               python-central (>= 0.5),
+               python-support (>= 0.6),
                quilt,
                intltool
 Standards-Version: 3.7.3

Added: desktop/unstable/gnome-menus/debian/python-gmenu.postinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/python-gmenu.postinst?rev=15868&op=file
==============================================================================
--- desktop/unstable/gnome-menus/debian/python-gmenu.postinst (added)
+++ desktop/unstable/gnome-menus/debian/python-gmenu.postinst Tue May  6 19:27:22 2008
@@ -1,0 +1,9 @@
+#! /bin/sh
+set -e
+
+# Workaround for python-central disaster
+if [ "$1" = "configure" ] && dpkg --compare-versions "$2" lt "2.22.1-2"; then
+	rm -rf /usr/lib/python2.?/site-packages/GMenuSimpleEditor
+fi
+
+#DEBHELPER#

Modified: desktop/unstable/gnome-menus/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/rules?rev=15868&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/rules (original)
+++ desktop/unstable/gnome-menus/debian/rules Tue May  6 19:27:22 2008
@@ -52,7 +52,7 @@
 binary-install/python-gmenu::
 	# force executable bit on files looking like python scripts
 	egrep -rlZ '^#!(.*)python' debian/python-gmenu/usr/lib/ | xargs -0 chmod a+x --
-	dh_pycentral
+	dh_pysupport
 
 clean::
 	-rm -rf $(DEB_BUILDDIR)
@@ -61,6 +61,8 @@
 	-rm -rf $(addprefix build-stamp-, $(PY_VERSIONS))
 	-rm -rf $(addprefix install-stamp-, $(PY_VERSIONS))
 	-rm -f $(OUTFILES)
+
+update-po::
 	ls $(INFILES) | sed 's#^#../#' >debian/po-up/POTFILES.in
 	cd debian/po-up && intltool-update -g debian --pot && \
 		for i in *.po; do intltool-update -g debian --dist $${i%.po}; done