From 50f1783714c3f2427d8c68c79f2103bb06377abb Mon Sep 17 00:00:00 2001 From: Robert Ancell Date: Tue, 11 Feb 2014 11:59:02 +1300 Subject: Move date/time panel into unity-control-center --- debian/control | 25 +++++++------------------ debian/gnome-control-center-datetime.install | 3 --- debian/unity-control-center-datetime.install | 3 --- 3 files changed, 7 insertions(+), 24 deletions(-) delete mode 100644 debian/gnome-control-center-datetime.install delete mode 100644 debian/unity-control-center-datetime.install (limited to 'debian') 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 -- cgit v1.2.3 From 70adcb6a1bec44eed5cdc9d59982df814df5d4ff Mon Sep 17 00:00:00 2001 From: Robert Ancell Date: Tue, 11 Feb 2014 12:12:31 +1300 Subject: Drop dependency on libtimezonemap1-dev --- debian/control | 1 - 1 file changed, 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 4f7211f..af541d0 100644 --- a/debian/control +++ b/debian/control @@ -26,7 +26,6 @@ Build-Depends: cmake, libpolkit-gobject-1-dev, libedataserver1.2-dev (>= 3.5), libgconf2-dev (>= 2.31), - libtimezonemap1-dev, liburl-dispatcher1-dev, libproperties-cpp-dev, libdbustest1-dev, -- cgit v1.2.3 From 5f7bb3dd0bf5e36365f49b014368210460ebc6e4 Mon Sep 17 00:00:00 2001 From: Robert Ancell Date: Wed, 12 Feb 2014 09:06:28 +1300 Subject: Remove gnome-control-center-datetime and unity-control-center-datetime - we don't need them --- debian/control | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'debian') diff --git a/debian/control b/debian/control index af541d0..423f8b8 100644 --- a/debian/control +++ b/debian/control @@ -47,25 +47,9 @@ Depends: ${shlibs:Depends}, systemd-shim, Recommends: indicator-applet | indicator-renderer, evolution-data-server, - unity-control-center (>= 14.04.3) | 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}, -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}, - ${misc:Depends}, - unity-control-center (>= 14.04.3) -Description: transitional dummy package - This is a transitional dummy package. It can safely be removed. - -- cgit v1.2.3 From 017cc814beba8b40221f1983114dafd7df4e3f52 Mon Sep 17 00:00:00 2001 From: Robert Ancell Date: Wed, 12 Feb 2014 10:50:55 +1300 Subject: Remove .install file - we have one binary package now --- debian/indicator-datetime.install | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 debian/indicator-datetime.install (limited to 'debian') 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/* -- cgit v1.2.3