sync with trunk

3 files changed, 39 insertions, 8 deletions

diff --git a/debian/changelog b/debian/changelog
index 2c5e1d5..acb6313 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,41 @@
+indicator-datetime (13.10.0+15.10.20150909-0ubuntu1) wily; urgency=medium
+
+  [ CI Train Bot ]
+  * New rebuild forced.
+
+  [ Iain Lane ]
+  * Remove warnings from test logs. Swallow the ones that are expected
+    and fail the test if they don't show up. In addition, fail tests if
+    unexpected warnings show up again.
+
+  [ Lars Uebernickel ]
+  * Remove warnings from test logs. Swallow the ones that are expected
+    and fail the test if they don't show up. In addition, fail tests if
+    unexpected warnings show up again.
+
+  [ Sebastien Bacher ]
+  * under unity8 start system-settings instead unity-control-center,
+    don't special case u-c-c by looking for the binary, Unity
+    installations come with it installed (LP: #1489481)
+
+ -- Iain Lane <iain@orangesquash.org.uk>  Wed, 09 Sep 2015 16:40:52 +0000
+
+indicator-datetime (13.10.0+15.10.20150728-0ubuntu1) wily; urgency=medium
+
+  * 
+
+ -- CI Train Bot <ci-train-bot@canonical.com>  Tue, 28 Jul 2015 08:42:27 +0000
+
+indicator-datetime (13.10.0+15.10.20150727-0ubuntu1) wily; urgency=medium
+
+  [ CI Train Bot ]
+  * New rebuild forced.
+
+  [ Charles Kerr ]
+  * drop build-dependency on g++-4.9 (LP: #1452319)
+
+ -- CI Train Bot <ci-train-bot@canonical.com>  Mon, 27 Jul 2015 18:06:18 +0000
+
 indicator-datetime (13.10.0+15.10.20150710.1-0ubuntu1) wily; urgency=medium
 
   * New rebuild forced.
diff --git a/debian/control b/debian/control
index e9f14ec..84a1864 100644
--- a/debian/control
+++ b/debian/control
@@ -9,13 +9,11 @@ Build-Depends: cmake,
                libglib2.0-dev (>= 2.35.4),
                libnotify-dev (>= 0.7.6),
                libgstreamer1.0-dev,
-               libecal1.2-dev (>= 3.5),
+               libecal1.2-dev (>= 3.16),
                libical-dev (>= 1.0),
                libedataserver1.2-dev (>= 3.5),
                liburl-dispatcher1-dev,
                libproperties-cpp-dev,
-# for safeguarding against ABI breaks in libstdc++, explicitly select a g++ version
-               g++-4.9,
 # for the test harness:
                libgtest-dev,
                libdbustest1-dev,
diff --git a/debian/rules b/debian/rules
index cf940f5..d2889aa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,5 @@
 #!/usr/bin/make -f
 
-# Explicitly selecting a G{CC,++}-version here to avoid accidental
-# ABI breaks introduced by toolchain updates.
-export CC=$(DEB_HOST_GNU_TYPE)-gcc-4.9
-export CXX=$(DEB_HOST_GNU_TYPE)-g++-4.9
-
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
 
 %: