From ef381a023c9a4337e61805e4d9e7da4e0c58c965 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 25 Feb 2009 15:48:02 -0600 Subject: releasing version 0.1.1-0ubuntu3~ppa3 --- debian/control | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 933e50b..5e678b6 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,8 @@ Build-Depends: debhelper (>= 5.0), intltool, gobject-introspection (>= 0.6), gobject-introspection-glib-2.0 (>= 0.6), - libgirepository-dev (>= 0.6) + libgirepository-dev (>= 0.6), + gobject-introspection-repository Standards-Version: 3.8.0 Homepage: https://launchpad.net/indicator-applet Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/indicator-applet/ubuntu -- cgit v1.2.3 From 4086f8b415719e18b619da74299965466907fa9e Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 17 Mar 2009 11:03:51 -0500 Subject: Removing GObject introspection from the build deps --- debian/control | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 5e678b6..fda7679 100644 --- a/debian/control +++ b/debian/control @@ -9,11 +9,7 @@ Build-Depends: debhelper (>= 5.0), libdbus-glib-1-dev, gnome-doc-utils, libtool, - intltool, - gobject-introspection (>= 0.6), - gobject-introspection-glib-2.0 (>= 0.6), - libgirepository-dev (>= 0.6), - gobject-introspection-repository + intltool Standards-Version: 3.8.0 Homepage: https://launchpad.net/indicator-applet Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/indicator-applet/ubuntu -- cgit v1.2.3 From ec4b835dcdeea39f4aa97dcb9c39b8fe831c859c Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Wed, 25 Mar 2009 11:25:19 +0100 Subject: debian/control: Add dependency to indicator-messages; the applet is currently fairly useless without it. (LP: #346359) --- debian/changelog | 7 +++++++ debian/control | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 4217bc8..2be1034 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-applet (0.1.3-0ubuntu2) UNRELEASED; urgency=low + + * debian/control: Add dependency to indicator-messages; the applet is + currently fairly useless without it. (LP: #346359) + + -- Martin Pitt Wed, 25 Mar 2009 11:24:32 +0100 + indicator-applet (0.1.3-0ubuntu1) jaunty; urgency=low * New upstream version 0.1.3, makes the GObject introspection diff --git a/debian/control b/debian/control index fda7679..6ca0080 100644 --- a/debian/control +++ b/debian/control @@ -18,7 +18,8 @@ Package: indicator-applet Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - gnome-panel + gnome-panel, + indicator-messages Description: GNOME panel indicator applet indicator-applet is an applet to display information from various applications consistently in the GNOME panel. -- cgit v1.2.3 From 3e8de8a4ff6a37fc89f9374c2a78402fa08390a1 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 27 Mar 2009 23:39:31 -0500 Subject: debian/control: Adding libgnomeui-dev as a dependency as it was added upstream. --- debian/changelog | 2 ++ debian/control | 1 + 2 files changed, 3 insertions(+) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index c905356..7b28572 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,8 @@ indicator-applet (0.1.4-0ubuntu1) UNRELEASED; urgency=low (LP: #349540) * Make sure translations get loaded and make the 'No Indicators' error and the license translatable. Patch from Gabor Kelemen. (LP: #349998) + * debian/control: Adding libgnomeui-dev as a dependency as it was added + upstream. -- Ted Gould Fri, 27 Mar 2009 23:36:00 -0500 diff --git a/debian/control b/debian/control index 6ca0080..7fb1784 100644 --- a/debian/control +++ b/debian/control @@ -8,6 +8,7 @@ Build-Depends: debhelper (>= 5.0), libpanel-applet2-dev (>= 2.0.0), libdbus-glib-1-dev, gnome-doc-utils, + libgnomeui-dev, libtool, intltool Standards-Version: 3.8.0 -- cgit v1.2.3 From 6465b8b734bb4ef825b518cc5f1397b6ba1bcf17 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 21 Apr 2009 20:42:26 -0500 Subject: * debian/control: Add in package libindicator-dev * debian/libindicate-dev.install: Add greater specificity on what gets installed to not get confused with files from libindicator * debian/libindicator-dev.install: Specify which files should be put into the development package. --- debian/changelog | 5 +++++ debian/control | 12 ++++++++++++ debian/libindicate-dev.install | 4 ++-- debian/libindicator-dev.install | 2 ++ 4 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 debian/libindicator-dev.install (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 8496552..1a1dc4a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,11 @@ indicator-applet (0.2.0~bzr298-0ubuntu1) UNRELEASED; urgency=low * Upstream snapshot + * debian/control: Add in package libindicator-dev + * debian/libindicate-dev.install: Add greater specificity on what + gets installed to not get confused with files from libindicator + * debian/libindicator-dev.install: Specify which files should be + put into the development package. -- Ted Gould Tue, 21 Apr 2009 17:06:18 -0500 diff --git a/debian/control b/debian/control index d269a2d..9a734c5 100644 --- a/debian/control +++ b/debian/control @@ -54,3 +54,15 @@ Description: GNOME panel indicator applet - shared library various applications consistently in the GNOME panel. . This package contains files that are needed to build applications. + +Package: libindicator-dev +Section: libdevel +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libgtk2.0-dev (>= 2.12.0) +Description: GNOME panel indicator applet - shared library + This library contains information to build indicators to go into + the indicator applet. + . + This package contains files that are needed to build applications. diff --git a/debian/libindicate-dev.install b/debian/libindicate-dev.install index 4623919..ba86036 100644 --- a/debian/libindicate-dev.install +++ b/debian/libindicate-dev.install @@ -1,4 +1,4 @@ -debian/tmp/usr/include/ -debian/tmp/usr/lib/pkgconfig +debian/tmp/usr/include/libindicate* +debian/tmp/usr/lib/pkgconfig/indicate.pc debian/tmp/usr/lib/libindicate.a debian/tmp/usr/lib/libindicate.so diff --git a/debian/libindicator-dev.install b/debian/libindicator-dev.install new file mode 100644 index 0000000..7e7d9db --- /dev/null +++ b/debian/libindicator-dev.install @@ -0,0 +1,2 @@ +debian/tmp/usr/include/libindicator* +debian/tmp/usr/lib/pkgconfig/indicator.pc -- cgit v1.2.3 From 74a29536b81b8aa54f418078b8a4c39489d6bf5f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 21 Apr 2009 20:45:05 -0500 Subject: * debian/control: * Add in package libindicator-dev * Add build depends on libxml2-dev for upstream dep --- debian/changelog | 4 +++- debian/control | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 1a1dc4a..3134406 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,9 @@ indicator-applet (0.2.0~bzr298-0ubuntu1) UNRELEASED; urgency=low * Upstream snapshot - * debian/control: Add in package libindicator-dev + * debian/control: + * Add in package libindicator-dev + * Add build depends on libxml2-dev for upstream dep * debian/libindicate-dev.install: Add greater specificity on what gets installed to not get confused with files from libindicator * debian/libindicator-dev.install: Specify which files should be diff --git a/debian/control b/debian/control index 9a734c5..9595fc5 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,8 @@ Build-Depends: debhelper (>= 5.0), gnome-doc-utils, libgnomeui-dev, libtool, - intltool + intltool, + libxml2-dev Standards-Version: 3.8.0 Homepage: https://launchpad.net/indicator-applet Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/indicator-applet/ubuntu -- cgit v1.2.3 From 60e4ddeb21827772b883987dc79bfdfda9b78fe6 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 27 Apr 2009 10:51:25 -0500 Subject: debian/control: Adding a build-dep on dbus-test-runner --- debian/changelog | 1 + debian/control | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 11bdc8c..6d3043d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ indicator-applet (0.2.0~bzr307-0ubuntu1) UNRELEASED; urgency=low * Upstream Snapshot: Adding in a test suite. + * debian/control: Adding a build-dep on dbus-test-runner -- Ted Gould Mon, 27 Apr 2009 10:50:10 -0500 diff --git a/debian/control b/debian/control index 9595fc5..f663d47 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,8 @@ Build-Depends: debhelper (>= 5.0), libgnomeui-dev, libtool, intltool, - libxml2-dev + libxml2-dev, + dbus-test-runner Standards-Version: 3.8.0 Homepage: https://launchpad.net/indicator-applet Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/indicator-applet/ubuntu -- cgit v1.2.3 From 10e51643f04368de99bebfafc0b995339fceed73 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Wed, 13 May 2009 13:25:33 -0400 Subject: Added package libindicate-doc and removed dbus-test-runner build requirement --- debian/control | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index f663d47..47b903a 100644 --- a/debian/control +++ b/debian/control @@ -11,8 +11,7 @@ Build-Depends: debhelper (>= 5.0), libgnomeui-dev, libtool, intltool, - libxml2-dev, - dbus-test-runner + libxml2-dev Standards-Version: 3.8.0 Homepage: https://launchpad.net/indicator-applet Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/indicator-applet/ubuntu @@ -68,3 +67,18 @@ Description: GNOME panel indicator applet - shared library the indicator applet. . This package contains files that are needed to build applications. + +Package: libindicate-doc +Section: doc +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libindicate1 (= ${binary:Version}), + libdbus-glib-1-dev (>= 0.76), + libgtk2.0-dev (>= 2.12.0) +Description: GNOME panel indicator applet - shared library + indicator-applet is an applet to display information from + various applications consistently in the GNOME panel.· + . + This package contains files that are needed to build applications. + -- cgit v1.2.3 From 84f000268db92a3070b223c956f07dac729c4703 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 4 Aug 2009 00:27:09 +0100 Subject: * debian/control: * Changing the version number of libindcate to 2 to match the .so numbering. * Creating packages for libindicate-gtk --- debian/changelog | 8 ++++++-- debian/control | 27 ++++++++++++++++++++++++++- 2 files changed, 32 insertions(+), 3 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index c05a0c0..a33afbf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ -indicator-applet (0.2.0~bzr309-0ubuntu4~ppa1) UNRELEASED; urgency=low +indicator-applet (0.2.0~bzr309-0ubuntu4~ppa2) UNRELEASED; urgency=low * Merging in upstream code to split out libindicate-gtk + * debian/control: + * Changing the version number of libindcate to 2 to match + the .so numbering. + * Creating packages for libindicate-gtk - -- Ted Gould Tue, 04 Aug 2009 00:22:33 +0100 + -- Ted Gould Tue, 04 Aug 2009 00:26:22 +0100 indicator-applet (0.2.0~bzr309-0ubuntu3) karmic; urgency=low diff --git a/debian/control b/debian/control index 47b903a..f755f70 100644 --- a/debian/control +++ b/debian/control @@ -29,7 +29,7 @@ Description: GNOME panel indicator applet Currently this includes support for messaging applications in the indicator-messages package. -Package: libindicate1 +Package: libindicate2 Section: libs Conflicts: libindicate Replaces: libindicate @@ -48,6 +48,31 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libindicate1 (= ${binary:Version}), + libdbus-glib-1-dev (>= 0.76) +Description: GNOME panel indicator applet - shared library + indicator-applet is an applet to display information from + various applications consistently in the GNOME panel. + . + This package contains files that are needed to build applications. + +Package: libindicate-gtk0 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: GNOME panel indicator applet - shared library + indicator-applet is an applet to display information from + various applications consistently in the GNOME panel. + . + This package contains shared libraries to be used by applications. + +Package: libindicate-gtk-dev +Section: libdevel +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libindicate-gtk (= ${binary:Version}), + libindicate-dev, libdbus-glib-1-dev (>= 0.76), libgtk2.0-dev (>= 2.12.0) Description: GNOME panel indicator applet - shared library -- cgit v1.2.3 From 54b4e00a4cfb33377a4fcbfa550c2fe9f098697f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 4 Aug 2009 01:36:30 +0100 Subject: debian/control: Fixing some libindicate1's that should be libindicate2 and making everything dependent on the versions that are built here in the package. --- debian/changelog | 8 ++++++++ debian/control | 7 ++++--- 2 files changed, 12 insertions(+), 3 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 8e40a75..32fb168 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +indicator-applet (0.2.0~bzr309-0ubuntu4~ppa2) UNRELEASED; urgency=low + + * debian/control: Fixing some libindicate1's that should be + libindicate2 and making everything dependent on the versions + that are built here in the package. + + -- Ted Gould Tue, 04 Aug 2009 01:35:47 +0100 + indicator-applet (0.2.0~bzr309-0ubuntu4~ppa1) karmic; urgency=low * Merging in upstream code to split out libindicate-gtk diff --git a/debian/control b/debian/control index f755f70..92c60a7 100644 --- a/debian/control +++ b/debian/control @@ -47,7 +47,7 @@ Section: libdevel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libindicate1 (= ${binary:Version}), + libindicate2 (= ${binary:Version}), libdbus-glib-1-dev (>= 0.76) Description: GNOME panel indicator applet - shared library indicator-applet is an applet to display information from @@ -72,7 +72,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libindicate-gtk (= ${binary:Version}), - libindicate-dev, + libindicate-dev (= ${binary:Version}), libdbus-glib-1-dev (>= 0.76), libgtk2.0-dev (>= 2.12.0) Description: GNOME panel indicator applet - shared library @@ -98,7 +98,8 @@ Section: doc Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libindicate1 (= ${binary:Version}), + libindicate2 (= ${binary:Version}), + libindicate-gtk0 (= ${binary:Version}), libdbus-glib-1-dev (>= 0.76), libgtk2.0-dev (>= 2.12.0) Description: GNOME panel indicator applet - shared library -- cgit v1.2.3 From 41c535b370fe6eb2429cbcdcb4d4ecb83833037c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 4 Aug 2009 10:53:46 +0100 Subject: debian/control: Fixing the library reference of libindicate-gtk-dev --- debian/changelog | 7 +++++++ debian/control | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 8a58fb5..095e35d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-applet (0.2.0~bzr319-0ubuntu1~ppa3) UNRELEASED; urgency=low + + * debian/control: Fixing the library reference of + libindicate-gtk-dev + + -- Ted Gould Tue, 04 Aug 2009 10:53:19 +0100 + indicator-applet (0.2.0~bzr319-0ubuntu1~ppa2) karmic; urgency=low * Forgot to autogen.sh diff --git a/debian/control b/debian/control index 92c60a7..23e0158 100644 --- a/debian/control +++ b/debian/control @@ -71,7 +71,7 @@ Section: libdevel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libindicate-gtk (= ${binary:Version}), + libindicate-gtk0 (= ${binary:Version}), libindicate-dev (= ${binary:Version}), libdbus-glib-1-dev (>= 0.76), libgtk2.0-dev (>= 2.12.0) -- cgit v1.2.3 From 8223eb61915a7ee010d4ac754066ea36a1db50e1 Mon Sep 17 00:00:00 2001 From: Jonathan Riddell Date: Wed, 5 Aug 2009 11:29:13 +0100 Subject: Add build-dep on gtk-doc-tools --- debian/changelog | 6 ++++++ debian/control | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index d2f8ca2..26c8aee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +indicator-applet (0.2.0~bzr319-0ubuntu4) karmic; urgency=low + + * Add build-dep on gtk-doc-tools + + -- Jonathan Riddell Wed, 05 Aug 2009 11:28:57 +0100 + indicator-applet (0.2.0~bzr319-0ubuntu3) karmic; urgency=low * debian/rules diff --git a/debian/control b/debian/control index 23e0158..4281a15 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,8 @@ Build-Depends: debhelper (>= 5.0), libgnomeui-dev, libtool, intltool, - libxml2-dev + libxml2-dev, + gtk-doc-tools Standards-Version: 3.8.0 Homepage: https://launchpad.net/indicator-applet Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/indicator-applet/ubuntu -- cgit v1.2.3 From 93135b103822476a99a7eeffbdd47c3634d2ba4a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 7 Aug 2009 18:30:27 +0100 Subject: * debian/control: Adding information on indicator-applet-sus which is a different applet for the SUS indicator. * debian/indicator-applet.install: Making it more specific so that it doesn't grab the directories that now have additional files created by indicator-applet-sus existing. * debian/indicator-applet-sus.install: List files that are now used by the new binary package. --- debian/changelog | 7 +++++++ debian/control | 13 +++++++++++++ debian/indicator-applet-sus.install | 2 ++ debian/indicator-applet.install | 6 +++--- 4 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 debian/indicator-applet-sus.install (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index d64362f..7e94921 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,13 @@ indicator-applet (0.2.0~bzr319-0ubuntu5~ppa1) UNRELEASED; urgency=low * Updating from upstream with two (count them) two applets installed in the source. + * debian/control: Adding information on indicator-applet-sus which + is a different applet for the SUS indicator. + * debian/indicator-applet.install: Making it more specific so that + it doesn't grab the directories that now have additional files + created by indicator-applet-sus existing. + * debian/indicator-applet-sus.install: List files that are now + used by the new binary package. -- Ted Gould Fri, 07 Aug 2009 18:18:17 +0100 diff --git a/debian/control b/debian/control index 4281a15..57cadef 100644 --- a/debian/control +++ b/debian/control @@ -30,6 +30,19 @@ Description: GNOME panel indicator applet Currently this includes support for messaging applications in the indicator-messages package. +Package: indicator-applet-sus +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + gnome-panel, + indicator-applet +Description: A clone of the GNOME panel indicator applet. + Indicator-applet is an applet to display information from + various applications consistently in the GNOME panel. + . + This instance will only load the SUS indicator which provies + status changing, user choosing and session management. + Package: libindicate2 Section: libs Conflicts: libindicate diff --git a/debian/indicator-applet-sus.install b/debian/indicator-applet-sus.install new file mode 100644 index 0000000..6bb7e07 --- /dev/null +++ b/debian/indicator-applet-sus.install @@ -0,0 +1,2 @@ +debian/tmp/usr/lib/bonobo/servers/GNOME_IndicatorAppletSUS.server +debian/tmp/usr/lib/indicator-applet/indicator-applet-sus diff --git a/debian/indicator-applet.install b/debian/indicator-applet.install index a6e5326..772d432 100644 --- a/debian/indicator-applet.install +++ b/debian/indicator-applet.install @@ -1,4 +1,4 @@ -debian/tmp/etc -debian/tmp/usr/lib/bonobo -debian/tmp/usr/lib/indicator-applet +debian/tmp/usr/lib/bonobo/servers/GNOME_IndicatorApplet.server +debian/tmp/usr/lib/indicator-applet/indicator-applet +debian/tmp/usr/lib/indicator-applet/listen-and-print debian/tmp/usr/share/icons -- cgit v1.2.3 From 709f0a835c44065571debf2ff1a9c428aed3a56f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 7 Aug 2009 18:31:45 +0100 Subject: Locking the version number so the two indicator-applets are the same --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 57cadef..86c1447 100644 --- a/debian/control +++ b/debian/control @@ -35,7 +35,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-panel, - indicator-applet + indicator-applet (= ${binary:Version}) Description: A clone of the GNOME panel indicator applet. Indicator-applet is an applet to display information from various applications consistently in the GNOME panel. -- cgit v1.2.3 From a810a01a01d6600cc3a2dace659fcaf387b92f72 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 18 Aug 2009 13:45:00 -0500 Subject: * Merging in the seperation from indicator-applet * debian/* Removing all of the indicator-applet stuff --- debian/changelog | 3 +- debian/control | 111 ++---------------------------------- debian/copyright | 20 ------- debian/indicator-applet-sus.install | 2 - debian/indicator-applet.install | 4 -- debian/libindicate-dev.install | 4 -- debian/libindicate-doc.install | 2 - debian/libindicate-gtk-dev.install | 4 -- debian/libindicate-gtk0.install | 1 - debian/libindicate2.install | 1 - debian/rules | 2 - debian/watch | 2 +- 12 files changed, 8 insertions(+), 148 deletions(-) delete mode 100644 debian/indicator-applet-sus.install delete mode 100644 debian/indicator-applet.install delete mode 100644 debian/libindicate-dev.install delete mode 100644 debian/libindicate-doc.install delete mode 100644 debian/libindicate-gtk-dev.install delete mode 100644 debian/libindicate-gtk0.install delete mode 100644 debian/libindicate2.install (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index bbb70e4..281b0b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ libindicator (0.2.0~bzr325-0ubuntu1~ppa1) UNRELEASED; urgency=low - * Merging in the separation from indicator-applet + * Merging in the seperation from indicator-applet + * debian/* Removing all of the indicator-applet stuff -- Ted Gould Tue, 18 Aug 2009 13:39:35 -0500 diff --git a/debian/control b/debian/control index 86c1447..1c91055 100644 --- a/debian/control +++ b/debian/control @@ -1,99 +1,13 @@ -Source: indicator-applet -Section: gnome +Source: libindicator +Section: libs Priority: optional Maintainer: Ubuntu Core Developers Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.41), - libgtk2.0-dev (>= 2.12.0), - libpanel-applet2-dev (>= 2.0.0), - libdbus-glib-1-dev, - gnome-doc-utils, - libgnomeui-dev, - libtool, - intltool, - libxml2-dev, - gtk-doc-tools + libtool Standards-Version: 3.8.0 -Homepage: https://launchpad.net/indicator-applet -Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/indicator-applet/ubuntu - -Package: indicator-applet -Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends}, - gnome-panel, - indicator-messages -Description: GNOME panel indicator applet - indicator-applet is an applet to display information from - various applications consistently in the GNOME panel. - . - Currently this includes support for messaging applications in the - indicator-messages package. - -Package: indicator-applet-sus -Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends}, - gnome-panel, - indicator-applet (= ${binary:Version}) -Description: A clone of the GNOME panel indicator applet. - Indicator-applet is an applet to display information from - various applications consistently in the GNOME panel. - . - This instance will only load the SUS indicator which provies - status changing, user choosing and session management. - -Package: libindicate2 -Section: libs -Conflicts: libindicate -Replaces: libindicate -Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends} -Description: GNOME panel indicator applet - shared library - indicator-applet is an applet to display information from - various applications consistently in the GNOME panel. - . - This package contains shared libraries to be used by applications. - -Package: libindicate-dev -Section: libdevel -Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends}, - libindicate2 (= ${binary:Version}), - libdbus-glib-1-dev (>= 0.76) -Description: GNOME panel indicator applet - shared library - indicator-applet is an applet to display information from - various applications consistently in the GNOME panel. - . - This package contains files that are needed to build applications. - -Package: libindicate-gtk0 -Section: libs -Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends} -Description: GNOME panel indicator applet - shared library - indicator-applet is an applet to display information from - various applications consistently in the GNOME panel. - . - This package contains shared libraries to be used by applications. - -Package: libindicate-gtk-dev -Section: libdevel -Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends}, - libindicate-gtk0 (= ${binary:Version}), - libindicate-dev (= ${binary:Version}), - libdbus-glib-1-dev (>= 0.76), - libgtk2.0-dev (>= 2.12.0) -Description: GNOME panel indicator applet - shared library - indicator-applet is an applet to display information from - various applications consistently in the GNOME panel. - . - This package contains files that are needed to build applications. +Homepage: https://launchpad.net/libindicator +Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/libindicator/ubuntu Package: libindicator-dev Section: libdevel @@ -107,18 +21,3 @@ Description: GNOME panel indicator applet - shared library . This package contains files that are needed to build applications. -Package: libindicate-doc -Section: doc -Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends}, - libindicate2 (= ${binary:Version}), - libindicate-gtk0 (= ${binary:Version}), - libdbus-glib-1-dev (>= 0.76), - libgtk2.0-dev (>= 2.12.0) -Description: GNOME panel indicator applet - shared library - indicator-applet is an applet to display information from - various applications consistently in the GNOME panel.· - . - This package contains files that are needed to build applications. - diff --git a/debian/copyright b/debian/copyright index 074097c..ca1ebdd 100644 --- a/debian/copyright +++ b/debian/copyright @@ -29,25 +29,5 @@ License: On Debian systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL-3'. -License for libindicate/* (libindicate0 and libindicate-dev packages): - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 or 3 of the License. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -On Debian systems, the complete text of the GNU Lesser General Public License -can be found in `/usr/share/common-licenses/LGPL-2.1' and -`/usr/share/common-licenses/LGPL-3'. - The Debian packaging is (C) 2009, Canonical Ltd. and is licensed under the GPLv3, see `/usr/share/common-licenses/GPL-3'. diff --git a/debian/indicator-applet-sus.install b/debian/indicator-applet-sus.install deleted file mode 100644 index 3a016e0..0000000 --- a/debian/indicator-applet-sus.install +++ /dev/null @@ -1,2 +0,0 @@ -debian/tmp/usr/lib/bonobo/servers/GNOME_FastUserSwitchApplet.server -debian/tmp/usr/lib/indicator-applet/indicator-applet-sus diff --git a/debian/indicator-applet.install b/debian/indicator-applet.install deleted file mode 100644 index 772d432..0000000 --- a/debian/indicator-applet.install +++ /dev/null @@ -1,4 +0,0 @@ -debian/tmp/usr/lib/bonobo/servers/GNOME_IndicatorApplet.server -debian/tmp/usr/lib/indicator-applet/indicator-applet -debian/tmp/usr/lib/indicator-applet/listen-and-print -debian/tmp/usr/share/icons diff --git a/debian/libindicate-dev.install b/debian/libindicate-dev.install deleted file mode 100644 index 81e1396..0000000 --- a/debian/libindicate-dev.install +++ /dev/null @@ -1,4 +0,0 @@ -debian/tmp/usr/include/libindicate-0.1/libindicate/* -debian/tmp/usr/lib/pkgconfig/indicate.pc -debian/tmp/usr/lib/libindicate.a -debian/tmp/usr/lib/libindicate.so diff --git a/debian/libindicate-doc.install b/debian/libindicate-doc.install deleted file mode 100644 index 55af9eb..0000000 --- a/debian/libindicate-doc.install +++ /dev/null @@ -1,2 +0,0 @@ -debian/tmp/usr/share/gtk-doc/html/libindicate/* -debian/tmp/usr/share/doc/indicator-applet/examples/* diff --git a/debian/libindicate-gtk-dev.install b/debian/libindicate-gtk-dev.install deleted file mode 100644 index 5f0e682..0000000 --- a/debian/libindicate-gtk-dev.install +++ /dev/null @@ -1,4 +0,0 @@ -debian/tmp/usr/include/libindicate-0.1/libindicate-gtk/* -debian/tmp/usr/lib/pkgconfig/indicate-gtk.pc -debian/tmp/usr/lib/libindicate-gtk.a -debian/tmp/usr/lib/libindicate-gtk.so diff --git a/debian/libindicate-gtk0.install b/debian/libindicate-gtk0.install deleted file mode 100644 index fc6b412..0000000 --- a/debian/libindicate-gtk0.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libindicate-gtk.so.* diff --git a/debian/libindicate2.install b/debian/libindicate2.install deleted file mode 100644 index 0618a58..0000000 --- a/debian/libindicate2.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libindicate.so.* diff --git a/debian/rules b/debian/rules index 27ff7f1..744b984 100755 --- a/debian/rules +++ b/debian/rules @@ -3,6 +3,4 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk -DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --disable-gobject-introspection --enable-gtk-doc LDFLAGS += -Wl,-z,defs -Wl,--as-needed -DEB_DH_MAKESHLIBS_ARGS_libindicate0 += -V 'libindicate0 (>= 0.1.2)' diff --git a/debian/watch b/debian/watch index e8ab1bd..16f79e0 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,2 @@ version=3 -http://launchpad.net/indicator-applet/+download .*/indicator-applet-([0-9.]+)\.tar\.gz +http://launchpad.net/libindicator/+download .*/libindicator-([0-9.]+)\.tar\.gz -- cgit v1.2.3 From 7e26ec7553aca5a7fd4588f0ea6b89d1206bb7ac Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Mon, 24 Aug 2009 12:20:28 -0400 Subject: * debian/control: - Set both Vcs-Bzr and Vcs-Bzr-Browser, with ~ubuntu-desktop --- debian/changelog | 6 +++++- debian/control | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index ad87958..e020f46 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,7 +19,11 @@ libindicator (0.2.0~bzr325-0ubuntu1) UNRELEASED; urgency=low * debian/indicator-applet-sus.install: List files that are now used by the new binary package. - -- Ken VanDine Mon, 24 Aug 2009 08:59:06 -0400 + [ Ken VanDine ] + * debian/control: + - Set both Vcs-Bzr and Vcs-Bzr-Browser, with ~ubuntu-desktop + + -- Ken VanDine Mon, 24 Aug 2009 12:19:54 -0400 indicator-applet (0.2.0~bzr319-0ubuntu4) karmic; urgency=low diff --git a/debian/control b/debian/control index 1c91055..34aea00 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,8 @@ Build-Depends: debhelper (>= 5.0), libtool Standards-Version: 3.8.0 Homepage: https://launchpad.net/libindicator -Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/libindicator/ubuntu +Vcs-Bzr: lp:~ubuntu-desktop/libindicator/ubuntu +Vcs-Bzr-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/libindicator/ubuntu Package: libindicator-dev Section: libdevel -- cgit v1.2.3 From 6736e778c98cc72fab060816658bfb8bfd719499 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Tue, 25 Aug 2009 08:33:06 +0200 Subject: debian/control: Fix Vcs-* links. --- debian/changelog | 1 + debian/control | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 4b7cd73..d0f2967 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,5 +25,6 @@ libindicator (0.2.0~bzr325-0ubuntu1) UNRELEASED; urgency=low [ Martin Pitt ] * Flush changelog. + * debian/control: Fix Vcs-* links. -- Ken VanDine Mon, 24 Aug 2009 12:19:54 -0400 diff --git a/debian/control b/debian/control index 34aea00..9f0f009 100644 --- a/debian/control +++ b/debian/control @@ -7,8 +7,8 @@ Build-Depends: debhelper (>= 5.0), libtool Standards-Version: 3.8.0 Homepage: https://launchpad.net/libindicator -Vcs-Bzr: lp:~ubuntu-desktop/libindicator/ubuntu -Vcs-Bzr-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/libindicator/ubuntu +Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/libindicator/ubuntu +Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/libindicator/ubuntu Package: libindicator-dev Section: libdevel -- cgit v1.2.3 From 00808f0d8cc647ba6af5da0835d45091ac076daa Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 2 Nov 2009 16:39:53 -0600 Subject: * debian/control: Adding a target for libindicator0 * Adding libindicator0.install and libindicator-dev.install --- debian/changelog | 2 ++ debian/control | 11 +++++++++++ debian/libindicator-dev.install | 4 ++++ debian/libindicator0.install | 1 + 4 files changed, 18 insertions(+) create mode 100644 debian/libindicator-dev.install create mode 100644 debian/libindicator0.install (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index f11c653..657c101 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ libindicator (0.2.1-0ubuntu2~ppa1~sm1) UNRELEASED; urgency=low * Adding in service management code. + * debian/control: Adding a target for libindicator0 + * Adding libindicator0.install and libindicator-dev.install -- Ted Gould Mon, 02 Nov 2009 16:30:36 -0600 diff --git a/debian/control b/debian/control index 9f0f009..6d14ad9 100644 --- a/debian/control +++ b/debian/control @@ -10,6 +10,17 @@ Homepage: https://launchpad.net/libindicator Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/libindicator/ubuntu Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/libindicator/ubuntu +Package: libindicator0 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: GNOME panel indicator applet - shared library + This library contains information to build indicators to go into + the indicator applet. + . + This package contains files that are needed to build applications. + Package: libindicator-dev Section: libdevel Architecture: any diff --git a/debian/libindicator-dev.install b/debian/libindicator-dev.install new file mode 100644 index 0000000..9b68f17 --- /dev/null +++ b/debian/libindicator-dev.install @@ -0,0 +1,4 @@ +debian/tmp/usr/include/libindicator-0.1/libindicate/* +debian/tmp/usr/lib/pkgconfig/indicator.pc +debian/tmp/usr/lib/libindicator.a +debian/tmp/usr/lib/libindicator.so diff --git a/debian/libindicator0.install b/debian/libindicator0.install new file mode 100644 index 0000000..85dbd3e --- /dev/null +++ b/debian/libindicator0.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libindicator.so.* -- cgit v1.2.3 From 3177188812f8d9e43ac6d2bb3c8bd1894b5c2e5f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 5 Nov 2009 10:08:29 -0600 Subject: debian/control: Adding build deps for the libraries we're using. Seems we should have done that earlier, eh? --- debian/changelog | 7 +++++++ debian/control | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index fee9caf..58651ae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libindicator (0.3.0~dev-0ubuntu1~ppa2) UNRELEASED; urgency=low + + * debian/control: Adding build deps for the libraries we're + using. Seems we should have done that earlier, eh? + + -- Ted Gould Thu, 05 Nov 2009 10:08:01 -0600 + libindicator (0.3.0~dev-0ubuntu1~ppa1) karmic; urgency=low * Changing the object interface to allow for multiple items diff --git a/debian/control b/debian/control index 6d14ad9..e0f02d0 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,10 @@ Priority: optional Maintainer: Ubuntu Core Developers Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.41), - libtool + libgtk2.0-dev (>= 2.12.0), + libtool, + intltool, + gtk-doc-tools Standards-Version: 3.8.0 Homepage: https://launchpad.net/libindicator Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/libindicator/ubuntu -- cgit v1.2.3 From a6c762e20e9042d69069f8fb06272d0a1e5fadb3 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 5 Nov 2009 10:25:09 -0600 Subject: debian/control: Adding build deps dbus-glib as well. --- debian/changelog | 6 ++++++ debian/control | 1 + 2 files changed, 7 insertions(+) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index f9e7c99..53bf327 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libindicator (0.3.0~dev-0ubuntu1~ppa3) UNRELEASED; urgency=low + + * debian/control: Adding build deps dbus-glib as well. + + -- Ted Gould Thu, 05 Nov 2009 10:24:54 -0600 + libindicator (0.3.0~dev-0ubuntu1~ppa2) karmic; urgency=low * debian/control: Adding build deps for the libraries we're diff --git a/debian/control b/debian/control index e0f02d0..439dc06 100644 --- a/debian/control +++ b/debian/control @@ -5,6 +5,7 @@ Maintainer: Ubuntu Core Developers Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.41), libgtk2.0-dev (>= 2.12.0), + libdbus-glib-1-dev, libtool, intltool, gtk-doc-tools -- cgit v1.2.3 From 7b0d813fe0e2f6fd32ac45a1ddcc85248d1d55f5 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 16 Nov 2009 23:18:22 -0600 Subject: debian/control: Adding a depend for the -dev package on the base library to stop users from linking staticly. --- debian/changelog | 7 +++++++ debian/control | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index eeee5c1..ab70026 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libindicator (0.3.0~dev-0ubuntu1~ppa5) UNRELEASED; urgency=low + + * debian/control: Adding a depend for the -dev package on the + base library to stop users from linking staticly. + + -- Ted Gould Mon, 16 Nov 2009 23:17:50 -0600 + libindicator (0.3.0~dev-0ubuntu1~ppa4) karmic; urgency=low * 64-bit fix for printf's diff --git a/debian/control b/debian/control index 439dc06..f0b27ee 100644 --- a/debian/control +++ b/debian/control @@ -30,7 +30,8 @@ Section: libdevel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libgtk2.0-dev (>= 2.12.0) + libgtk2.0-dev (>= 2.12.0), + libindicator0 (= ${binary:Version}) Description: GNOME panel indicator applet - shared library This library contains information to build indicators to go into the indicator applet. -- cgit v1.2.3 From 5a914cab764be1b49e5aad9c6c50c9d4365f819d Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 24 Nov 2009 10:33:21 -0600 Subject: debian/control, debian/libindicator-tools: Adding in a new package for the tools of libindicator. --- debian/changelog | 2 ++ debian/control | 7 +++++++ debian/libindicator-tools.install | 1 + 3 files changed, 10 insertions(+) create mode 100644 debian/libindicator-tools.install (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index bda1693..e6a0715 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ libindicator (0.3.0~dev-0ubuntu1~ppa6~tl1) UNRELEASED; urgency=low * Adding a new tool to load indicators from the command line. + * debian/control, debian/libindicator-tools: Adding in a new + package for the tools of libindicator. -- Ted Gould Tue, 24 Nov 2009 10:28:21 -0600 diff --git a/debian/control b/debian/control index f0b27ee..394ec97 100644 --- a/debian/control +++ b/debian/control @@ -38,3 +38,10 @@ Description: GNOME panel indicator applet - shared library . This package contains files that are needed to build applications. +Package: libindicator-tools +Section: devel +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: Need a better description + diff --git a/debian/libindicator-tools.install b/debian/libindicator-tools.install new file mode 100644 index 0000000..e9565f0 --- /dev/null +++ b/debian/libindicator-tools.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libindicator/* -- cgit v1.2.3 From 411182c39c63d7d7ad35edf133ba58e2295f5bef Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 24 Nov 2009 14:55:22 -0600 Subject: debian/control: Making sure the tools package is using the same version of the library that it was built with. --- debian/changelog | 7 +++++++ debian/control | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index beacae9..f1ce3b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libindicator (0.3.0~dev-0ubuntu1~ppa6~tl3) UNRELEASED; urgency=low + + * debian/control: Making sure the tools package is using the + same version of the library that it was built with. + + -- Ted Gould Tue, 24 Nov 2009 14:54:28 -0600 + libindicator (0.3.0~dev-0ubuntu1~ppa6~tl2) karmic; urgency=low * Adding support for remove. diff --git a/debian/control b/debian/control index 394ec97..d4fd2f2 100644 --- a/debian/control +++ b/debian/control @@ -42,6 +42,7 @@ Package: libindicator-tools Section: devel Architecture: any Depends: ${shlibs:Depends}, - ${misc:Depends} + ${misc:Depends}, + libindicator0 (= ${binary:Version}) Description: Need a better description -- cgit v1.2.3 From c45b838f4dd31955d563bff6df163f65b75f9482 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 10 Dec 2009 12:15:54 -0500 Subject: * debian/control: - Added description for libindicator-tools --- debian/changelog | 6 +++++- debian/control | 6 ++++-- 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index b32330a..521cb44 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,9 @@ libindicator (0.3.0-0ubuntu1) karmic; urgency=low + * debian/control: + - Added description for libindicator-tools + + [Ted Gould] * Upstream 0.3.0 Release * Adds a new tool to load indicators from the command line. * Adds an object for loading indicators. @@ -9,7 +13,7 @@ libindicator (0.3.0-0ubuntu1) karmic; urgency=low * debian/control, debian/libindicator-tools: Adding in a new package for the tools of libindicator. - -- Ted Gould Thu, 10 Dec 2009 10:59:37 -0600 + -- Ken VanDine Thu, 10 Dec 2009 12:11:49 -0500 libindicator (0.2.1-0ubuntu2~ppa1) karmic; urgency=low diff --git a/debian/control b/debian/control index d4fd2f2..aa6d787 100644 --- a/debian/control +++ b/debian/control @@ -44,5 +44,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libindicator0 (= ${binary:Version}) -Description: Need a better description - +Description: Tools for libindicator + Tools useful for developers of applications using indicators. + . + This package contains files that are needed to build applications. -- cgit v1.2.3 From d4404ea28806ee86d420b1c43e88255d2d3bfcf1 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 24 Feb 2010 21:04:56 -0600 Subject: debian/control: Reducing libglib dependency down to 2.22 for Karmic builds --- debian/changelog | 7 +++++++ debian/control | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 12f819d..322118f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libindicator (0.3.3-0ubuntu2) UNRELEASED; urgency=low + + * debian/control: + Reducing libglib dependency down to 2.22 for Karmic builds + + -- Ted Gould Wed, 24 Feb 2010 21:04:26 -0600 + libindicator (0.3.3-0ubuntu1) lucid; urgency=low * debian/control: diff --git a/debian/control b/debian/control index 52a36ed..686f637 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Ubuntu Core Developers Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.41), - libglib2.0-dev (>= 2.23), + libglib2.0-dev (>= 2.22), libgtk2.0-dev (>= 2.12.0), libdbus-glib-1-dev, libtool, -- cgit v1.2.3 From 30f1ae42f91519b8f06660c8c352a5fefb301c4b Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 16 Jun 2010 09:50:48 +0200 Subject: Apply 0.3.8-1 changes * Merge Ubuntu package into Debian. Closes: #549999 * debian/copyright: + Update to machine readable format. * debian/control: + Drop cdbs Build-Dep, bump debhelper to >=7. + Standards-Version 3.8.4. + Update Vcs-* fields. + Drop GNOME from Description, the package is not GNOME specific. + Slightly update Description, thanks lintian. * debian/rules: + Use minimal debhelper 7 rules without cdbs. + Disable tests for now, they fail (launchpad 587811) * debian/source/format: + Add file, make package 3.0 (quilt). --- debian/changelog | 21 ++++++++++++++++++++- debian/control | 18 +++++++++--------- debian/copyright | 42 +++++++++++++----------------------------- debian/rules | 12 +++++++++--- debian/source/format | 1 + 5 files changed, 52 insertions(+), 42 deletions(-) create mode 100644 debian/source/format (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 4abbcdd..cd22c14 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,23 @@ +libindicator (0.3.8-1) unstable; urgency=low + + * Merge Ubuntu package into Debian. + Closes: #549999 + * debian/copyright: + + Update to machine readable format. + * debian/control: + + Drop cdbs Build-Dep, bump debhelper to >=7. + + Standards-Version 3.8.4. + + Update Vcs-* fields. + + Drop GNOME from Description, the package is not GNOME specific. + + Slightly update Description, thanks lintian. + * debian/rules: + + Use minimal debhelper 7 rules without cdbs. + + Disable tests for now, they fail (launchpad 587811) + * debian/source/format: + + Add file, make package 3.0 (quilt). + + -- Evgeni Golov Mon, 07 Jun 2010 11:21:32 +0200 + libindicator (0.3.8-0ubuntu1) lucid; urgency=low * New upstream release. @@ -142,4 +162,3 @@ libindicator (0.2.0~bzr325-0ubuntu1) karmic; urgency=low * debian/control: Fix Vcs-* links. -- Ken VanDine Tue, 25 Aug 2009 08:35:00 +0200 - diff --git a/debian/control b/debian/control index 686f637..6edb124 100644 --- a/debian/control +++ b/debian/control @@ -1,30 +1,30 @@ Source: libindicator Section: libs Priority: optional -Maintainer: Ubuntu Core Developers -Build-Depends: debhelper (>= 5.0), - cdbs (>= 0.4.41), +Maintainer: Evgeni Golov +Uploaders: Kartik Mistry +Build-Depends: debhelper (>= 7.0.50~), libglib2.0-dev (>= 2.22), libgtk2.0-dev (>= 2.12.0), libdbus-glib-1-dev, libtool, intltool, gtk-doc-tools -Standards-Version: 3.8.0 +Standards-Version: 3.8.4 Homepage: https://launchpad.net/libindicator -Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/libindicator/ubuntu -Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/libindicator/ubuntu +Vcs-Git: git://git.debian.org/collab-maint/libindicator.git +Vcs-Browser: http://git.debian.org/?p=collab-maint/libindicator.git Package: libindicator0 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: GNOME panel indicator applet - shared library +Description: panel indicator applet - shared library This library contains information to build indicators to go into the indicator applet. . - This package contains files that are needed to build applications. + This package contains the library itself. Package: libindicator-dev Section: libdevel @@ -33,7 +33,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, libgtk2.0-dev (>= 2.12.0), libindicator0 (= ${binary:Version}) -Description: GNOME panel indicator applet - shared library +Description: panel indicator applet - library development files This library contains information to build indicators to go into the indicator applet. . diff --git a/debian/copyright b/debian/copyright index ca1ebdd..f47fefc 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,33 +1,17 @@ -This package was debianized by Ted Gould on -Wed, 11 Feb 2009 15:41:06 -0600. +Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135 +Name: libindicator +Maintainer: Ted Gould +Source: https://launchpad.net/libindicator -It was downloaded from +Files: * +Copyright: 2009-2010 Ted Gould , Canonical Ltd. +License: GPL-3 -Upstream Author: - - Ted Gould - -Copyright: - - Copyright (C) 2009 Canonical Ltd. - -License: - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, version 3 of the License. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +Files: debian/* +Copyright: 2009-2010 Evgeni Golov +Copyright: 2009-2010 Ted Gould , Canonical Ltd. +License: GPL-3 +License: GPL-3 On Debian systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL-3'. - -The Debian packaging is (C) 2009, Canonical Ltd. and -is licensed under the GPLv3, see `/usr/share/common-licenses/GPL-3'. + Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'. diff --git a/debian/rules b/debian/rules index 151c78d..9612514 100755 --- a/debian/rules +++ b/debian/rules @@ -1,8 +1,14 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/gnome.mk +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 LDFLAGS += -Wl,-z,defs -Wl,--as-needed -DEB_DH_MAKESHLIBS_ARGS_libindicator0 += -V 'libindicator0 (>= 0.3.6)' +%: + dh $@ + +override_dh_auto_test: + +override_dh_makeshlibs: + dh_makeshlibs -V 'libindicator0 (>= 0.3.6)' diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) -- cgit v1.2.3 From e3df28309fff9d052b6474821870beb724b64ce5 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 16 Jun 2010 09:52:28 +0200 Subject: Revert cdbs drop, as requested by the Ubuntu maintainers. --- debian/changelog | 6 ++++++ debian/control | 3 ++- debian/rules | 12 +++--------- 3 files changed, 11 insertions(+), 10 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index cd22c14..4a78988 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libindicator (0.3.8-2) unstable; urgency=low + + * Revert cdbs drop, as requested by the Ubuntu maintainers. + + -- Evgeni Golov Wed, 16 Jun 2010 09:51:54 +0200 + libindicator (0.3.8-1) unstable; urgency=low * Merge Ubuntu package into Debian. diff --git a/debian/control b/debian/control index 6edb124..8748c62 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,8 @@ Section: libs Priority: optional Maintainer: Evgeni Golov Uploaders: Kartik Mistry -Build-Depends: debhelper (>= 7.0.50~), +Build-Depends: debhelper (>= 5.0), + cdbs (>= 0.4.41), libglib2.0-dev (>= 2.22), libgtk2.0-dev (>= 2.12.0), libdbus-glib-1-dev, diff --git a/debian/rules b/debian/rules index 9612514..151c78d 100755 --- a/debian/rules +++ b/debian/rules @@ -1,14 +1,8 @@ #!/usr/bin/make -f -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/gnome.mk LDFLAGS += -Wl,-z,defs -Wl,--as-needed -%: - dh $@ - -override_dh_auto_test: - -override_dh_makeshlibs: - dh_makeshlibs -V 'libindicator0 (>= 0.3.6)' +DEB_DH_MAKESHLIBS_ARGS_libindicator0 += -V 'libindicator0 (>= 0.3.6)' -- cgit v1.2.3 From 34b4a4d73f886573fc992d0618f44817ec12c3a5 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 16 Jun 2010 09:55:10 +0200 Subject: Update Maintainer and Vcs-* fields for pkg-ayatana. --- debian/changelog | 3 ++- debian/control | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 4a78988..b9f01e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ libindicator (0.3.8-2) unstable; urgency=low * Revert cdbs drop, as requested by the Ubuntu maintainers. + * Update Maintainer and Vcs-* fields for pkg-ayatana. - -- Evgeni Golov Wed, 16 Jun 2010 09:51:54 +0200 + -- Evgeni Golov Wed, 16 Jun 2010 09:54:50 +0200 libindicator (0.3.8-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 8748c62..5e1dfe8 100644 --- a/debian/control +++ b/debian/control @@ -1,8 +1,8 @@ Source: libindicator Section: libs Priority: optional -Maintainer: Evgeni Golov -Uploaders: Kartik Mistry +Maintainer: The Ayatana Packagers +Uploaders: Evgeni Golov , Kartik Mistry Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.41), libglib2.0-dev (>= 2.22), @@ -13,8 +13,8 @@ Build-Depends: debhelper (>= 5.0), gtk-doc-tools Standards-Version: 3.8.4 Homepage: https://launchpad.net/libindicator -Vcs-Git: git://git.debian.org/collab-maint/libindicator.git -Vcs-Browser: http://git.debian.org/?p=collab-maint/libindicator.git +Vcs-Bzr: http://bzr.debian.org/bzr/pkg-ayatana/libindicator/debian +Vcs-Browser: http://bzr.debian.org/loggerhead/pkg-ayatana/libindicator/debian Package: libindicator0 Section: libs -- cgit v1.2.3 From 79f7355391b87f88f79330f4d7507ef72c15734c Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Fri, 13 Aug 2010 11:57:45 +0200 Subject: releasing version 0.3.11-0ubuntu2 --- debian/changelog | 10 ++++ debian/control | 4 +- debian/patches/workaround-icon-crash.patch | 74 ++++++++++++++++++++++++++++++ debian/rules | 3 ++ 4 files changed, 89 insertions(+), 2 deletions(-) create mode 100644 debian/patches/workaround-icon-crash.patch (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 438fe31..f495c3c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +libindicator (0.3.11-0ubuntu2) maverick; urgency=low + + * workaround-icon-crash.patch: + - change from Mikkel Kamstrup Erlandsen to workaround a crasher in the + new version + * debian/control: + - updated the gtk build requirement + + -- Sebastien Bacher Fri, 13 Aug 2010 11:40:29 +0200 + libindicator (0.3.11-0ubuntu1) maverick; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index af01ed9..6530e9b 100644 --- a/debian/control +++ b/debian/control @@ -7,12 +7,12 @@ Uploaders: Evgeni Golov , Kartik Mistry Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.41), libglib2.0-dev (>= 2.22), - libgtk2.0-dev (>= 2.12.0), + libgtk2.0-dev (>= 2.18), libdbus-glib-1-dev, libtool, intltool, gtk-doc-tools -Standards-Version: 3.8.4 +Standards-Version: 3.9.0 Homepage: https://launchpad.net/libindicator Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/libindicator/ubuntu Vcs-Browser: http://bazaar.launchpad.net/~indicator-applet-developers/libindicator/ubuntu diff --git a/debian/patches/workaround-icon-crash.patch b/debian/patches/workaround-icon-crash.patch new file mode 100644 index 0000000..5b6f1d6 --- /dev/null +++ b/debian/patches/workaround-icon-crash.patch @@ -0,0 +1,74 @@ +=== modified file 'libindicator/indicator-image-helper.c' +--- libindicator/indicator-image-helper.c 2010-08-12 19:37:24 +0000 ++++ libindicator/indicator-image-helper.c 2010-08-13 09:03:45 +0000 +@@ -29,61 +29,15 @@ + static void + refresh_image (GtkImage * image) + { ++ GIcon * icon; ++ + g_return_if_fail(GTK_IS_IMAGE(image)); +- const gchar * icon_filename = NULL; +- GtkIconInfo * icon_info = NULL; +- gint icon_size = 22; +- +- GIcon * icon_names = (GIcon *)g_object_get_data(G_OBJECT(image), INDICATOR_NAMES_DATA); +- g_return_if_fail(icon_names != NULL); +- +- /* Get the default theme */ +- GtkIconTheme * default_theme = gtk_icon_theme_get_default(); +- g_return_if_fail(default_theme != NULL); +- +- /* Look through the themes for that icon */ +- icon_info = gtk_icon_theme_lookup_by_gicon(default_theme, icon_names, icon_size, 0); +- if (icon_info == NULL) { +- /* Try using the second item in the names, which should be the original filename supplied */ +- const gchar * const * names = g_themed_icon_get_names(G_THEMED_ICON( icon_names )); +- if (names) { +- icon_filename = names[1]; +- } else { +- g_warning("Unable to find icon\n"); +- return; +- } +- } else { +- /* Grab the filename */ +- icon_filename = gtk_icon_info_get_filename(icon_info); +- } +- g_return_if_fail(icon_filename != NULL); /* An error because we don't have a filename */ +- +- /* Build a pixbuf */ +- GError * error = NULL; +- GdkPixbuf * pixbuf = gdk_pixbuf_new_from_file(icon_filename, &error); +- +- if (icon_info != NULL) { +- gtk_icon_info_free(icon_info); +- } +- +- if (pixbuf == NULL) { +- g_error("Unable to load icon from file '%s' because: %s", icon_filename, error == NULL ? "I don't know" : error->message); +- return; +- } +- +- /* Scale icon if all we get is something too big. */ +- if (gdk_pixbuf_get_height(pixbuf) > icon_size) { +- gfloat scale = (gfloat)icon_size / (gfloat)gdk_pixbuf_get_height(pixbuf); +- gint width = round(gdk_pixbuf_get_width(pixbuf) * scale); +- +- GdkPixbuf * scaled = gdk_pixbuf_scale_simple(pixbuf, width, icon_size, GDK_INTERP_BILINEAR); +- g_object_unref(G_OBJECT(pixbuf)); +- pixbuf = scaled; +- } +- +- /* Put the pixbuf on the image */ +- gtk_image_set_from_pixbuf(image, pixbuf); +- g_object_unref(G_OBJECT(pixbuf)); ++ ++ icon = (GIcon *)g_object_get_data(G_OBJECT(image), INDICATOR_NAMES_DATA); ++ g_return_if_fail(G_IS_ICON (icon)); ++ ++ gtk_image_set_pixel_size (image, 22); ++ gtk_image_set_from_gicon (image, icon, GTK_ICON_SIZE_SMALL_TOOLBAR); + + return; + } + diff --git a/debian/rules b/debian/rules index 151c78d..095f53b 100755 --- a/debian/rules +++ b/debian/rules @@ -2,7 +2,10 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk + LDFLAGS += -Wl,-z,defs -Wl,--as-needed DEB_DH_MAKESHLIBS_ARGS_libindicator0 += -V 'libindicator0 (>= 0.3.6)' + -- cgit v1.2.3 From afe60bd5daa81d3a25cb015e6b6654119b15cc09 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 16 Sep 2010 16:36:21 -0500 Subject: debian/control: Switching from libindicator0 to libindicator1 as we've broken ABI. --- debian/changelog | 4 +++- debian/control | 7 ++++--- debian/libindicator0.install | 1 - debian/libindicator1.install | 1 + 4 files changed, 8 insertions(+), 5 deletions(-) delete mode 100644 debian/libindicator0.install create mode 100644 debian/libindicator1.install (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 460125d..5fde901 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,10 @@ libindicator (0.3.13-0ubuntu1~ppa2~ats1) UNRELEASED; urgency=low * Upstream Merge * Adding a function to signal a menu is shown + * debian/control: Switching from libindicator0 to libindicator1 + as we've broken ABI. - -- Ted Gould Thu, 16 Sep 2010 16:33:54 -0500 + -- Ted Gould Thu, 16 Sep 2010 16:35:58 -0500 libindicator (0.3.13-0ubuntu1~ppa1) maverick; urgency=low diff --git a/debian/control b/debian/control index 6530e9b..eabc1f9 100644 --- a/debian/control +++ b/debian/control @@ -17,11 +17,12 @@ Homepage: https://launchpad.net/libindicator Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/libindicator/ubuntu Vcs-Browser: http://bazaar.launchpad.net/~indicator-applet-developers/libindicator/ubuntu -Package: libindicator0 +Package: libindicator1 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Replaces: libindicator0 Description: panel indicator applet - shared library This library contains information to build indicators to go into the indicator applet. @@ -34,7 +35,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libgtk2.0-dev (>= 2.12.0), - libindicator0 (= ${binary:Version}) + libindicator1 (= ${binary:Version}) Description: panel indicator applet - library development files This library contains information to build indicators to go into the indicator applet. @@ -46,7 +47,7 @@ Section: devel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libindicator0 (= ${binary:Version}) + libindicator1 (= ${binary:Version}) Description: Tools for libindicator Tools useful for developers of applications using indicators. . diff --git a/debian/libindicator0.install b/debian/libindicator0.install deleted file mode 100644 index 85dbd3e..0000000 --- a/debian/libindicator0.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libindicator.so.* diff --git a/debian/libindicator1.install b/debian/libindicator1.install new file mode 100644 index 0000000..85dbd3e --- /dev/null +++ b/debian/libindicator1.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libindicator.so.* -- cgit v1.2.3 From daaf146585e8bad6912bd926ded7c177a0fe6d0d Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 17 Sep 2010 16:41:30 -0500 Subject: debian/control: Replaces really needs to be conflicts. You don't want both of these. --- debian/changelog | 7 +++++++ debian/control | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 542a812..8e8a1a3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libindicator (0.3.13-0ubuntu1~ppa2~ats4) UNRELEASED; urgency=low + + * debian/control: Replaces really needs to be conflicts. You don't + want both of these. + + -- Ted Gould Fri, 17 Sep 2010 16:41:00 -0500 + libindicator (0.3.13-0ubuntu1~ppa2~ats3) maverick; urgency=low * Autogen update diff --git a/debian/control b/debian/control index eabc1f9..0dfe822 100644 --- a/debian/control +++ b/debian/control @@ -22,7 +22,7 @@ Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Replaces: libindicator0 +Conflicts: libindicator0 Description: panel indicator applet - shared library This library contains information to build indicators to go into the indicator applet. -- cgit v1.2.3 From 5ca60866b7146c0bda1f8123c72b07fe4c08859e Mon Sep 17 00:00:00 2001 From: Didier Roche Date: Tue, 21 Sep 2010 12:36:23 +0200 Subject: * debian/control: - put the Vcs-Bzr to point the right official branch --- debian/changelog | 2 ++ debian/control | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 20bad04..62a1087 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ libindicator (0.3.13-0ubuntu2) UNRELEASED; urgency=low * debian/source: - don't use quilt format, it's making the daily build not working + * debian/control: + - put the Vcs-Bzr to point the right official branch -- Didier Roche Tue, 21 Sep 2010 12:33:31 +0200 diff --git a/debian/control b/debian/control index 6530e9b..10bccec 100644 --- a/debian/control +++ b/debian/control @@ -14,8 +14,8 @@ Build-Depends: debhelper (>= 5.0), gtk-doc-tools Standards-Version: 3.9.0 Homepage: https://launchpad.net/libindicator -Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/libindicator/ubuntu -Vcs-Browser: http://bazaar.launchpad.net/~indicator-applet-developers/libindicator/ubuntu +Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/libindicator/ubuntu +Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/libindicator/ubuntu Package: libindicator0 Section: libs -- cgit v1.2.3 From f7bd2022d25d17dbb9f5a1acbec6f7a1f36e03b0 Mon Sep 17 00:00:00 2001 From: Didier Roche Date: Tue, 21 Sep 2010 12:45:54 +0200 Subject: - rename to soname bump * debian/libindicator1.install: rename to soname bump * debian/rules: update MAKESHLIBS_ARGS --- debian/changelog | 3 +++ debian/control | 6 +++--- debian/libindicator0.install | 1 - debian/libindicator1.install | 1 + debian/rules | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) delete mode 100644 debian/libindicator0.install create mode 100644 debian/libindicator1.install (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 62a1087..f487a12 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,9 @@ libindicator (0.3.13-0ubuntu2) UNRELEASED; urgency=low - don't use quilt format, it's making the daily build not working * debian/control: - put the Vcs-Bzr to point the right official branch + - rename to soname bump + * debian/libindicator1.install: rename to soname bump + * debian/rules: update MAKESHLIBS_ARGS -- Didier Roche Tue, 21 Sep 2010 12:33:31 +0200 diff --git a/debian/control b/debian/control index 10bccec..a67274d 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,7 @@ Homepage: https://launchpad.net/libindicator Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/libindicator/ubuntu Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/libindicator/ubuntu -Package: libindicator0 +Package: libindicator1 Section: libs Architecture: any Depends: ${shlibs:Depends}, @@ -34,7 +34,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libgtk2.0-dev (>= 2.12.0), - libindicator0 (= ${binary:Version}) + libindicator1 (= ${binary:Version}) Description: panel indicator applet - library development files This library contains information to build indicators to go into the indicator applet. @@ -46,7 +46,7 @@ Section: devel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libindicator0 (= ${binary:Version}) + libindicator1 (= ${binary:Version}) Description: Tools for libindicator Tools useful for developers of applications using indicators. . diff --git a/debian/libindicator0.install b/debian/libindicator0.install deleted file mode 100644 index 85dbd3e..0000000 --- a/debian/libindicator0.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libindicator.so.* diff --git a/debian/libindicator1.install b/debian/libindicator1.install new file mode 100644 index 0000000..85dbd3e --- /dev/null +++ b/debian/libindicator1.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libindicator.so.* diff --git a/debian/rules b/debian/rules index 095f53b..151b094 100755 --- a/debian/rules +++ b/debian/rules @@ -7,5 +7,5 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk LDFLAGS += -Wl,-z,defs -Wl,--as-needed -DEB_DH_MAKESHLIBS_ARGS_libindicator0 += -V 'libindicator0 (>= 0.3.6)' +DEB_DH_MAKESHLIBS_ARGS_libindicator0 += -V 'libindicator1 (>= 0.3.13)' -- cgit v1.2.3 From 027d9ed234da622d47a3f6c1b5e95e0b389047b9 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 21 Sep 2010 09:22:02 -0500 Subject: Setting right VCS directories --- debian/changelog | 1 - debian/control | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 67d6995..6d61fc8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +3,6 @@ libindicator (0.3.13-0ubuntu2~ppa1) UNRELEASED; urgency=low * debian/source: - don't use quilt format, it's making the daily build not working * debian/control: - - put the Vcs-Bzr to point the right official branch - rename to soname bump * debian/libindicator1.install: rename to soname bump * debian/rules: update MAKESHLIBS_ARGS diff --git a/debian/control b/debian/control index 9f16716..0dfe822 100644 --- a/debian/control +++ b/debian/control @@ -14,8 +14,8 @@ Build-Depends: debhelper (>= 5.0), gtk-doc-tools Standards-Version: 3.9.0 Homepage: https://launchpad.net/libindicator -Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/libindicator/ubuntu -Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/libindicator/ubuntu +Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/libindicator/ubuntu +Vcs-Browser: http://bazaar.launchpad.net/~indicator-applet-developers/libindicator/ubuntu Package: libindicator1 Section: libs -- cgit v1.2.3 From 98f804c2c5b4852c91796195dd3140d57f2afbc3 Mon Sep 17 00:00:00 2001 From: Didier Roche Date: Wed, 22 Sep 2010 10:05:24 +0200 Subject: redo removed adjustements --- debian/changelog | 17 +++++++++-------- debian/control | 5 ++--- debian/rules | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 3b7ca79..2fda7f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,19 +1,20 @@ -libindicator (0.3.14-0ubuntu1~ppa1) maverick; urgency=low +libindicator (0.3.14-0ubuntu1) UNRELEASED; urgency=low * New upstream release. - * Adding a function to signal a menu is shown + * Adding a function to signal a menu is shown (LP: #637692) * Changing indicator directory to '4' - - -- Ted Gould Tue, 21 Sep 2010 15:55:56 -0500 - -libindicator (0.3.13-0ubuntu2~ppa1) UNRELEASED; urgency=low - * debian/source: - don't use quilt format, it's making the daily build not working * debian/control: - rename to soname bump + - put the Vcs-Bzr to point the right official branch * debian/libindicator1.install: rename to soname bump - * debian/rules: update MAKESHLIBS_ARGS + * debian/rules: + - update MAKESHLIBS_ARGS + + [Ted Gould] + * debian/rules: + - removing simple-patchsys -- Didier Roche Tue, 21 Sep 2010 12:33:31 +0200 diff --git a/debian/control b/debian/control index 0dfe822..a67274d 100644 --- a/debian/control +++ b/debian/control @@ -14,15 +14,14 @@ Build-Depends: debhelper (>= 5.0), gtk-doc-tools Standards-Version: 3.9.0 Homepage: https://launchpad.net/libindicator -Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/libindicator/ubuntu -Vcs-Browser: http://bazaar.launchpad.net/~indicator-applet-developers/libindicator/ubuntu +Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/libindicator/ubuntu +Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/libindicator/ubuntu Package: libindicator1 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Conflicts: libindicator0 Description: panel indicator applet - shared library This library contains information to build indicators to go into the indicator applet. diff --git a/debian/rules b/debian/rules index 9099854..7ad558a 100755 --- a/debian/rules +++ b/debian/rules @@ -6,5 +6,5 @@ include /usr/share/cdbs/1/class/gnome.mk LDFLAGS += -Wl,-z,defs -Wl,--as-needed -DEB_DH_MAKESHLIBS_ARGS_libindicator0 += -V 'libindicator1 (>= 0.3.13)' +DEB_DH_MAKESHLIBS_ARGS_libindicator0 += -V 'libindicator1 (>= 0.3.14)' -- cgit v1.2.3 From d6160f5deba95d4b915a53382e15610d39e81bbe Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 15 Oct 2010 14:54:32 -0500 Subject: debian/control: Adding package libindicator-debugenv --- debian/changelog | 3 ++- debian/control | 11 +++++++++++ debian/libindicator-debugenv.install | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 debian/libindicator-debugenv.install (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index ad3b567..19253bf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,9 @@ libindicator (0.3.14-0ubuntu2~ppa1) UNRELEASED; urgency=low * Upstream Merge * Adding a small file to set debugging environment variables * Autogen + * debian/control: Adding package libindicator-debugenv - -- Ted Gould Fri, 15 Oct 2010 14:51:55 -0500 + -- Ted Gould Fri, 15 Oct 2010 14:54:17 -0500 libindicator (0.3.14-0ubuntu1) maverick; urgency=low diff --git a/debian/control b/debian/control index d701099..5f33619 100644 --- a/debian/control +++ b/debian/control @@ -51,3 +51,14 @@ Description: Tools for libindicator Tools useful for developers of applications using indicators. . This package contains files that are needed to build applications. + +Package: libindicator-debugenv +Section: devel +Architecture: all +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libindicator1 (= ${binary:Version}) +Description: Debug environment for libindicator + Sets debug values useful for developers of applications using indicators. + . + This package contains session configuration files diff --git a/debian/libindicator-debugenv.install b/debian/libindicator-debugenv.install new file mode 100644 index 0000000..da1327b --- /dev/null +++ b/debian/libindicator-debugenv.install @@ -0,0 +1 @@ +debian/tmp/etc/* -- cgit v1.2.3 From 8915dd59667cd7aae74860ee063374b24734e03c Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Wed, 24 Nov 2010 18:39:14 -0500 Subject: * debian/rules - Added build targets to build with gtk3 enabled in additional to default build with gtk2 * debian/control - Updated build depends to support building with gtk+-3.0 - Added dh-autoreconf build depends - Added libindicator3-1, libindicator3-dev, libindicator3-tools binaries binaries * libindicator/Makefile.am and tools/Makefile.am - Fixes needed for building with-gtk=3 --- debian/changelog | 16 +++++++++++++-- debian/control | 41 ++++++++++++++++++++++++++++++++++++-- debian/libindicator-tools.install | 2 +- debian/libindicator3-1.install | 1 + debian/libindicator3-dev.install | 3 +++ debian/libindicator3-tools.install | 1 + debian/rules | 31 +++++++++++++++++++++++++++- libindicator/Makefile.am | 4 ++-- libindicator3-1.install | 1 + tools/Makefile.am | 15 ++++++++++++-- 10 files changed, 105 insertions(+), 10 deletions(-) create mode 100644 debian/libindicator3-1.install create mode 100644 debian/libindicator3-dev.install create mode 100644 debian/libindicator3-tools.install create mode 100644 libindicator3-1.install (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index aafd6ce..86b8a5b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,23 @@ -libindicator (0.3.15-0ubuntu1~ppa1) maverick; urgency=low +libindicator (0.3.15-0ubuntu1) UNRELEASED; urgency=low + + * debian/rules + - Added build targets to build with gtk3 enabled in additional to + default build with gtk2 + * debian/control + - Updated build depends to support building with gtk+-3.0 + - Added dh-autoreconf build depends + - Added libindicator3-1, libindicator3-dev, libindicator3-tools binaries + binaries + * libindicator/Makefile.am and tools/Makefile.am + - Fixes needed for building with-gtk=3 + [ Ted Gould ] * New upstream release. * Adding a small file to set debugging environment variables * Allowing to build for GTK 2/3 and build parallel libraries * debian/control: Adding package libindicator-debugenv - -- Ted Gould Thu, 11 Nov 2010 14:44:51 -0600 + -- Ken VanDine Wed, 24 Nov 2010 18:29:40 -0500 libindicator (0.3.14-0ubuntu1) maverick; urgency=low diff --git a/debian/control b/debian/control index 5f33619..a7e93cb 100644 --- a/debian/control +++ b/debian/control @@ -8,10 +8,12 @@ Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.41), libglib2.0-dev (>= 2.22), libgtk2.0-dev (>= 2.18), + libgtk3.0-dev (>= 2.91.3), libdbus-glib-1-dev, libtool, intltool, - gtk-doc-tools + gtk-doc-tools, + dh-autoreconf Standards-Version: 3.9.0 Homepage: https://launchpad.net/libindicator Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/libindicator/ubuntu @@ -54,7 +56,7 @@ Description: Tools for libindicator Package: libindicator-debugenv Section: devel -Architecture: all +Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libindicator1 (= ${binary:Version}) @@ -62,3 +64,38 @@ Description: Debug environment for libindicator Sets debug values useful for developers of applications using indicators. . This package contains session configuration files + +Package: libindicator3-1 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: panel indicator applet - shared library + This library contains information to build indicators to go into + the indicator applet. + . + This package contains the library itself. + +Package: libindicator3-dev +Section: libdevel +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libgtk3.0-dev (>= 2.91.3), + libindicator3-1 (= ${binary:Version}) +Description: panel indicator applet - library development files + This library contains information to build indicators to go into + the indicator applet. + . + This package contains files that are needed to build applications. + +Package: libindicator3-tools +Section: devel +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libindicator3-1 (= ${binary:Version}) +Description: Tools for libindicator + Tools useful for developers of applications using indicators. + . + This package contains files that are needed to build applications. diff --git a/debian/libindicator-tools.install b/debian/libindicator-tools.install index e9565f0..07cd88f 100644 --- a/debian/libindicator-tools.install +++ b/debian/libindicator-tools.install @@ -1 +1 @@ -debian/tmp/usr/lib/libindicator/* +debian/tmp/usr/lib/libindicator/indicator-loader diff --git a/debian/libindicator3-1.install b/debian/libindicator3-1.install new file mode 100644 index 0000000..aaa2e72 --- /dev/null +++ b/debian/libindicator3-1.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libindicator3.so.* diff --git a/debian/libindicator3-dev.install b/debian/libindicator3-dev.install new file mode 100644 index 0000000..2ac38b7 --- /dev/null +++ b/debian/libindicator3-dev.install @@ -0,0 +1,3 @@ +debian/tmp/usr/lib/pkgconfig/indicator3.pc +debian/tmp/usr/lib/libindicator3.a +debian/tmp/usr/lib/libindicator3.so diff --git a/debian/libindicator3-tools.install b/debian/libindicator3-tools.install new file mode 100644 index 0000000..2766bc0 --- /dev/null +++ b/debian/libindicator3-tools.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libindicator/indicator-loader3 diff --git a/debian/rules b/debian/rules index 7ad558a..e4f4f04 100755 --- a/debian/rules +++ b/debian/rules @@ -2,9 +2,38 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/cdbs/1/rules/autoreconf.mk +DEB_SRCDIR = . +DEB_BUILDDIR = $(DEB_SRCDIR)/build LDFLAGS += -Wl,-z,defs -Wl,--as-needed -DEB_DH_MAKESHLIBS_ARGS_libindicator0 += -V 'libindicator1 (>= 0.3.14)' +DEB_DH_MAKESHLIBS_ARGS_libindicator1 += -V 'libindicator1 (>= 0.3.15)' +DEB_DH_MAKESHLIBS_ARGS_libindicator3 += -V 'libindicator3-1 (>= 0.3.15)' +configure/libindicator3-1:: stamp-configure-gtk3 +stamp-configure-gtk3: + : # configure for GTK+ 3.0 + set -e; \ + rm -rf build-gtk3; \ + mkdir build-gtk3; \ + cd build-gtk3; \ + $(DEB_CONFIGURE_SCRIPT_ENV) ../configure --with-gtk=3 \ + $(filter-out --srcdir=%, $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_EXTRA_FLAGS)); \ + cd ..; + touch stamp-configure-gtk3 + +build/libindicator3-1:: stamp-build-gtk3 +stamp-build-gtk3: stamp-configure-gtk3 + : # build for GTK+ 3.0 + $(MAKE) -C build-gtk3; + touch stamp-build-gtk3 + +common-install-prehook-arch:: stamp-build-gtk3 + : # install for GTK+ 3.0 + $(MAKE) -C build-gtk3 DESTDIR=$(CURDIR)/debian/tmp install + +clean:: + rm -f stamp-*-gtk3 + rm -rf build-gtk3 diff --git a/libindicator/Makefile.am b/libindicator/Makefile.am index 39cb2b7..b6239e6 100644 --- a/libindicator/Makefile.am +++ b/libindicator/Makefile.am @@ -73,7 +73,7 @@ glib_marshal_prefix = _indicator_object_marshal indicator-object-enum-types.h: s-enum-types-h @true s-enum-types-h: $(indicator_headers) - ( cd $(srcdir) && $(GLIB_MKENUMS) --template $(srcdir)/indicator-object-enum-types.h.template \ + ( cd $(srcdir) && $(GLIB_MKENUMS) --template $(abs_srcdir)/indicator-object-enum-types.h.template \ $(indicator_headers) ) >> tmp-indicator-object-enum-types.h \ && (cmp -s tmp-indicator-object-enum-types.h indicator-object-enum-types.h || cp tmp-indicator-object-enum-types.h indicator-object-enum-types.h ) \ && rm -f tmp-indicator-object-enum-types.h && echo timestamp > $(@F) @@ -81,7 +81,7 @@ s-enum-types-h: $(indicator_headers) indicator-object-enum-types.c: s-enum-types-c @true s-enum-types-c: $(indicator_headers) - ( cd $(srcdir) && $(GLIB_MKENUMS) --template $(srcdir)/indicator-object-enum-types.c.template \ + ( cd $(srcdir) && $(GLIB_MKENUMS) --template $(abs_srcdir)/indicator-object-enum-types.c.template \ $(indicator_headers) ) > tmp-indicator-object-enum-types.c \ && (cmp -s tmp-indicator-object-enum-types.c indicator-object-enum-types.c || cp tmp-indicator-object-enum-types.c indicator-object-enum-types.c ) \ && rm -f tmp-indicator-object-enum-types.c diff --git a/libindicator3-1.install b/libindicator3-1.install new file mode 100644 index 0000000..aaa2e72 --- /dev/null +++ b/libindicator3-1.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libindicator3.so.* diff --git a/tools/Makefile.am b/tools/Makefile.am index 6c67491..9861ac1 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,11 +1,13 @@ if USE_GTK3 INDICATOR_LIB = -lindicator3 +libexec_PROGRAMS = indicator-loader3 +VER=3 else +VER= INDICATOR_LIB = -lindicator +libexec_PROGRAMS = indicator-loader endif -libexec_PROGRAMS = \ - indicator-loader ############################# # Indicator Loader @@ -17,6 +19,7 @@ indicator_loader_SOURCES = \ indicator_loader_CFLAGS = \ -Wall -Werror \ $(LIBINDICATOR_CFLAGS) -I$(top_srcdir) \ + -Wall -Werror \ -DBUILD_DIR="\"$(builddir)\"" indicator_loader_LDADD = \ @@ -24,6 +27,14 @@ indicator_loader_LDADD = \ -L$(top_builddir)/libindicator/.libs \ $(INDICATOR_LIB) +# We duplicate these here because Automake won't let us use $(VER) on the left hand side. +# Since we carefully use $(VER) in the right hand side above, we can assign the same values. +# Only one version of the library is every compiled at the same time, so it is safe to reuse +# the right hand sides like this. +indicator_loader3_SOURCES = $(indicator_loader_SOURCES) +indicator_loader3_CFLAGS = $(indicator_loader_CFLAGS) +indicator_loader3_LDADD = $(indicator_loader_LDADD) + xsessiondir = $(sysconfdir)/X11/Xsession.d xsession_DATA = 80indicator-debugging -- cgit v1.2.3 From c5c78aad9e7710a18640ea44c2a5af154b2943bc Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Mon, 6 Dec 2010 10:34:22 -0500 Subject: releasing version 0.3.15-0ubuntu2 --- debian/changelog | 14 ++++++++++++++ debian/control | 11 ----------- debian/libindicator-debugenv.install | 1 - debian/libindicator-tools.install | 2 ++ tools/Makefile.am | 2 +- 5 files changed, 17 insertions(+), 13 deletions(-) delete mode 100644 debian/libindicator-debugenv.install (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 6e67b9b..01246d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +libindicator (0.3.15-0ubuntu2) natty; urgency=low + + * debian/control: + - dropped libindicator-debugenv package + * -debian/libindicator-debugenv.install + * debian/libindicator-tools.install + - Install indicator-loader and indicator-loader3 in the + libindicator-tools package (means it depends on both gtk2 and gtk3) + - Install sample xsession env in pkgdatadir for developer use + * tools/Makefile.am + - Install 80indicator-debugging in pkgdatadir + + -- Ken VanDine Mon, 06 Dec 2010 10:19:58 -0500 + libindicator (0.3.15-0ubuntu1) natty; urgency=low * debian/rules diff --git a/debian/control b/debian/control index a7e93cb..71082ea 100644 --- a/debian/control +++ b/debian/control @@ -54,17 +54,6 @@ Description: Tools for libindicator . This package contains files that are needed to build applications. -Package: libindicator-debugenv -Section: devel -Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends}, - libindicator1 (= ${binary:Version}) -Description: Debug environment for libindicator - Sets debug values useful for developers of applications using indicators. - . - This package contains session configuration files - Package: libindicator3-1 Section: libs Architecture: any diff --git a/debian/libindicator-debugenv.install b/debian/libindicator-debugenv.install deleted file mode 100644 index da1327b..0000000 --- a/debian/libindicator-debugenv.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/etc/* diff --git a/debian/libindicator-tools.install b/debian/libindicator-tools.install index 07cd88f..a95bc4b 100644 --- a/debian/libindicator-tools.install +++ b/debian/libindicator-tools.install @@ -1 +1,3 @@ debian/tmp/usr/lib/libindicator/indicator-loader +debian/tmp/usr/lib/libindicator/indicator-loader3 +debian/tmp/usr/share/libindicator/80indicator-debugging diff --git a/tools/Makefile.am b/tools/Makefile.am index 9861ac1..795e4fc 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -35,7 +35,7 @@ indicator_loader3_SOURCES = $(indicator_loader_SOURCES) indicator_loader3_CFLAGS = $(indicator_loader_CFLAGS) indicator_loader3_LDADD = $(indicator_loader_LDADD) -xsessiondir = $(sysconfdir)/X11/Xsession.d +xsessiondir = $(pkgdatadir) xsession_DATA = 80indicator-debugging -- cgit v1.2.3 From 7404425aa6b83ff99cad1b9b544893cdc6be3d65 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sun, 9 Jan 2011 14:21:19 -0600 Subject: debian/control: Migrating library versions from 1 to 2 --- debian/changelog | 3 ++- debian/control | 12 ++++++------ debian/libindicator1.install | 1 - debian/libindicator2.install | 1 + debian/libindicator3-1.install | 1 - debian/libindicator3-2.install | 1 + 6 files changed, 10 insertions(+), 9 deletions(-) delete mode 100644 debian/libindicator1.install create mode 100644 debian/libindicator2.install delete mode 100644 debian/libindicator3-1.install create mode 100644 debian/libindicator3-2.install (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index ea3e445..2f2ec41 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,9 @@ libindicator (0.3.15-0ubuntu3~ppa2~gdbus1) UNRELEASED; urgency=low * Upstream Merge: * GDBus Port * autogen.sh + * debian/control: Migrating library versions from 1 to 2 - -- Ted Gould Sun, 09 Jan 2011 14:18:14 -0600 + -- Ted Gould Sun, 09 Jan 2011 14:20:52 -0600 libindicator (0.3.15-0ubuntu3~ppa1) natty; urgency=low diff --git a/debian/control b/debian/control index 71082ea..af14b30 100644 --- a/debian/control +++ b/debian/control @@ -19,7 +19,7 @@ Homepage: https://launchpad.net/libindicator Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/libindicator/ubuntu Vcs-Browser: http://bazaar.launchpad.net/~indicator-applet-developers/libindicator/ubuntu -Package: libindicator1 +Package: libindicator2 Section: libs Architecture: any Depends: ${shlibs:Depends}, @@ -36,7 +36,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libgtk2.0-dev (>= 2.12.0), - libindicator1 (= ${binary:Version}) + libindicator2 (= ${binary:Version}) Description: panel indicator applet - library development files This library contains information to build indicators to go into the indicator applet. @@ -48,13 +48,13 @@ Section: devel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libindicator1 (= ${binary:Version}) + libindicator2 (= ${binary:Version}) Description: Tools for libindicator Tools useful for developers of applications using indicators. . This package contains files that are needed to build applications. -Package: libindicator3-1 +Package: libindicator3-2 Section: libs Architecture: any Depends: ${shlibs:Depends}, @@ -71,7 +71,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libgtk3.0-dev (>= 2.91.3), - libindicator3-1 (= ${binary:Version}) + libindicator3-2 (= ${binary:Version}) Description: panel indicator applet - library development files This library contains information to build indicators to go into the indicator applet. @@ -83,7 +83,7 @@ Section: devel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libindicator3-1 (= ${binary:Version}) + libindicator3-2 (= ${binary:Version}) Description: Tools for libindicator Tools useful for developers of applications using indicators. . diff --git a/debian/libindicator1.install b/debian/libindicator1.install deleted file mode 100644 index 85dbd3e..0000000 --- a/debian/libindicator1.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libindicator.so.* diff --git a/debian/libindicator2.install b/debian/libindicator2.install new file mode 100644 index 0000000..85dbd3e --- /dev/null +++ b/debian/libindicator2.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libindicator.so.* diff --git a/debian/libindicator3-1.install b/debian/libindicator3-1.install deleted file mode 100644 index aaa2e72..0000000 --- a/debian/libindicator3-1.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libindicator3.so.* diff --git a/debian/libindicator3-2.install b/debian/libindicator3-2.install new file mode 100644 index 0000000..aaa2e72 --- /dev/null +++ b/debian/libindicator3-2.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libindicator3.so.* -- cgit v1.2.3 From 990356c47906309289377b57b5eec0298f30bcb6 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 10 Jan 2011 11:54:57 -0600 Subject: debian/control: Dropping dbus-glib as a build-dep --- debian/changelog | 3 ++- debian/control | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 2bd9528..6dc4d20 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,9 @@ libindicator (0.3.15-0ubuntu3~ppa2) UNRLEASED; urgency=low * GDBus Port * autogen.sh * debian/control: Migrating library versions from 1 to 2 + * debian/control: Dropping dbus-glib as a build-dep - -- Ted Gould Mon, 10 Jan 2011 11:52:20 -0600 + -- Ted Gould Mon, 10 Jan 2011 11:53:03 -0600 libindicator (0.3.15-0ubuntu3~ppa1) natty; urgency=low diff --git a/debian/control b/debian/control index af14b30..17855cf 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,6 @@ Build-Depends: debhelper (>= 5.0), libglib2.0-dev (>= 2.22), libgtk2.0-dev (>= 2.18), libgtk3.0-dev (>= 2.91.3), - libdbus-glib-1-dev, libtool, intltool, gtk-doc-tools, -- cgit v1.2.3 From 2dae441fca0caed55dddc37f9a056e3b6aa8b2b4 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 17 Feb 2011 10:23:46 -0600 Subject: debian/*: Changing the library major version from 2 to 3 --- debian/changelog | 3 ++- debian/control | 12 ++++++------ debian/libindicator2.install | 1 - debian/libindicator3-2.install | 1 - debian/libindicator3-3.install | 1 + debian/libindicator3.install | 1 + 6 files changed, 10 insertions(+), 9 deletions(-) delete mode 100644 debian/libindicator2.install delete mode 100644 debian/libindicator3-2.install create mode 100644 debian/libindicator3-3.install create mode 100644 debian/libindicator3.install (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 5a66acc..84753fe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,9 @@ libindicator (0.3.19-0ubuntu1~ppa1) UNRELEASED; urgency=low * New upstream release. ∘ Adding in a11y description support ∘ Fixing distcheck (LP: #587811) + * debian/*: Changing the library major version from 2 to 3 - -- Ted Gould Thu, 17 Feb 2011 10:20:50 -0600 + -- Ted Gould Thu, 17 Feb 2011 10:23:24 -0600 libindicator (0.3.18-0ubuntu1) natty; urgency=low diff --git a/debian/control b/debian/control index 4d0932f..4a138a8 100644 --- a/debian/control +++ b/debian/control @@ -18,7 +18,7 @@ Homepage: https://launchpad.net/libindicator Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/libindicator/ubuntu Vcs-Browser: http://bazaar.launchpad.net/~indicator-applet-developers/libindicator/ubuntu -Package: libindicator2 +Package: libindicator3 Section: libs Architecture: any Depends: ${shlibs:Depends}, @@ -36,7 +36,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libgtk2.0-dev (>= 2.12.0), - libindicator2 (= ${binary:Version}) + libindicator3 (= ${binary:Version}) Description: panel indicator applet - library development files This library contains information to build indicators to go into the indicator applet. @@ -48,13 +48,13 @@ Section: devel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libindicator2 (= ${binary:Version}) + libindicator3 (= ${binary:Version}) Description: Tools for libindicator Tools useful for developers of applications using indicators. . This package contains files that are needed to build applications. -Package: libindicator3-2 +Package: libindicator3-3 Section: libs Architecture: any Depends: ${shlibs:Depends}, @@ -71,7 +71,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libgtk3.0-dev (>= 2.91.3), - libindicator3-2 (= ${binary:Version}) + libindicator3-3 (= ${binary:Version}) Description: panel indicator applet - library development files This library contains information to build indicators to go into the indicator applet. @@ -83,7 +83,7 @@ Section: devel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libindicator3-2 (= ${binary:Version}) + libindicator3-3 (= ${binary:Version}) Description: Tools for libindicator Tools useful for developers of applications using indicators. . diff --git a/debian/libindicator2.install b/debian/libindicator2.install deleted file mode 100644 index 85dbd3e..0000000 --- a/debian/libindicator2.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libindicator.so.* diff --git a/debian/libindicator3-2.install b/debian/libindicator3-2.install deleted file mode 100644 index aaa2e72..0000000 --- a/debian/libindicator3-2.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libindicator3.so.* diff --git a/debian/libindicator3-3.install b/debian/libindicator3-3.install new file mode 100644 index 0000000..aaa2e72 --- /dev/null +++ b/debian/libindicator3-3.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libindicator3.so.* diff --git a/debian/libindicator3.install b/debian/libindicator3.install new file mode 100644 index 0000000..85dbd3e --- /dev/null +++ b/debian/libindicator3.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libindicator.so.* -- cgit v1.2.3 From 4447040f1ad2c370a7532bb3ecb01fc7c0ab0da9 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 17 Feb 2011 10:25:54 -0600 Subject: debian/control: Adding Breaks for the previous library rev so that users don't end up with systems that use both. --- debian/changelog | 4 +++- debian/control | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 84753fe..e1df5b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,10 @@ libindicator (0.3.19-0ubuntu1~ppa1) UNRELEASED; urgency=low ∘ Adding in a11y description support ∘ Fixing distcheck (LP: #587811) * debian/*: Changing the library major version from 2 to 3 + * debian/control: Adding Breaks for the previous library rev + so that users don't end up with systems that use both. - -- Ted Gould Thu, 17 Feb 2011 10:23:24 -0600 + -- Ted Gould Thu, 17 Feb 2011 10:25:11 -0600 libindicator (0.3.18-0ubuntu1) natty; urgency=low diff --git a/debian/control b/debian/control index 4a138a8..03085a2 100644 --- a/debian/control +++ b/debian/control @@ -23,7 +23,8 @@ Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Breaks: libindicator1 +Breaks: libindicator1 (<= ${binary:Version}), + libindicator2 (<= ${binary:Version}) Description: panel indicator applet - shared library This library contains information to build indicators to go into the indicator applet. @@ -59,6 +60,7 @@ Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Breaks: libindicator3-2 (<= ${binary:Version}) Description: panel indicator applet - shared library This library contains information to build indicators to go into the indicator applet. -- cgit v1.2.3 From 58dbd1d4fe540ddd5bce899a6debbf2bc7270846 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Wed, 23 Feb 2011 08:50:33 -0500 Subject: releasing version 0.3.19-0ubuntu2 --- debian/changelog | 7 +++++++ debian/control | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 1ad8a55..2a4cd6f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libindicator (0.3.19-0ubuntu2) natty; urgency=low + + * debian/control: + - Use new build-depends for libgtk-3-dev + + -- Ken VanDine Wed, 23 Feb 2011 08:49:50 -0500 + libindicator (0.3.19-0ubuntu1) natty; urgency=low * debian/rules diff --git a/debian/control b/debian/control index 03085a2..7e47913 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.41), libglib2.0-dev (>= 2.22), libgtk2.0-dev (>= 2.18), - libgtk3.0-dev (>= 2.91.3), + libgtk-3-dev (>= 2.91.3), libtool, intltool, gtk-doc-tools, -- cgit v1.2.3 From f41742762f73173d8f6254f29bc612a81b3412ab Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Wed, 23 Feb 2011 12:09:25 -0500 Subject: releasing version 0.3.19-0ubuntu3 --- debian/changelog | 7 +++++++ debian/control | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 2a4cd6f..90303c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libindicator (0.3.19-0ubuntu3) natty; urgency=low + + * debian/control + - More renaming of Depends to libgtk-3-dev + + -- Ken VanDine Wed, 23 Feb 2011 12:08:03 -0500 + libindicator (0.3.19-0ubuntu2) natty; urgency=low * debian/control: diff --git a/debian/control b/debian/control index 7e47913..c408e18 100644 --- a/debian/control +++ b/debian/control @@ -72,7 +72,7 @@ Section: libdevel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libgtk3.0-dev (>= 2.91.3), + libgtk-3-dev (>= 2.91.3), libindicator3-3 (= ${binary:Version}) Description: panel indicator applet - library development files This library contains information to build indicators to go into -- cgit v1.2.3 From 36fb97c7c97c3b40b48190e8e37b494bdff9edb9 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Wed, 29 Jun 2011 11:06:26 +0100 Subject: releasing version 0.3.22-0ubuntu2 --- debian/changelog | 10 ++++++++++ debian/control | 5 +++-- debian/libindicator3-dev.install | 1 - 3 files changed, 13 insertions(+), 3 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 7461b6d..54cdbc4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +libindicator (0.3.22-0ubuntu2) oneiric; urgency=low + + * debian/libindicator3-dev.install + - Don't install the headers twice, we only need them in libindicator-dev + * debian/control + - Make libindicator3-dev depend on libindicator-dev (LP: #3803136) + - Bump standards version to 3.9.2 + + -- Ken VanDine Wed, 29 Jun 2011 10:39:15 +0100 + libindicator (0.3.22-0ubuntu1) natty; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index 7cdb2a7..5d03e92 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 5.0), intltool, gtk-doc-tools, dh-autoreconf -Standards-Version: 3.9.0 +Standards-Version: 3.9.2 Homepage: https://launchpad.net/libindicator Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/libindicator/ubuntu Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/libindicator/ubuntu @@ -73,7 +73,8 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libgtk-3-dev (>= 2.91.3), - libindicator3-3 (= ${binary:Version}) + libindicator3-3 (= ${binary:Version}), + libindicator-dev (= ${binary:Version}) Description: panel indicator applet - library development files This library contains information to build indicators to go into the indicator applet. diff --git a/debian/libindicator3-dev.install b/debian/libindicator3-dev.install index d11f81d..2ac38b7 100644 --- a/debian/libindicator3-dev.install +++ b/debian/libindicator3-dev.install @@ -1,4 +1,3 @@ -debian/tmp/usr/include/libindicator3-0.3/libindicator/* debian/tmp/usr/lib/pkgconfig/indicator3.pc debian/tmp/usr/lib/libindicator3.a debian/tmp/usr/lib/libindicator3.so -- cgit v1.2.3 From f44a6bcf14243565e49f368b9db7423f49f871ce Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 7 Jul 2011 00:38:18 -0500 Subject: * debian/*install, control: Changing ABI version number bump in package names * debian/rules: Making GTK2 the special case as GTK3 is default now --- debian/changelog | 4 +++- debian/control | 18 ++++++++++-------- debian/libindicator3-3.install | 1 - debian/libindicator3-4.install | 1 + debian/libindicator3.install | 1 - debian/libindicator4.install | 1 + debian/rules | 40 ++++++++++++++++++++-------------------- 7 files changed, 35 insertions(+), 31 deletions(-) delete mode 100644 debian/libindicator3-3.install create mode 100644 debian/libindicator3-4.install delete mode 100644 debian/libindicator3.install create mode 100644 debian/libindicator4.install (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index bdba7bd..e8a7008 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,8 +7,10 @@ libindicator (0.3.90-0ubuntu1~ppa1) UNRELEASED; urgency=low the future * Adding a name-hint to the indicator entries * Merging scroll functions into a single good one (LP: #804618) + * debian/*install, control: Changing ABI version number bump in package names + * debian/rules: Making GTK2 the special case as GTK3 is default now - -- Ted Gould Thu, 07 Jul 2011 00:28:56 -0500 + -- Ted Gould Thu, 07 Jul 2011 00:37:34 -0500 libindicator (0.3.22-0ubuntu2) oneiric; urgency=low diff --git a/debian/control b/debian/control index 5d03e92..c7cb436 100644 --- a/debian/control +++ b/debian/control @@ -18,13 +18,14 @@ Homepage: https://launchpad.net/libindicator Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/libindicator/ubuntu Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/libindicator/ubuntu -Package: libindicator3 +Package: libindicator4 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Breaks: libindicator1 (<= ${binary:Version}), - libindicator2 (<= ${binary:Version}) + libindicator2 (<= ${binary:Version}), + libindicator3 (<= ${binary:Version}) Description: panel indicator applet - shared library This library contains information to build indicators to go into the indicator applet. @@ -37,7 +38,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libgtk2.0-dev (>= 2.12.0), - libindicator3 (= ${binary:Version}) + libindicator4 (= ${binary:Version}) Description: panel indicator applet - library development files This library contains information to build indicators to go into the indicator applet. @@ -49,18 +50,19 @@ Section: devel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libindicator3 (= ${binary:Version}) + libindicator4 (= ${binary:Version}) Description: Tools for libindicator Tools useful for developers of applications using indicators. . This package contains files that are needed to build applications. -Package: libindicator3-3 +Package: libindicator3-4 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Breaks: libindicator3-2 (<= ${binary:Version}) +Breaks: libindicator3-2 (<= ${binary:Version}), + libindicator3-3 (<= ${binary:Version}) Description: panel indicator applet - shared library This library contains information to build indicators to go into the indicator applet. @@ -73,7 +75,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libgtk-3-dev (>= 2.91.3), - libindicator3-3 (= ${binary:Version}), + libindicator3-4 (= ${binary:Version}), libindicator-dev (= ${binary:Version}) Description: panel indicator applet - library development files This library contains information to build indicators to go into @@ -86,7 +88,7 @@ Section: devel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libindicator3-3 (= ${binary:Version}) + libindicator3-4 (= ${binary:Version}) Description: Tools for libindicator Tools useful for developers of applications using indicators. . diff --git a/debian/libindicator3-3.install b/debian/libindicator3-3.install deleted file mode 100644 index aaa2e72..0000000 --- a/debian/libindicator3-3.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libindicator3.so.* diff --git a/debian/libindicator3-4.install b/debian/libindicator3-4.install new file mode 100644 index 0000000..aaa2e72 --- /dev/null +++ b/debian/libindicator3-4.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libindicator3.so.* diff --git a/debian/libindicator3.install b/debian/libindicator3.install deleted file mode 100644 index 85dbd3e..0000000 --- a/debian/libindicator3.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libindicator.so.* diff --git a/debian/libindicator4.install b/debian/libindicator4.install new file mode 100644 index 0000000..85dbd3e --- /dev/null +++ b/debian/libindicator4.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libindicator.so.* diff --git a/debian/rules b/debian/rules index 4c21f86..4581c33 100755 --- a/debian/rules +++ b/debian/rules @@ -9,31 +9,31 @@ DEB_BUILDDIR = $(DEB_SRCDIR)/build LDFLAGS += -Wl,-z,defs -Wl,--as-needed -DEB_DH_MAKESHLIBS_ARGS_libindicator3 += -V 'libindicator3 (>= 0.3.19)' -DEB_DH_MAKESHLIBS_ARGS_libindicator3_3 += -V 'libindicator3-3 (>= 0.3.19)' +DEB_DH_MAKESHLIBS_ARGS_libindicator4 += -V 'libindicator4 (>= 0.3.90)' +DEB_DH_MAKESHLIBS_ARGS_libindicator3_4 += -V 'libindicator3-4 (>= 0.3.90)' -configure/libindicator3-3:: stamp-configure-gtk3 -stamp-configure-gtk3: - : # configure for GTK+ 3.0 +configure/libindicator4:: stamp-configure-gtk2 +stamp-configure-gtk2: + : # configure for GTK+ 2.0 set -e; \ - rm -rf build-gtk3; \ - mkdir build-gtk3; \ - cd build-gtk3; \ - $(DEB_CONFIGURE_SCRIPT_ENV) ../configure --with-gtk=3 \ + rm -rf build-gtk2; \ + mkdir build-gtk2; \ + cd build-gtk2; \ + $(DEB_CONFIGURE_SCRIPT_ENV) ../configure --with-gtk=2 \ $(filter-out --srcdir=%, $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_EXTRA_FLAGS)); \ cd ..; - touch stamp-configure-gtk3 + touch stamp-configure-gtk2 -build/libindicator3-3:: stamp-build-gtk3 -stamp-build-gtk3: stamp-configure-gtk3 - : # build for GTK+ 3.0 - $(MAKE) -C build-gtk3; - touch stamp-build-gtk3 +build/libindicator4:: stamp-build-gtk2 +stamp-build-gtk2: stamp-configure-gtk2 + : # build for GTK+ 2.0 + $(MAKE) -C build-gtk2; + touch stamp-build-gtk2 -common-install-prehook-arch:: stamp-build-gtk3 - : # install for GTK+ 3.0 - $(MAKE) -C build-gtk3 DESTDIR=$(CURDIR)/debian/tmp install +common-install-prehook-arch:: stamp-build-gtk2 + : # install for GTK+ 2.0 + $(MAKE) -C build-gtk2 DESTDIR=$(CURDIR)/debian/tmp install clean:: - rm -f stamp-*-gtk3 - rm -rf build-gtk3 + rm -f stamp-*-gtk2 + rm -rf build-gtk2 -- cgit v1.2.3 From c292980b2487057592929d5b9b9c4446013241c5 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 7 Jul 2011 10:55:25 -0400 Subject: * debian/rules - Simplify the dual builds with cdbs - Fixed package names to match soname * debian/*.install fixed paths to work with the dual builds change * tools/Makefile.in - Fixed path for xsessiondir * debian/control - Fixed package names to match soname --- debian/changelog | 15 ++++++++++-- debian/control | 12 +++++----- debian/libindicator-dev.install | 8 +++---- debian/libindicator-tools.install | 4 ++-- debian/libindicator3-4.install | 1 - debian/libindicator3-6.install | 1 + debian/libindicator3-dev.install | 6 ++--- debian/libindicator3-tools.install | 2 +- debian/libindicator4.install | 1 - debian/libindicator6.install | 1 + debian/rules | 47 +++++++++++++------------------------- tools/Makefile.in | 2 +- 12 files changed, 48 insertions(+), 52 deletions(-) delete mode 100644 debian/libindicator3-4.install create mode 100644 debian/libindicator3-6.install delete mode 100644 debian/libindicator4.install create mode 100644 debian/libindicator6.install (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 5cc9fb0..eefe70a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -libindicator (0.3.90-0ubuntu1~ppa1) oneiric; urgency=low +libindicator (0.3.90-0ubuntu1) UNRELEASED; urgency=low + [ Ted Gould ] * New upstream release. * Build Fixes * Adding license to test files (LP: #684886) @@ -11,7 +12,17 @@ libindicator (0.3.90-0ubuntu1~ppa1) oneiric; urgency=low * debian/rules: Making GTK2 the special case as GTK3 is default now * debian/*install: Fixing pkgconfig file names - -- Ted Gould Thu, 07 Jul 2011 08:29:37 -0500 + [ Ken VanDine ] + * debian/rules + - Simplify the dual builds with cdbs + - Fixed package names to match soname + * debian/*.install fixed paths to work with the dual builds change + * tools/Makefile.in + - Fixed path for xsessiondir + * debian/control + - Fixed package names to match soname + + -- Ken VanDine Thu, 07 Jul 2011 10:18:04 -0400 libindicator (0.3.22-0ubuntu2) oneiric; urgency=low diff --git a/debian/control b/debian/control index c7cb436..d9fbd97 100644 --- a/debian/control +++ b/debian/control @@ -18,7 +18,7 @@ Homepage: https://launchpad.net/libindicator Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/libindicator/ubuntu Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/libindicator/ubuntu -Package: libindicator4 +Package: libindicator6 Section: libs Architecture: any Depends: ${shlibs:Depends}, @@ -38,7 +38,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libgtk2.0-dev (>= 2.12.0), - libindicator4 (= ${binary:Version}) + libindicator6 (= ${binary:Version}) Description: panel indicator applet - library development files This library contains information to build indicators to go into the indicator applet. @@ -50,13 +50,13 @@ Section: devel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libindicator4 (= ${binary:Version}) + libindicator6 (= ${binary:Version}) Description: Tools for libindicator Tools useful for developers of applications using indicators. . This package contains files that are needed to build applications. -Package: libindicator3-4 +Package: libindicator3-6 Section: libs Architecture: any Depends: ${shlibs:Depends}, @@ -75,7 +75,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libgtk-3-dev (>= 2.91.3), - libindicator3-4 (= ${binary:Version}), + libindicator3-6 (= ${binary:Version}), libindicator-dev (= ${binary:Version}) Description: panel indicator applet - library development files This library contains information to build indicators to go into @@ -88,7 +88,7 @@ Section: devel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libindicator3-4 (= ${binary:Version}) + libindicator3-6 (= ${binary:Version}) Description: Tools for libindicator Tools useful for developers of applications using indicators. . diff --git a/debian/libindicator-dev.install b/debian/libindicator-dev.install index 7f34ecd..25c2128 100644 --- a/debian/libindicator-dev.install +++ b/debian/libindicator-dev.install @@ -1,4 +1,4 @@ -debian/tmp/usr/include/libindicator-0.4/libindicator/* -debian/tmp/usr/lib/pkgconfig/indicator-0.4.pc -debian/tmp/usr/lib/libindicator.a -debian/tmp/usr/lib/libindicator.so +debian/tmp/gtk2/usr/include /usr/ +debian/tmp/gtk2/usr/lib/pkgconfig/indicator-0.4.pc /usr/lib/pkgconfig/ +debian/tmp/gtk2/usr/lib/libindicator.a /usr/lib/ +debian/tmp/gtk2/usr/lib/libindicator.so /usr/lib/ diff --git a/debian/libindicator-tools.install b/debian/libindicator-tools.install index 34f8177..20b86c8 100644 --- a/debian/libindicator-tools.install +++ b/debian/libindicator-tools.install @@ -1,2 +1,2 @@ -debian/tmp/usr/lib/libindicator/indicator-loader -debian/tmp/usr/share/libindicator/80indicator-debugging +debian/tmp/gtk2/usr/lib/libindicator/indicator-loader /usr/lib/libindicator/ +debian/tmp/gtk2/usr/share/libindicator/80indicator-debugging /usr/share/libindicator/ diff --git a/debian/libindicator3-4.install b/debian/libindicator3-4.install deleted file mode 100644 index aaa2e72..0000000 --- a/debian/libindicator3-4.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libindicator3.so.* diff --git a/debian/libindicator3-6.install b/debian/libindicator3-6.install new file mode 100644 index 0000000..75485eb --- /dev/null +++ b/debian/libindicator3-6.install @@ -0,0 +1 @@ +debian/tmp/gtk3/usr/lib/libindicator3.so.* /usr/lib/ diff --git a/debian/libindicator3-dev.install b/debian/libindicator3-dev.install index 7381df0..4af3d44 100644 --- a/debian/libindicator3-dev.install +++ b/debian/libindicator3-dev.install @@ -1,3 +1,3 @@ -debian/tmp/usr/lib/pkgconfig/indicator3-0.4.pc -debian/tmp/usr/lib/libindicator3.a -debian/tmp/usr/lib/libindicator3.so +debian/tmp/gtk3/usr/lib/pkgconfig/indicator3-0.4.pc /usr/lib/pkgconfig/ +debian/tmp/gtk3/usr/lib/libindicator3.a /usr/lib/ +debian/tmp/gtk3/usr/lib/libindicator3.so /usr/lib/ diff --git a/debian/libindicator3-tools.install b/debian/libindicator3-tools.install index 2766bc0..47689fd 100644 --- a/debian/libindicator3-tools.install +++ b/debian/libindicator3-tools.install @@ -1 +1 @@ -debian/tmp/usr/lib/libindicator/indicator-loader3 +debian/tmp/gtk3/usr/lib/libindicator/indicator-loader3 /usr/lib/libindicator/ diff --git a/debian/libindicator4.install b/debian/libindicator4.install deleted file mode 100644 index 85dbd3e..0000000 --- a/debian/libindicator4.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libindicator.so.* diff --git a/debian/libindicator6.install b/debian/libindicator6.install new file mode 100644 index 0000000..c3bfad0 --- /dev/null +++ b/debian/libindicator6.install @@ -0,0 +1 @@ +debian/tmp/gtk2/usr/lib/libindicator.so.* /usr/lib/ diff --git a/debian/rules b/debian/rules index 4581c33..17ed4cf 100755 --- a/debian/rules +++ b/debian/rules @@ -1,39 +1,24 @@ #!/usr/bin/make -f +DEB_BUILDDIR = build +DEB_MAKE_FLAVORS = gtk2 gtk3 + include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk -include /usr/share/cdbs/1/rules/autoreconf.mk -DEB_SRCDIR = . -DEB_BUILDDIR = $(DEB_SRCDIR)/build +DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/tmp/@FLAVOR@ +DEB_DESTDIR = $(CURDIR)/debian/tmp/$(cdbs_make_curflavor)/ + +DEB_CONFIGURE_FLAGS_gtk2 = --with-gtk=2 +DEB_CONFIGURE_FLAGS_gtk3 = --with-gtk=3 LDFLAGS += -Wl,-z,defs -Wl,--as-needed -DEB_DH_MAKESHLIBS_ARGS_libindicator4 += -V 'libindicator4 (>= 0.3.90)' -DEB_DH_MAKESHLIBS_ARGS_libindicator3_4 += -V 'libindicator3-4 (>= 0.3.90)' - -configure/libindicator4:: stamp-configure-gtk2 -stamp-configure-gtk2: - : # configure for GTK+ 2.0 - set -e; \ - rm -rf build-gtk2; \ - mkdir build-gtk2; \ - cd build-gtk2; \ - $(DEB_CONFIGURE_SCRIPT_ENV) ../configure --with-gtk=2 \ - $(filter-out --srcdir=%, $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_EXTRA_FLAGS)); \ - cd ..; - touch stamp-configure-gtk2 - -build/libindicator4:: stamp-build-gtk2 -stamp-build-gtk2: stamp-configure-gtk2 - : # build for GTK+ 2.0 - $(MAKE) -C build-gtk2; - touch stamp-build-gtk2 - -common-install-prehook-arch:: stamp-build-gtk2 - : # install for GTK+ 2.0 - $(MAKE) -C build-gtk2 DESTDIR=$(CURDIR)/debian/tmp install - -clean:: - rm -f stamp-*-gtk2 - rm -rf build-gtk2 +DEB_DH_MAKESHLIBS_ARGS_libindicator6 += -V 'libindicator6 (>= 0.3.90)' +DEB_DH_MAKESHLIBS_ARGS_libindicator3_6 += -V 'libindicator3-6 (>= 0.3.90)' + +debian/stamp-autotools/gtk2: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk2) +debian/stamp-autotools/gtk3: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk3) + +common-install-arch:: + find debian/tmp -name \*.la -delete diff --git a/tools/Makefile.in b/tools/Makefile.in index e01a0d4..0d46485 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -281,7 +281,7 @@ indicator_loader_LDADD = \ indicator_loader3_SOURCES = $(indicator_loader_SOURCES) indicator_loader3_CFLAGS = $(indicator_loader_CFLAGS) indicator_loader3_LDADD = $(indicator_loader_LDADD) -xsessiondir = $(sysconfdir)/X11/Xsession.d +xsessiondir = $(pkgdatadir) xsession_DATA = 80indicator-debugging EXTRA_DIST = $(xsession_DATA) all: all-am -- cgit v1.2.3 From 604acbf9ee30144f0a517e768b23830241675f47 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Thu, 1 Sep 2011 14:22:10 -0700 Subject: Drop the Breaks: against old versions of libindicator and libindicator3; there are no file conflicts between the libraries, so this doesn't accurately reflect the package relationships but does make it harder to calculate upgrades from natty. LP: #839098. --- debian/changelog | 9 +++++++++ debian/control | 5 ----- 2 files changed, 9 insertions(+), 5 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index c38339c..f21b16d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +libindicator (0.3.93-0ubuntu2) UNRELEASED; urgency=low + + * Drop the Breaks: against old versions of libindicator and libindicator3; + there are no file conflicts between the libraries, so this doesn't + accurately reflect the package relationships but does make it harder to + calculate upgrades from natty. LP: #839098. + + -- Steve Langasek Thu, 01 Sep 2011 14:20:26 -0700 + libindicator (0.3.93-0ubuntu1) oneiric; urgency=low * debian/rules: diff --git a/debian/control b/debian/control index d9fbd97..06ee081 100644 --- a/debian/control +++ b/debian/control @@ -23,9 +23,6 @@ Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Breaks: libindicator1 (<= ${binary:Version}), - libindicator2 (<= ${binary:Version}), - libindicator3 (<= ${binary:Version}) Description: panel indicator applet - shared library This library contains information to build indicators to go into the indicator applet. @@ -61,8 +58,6 @@ Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Breaks: libindicator3-2 (<= ${binary:Version}), - libindicator3-3 (<= ${binary:Version}) Description: panel indicator applet - shared library This library contains information to build indicators to go into the indicator applet. -- cgit v1.2.3 From f131f1f92f2a91e9dcc52bc48fbfdfd0d62405ef Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 24 Jan 2012 10:15:31 -0600 Subject: debian/control: Bumping ABI version of lib --- debian/changelog | 3 ++- debian/control | 14 ++++++++------ debian/libindicator3-6.install | 1 - debian/libindicator3-7.install | 1 + debian/libindicator6.install | 1 - debian/libindicator7.install | 1 + 6 files changed, 12 insertions(+), 9 deletions(-) delete mode 100644 debian/libindicator3-6.install create mode 100644 debian/libindicator3-7.install delete mode 100644 debian/libindicator6.install create mode 100644 debian/libindicator7.install (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 2977081..59b5533 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,8 +9,9 @@ libindicator (0.4.90-0ubuntu1~ppa1) UNRELEASED; urgency=low * Support hiding and showing indicators * Track the parent object in the entry * Adding activate function to include Window ID + * debian/control: Bumping ABI version of lib - -- Ted Gould Tue, 24 Jan 2012 10:08:58 -0600 + -- Ted Gould Tue, 24 Jan 2012 10:15:17 -0600 libindicator (0.4.1-1) experimental; urgency=low diff --git a/debian/control b/debian/control index 06ee081..218cfe1 100644 --- a/debian/control +++ b/debian/control @@ -18,11 +18,12 @@ Homepage: https://launchpad.net/libindicator Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/libindicator/ubuntu Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/libindicator/ubuntu -Package: libindicator6 +Package: libindicator7 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Conflicts: libindicator6 Description: panel indicator applet - shared library This library contains information to build indicators to go into the indicator applet. @@ -35,7 +36,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libgtk2.0-dev (>= 2.12.0), - libindicator6 (= ${binary:Version}) + libindicator7 (= ${binary:Version}) Description: panel indicator applet - library development files This library contains information to build indicators to go into the indicator applet. @@ -47,17 +48,18 @@ Section: devel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libindicator6 (= ${binary:Version}) + libindicator7 (= ${binary:Version}) Description: Tools for libindicator Tools useful for developers of applications using indicators. . This package contains files that are needed to build applications. -Package: libindicator3-6 +Package: libindicator3-7 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Conflicts: libindicator3-6 Description: panel indicator applet - shared library This library contains information to build indicators to go into the indicator applet. @@ -70,7 +72,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libgtk-3-dev (>= 2.91.3), - libindicator3-6 (= ${binary:Version}), + libindicator3-7 (= ${binary:Version}), libindicator-dev (= ${binary:Version}) Description: panel indicator applet - library development files This library contains information to build indicators to go into @@ -83,7 +85,7 @@ Section: devel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libindicator3-6 (= ${binary:Version}) + libindicator3-7 (= ${binary:Version}) Description: Tools for libindicator Tools useful for developers of applications using indicators. . diff --git a/debian/libindicator3-6.install b/debian/libindicator3-6.install deleted file mode 100644 index 75485eb..0000000 --- a/debian/libindicator3-6.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/gtk3/usr/lib/libindicator3.so.* /usr/lib/ diff --git a/debian/libindicator3-7.install b/debian/libindicator3-7.install new file mode 100644 index 0000000..75485eb --- /dev/null +++ b/debian/libindicator3-7.install @@ -0,0 +1 @@ +debian/tmp/gtk3/usr/lib/libindicator3.so.* /usr/lib/ diff --git a/debian/libindicator6.install b/debian/libindicator6.install deleted file mode 100644 index c3bfad0..0000000 --- a/debian/libindicator6.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/gtk2/usr/lib/libindicator.so.* /usr/lib/ diff --git a/debian/libindicator7.install b/debian/libindicator7.install new file mode 100644 index 0000000..c3bfad0 --- /dev/null +++ b/debian/libindicator7.install @@ -0,0 +1 @@ +debian/tmp/gtk2/usr/lib/libindicator.so.* /usr/lib/ -- cgit v1.2.3 From 118a95aad977f3a624cd3b4527941e8b1b01f0e1 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Tue, 24 Jan 2012 21:50:55 -0500 Subject: releasing version 0.4.90-0ubuntu2 --- debian/changelog | 7 +++++++ debian/control | 2 -- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index d3d483f..9437510 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libindicator (0.4.90-0ubuntu2) precise; urgency=low + + * debian/control + - dropped the Conflicts with libindicator6 and libindicator3-6 + + -- Ken VanDine Tue, 24 Jan 2012 21:44:30 -0500 + libindicator (0.4.90-0ubuntu1) precise; urgency=low [ Ted Gould ] diff --git a/debian/control b/debian/control index 218cfe1..90e1367 100644 --- a/debian/control +++ b/debian/control @@ -23,7 +23,6 @@ Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Conflicts: libindicator6 Description: panel indicator applet - shared library This library contains information to build indicators to go into the indicator applet. @@ -59,7 +58,6 @@ Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Conflicts: libindicator3-6 Description: panel indicator applet - shared library This library contains information to build indicators to go into the indicator applet. -- cgit v1.2.3 From 36b39c96eac1bcadaf506a52b6c583155559458b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 14 Feb 2012 14:23:06 -0600 Subject: debian/control, debian/rules: Adding in autoreconf support --- debian/changelog | 3 ++- debian/control | 1 + debian/rules | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 37ed70f..c92d5d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,8 +7,9 @@ libindicator (0.4.91-0ubuntu1~ppa1) UNRELEASED; urgency=low * Dropping debian/patches * Upstream Merge * Explicitly add in gmodule as a required library + * debian/control, debian/rules: Adding in autoreconf support - -- Ted Gould Tue, 14 Feb 2012 14:21:17 -0600 + -- Ted Gould Tue, 14 Feb 2012 14:22:50 -0600 libindicator (0.4.90-0ubuntu4) precise; urgency=low diff --git a/debian/control b/debian/control index 90e1367..4816b56 100644 --- a/debian/control +++ b/debian/control @@ -5,6 +5,7 @@ Maintainer: Ubuntu Core Developers XSBC-Original-Maintainer: The Ayatana Packagers Uploaders: Evgeni Golov , Kartik Mistry Build-Depends: debhelper (>= 5.0), + dh-autoreconf, cdbs (>= 0.4.41), libglib2.0-dev (>= 2.22), libgtk2.0-dev (>= 2.18), diff --git a/debian/rules b/debian/rules index f62d05a..7e69bc0 100755 --- a/debian/rules +++ b/debian/rules @@ -5,6 +5,7 @@ DEB_MAKE_FLAVORS = gtk2 gtk3 include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/cdbs/1/rules/autoreconf.mk DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/tmp/@FLAVOR@ DEB_DESTDIR = $(CURDIR)/debian/tmp/$(cdbs_make_curflavor)/ -- cgit v1.2.3 From 7f1272a5681547e6a6cb083b699be4770c08ac96 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 14 Feb 2012 14:27:38 -0600 Subject: * debian/control, debian/rules: * Adding in autoreconf support * Adding a check rule and requiring new build deps --- debian/changelog | 6 ++++-- debian/control | 3 ++- debian/rules | 2 ++ 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index c92d5d9..3232851 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,9 +7,11 @@ libindicator (0.4.91-0ubuntu1~ppa1) UNRELEASED; urgency=low * Dropping debian/patches * Upstream Merge * Explicitly add in gmodule as a required library - * debian/control, debian/rules: Adding in autoreconf support + * debian/control, debian/rules: + * Adding in autoreconf support + * Adding a check rule and requiring new build deps - -- Ted Gould Tue, 14 Feb 2012 14:22:50 -0600 + -- Ted Gould Tue, 14 Feb 2012 14:27:03 -0600 libindicator (0.4.90-0ubuntu4) precise; urgency=low diff --git a/debian/control b/debian/control index 4816b56..998c41c 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,8 @@ Build-Depends: debhelper (>= 5.0), libtool, intltool, gtk-doc-tools, - dh-autoreconf + dbus-test-runner, + xvfb Standards-Version: 3.9.2 Homepage: https://launchpad.net/libindicator Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/libindicator/ubuntu diff --git a/debian/rules b/debian/rules index 7e69bc0..e74ddd1 100755 --- a/debian/rules +++ b/debian/rules @@ -13,6 +13,8 @@ DEB_DESTDIR = $(CURDIR)/debian/tmp/$(cdbs_make_curflavor)/ DEB_CONFIGURE_FLAGS_gtk2 = --with-gtk=2 DEB_CONFIGURE_FLAGS_gtk3 = --with-gtk=3 +DEB_MAKE_CHECK_TARGET := check + LDFLAGS += -Wl,-z,defs -Wl,--as-needed DEB_DH_MAKESHLIBS_ARGS_libindicator7 += -V 'libindicator7 (>= 0.4.90)' -- cgit v1.2.3 From 30aa94e03335dc768f18a1858b6be7f2aaeeb50b Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Wed, 21 Nov 2012 14:25:01 -0500 Subject: * debian/control: - Reorganize Build-Depends for clarity. - Update style to be consistent with other indicator stack packages. --- debian/changelog | 8 ++++++++ debian/control | 22 +++++++++++----------- 2 files changed, 19 insertions(+), 11 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 4204507..715e2f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +libindicator (12.10.2-0ubuntu1) UNRELEASED; urgency=low + + * debian/control: + - Reorganize Build-Depends for clarity. + - Update style to be consistent with other indicator stack packages. + + -- Mathieu Trudel-Lapierre Wed, 21 Nov 2012 14:23:18 -0500 + libindicator (12.10.1-0ubuntu1) quantal; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index 998c41c..aab89ea 100644 --- a/debian/control +++ b/debian/control @@ -6,15 +6,15 @@ XSBC-Original-Maintainer: The Ayatana Packagers , Kartik Mistry Build-Depends: debhelper (>= 5.0), dh-autoreconf, - cdbs (>= 0.4.41), - libglib2.0-dev (>= 2.22), - libgtk2.0-dev (>= 2.18), - libgtk-3-dev (>= 2.91.3), libtool, intltool, gtk-doc-tools, dbus-test-runner, - xvfb + xvfb, + cdbs (>= 0.4.41), + libglib2.0-dev (>= 2.22), + libgtk2.0-dev (>= 2.18), + libgtk-3-dev (>= 2.91.3), Standards-Version: 3.9.2 Homepage: https://launchpad.net/libindicator Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/libindicator/ubuntu @@ -24,7 +24,7 @@ Package: libindicator7 Section: libs Architecture: any Depends: ${shlibs:Depends}, - ${misc:Depends} + ${misc:Depends}, Description: panel indicator applet - shared library This library contains information to build indicators to go into the indicator applet. @@ -37,7 +37,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libgtk2.0-dev (>= 2.12.0), - libindicator7 (= ${binary:Version}) + libindicator7 (= ${binary:Version}), Description: panel indicator applet - library development files This library contains information to build indicators to go into the indicator applet. @@ -49,7 +49,7 @@ Section: devel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libindicator7 (= ${binary:Version}) + libindicator7 (= ${binary:Version}), Description: Tools for libindicator Tools useful for developers of applications using indicators. . @@ -59,7 +59,7 @@ Package: libindicator3-7 Section: libs Architecture: any Depends: ${shlibs:Depends}, - ${misc:Depends} + ${misc:Depends}, Description: panel indicator applet - shared library This library contains information to build indicators to go into the indicator applet. @@ -73,7 +73,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, libgtk-3-dev (>= 2.91.3), libindicator3-7 (= ${binary:Version}), - libindicator-dev (= ${binary:Version}) + libindicator-dev (= ${binary:Version}), Description: panel indicator applet - library development files This library contains information to build indicators to go into the indicator applet. @@ -85,7 +85,7 @@ Section: devel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libindicator3-7 (= ${binary:Version}) + libindicator3-7 (= ${binary:Version}), Description: Tools for libindicator Tools useful for developers of applications using indicators. . -- cgit v1.2.3 From 9ec2a25350ecf32bfc2e308d598de49fd7fc69c6 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Wed, 21 Nov 2012 14:25:36 -0500 Subject: Bump debhelper Build-Depends to (>= 9). --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 715e2f8..368e11a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ libindicator (12.10.2-0ubuntu1) UNRELEASED; urgency=low * debian/control: - Reorganize Build-Depends for clarity. - Update style to be consistent with other indicator stack packages. + - Bump debhelper Build-Depends to (>= 9). -- Mathieu Trudel-Lapierre Wed, 21 Nov 2012 14:23:18 -0500 diff --git a/debian/control b/debian/control index aab89ea..cd844b9 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Ubuntu Core Developers XSBC-Original-Maintainer: The Ayatana Packagers Uploaders: Evgeni Golov , Kartik Mistry -Build-Depends: debhelper (>= 5.0), +Build-Depends: debhelper (>= 9), dh-autoreconf, libtool, intltool, -- cgit v1.2.3 From d1e3acb63a29ac2f2905d1ec5e0c09360bd7dffc Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Wed, 21 Nov 2012 14:59:05 -0500 Subject: Drop Build-Depends on cdbs. --- debian/changelog | 1 + debian/control | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 8444808..5326bff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ libindicator (12.10.2-0ubuntu1) UNRELEASED; urgency=low - Reorganize Build-Depends for clarity. - Update style to be consistent with other indicator stack packages. - Bump debhelper Build-Depends to (>= 9). + - Drop Build-Depends on cdbs. * debian/rules: - Convert to using the dh9 sequencer. diff --git a/debian/control b/debian/control index cd844b9..0f0f650 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,6 @@ Build-Depends: debhelper (>= 9), gtk-doc-tools, dbus-test-runner, xvfb, - cdbs (>= 0.4.41), libglib2.0-dev (>= 2.22), libgtk2.0-dev (>= 2.18), libgtk-3-dev (>= 2.91.3), -- cgit v1.2.3 From e16a12634552cf2981a437cac745aa24359e9627 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Wed, 21 Nov 2012 15:00:45 -0500 Subject: Add a Build-Depends on gnome-common. --- debian/changelog | 1 + debian/control | 1 + 2 files changed, 2 insertions(+) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index dfb1d58..9771710 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ libindicator (12.10.2-0ubuntu1) UNRELEASED; urgency=low - Update style to be consistent with other indicator stack packages. - Bump debhelper Build-Depends to (>= 9). - Drop Build-Depends on cdbs. + - Add a Build-Depends on gnome-common. * debian/rules: - Convert to using the dh9 sequencer. - Override dh_autoreconf to run autogen.sh and not call configure. diff --git a/debian/control b/debian/control index 0f0f650..9e8bc57 100644 --- a/debian/control +++ b/debian/control @@ -8,6 +8,7 @@ Build-Depends: debhelper (>= 9), dh-autoreconf, libtool, intltool, + gnome-common, gtk-doc-tools, dbus-test-runner, xvfb, -- cgit v1.2.3 From 1d6bc1dc2ce966ebfc26a842afd51f2d31a9b0b9 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Thu, 22 Nov 2012 02:30:41 -0500 Subject: Update Vcs-Bzr, Vcs-Browser and add a notice to uploaders. --- debian/changelog | 1 + debian/control | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 9771710..97c5bfc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ libindicator (12.10.2-0ubuntu1) UNRELEASED; urgency=low - Bump debhelper Build-Depends to (>= 9). - Drop Build-Depends on cdbs. - Add a Build-Depends on gnome-common. + - Update Vcs-Bzr, Vcs-Browser and add a notice to uploaders. * debian/rules: - Convert to using the dh9 sequencer. - Override dh_autoreconf to run autogen.sh and not call configure. diff --git a/debian/control b/debian/control index 9e8bc57..beea51c 100644 --- a/debian/control +++ b/debian/control @@ -17,8 +17,11 @@ Build-Depends: debhelper (>= 9), libgtk-3-dev (>= 2.91.3), Standards-Version: 3.9.2 Homepage: https://launchpad.net/libindicator -Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/libindicator/ubuntu -Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/libindicator/ubuntu +# If you aren't a member of ~indicator-applet-developers but need to upload +# packaging changes, just go ahead. ~indicator-applet-developers will notice +# and sync up the code again. +Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/libindicator/trunk.13.04 +Vcs-Browser: https://bazaar.launchpad.net/~indicator-applet-developers/libindicator/trunk.13.04/files Package: libindicator7 Section: libs -- cgit v1.2.3 From 93e0bd194387d998de428c326efe21eb92c57dfa Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Thu, 22 Nov 2012 12:19:57 -0500 Subject: Add the proper Pre-Depends: multiarch to libindicator3-7. --- debian/changelog | 1 + debian/control | 1 + 2 files changed, 2 insertions(+) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index dbe6fad..51a40c8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ libindicator (12.10.2-0ubuntu1) UNRELEASED; urgency=low - Drop Build-Depends on cdbs. - Add a Build-Depends on gnome-common. - Update Vcs-Bzr, Vcs-Browser and add a notice to uploaders. + - Add the proper Pre-Depends: multiarch to libindicator3-7. * debian/rules: - Convert to using the dh9 sequencer. - Override dh_autoreconf to run autogen.sh and not call configure. diff --git a/debian/control b/debian/control index beea51c..582965d 100644 --- a/debian/control +++ b/debian/control @@ -61,6 +61,7 @@ Description: Tools for libindicator Package: libindicator3-7 Section: libs Architecture: any +Pre-Depends: multiarch-support Depends: ${shlibs:Depends}, ${misc:Depends}, Description: panel indicator applet - shared library -- cgit v1.2.3