aboutsummaryrefslogtreecommitdiff
path: root/debian/control
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2014-01-27 11:02:40 -0600
committerCharles Kerr <charles.kerr@canonical.com>2014-01-27 11:02:40 -0600
commitef84548e3025184c4f631a23fceefb008dd6968b (patch)
tree84d25ec1d82475d7b10a7ab0fe4531cfdca3709e /debian/control
parentf320760f20b282e9b2695477ab602d4041a3ada8 (diff)
parentad76159088202f6e4390843cfed6dd712b8e2544 (diff)
downloadayatana-indicator-datetime-ef84548e3025184c4f631a23fceefb008dd6968b.tar.gz
ayatana-indicator-datetime-ef84548e3025184c4f631a23fceefb008dd6968b.tar.bz2
ayatana-indicator-datetime-ef84548e3025184c4f631a23fceefb008dd6968b.zip
merge lp:~robert-ancell/indicator-datetime/unity-control-center2 into lp:indicator-datetime
Diffstat (limited to 'debian/control')
-rw-r--r--debian/control18
1 files changed, 17 insertions, 1 deletions
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.
+