merge lp:~robert-ancell/indicator-datetime/unity-control-center2 into lp:indicator-datetime

4 files changed, 34 insertions, 3 deletions

diff --git a/debian/changelog b/debian/changelog
index e1509fd..5ceaecf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+indicator-datetime (13.10.0+14.04.20131217-0ubuntu1) trusty; urgency=low
+
+  [ Charles Kerr ]
+  * Make the phone profile's header format sensitive to whether the
+    phone is running in a 12h or 24h locale, and use a 12h or 24h
+    notation accordingly. (LP: #1256061)
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 291
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com>  Tue, 17 Dec 2013 09:49:56 +0000
+
 indicator-datetime (13.10.0+14.04.20131125-0ubuntu1) trusty; urgency=low
 
   [ Charles Kerr ]
diff --git a/debian/control b/debian/control
index 3dc61c6..1788381 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,14 @@ Source: indicator-datetime
 Section: misc
 Priority: optional
 Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
+# language-pack-en-base is for the unit tests s.t. we can test in 12h and 24h locales
 Build-Depends: cmake,
                dbus,
                debhelper (>= 9), 
                dh-translations,
                intltool (>= 0.35.0), 
                gnome-common,
+               language-pack-en-base,
                libxorg-gtest-dev,
                libgtest-dev,
                libglib2.0-dev (>= 2.35.4),
@@ -23,9 +25,11 @@ Build-Depends: cmake,
                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,
+               locales,
 Standards-Version: 3.9.3
 Homepage: https://launchpad.net/indicator-datetime
 # If you aren't a member of ~indicator-applet-developers but need to upload
@@ -43,7 +47,7 @@ Depends: ${shlibs:Depends},
          systemd-shim,
 Recommends: indicator-applet | indicator-renderer,
             evolution-data-server,
-            gnome-control-center-datetime | ubuntu-system-settings,
+            unity-control-center-datetime | gnome-control-center-datetime | ubuntu-system-settings,
 Suggests: click,
 Conflicts: indicator-datetime (<< 13.10.0)
 Replaces: indicator-datetime (<< 13.10.0)
@@ -62,3 +66,15 @@ 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
index 52a8c70..1551ef9 100644
--- a/debian/gnome-control-center-datetime.install
+++ b/debian/gnome-control-center-datetime.install
@@ -1,3 +1,3 @@
 usr/lib/*/control-center-1/panels/*
-usr/share/indicator-datetime/*
-usr/share/applications/*
+usr/share/indicator-datetime/gnome-control-center/*
+usr/share/applications/gnome-indicator-datetime-panel.desktop
diff --git a/debian/unity-control-center-datetime.install b/debian/unity-control-center-datetime.install
new file mode 100644
index 0000000..d363e00
--- /dev/null
+++ b/debian/unity-control-center-datetime.install
@@ -0,0 +1,3 @@
+usr/lib/*/unity-control-center-1/panels/*
+usr/share/indicator-datetime/unity-control-center/*
+usr/share/applications/unity-datetime-panel.desktop