diff options
| author | Robert Ancell <robert.ancell@canonical.com> | 2014-02-11 11:59:02 +1300 |
|---|---|---|
| committer | Robert Ancell <robert.ancell@canonical.com> | 2014-02-11 11:59:02 +1300 |
| commit | 50f1783714c3f2427d8c68c79f2103bb06377abb (patch) | |
| tree | ae6055b3d8044798c9874e3845161ffd7b4b5cb3 /debian | |
| parent | 65eec54164026c8ee269c6c3db2509a856f632c3 (diff) | |
| download | ayatana-indicator-datetime-50f1783714c3f2427d8c68c79f2103bb06377abb.tar.gz ayatana-indicator-datetime-50f1783714c3f2427d8c68c79f2103bb06377abb.tar.bz2 ayatana-indicator-datetime-50f1783714c3f2427d8c68c79f2103bb06377abb.zip | |
Move date/time panel into unity-control-center
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/control | 25 | ||||
| -rw-r--r-- | debian/gnome-control-center-datetime.install | 3 | ||||
| -rw-r--r-- | debian/unity-control-center-datetime.install | 3 |
3 files changed, 7 insertions, 24 deletions
diff --git a/debian/control b/debian/control index 175684f..4f7211f 100644 --- a/debian/control +++ b/debian/control @@ -26,8 +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, @@ -50,7 +48,7 @@ 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) | gnome-control-center-datetime | ubuntu-system-settings, Suggests: click, Conflicts: indicator-datetime (<< 13.10.0) Replaces: indicator-datetime (<< 13.10.0) @@ -61,23 +59,14 @@ 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. +Description: transitional dummy package + This is a transitional dummy package. It can safely be removed. Package: unity-control-center-datetime Architecture: any -Depends: ${shlibs:Depends}, +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. + unity-control-center (>= 14.04.3) +Description: transitional dummy package + This is a transitional dummy package. It can safely be removed. 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/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 |