aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog36
-rw-r--r--debian/control8
-rw-r--r--debian/source/format1
3 files changed, 26 insertions, 19 deletions
diff --git a/debian/changelog b/debian/changelog
index d7b1a6f..e555f3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,31 +1,35 @@
-indicator-datetime (0.1.92-0ubuntu2~ppa1~apnt4) natty; urgency=low
+indicator-datetime (0.1.92-0ubuntu5~ppa1) UNRELEASED; urgency=low
* Upstream Merge
- * Adding some color support along with times
+ * Merging in first EDS branch
+ * debian/rules: Adding in autoreconf
- -- Ted Gould <ted@ubuntu.com> Tue, 08 Feb 2011 14:26:28 -0600
+ -- Ted Gould <ted@ubuntu.com> Tue, 08 Feb 2011 22:21:14 -0600
-indicator-datetime (0.1.92-0ubuntu2~ppa1~apnt3) natty; urgency=low
+indicator-datetime (0.1.92-0ubuntu4) natty; urgency=low
- * Upstream Merge
- * Debugging statements and cleaning code a bit
+ * debian/source/format
+ - Source format v1 instead of v3
- -- Ted Gould <ted@ubuntu.com> Fri, 04 Feb 2011 15:53:05 -0600
+ -- Ken VanDine <ken.vandine@canonical.com> Tue, 08 Feb 2011 13:59:35 -0500
-indicator-datetime (0.1.92-0ubuntu2~ppa1~apnt2) natty; urgency=low
+indicator-datetime (0.1.92-0ubuntu3) natty; urgency=low
- * Upstream Merge
- * Unreffing the menu item
+ * debian/control
+ - Bump standards version to 3.9.1
+ - Set Vcs-Bzr
+ * +debian/source/format
- -- Ted Gould <ted@ubuntu.com> Fri, 04 Feb 2011 15:35:12 -0600
+ -- Ken VanDine <ken.vandine@canonical.com> Tue, 08 Feb 2011 11:14:02 -0500
-indicator-datetime (0.1.92-0ubuntu2~ppa1~apnt1) natty; urgency=low
+indicator-datetime (0.1.92-0ubuntu2) natty; urgency=low
- * Upstream Merge
- * Merging in first EDS branch
- * debian/rules: Adding in autoreconf
+ * debian/control
+ - Depend on geoclue-ubuntu-geoip | geoclue-provider (LP: #714763)
+ * src/datetime-service.c
+ - Don't crash if we can get a geoclue provider (LP: #714763)
- -- Ted Gould <ted@ubuntu.com> Fri, 04 Feb 2011 15:25:13 -0600
+ -- Ken VanDine <ken.vandine@canonical.com> Tue, 08 Feb 2011 11:02:31 -0500
indicator-datetime (0.1.92-0ubuntu1) natty; urgency=low
diff --git a/debian/control b/debian/control
index 49a3ca8..b02380d 100644
--- a/debian/control
+++ b/debian/control
@@ -12,14 +12,16 @@ Build-Depends: cdbs,
libido-0.1-dev (>= 0.1.10),
libgeoclue-dev (>= 0.12.0),
liboobs-1-dev (>= 2.31.0)
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
Homepage: https://launchpad.net/indicator-datetime
+Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-datetime/ubuntu
Package: indicator-datetime
Architecture: any
Depends: ${shlibs:Depends},
- ${misc:Depends}
-Recommends: indicator-applet | indicator-renderer, geoclue-ubuntu-geoip
+ ${misc:Depends},
+ geoclue-ubuntu-geoip | geoclue-provider
+Recommends: indicator-applet | indicator-renderer
Description: A very, very simple clock
A simple clock appearing in the indicator bar
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..d3827e7
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+1.0