sync with trunk

5 files changed, 37 insertions, 41 deletions

diff --git a/debian/changelog b/debian/changelog
index d97de34..097df7e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,39 @@
+indicator-datetime (13.10.0+14.04.20140217-0ubuntu1) trusty; urgency=low
+
+  [ Robert Ancell ]
+  * Move date/time panel into unity-control-center
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com>  Mon, 17 Feb 2014 12:53:26 +0000
+
+indicator-datetime (13.10.0+14.04.20140205-0ubuntu1) trusty; urgency=low
+
+  [ Charles Kerr ]
+  * Don't load the alarm icon until it's needed s.t. we don't hit click
+    unnecessarily when starting up in the greeter.
+
+  [ Sebastien Bacher ]
+  * use the correct naming under unity-control-center
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com>  Wed, 05 Feb 2014 18:22:52 +0000
+
+indicator-datetime (13.10.0+14.04.20140131-0ubuntu1) trusty; urgency=low
+
+  [ Charles Kerr ]
+  * Finally land this. Other, still open bugs will be fixed in
+    subsequent commits. (LP: #793450)
+
+  [ Sebastien Bacher ]
+  * Use the correct location for datetime-dialog.ui. (LP: #1274046)
+
+  [ Lars Uebernickel ]
+  * Set calendar to the current date when the menu is popped up This
+    makes use of the "submenu-action" attribute to get notified when the
+    menu is popped up. Charles, if your big refactoring-branch should
+    land before this, do you mind adapting this patch for that? Thanks .
+    (LP: #793450)
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com>  Fri, 31 Jan 2014 11:46:16 +0000
+
 indicator-datetime (13.10.0+14.04.20140124-0ubuntu1) trusty; urgency=low
 
   [ Robert Ancell ]
diff --git a/debian/control b/debian/control
index 76fc5a1..84f76ca 100644
--- a/debian/control
+++ b/debian/control
@@ -26,9 +26,6 @@ Build-Depends: cmake,
                libpolkit-gobject-1-dev,
                libedataserver1.2-dev (>= 3.5),
                libgconf2-dev (>= 2.31),
-               libgnome-control-center-dev,
-               libunity-control-center-dev,
-               libtimezonemap1-dev,
                liburl-dispatcher1-dev,
                libproperties-cpp-dev,
                libdbustest1-dev,
@@ -50,34 +47,9 @@ Depends: ${shlibs:Depends},
          systemd-shim,
 Recommends: indicator-applet | indicator-renderer,
             evolution-data-server,
-            unity-control-center-datetime | gnome-control-center-datetime | ubuntu-system-settings,
+            unity-control-center (>= 14.04.3) | ubuntu-system-settings,
 Suggests: click,
 Conflicts: indicator-datetime (<< 13.10.0)
 Replaces: indicator-datetime (<< 13.10.0)
 Description: Simple clock
  A simple clock appearing in the indicator bar
-
-Package: gnome-control-center-datetime
-Architecture: any
-Depends: ${shlibs:Depends}, 
-         ${misc:Depends},
-         indicator-datetime (=${binary:Version}),
-         gnome-control-center,
-Conflicts: indicator-datetime (<< 13.10.0)
-Replaces: indicator-datetime (<< 13.10.0)
-Description: Clock settings in the GNOME Control Center
- A module to get date time and clock settings in the GNOME control
- center.
-
-Package: unity-control-center-datetime
-Architecture: any
-Depends: ${shlibs:Depends}, 
-         ${misc:Depends},
-         indicator-datetime (=${binary:Version}),
-         unity-control-center,
-Conflicts: indicator-datetime (<< 13.10.0)
-Replaces: indicator-datetime (<< 13.10.0)
-Description: Clock settings in the Unity Control Center
- A module to get date time and clock settings in the Unity control
- center.
-
diff --git a/debian/gnome-control-center-datetime.install b/debian/gnome-control-center-datetime.install
deleted file mode 100644
index 1551ef9..0000000
--- a/debian/gnome-control-center-datetime.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/*/control-center-1/panels/*
-usr/share/indicator-datetime/gnome-control-center/*
-usr/share/applications/gnome-indicator-datetime-panel.desktop
diff --git a/debian/indicator-datetime.install b/debian/indicator-datetime.install
deleted file mode 100644
index 1085d5f..0000000
--- a/debian/indicator-datetime.install
+++ /dev/null
@@ -1,6 +0,0 @@
-usr/share/glib-2.0/schemas/*
-usr/share/upstart/sessions/*
-usr/share/unity/indicators/*
-usr/lib/*/indicator-datetime/indicator-datetime-service
-usr/share/locale/*
-etc/xdg/autostart/*
diff --git a/debian/unity-control-center-datetime.install b/debian/unity-control-center-datetime.install
deleted file mode 100644
index d363e00..0000000
--- a/debian/unity-control-center-datetime.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/*/unity-control-center-1/panels/*
-usr/share/indicator-datetime/unity-control-center/*
-usr/share/applications/unity-datetime-panel.desktop