aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorRobert Ancell <robert.ancell@canonical.com>2014-02-17 12:53:11 +0000
committerCI bot <ps-jenkins@lists.canonical.com>2014-02-17 12:53:11 +0000
commitd51b8833b50062e5db1004b4ff21c3ae354a352a (patch)
tree9e188dbaaf7f0836fc606d4a2732d838def86117 /debian
parent65eec54164026c8ee269c6c3db2509a856f632c3 (diff)
parent017cc814beba8b40221f1983114dafd7df4e3f52 (diff)
downloadayatana-indicator-datetime-d51b8833b50062e5db1004b4ff21c3ae354a352a.tar.gz
ayatana-indicator-datetime-d51b8833b50062e5db1004b4ff21c3ae354a352a.tar.bz2
ayatana-indicator-datetime-d51b8833b50062e5db1004b4ff21c3ae354a352a.zip
Move date/time panel into unity-control-center
Diffstat (limited to 'debian')
-rw-r--r--debian/control30
-rw-r--r--debian/gnome-control-center-datetime.install3
-rw-r--r--debian/indicator-datetime.install6
-rw-r--r--debian/unity-control-center-datetime.install3
4 files changed, 1 insertions, 41 deletions
diff --git a/debian/control b/debian/control
index 175684f..423f8b8 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