strips translations and alters maintainers during build

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

Proposed by Sebastien Bacher on 2012-03-08
Status: Merged
Merged at revision: 243
Proposed branch: lp:~seb128/pkgbinarymangler/keywords
Merge into: lp:ubuntu/precise/pkgbinarymangler
Diff against target: 53 lines (+11/-4) 4 files modified
To merge this branch: bzr merge lp:~seb128/pkgbinarymangler/keywords
Reviewer Review Type Date Requested Status
Ubuntu Core Development Team 2012-03-08 Pending
Martin Pitt 2012-03-08 Pending
Review via email: mp+96570@code.launchpad.net

This proposal supersedes a proposal from 2012-03-08.

Description of the Change

  * 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

To post a comment you must log in.
Loïc Minier (lool) wrote : Posted in a previous version of this proposal

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) wrote : Posted in a previous version of this proposal

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) wrote :

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

Preview Diff

1=== modified file 'debian/changelog'
2--- debian/changelog 2012-02-15 06:42:25 +0000
3+++ debian/changelog 2012-03-08 13:46:05 +0000
4@@ -1,3 +1,10 @@
5+pkgbinarymangler (116) UNRELEASED; urgency=low
6+
7+ * pkgstriptranslations: change X-GNOME-Keywords to official Keywords
8+ (lp: #949849)
9+
10+ -- Sebastien Bacher <seb128@ubuntu.com> Thu, 08 Mar 2012 12:41:06 +0100
11+
12 pkgbinarymangler (115) precise; urgency=low
13
14 [ Felix Geyer ]
15
16=== modified file 'pkgstriptranslations'
17--- pkgstriptranslations 2012-02-12 16:44:43 +0000
18+++ pkgstriptranslations 2012-03-08 13:46:05 +0000
19@@ -63,7 +63,7 @@
20 for desktop in `find "$PKGDIR" -type f -name "*.desktop"`; do
21 if grep -q '^X-.*-Gettext-Domain=' "$desktop"; then
22 echo "$desktop: stripping translations"
23- sed -ri '/^(Name|GenericName|Comment|X-GNOME-Keywords)\[/d' "$desktop";
24+ sed -ri '/^(Name|GenericName|Comment|Keywords)\[/d' "$desktop";
25 # adapt md5sums file
26 if [ -f $PKGDIR/DEBIAN/md5sums ]; then
27 P=${desktop#$PKGDIR}
28
29=== modified file 'test/icecream/data/translated.desktop'
30--- test/icecream/data/translated.desktop 2011-10-20 09:39:36 +0000
31+++ test/icecream/data/translated.desktop 2012-03-08 13:46:05 +0000
32@@ -11,6 +11,6 @@
33 Comment=Yummy!
34 Comment[de]=Lecker!
35 Comment[en_GB]=Wonderful!
36-X-GNOME-Keywords=Dessert;Sweets;
37-X-GNOME-Keywords[de]=Nachtisch;Süßigkeiten;
38+Keywords=Dessert;Sweets;
39+Keywords[de]=Nachtisch;Süßigkeiten;
40 Exec=/usr/bin/vanilla
41
42=== modified file 'test/run'
43--- test/run 2012-01-31 17:46:43 +0000
44+++ test/run 2012-03-08 13:46:05 +0000
45@@ -1200,7 +1200,7 @@
46 GenericName=desert
47 X-GNOME-FullName=Vanilla or Chocolate
48 Comment=Yummy!
49-X-GNOME-Keywords=Dessert;Sweets;
50+Keywords=Dessert;Sweets;
51 Exec=/usr/bin/vanilla
52 X-Ubuntu-Gettext-Domain=icecream
53 ''',

Subscribers

People subscribed via source and target branches