From f4031e6beb4bf139fe22fd6d8476d42031a2d6f0 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 27 Aug 2013 09:52:26 -0500 Subject: Split out control center modules into its own package --- debian/control | 12 +++++++++++- debian/indicator-datetime-control-center.install | 3 +++ debian/indicator-datetime.install | 5 +++++ 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 debian/indicator-datetime-control-center.install create mode 100644 debian/indicator-datetime.install (limited to 'debian') diff --git a/debian/control b/debian/control index 221bd22..ea5fd74 100644 --- a/debian/control +++ b/debian/control @@ -39,7 +39,17 @@ Depends: ${shlibs:Depends}, systemd-shim, Recommends: indicator-applet | indicator-renderer, evolution-data-server, - ubuntu-system-settings | gnome-control-center, + ubuntu-system-settings | indicator-datetime-control-center, Description: Simple clock A simple clock appearing in the indicator bar +Package: indicator-datetime-control-center +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + indicator-datetime (=${binary:Version}), + gnome-control-center, +Description: Clock settings in the GNOME Control Center + A module to get date time and clock settings in the GNOME control + center. + diff --git a/debian/indicator-datetime-control-center.install b/debian/indicator-datetime-control-center.install new file mode 100644 index 0000000..52a8c70 --- /dev/null +++ b/debian/indicator-datetime-control-center.install @@ -0,0 +1,3 @@ +usr/lib/*/control-center-1/panels/* +usr/share/indicator-datetime/* +usr/share/applications/* diff --git a/debian/indicator-datetime.install b/debian/indicator-datetime.install new file mode 100644 index 0000000..13d21f2 --- /dev/null +++ b/debian/indicator-datetime.install @@ -0,0 +1,5 @@ +usr/share/glib-2.0/schemas/* +usr/share/dbus-1/services/* +usr/share/unity/indicators/* +usr/lib/*/indicator-datetime-service +usr/share/locale/* -- cgit v1.2.3 From 5b157efa2ccf670fdacd7c6eeff8d5bfc5133007 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 27 Aug 2013 10:16:02 -0500 Subject: Change package name to 'gnome-control-center-datetime' --- debian/control | 4 ++-- debian/gnome-control-center-datetime.install | 3 +++ debian/indicator-datetime-control-center.install | 3 --- 3 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 debian/gnome-control-center-datetime.install delete mode 100644 debian/indicator-datetime-control-center.install (limited to 'debian') diff --git a/debian/control b/debian/control index ea5fd74..37ed84b 100644 --- a/debian/control +++ b/debian/control @@ -39,11 +39,11 @@ Depends: ${shlibs:Depends}, systemd-shim, Recommends: indicator-applet | indicator-renderer, evolution-data-server, - ubuntu-system-settings | indicator-datetime-control-center, + gnome-control-center-datetime | ubuntu-system-settings, Description: Simple clock A simple clock appearing in the indicator bar -Package: indicator-datetime-control-center +Package: gnome-control-center-datetime Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, diff --git a/debian/gnome-control-center-datetime.install b/debian/gnome-control-center-datetime.install new file mode 100644 index 0000000..52a8c70 --- /dev/null +++ b/debian/gnome-control-center-datetime.install @@ -0,0 +1,3 @@ +usr/lib/*/control-center-1/panels/* +usr/share/indicator-datetime/* +usr/share/applications/* diff --git a/debian/indicator-datetime-control-center.install b/debian/indicator-datetime-control-center.install deleted file mode 100644 index 52a8c70..0000000 --- a/debian/indicator-datetime-control-center.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib/*/control-center-1/panels/* -usr/share/indicator-datetime/* -usr/share/applications/* -- cgit v1.2.3 From ae5e28e58887846799e3f31f6a7920617e9258fd Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 27 Aug 2013 10:26:42 -0500 Subject: Clean up versions --- debian/control | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'debian') diff --git a/debian/control b/debian/control index 37ed84b..e7fa72e 100644 --- a/debian/control +++ b/debian/control @@ -40,6 +40,8 @@ Depends: ${shlibs:Depends}, Recommends: indicator-applet | indicator-renderer, evolution-data-server, gnome-control-center-datetime | ubuntu-system-settings, +Conflicts: indicator-datetime (<< 12.10.3) +Replaces: indicator-datetime (<< 12.10.3) Description: Simple clock A simple clock appearing in the indicator bar @@ -49,6 +51,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, indicator-datetime (=${binary:Version}), gnome-control-center, +Conflicts: indicator-datetime (<< 12.10.3) +Replaces: indicator-datetime (<< 12.10.3) Description: Clock settings in the GNOME Control Center A module to get date time and clock settings in the GNOME control center. -- cgit v1.2.3 From 50dcd83d7e7559c4deb95c477d7bb43c0e914fbe Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 27 Aug 2013 10:27:27 -0500 Subject: * Updating version to make the Conflicts/Replace nicer * Split out gnome-control-center panel into it's own package --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 96e9ebf..81abd59 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-datetime (13.10.0-0ubuntu1) UNRELEASED; urgency=low + + * Updating version to make the Conflicts/Replace nicer + * Split out gnome-control-center panel into it's own package + + -- Ted Gould Tue, 27 Aug 2013 10:26:47 -0500 + indicator-datetime (12.10.3+13.10.20130822.1-0ubuntu1) saucy; urgency=low [ Ubuntu daily release ] -- cgit v1.2.3 From def2cbb6aa5c0eb834fedcb8701d90f64960d449 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 27 Aug 2013 10:49:33 -0500 Subject: Making sure we conflict with *other* packages not us --- debian/control | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/control b/debian/control index e7fa72e..ae07129 100644 --- a/debian/control +++ b/debian/control @@ -40,8 +40,8 @@ Depends: ${shlibs:Depends}, Recommends: indicator-applet | indicator-renderer, evolution-data-server, gnome-control-center-datetime | ubuntu-system-settings, -Conflicts: indicator-datetime (<< 12.10.3) -Replaces: indicator-datetime (<< 12.10.3) +Conflicts: indicator-datetime (<< 13.10.0) +Replaces: indicator-datetime (<< 13.10.0) Description: Simple clock A simple clock appearing in the indicator bar @@ -51,8 +51,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, indicator-datetime (=${binary:Version}), gnome-control-center, -Conflicts: indicator-datetime (<< 12.10.3) -Replaces: indicator-datetime (<< 12.10.3) +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. -- cgit v1.2.3