aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-09-07 12:39:11 -0500
committerTed Gould <ted@gould.cx>2010-09-07 12:39:11 -0500
commit1820b9964af879284836d87429f63ce336f3c4cd (patch)
tree93c1ffb0b024e0858542099cf90a07678148b6a1
parent6b4550178934e6d9b9edd84fc8766e26bf03f283 (diff)
parentb9ce676a1d912a2e95a7f6511d5491190cf80072 (diff)
downloadayatana-indicator-datetime-1820b9964af879284836d87429f63ce336f3c4cd.tar.gz
ayatana-indicator-datetime-1820b9964af879284836d87429f63ce336f3c4cd.tar.bz2
ayatana-indicator-datetime-1820b9964af879284836d87429f63ce336f3c4cd.zip
Sync with ubuntu-desktop
-rw-r--r--debian/changelog13
-rwxr-xr-xdebian/rules1
2 files changed, 9 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index aa54774..92c3ced 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,18 +1,21 @@
-indicator-datetime (0.0.5-0ubuntu1) UNRELEASED; urgency=low
+indicator-datetime (0.0.5-0ubuntu2) maverick; urgency=low
- * New upstream release.
+ * debian/rules: use gnome.mk so a translation template is built (lp: #612540)
+
+ -- Sebastien Bacher <seb128@ubuntu.com> Tue, 03 Aug 2010 12:41:08 +0200
- -- Ted Gould <ted@ubuntu.com> Tue, 07 Sep 2010 12:34:12 -0500
+indicator-datetime (0.0.5-0ubuntu1) maverick; urgency=low
-indicator-datetime (0.0.4-0ubuntu2~ppa1) lucid; urgency=low
+ * New version update
+ [ Ted Gould ]
* Upstream Merge
* Making time format configurable via translations and
gsettings.
* debian/control: Adding in a glib dependency to get gsettings
* Autogen update
- -- Ted Gould <ted@ubuntu.com> Mon, 19 Jul 2010 07:52:01 -0500
+ -- Sebastien Bacher <seb128@ubuntu.com> Thu, 22 Jul 2010 21:41:12 +0200
indicator-datetime (0.0.4-0ubuntu1) maverick; urgency=low
diff --git a/debian/rules b/debian/rules
index 87f7f7e..ff2614a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/class/gnome.mk
include /usr/share/cdbs/1/rules/utils.mk
install/indicator-datetime::