sync with lp:indicator-datetime trunk

5 files changed, 36 insertions, 7 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
index e0019e6..3180cbe 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -34,12 +34,12 @@ EXTRA_DIST += $(dbus_services_in)
 # the gnome-control-center panel
 #
 
-EXTRA_DIST += datetime-dialog.ui
 if BUILD_CCPANEL
  pkgdata_DATA = datetime-dialog.ui
  @INTLTOOL_DESKTOP_RULE@
  desktopdir = $(datadir)/applications
- desktop_DATA = indicator-datetime-preferences.desktop
- EXTRA_DIST += $(desktop_DATA) $(desktop_DATA:.desktop=.desktop.in)
+ desktop_DATA = gnome-indicator-datetime-panel.desktop
+ EXTRA_DIST += $(desktop_DATA)
  CLEANFILES += $(desktop_DATA)
 endif
+EXTRA_DIST += $(desktop_DATA:.desktop=.desktop.in)
diff --git a/data/indicator-datetime-preferences.desktop.in b/data/gnome-indicator-datetime-panel.desktop.in
index 68571db..68571db 100644
--- a/data/indicator-datetime-preferences.desktop.in
+++ b/data/gnome-indicator-datetime-panel.desktop.in
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,
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8ca0cbc..f9676c3 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -24,10 +24,10 @@ AM_CXXFLAGS = $(GTEST_CXXFLAGS)
 
 TEST_LIBS = \
         $(top_builddir)/src/.libs/libdatetime.so \
+        libgtest.a \
         $(INDICATOR_LIBS) \
         $(COVERAGE_LDFLAGS) \
-        $(XORG_GTEST_LDFLAGS) \
-        libgtest.a
+        $(XORG_GTEST_LDFLAGS)
 
 TEST_CPPFLAGS = \
         $(AM_CPPFLAGS) \