Merge lp:~seb128/pkgbinarymangler/keywords into lp:ubuntu/precise/pkgbinarymangler

[Sebastien Bacher]

  * pkgstriptranslations: change X-GNOME-Keywords to official Keywords
    (lp: #949849)

I've opted to drop the X-GNOME-Keywords use, it has almost no rdepends and I don't want to support both in glib, easier to fix the few rdepends

[Loïc Minier (lool)]

I don't know why this has conflicts all over the place, but http://bazaar.launchpad.net/~seb128/pkgbinarymangler/keywords/revision/243 looks ok, except I would strip both the old and the new keyword header from .desktop files and extend the test to have both headers -- mainly in case there are still .desktop files with the old header in the archive or out of archive (unlikely to use pkgbinarymangler though), or for backports (unlikely too).

[Martin Pitt (pitti)]

lp:pkgbinarymangler does not exist any more. It only has a README explaining why it's obsolete. Please use lp:ubuntu/pkgbinarymangler.

review: Disapprove

[Sebastien Bacher (seb128)]

sorry, launchpad merge proposal defaulted to the wrong branch when I branched of the correct one

as explained to pitti on IRC we should better grep through the archive for the few users and fix them, the glib gettext patch doesn't support X-GNOME-Keywords anyway so stripping them would be of no use

=== modified file 'debian/changelog'
--- debian/changelog	2012-02-15 06:42:25 +0000
+++ debian/changelog	2012-03-08 13:46:05 +0000
@@ -1,3 +1,10 @@
+pkgbinarymangler (116) UNRELEASED; urgency=low
+
+  * pkgstriptranslations: change X-GNOME-Keywords to official Keywords
+    (lp: #949849)
+
+ -- Sebastien Bacher <[e-mail]>  Thu, 08 Mar 2012 12:41:06 +0100
+
 pkgbinarymangler (115) precise; urgency=low
 
   [ Felix Geyer ]

=== modified file 'pkgstriptranslations'
--- pkgstriptranslations	2012-02-12 16:44:43 +0000
+++ pkgstriptranslations	2012-03-08 13:46:05 +0000
@@ -63,7 +63,7 @@
     for desktop in `find "$PKGDIR" -type f -name "*.desktop"`; do
         if grep -q '^X-.*-Gettext-Domain=' "$desktop"; then
             echo "$desktop: stripping translations"
-            sed -ri '/^(Name|GenericName|Comment|X-GNOME-Keywords)\[/d' "$desktop";
+            sed -ri '/^(Name|GenericName|Comment|Keywords)\[/d' "$desktop";
             # adapt md5sums file
             if [ -f $PKGDIR/DEBIAN/md5sums ]; then
                 P=${desktop#$PKGDIR}

=== modified file 'test/icecream/data/translated.desktop'
--- test/icecream/data/translated.desktop	2011-10-20 09:39:36 +0000
+++ test/icecream/data/translated.desktop	2012-03-08 13:46:05 +0000
@@ -11,6 +11,6 @@
 Comment=Yummy!
 Comment[de]=Lecker!
 Comment[en_GB]=Wonderful!
-X-GNOME-Keywords=Dessert;Sweets;
-X-GNOME-Keywords[de]=Nachtisch;Süßigkeiten;
+Keywords=Dessert;Sweets;
+Keywords[de]=Nachtisch;Süßigkeiten;
 Exec=/usr/bin/vanilla

=== modified file 'test/run'
--- test/run	2012-01-31 17:46:43 +0000
+++ test/run	2012-03-08 13:46:05 +0000
@@ -1200,7 +1200,7 @@
 GenericName=desert
 X-GNOME-FullName=Vanilla or Chocolate
 Comment=Yummy!
-X-GNOME-Keywords=Dessert;Sweets;
+Keywords=Dessert;Sweets;
 Exec=/usr/bin/vanilla
 X-Ubuntu-Gettext-Domain=icecream
 ''',