aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2013-06-18 23:12:59 -0500
committerCharles Kerr <charles.kerr@canonical.com>2013-06-18 23:12:59 -0500
commit2c0b562cf3c58454d4e881569b7289bf464675e9 (patch)
tree7f25850bdb20e98e742fc0d5c3ce7701891d137a /debian
parentc18a48d1c81cef6bf874caae86f6230e64d7a13a (diff)
parent50de20c540f2d268ebd7d1a8d16f009d218b86fd (diff)
downloadayatana-indicator-datetime-2c0b562cf3c58454d4e881569b7289bf464675e9.tar.gz
ayatana-indicator-datetime-2c0b562cf3c58454d4e881569b7289bf464675e9.tar.bz2
ayatana-indicator-datetime-2c0b562cf3c58454d4e881569b7289bf464675e9.zip
sync with lp:indicator-datetime trunk
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog30
-rw-r--r--debian/control3
2 files changed, 31 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 7d949a1..814a60d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,33 @@
+indicator-datetime (12.10.3daily13.06.07-0ubuntu3) UNRELEASED; urgency=low
+
+ * Link test program in the right order. Importantly, make sure
+ XORG_GTEST_LIBS comes after it as it uses pthread.
+
+ -- Iain Lane <iain@orangesquash.org.uk> Thu, 13 Jun 2013 11:44:12 +0100
+
+indicator-datetime (12.10.3daily13.06.07-0ubuntu2) saucy; urgency=low
+
+ * Build against libical 1.0
+
+ -- Jonathan Riddell <jriddell@ubuntu.com> Thu, 13 Jun 2013 13:23:54 +0100
+
+indicator-datetime (12.10.3daily13.06.07-0ubuntu1) saucy; urgency=low
+
+ [ Jeremy Bicha ]
+ * Rename .desktop file for compatibility with gnome-control-center 3.8
+
+ [ Ubuntu daily release ]
+ * Automatic snapshot from revision 220
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 07 Jun 2013 02:02:41 +0000
+
+indicator-datetime (12.10.3daily13.05.06.1-0ubuntu2) saucy; urgency=low
+
+ * debian/control, configure.ac: Remove obsolete dependency on
+ libedataserverui-3.0-dev
+
+ -- Iain Lane <iain.lane@canonical.com> Fri, 31 May 2013 10:31:55 +0100
+
indicator-datetime (12.10.3daily13.05.06.1-0ubuntu1) saucy; urgency=low
[ Sebastien Bacher ]
diff --git a/debian/control b/debian/control
index 01fc757..b3c1db1 100644
--- a/debian/control
+++ b/debian/control
@@ -13,13 +13,12 @@ Build-Depends: debhelper (>= 9),
libido3-0.1-dev (>= 0.2.90),
libgeoclue-dev (>= 0.12.0),
libecal1.2-dev (>= 3.5),
- libical-dev (>= 0.48),
+ libical-dev (>= 1.0),
libgtk-3-dev (>= 3.1.4),
libcairo2-dev (>= 1.10),
libjson-glib-dev,
libpolkit-gobject-1-dev,
libedataserver1.2-dev (>= 3.5),
- libedataserverui-3.0-dev,
libgconf2-dev (>= 2.31),
libgnome-control-center-dev,
libtimezonemap1-dev,