Merge lp:~asac/webfav/trunk into lp:webfav

Proposed by Alexander Sack
Status: Needs review
Proposed branch: lp:~asac/webfav/trunk
Merge into: lp:webfav
Diff against target: None lines
To merge this branch: bzr merge lp:~asac/webfav/trunk
Reviewer Review Type Date Requested Status
UNR Developers Pending
Review via email: mp+10964@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Alexander Sack (asac) wrote :

check this. also sent mail to kyle with the produced en-US.xpi which we should try to import into the webfav project. check with me on iRC:

Unmerged revisions

7. By Alexander Sack

implemement mozilla-devscripts lp-locale-export feature
* add debian/translation-support/install.rdf.in template used to create en-US.xpi install.rdf
* auto parse extension version for the install.rdf.in template from above from the webfav install.rdf
  in debian/rules
* bump mozilla-devscripts build depend to >= 0.14~ which contains the fixes needed for webfav
* add normal hooks required for translation support to debian/rules

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2009-04-08 15:01:12 +0000
3+++ debian/control 2009-09-01 09:20:54 +0000
4@@ -2,7 +2,7 @@
5 Section: web
6 Priority: optional
7 Maintainer: Bill Filler <bill.filler@canonical.com>
8-Build-Depends: debhelper (>= 5), cdbs, mozilla-devscripts (>= 0.5~), zip
9+Build-Depends: debhelper (>= 5), cdbs, mozilla-devscripts (>= 0.14~), zip
10 Standards-Version: 3.7.3
11 Vcs-Bzr: https://bazaar.launchpad.net/~netbook-remix-team/webfav/trunk
12 Vcs-Browser: http://bazaar.launchpad.net/~netbook-remix-team/webfav/trunk
13
14=== modified file 'debian/rules'
15--- debian/rules 2009-01-14 16:31:49 +0000
16+++ debian/rules 2009-09-01 09:20:54 +0000
17@@ -17,5 +17,17 @@
18 # found in the top level directory
19 MOZ_XPI_BUILD_COMMAND = sh build.sh
20
21+MOZ_TRANSLATION_AUTO_XPI_SEARCHDIRS := debian/$(MOZ_EXTENSION_PKG)
22+
23 include /usr/share/cdbs/1/rules/debhelper.mk
24 include /usr/share/mozilla-devscripts/xpi.mk
25+include /usr/share/mozilla-devscripts/lp-locale-export.mk
26+
27+EM_TRANSLATION_VERSION = $(shell xpath -q -e '/RDF/Description/em:version/text()' install.rdf)
28+
29+binary-post-install/$(MOZ_EXTENSION_PKG):: auto-locale-xpi.mk/translate
30+ sed \
31+ -e 's/@EM_VERSION@/$(EM_TRANSLATION_VERSION)/' \
32+ < debian/translation-support/install.rdf.in > debian/install.rdf
33+ cd debian && zip lp-export-xpis/en-US.xpi install.rdf
34+
35
36=== added directory 'debian/translation-support'
37=== added file 'debian/translation-support/install.rdf.in'
38--- debian/translation-support/install.rdf.in 1970-01-01 00:00:00 +0000
39+++ debian/translation-support/install.rdf.in 2009-09-01 09:20:54 +0000
40@@ -0,0 +1,25 @@
41+<?xml version="1.0"?>
42+<!--
43+
44+-->
45+
46+<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
47+ xmlns:em="http://www.mozilla.org/2004/em-rdf#">
48+ <Description about="urn:mozilla:install-manifest"
49+ em:id="langpack-en-US@webfav.ubuntu.com"
50+ em:name="Webfav (en-US)"
51+ em:version="@EM_VERSION@"
52+ em:type="8"
53+ em:creator="http://translations.launchpad.net">
54+ <em:contributor></em:contributor>
55+
56+ <em:targetApplication>
57+ <Description>
58+ <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
59+ <em:minVersion>1.0</em:minVersion>
60+ <em:maxVersion>3.6.*</em:maxVersion>
61+ </Description>
62+ </em:targetApplication>
63+ </Description>
64+</RDF>
65+

Subscribers

People subscribed via source and target branches

to all changes: