summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Sack <asac@ubuntu.com>2009-08-10 00:57:56 +0200
committerAlexander Sack <asac@ubuntu.com>2009-08-10 00:57:56 +0200
commit33f8dd265442daf84e96bacd599c3e20c2ef002b (patch)
treecedee384ed9f5e74c7d93efe34cedf892518475f
parent19d4b597f47fbac866f02ebc4228d8562561f32a (diff)
* lp-locale-export.mk:
- fix LP: #411191 - webfav lp-locale-export.mk yields en-US.xpi with .manifest files only - fix parsing bug for jar: protocol lines
-rw-r--r--debian/changelog3
-rw-r--r--src/lp-locale-export.mk2
2 files changed, 4 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index ae09488..7a93405 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -44,6 +44,9 @@ mozilla-devscripts (0.14) UNRELEASED; urgency=low
accordingly.
- update src/Makefile
- update debian/mozilla-devscripts.install
+ * lp-locale-export.mk:
+ - fix LP: #411191 - webfav lp-locale-export.mk yields en-US.xpi with
+ .manifest files only - fix parsing bug for jar: protocol lines
-- Alexander Sack <asac@ubuntu.com> Wed, 29 Jul 2009 01:08:07 +0200
diff --git a/src/lp-locale-export.mk b/src/lp-locale-export.mk
index 3359793..23125fe 100644
--- a/src/lp-locale-export.mk
+++ b/src/lp-locale-export.mk
@@ -56,7 +56,7 @@ MOZCALL_manifest_locale_files_to_outdir = \
localefiles=`cat $(1) | \
grep "^locale[[:space:]]" | \
grep "[[:space:]]$(2)[[:space:]]" | \
- sed -e 's/^.*[[:space:]]$(2)[[:space:]]jar:\(.*\)!.*$$/\1/' | \
+ sed -e 's/^.*[[:space:]][[:space:]]*$(2)[[:space:]][[:space:]]*jar:\(.*\)!.*$$/\1/' | \
sed -e 's/^.*[[:space:]][[:space:]]*$(2)[[:space:]][[:space:]]*\(.*\)$$/\1/' \
`; \
echo "tar -c -C `dirname $(1)`/ -f - $$localefiles \| \