aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2011-09-15 10:07:00 -0500
committerTed Gould <ted@gould.cx>2011-09-15 10:07:00 -0500
commit8f8de9ac5d3a35a21606335aa23ceccca6f2a223 (patch)
treed08323bd5b75ef5db7eaf8ab27f4d836ed678d47
parent4cf539bab02a919d43dd5c370bdb0fab7a389a68 (diff)
parentba160425599248b4df06a847c5f89bead8785e21 (diff)
downloadayatana-indicator-datetime-8f8de9ac5d3a35a21606335aa23ceccca6f2a223.tar.gz
ayatana-indicator-datetime-8f8de9ac5d3a35a21606335aa23ceccca6f2a223.tar.bz2
ayatana-indicator-datetime-8f8de9ac5d3a35a21606335aa23ceccca6f2a223.zip
Merge in Ubuntu Desktop fixes
-rw-r--r--debian/changelog9
-rwxr-xr-xdebian/rules6
2 files changed, 14 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 547c1a6..9c18fbc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,11 @@
-indicator-datetime (0.2.93-0ubuntu1~ppa1) oneiric; urgency=low
+indicator-datetime (0.2.93-0ubuntu2) oneiric; urgency=low
+
+ * debian/rules
+ - dh_translations doesn't handle multibuilds, so manually add the domain
+
+ -- Ken VanDine <ken.vandine@canonical.com> Fri, 26 Aug 2011 10:35:45 -0400
+
+indicator-datetime (0.2.93-0ubuntu1) oneiric; urgency=low
* New upstream release.
∘ Use cleaner GDateTime API
diff --git a/debian/rules b/debian/rules
index daa4979..6d5fdb5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,3 +24,9 @@ common-install-arch::
find debian/tmp -name \*.la -delete
find debian/tmp -name \*.a -delete
cd po; intltool-update --pot --verbose
+ # Language packs
+ for d in $$(find debian/tmp -type f \( -name "*.desktop" -o -name "*.directory" \) ); do \
+ sed -ri '/^(Name|GenericName|Comment|X-GNOME-FullName)\[/d' $$d; \
+ echo "X-Ubuntu-Gettext-Domain=indicator-datetime" >> $$d; \
+ done;
+