From df182c1c6680b2b7f0fbce6361d8114f40d0e7ae Mon Sep 17 00:00:00 2001 From: Robert Collins Date: Mon, 2 Nov 2009 12:14:36 +1100 Subject: Draft packaging. --- debian/control | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 debian/control (limited to 'debian/control') diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..9f03658 --- /dev/null +++ b/debian/control @@ -0,0 +1,27 @@ +Source: cape-girardeau +Section: gnome +Priority: optional +Maintainer: Ubuntu Core Developers +Build-Depends: debhelper (>= 5.0), + cdbs (>= 0.4.41), + libgtk2.0-dev (>= 2.12.0), + libdbus-glib-1-dev, + gnome-doc-utils, + scrollkeeper, + intltool, + libindicate-dev (>= 0.2.0), + libindicate-gtk-dev (>= 0.2.0), + libindicator-dev (>= 0.2.0~bzr301), + libdbusmenu-gtk-dev (>= 0.1.1), + libdbusmenu-glib-dev (>= 0.1.1) +Standards-Version: 3.8.0 +Homepage: https://launchpad.net/wasilla +Vcs-Bzr: http://bazaar.launchpa.net/~canonical-dx-team/cape-girardeau/karmic + +Package: cape-girardeau +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: cape-girardeau project + . + This package is the cape-girardeau project + -- cgit v1.2.3 From a260225c5ed5d9c1cfb463728eed7a09d12c70aa Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 2 Nov 2009 20:45:25 -0600 Subject: Changing the package name --- debian/changelog | 2 +- debian/control | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index f9aae13..b2d4b8a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -cape-girardeau (0.0.1-0ubuntu1) karmic; urgency=low +indicator-custom (0.0.1-0ubuntu1) karmic; urgency=low * Development packaging edition. diff --git a/debian/control b/debian/control index 9f03658..d4f7d18 100644 --- a/debian/control +++ b/debian/control @@ -1,4 +1,4 @@ -Source: cape-girardeau +Source: indicator-custom Section: gnome Priority: optional Maintainer: Ubuntu Core Developers @@ -15,10 +15,10 @@ Build-Depends: debhelper (>= 5.0), libdbusmenu-gtk-dev (>= 0.1.1), libdbusmenu-glib-dev (>= 0.1.1) Standards-Version: 3.8.0 -Homepage: https://launchpad.net/wasilla +Homepage: https://launchpad.net/cape-girardeau Vcs-Bzr: http://bazaar.launchpa.net/~canonical-dx-team/cape-girardeau/karmic -Package: cape-girardeau +Package: indicator-custom Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: cape-girardeau project -- cgit v1.2.3 From 9d043e67d6424039aa64b854b75eed19d9af9f0e Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 2 Nov 2009 21:39:38 -0600 Subject: * debian/control: Splitting out libcustomindicator * Adding debian/libcustomindicator0.install, debian/libcustomindicator-dev.install, debian/indicator-custom.install to make all the different packages. --- debian/changelog | 10 ++++++++++ debian/control | 19 +++++++++++++++++++ debian/indicator-custom.install | 3 +++ debian/libcustomindicator-dev.install | 4 ++++ debian/libcustomindicator0.install | 1 + 5 files changed, 37 insertions(+) create mode 100644 debian/indicator-custom.install create mode 100644 debian/libcustomindicator-dev.install create mode 100644 debian/libcustomindicator0.install (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index b2d4b8a..41db8d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +indicator-custom (0.0.1-0ubuntu2) UNRELEASED; urgency=low + + * debian/control: Splitting out libcustomindicator + * Adding debian/libcustomindicator0.install, + debian/libcustomindicator-dev.install, + debian/indicator-custom.install + to make all the different packages. + + -- Ted Gould Mon, 02 Nov 2009 21:24:10 -0600 + indicator-custom (0.0.1-0ubuntu1) karmic; urgency=low * Development packaging edition. diff --git a/debian/control b/debian/control index d4f7d18..92bb538 100644 --- a/debian/control +++ b/debian/control @@ -25,3 +25,22 @@ Description: cape-girardeau project . This package is the cape-girardeau project +Package: libcustomindicator0 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: cape-girardeau project + . + This package is the cape-girardeau project + +Package: libcustomindicator-dev +Section: libdevel +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libdbus-glib-1-dev (>= 0.76) +Description: cape-girardeau project + . + This package is the cape-girardeau project + diff --git a/debian/indicator-custom.install b/debian/indicator-custom.install new file mode 100644 index 0000000..a4eeb0b --- /dev/null +++ b/debian/indicator-custom.install @@ -0,0 +1,3 @@ +debian/tmp/usr/lib/indicators/* +debian/tmp/usr/lib/indicator-custom/indicator-custom-service +debian/tmp/usr/share/dbus-1/services/indicator-custom.service diff --git a/debian/libcustomindicator-dev.install b/debian/libcustomindicator-dev.install new file mode 100644 index 0000000..0f13680 --- /dev/null +++ b/debian/libcustomindicator-dev.install @@ -0,0 +1,4 @@ +debian/tmp/usr/include/libcustomindicator-0.1/* +debian/tmp/usr/lib/libcustomindicator.so +debian/tmp/usr/lib/libcustomindicator.a +debian/tmp/usr/lib/libcustomindicator.la diff --git a/debian/libcustomindicator0.install b/debian/libcustomindicator0.install new file mode 100644 index 0000000..20b62d5 --- /dev/null +++ b/debian/libcustomindicator0.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libcustomindicator.so.* -- cgit v1.2.3 From c0b7c8945b847c6742c2c8b639d1e5888516845d Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 1 Dec 2009 09:26:29 -0600 Subject: * debian/* changing packaging to not be "custom" anymore and now everything is "application" * debian/control: Splitting out libappindicator * Adding debian/libappindicator0.install, debian/libappindicator-dev.install, debian/indicator-application.install --- debian/changelog | 34 ++++++++++++++++++---------------- debian/control | 8 ++++---- debian/indicator-application.install | 3 +++ debian/indicator-custom.install | 3 --- debian/libcustomindicator-dev.install | 8 ++++---- debian/libcustomindicator0.install | 2 +- debian/watch | 2 +- 7 files changed, 31 insertions(+), 29 deletions(-) create mode 100644 debian/indicator-application.install delete mode 100644 debian/indicator-custom.install (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 4c5247e..d307e45 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,76 +1,78 @@ -indicator-custom (0.0.1-0ubuntu3~ppa1~newname1) UNRELEASED; urgency=low +indicator-application (0.0.1-0ubuntu3~ppa1~newname1) UNRELEASED; urgency=low * Massive name change. + * debian/* changing packaging to not be "custom" anymore and now + everything is "application" -- Ted Gould Tue, 01 Dec 2009 09:21:54 -0600 -indicator-custom (0.0.1-0ubuntu3~ppa1~service8) karmic; urgency=low +indicator-application (0.0.1-0ubuntu3~ppa1~service8) karmic; urgency=low * Sync to trunk and fix distcheck by delaying connecting to the service by checking for data. -- Ted Gould Tue, 24 Nov 2009 17:08:34 -0600 -indicator-custom (0.0.1-0ubuntu3~ppa1~service7) karmic; urgency=low +indicator-application (0.0.1-0ubuntu3~ppa1~service7) karmic; urgency=low * More updates and getting kinda stable-ish -- Ted Gould Tue, 24 Nov 2009 16:31:53 -0600 -indicator-custom (0.0.1-0ubuntu3~ppa1~service6) karmic; urgency=low +indicator-application (0.0.1-0ubuntu3~ppa1~service6) karmic; urgency=low * Debug messages -- Ted Gould Mon, 23 Nov 2009 17:39:18 -0600 -indicator-custom (0.0.1-0ubuntu3~ppa1~service5) karmic; urgency=low +indicator-application (0.0.1-0ubuntu3~ppa1~service5) karmic; urgency=low * Forgot return types. -- Ted Gould Mon, 23 Nov 2009 16:52:16 -0600 -indicator-custom (0.0.1-0ubuntu3~ppa1~service4) karmic; urgency=low +indicator-application (0.0.1-0ubuntu3~ppa1~service4) karmic; urgency=low * Adding marshallers -- Ted Gould Mon, 23 Nov 2009 16:37:51 -0600 -indicator-custom (0.0.1-0ubuntu3~ppa1~service3) karmic; urgency=low +indicator-application (0.0.1-0ubuntu3~ppa1~service3) karmic; urgency=low * Adding more fun. Now we're cookin'! -- Ted Gould Mon, 23 Nov 2009 14:56:35 -0600 -indicator-custom (0.0.1-0ubuntu3~ppa1~service2) karmic; urgency=low +indicator-application (0.0.1-0ubuntu3~ppa1~service2) karmic; urgency=low * Building the service and getting things in better shape. -- Ted Gould Sun, 08 Nov 2009 23:04:48 -0600 -indicator-custom (0.0.1-0ubuntu3~ppa1~service1) karmic; urgency=low +indicator-application (0.0.1-0ubuntu3~ppa1~service1) karmic; urgency=low * Grabbing from the service development branch -- Ted Gould Mon, 02 Nov 2009 21:56:33 -0600 -indicator-custom (0.0.1-0ubuntu3~ppa1) karmic; urgency=low +indicator-application (0.0.1-0ubuntu3~ppa1) karmic; urgency=low * Flesh out the library to have stuff working. * Updating test suite to run under dbus-test-runner. -- Ted Gould Tue, 01 Dec 2009 09:17:24 -0600 -indicator-custom (0.0.1-0ubuntu2) karmic; urgency=low +indicator-application (0.0.1-0ubuntu2) karmic; urgency=low - * debian/control: Splitting out libcustomindicator - * Adding debian/libcustomindicator0.install, - debian/libcustomindicator-dev.install, - debian/indicator-custom.install + * debian/control: Splitting out libappindicator + * Adding debian/libappindicator0.install, + debian/libappindicator-dev.install, + debian/indicator-application.install to make all the different packages. -- Ted Gould Mon, 02 Nov 2009 21:41:20 -0600 -indicator-custom (0.0.1-0ubuntu1) karmic; urgency=low +indicator-application (0.0.1-0ubuntu1) karmic; urgency=low * Development packaging edition. diff --git a/debian/control b/debian/control index 92bb538..a6f0473 100644 --- a/debian/control +++ b/debian/control @@ -1,4 +1,4 @@ -Source: indicator-custom +Source: indicator-application Section: gnome Priority: optional Maintainer: Ubuntu Core Developers @@ -18,14 +18,14 @@ Standards-Version: 3.8.0 Homepage: https://launchpad.net/cape-girardeau Vcs-Bzr: http://bazaar.launchpa.net/~canonical-dx-team/cape-girardeau/karmic -Package: indicator-custom +Package: indicator-application Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: cape-girardeau project . This package is the cape-girardeau project -Package: libcustomindicator0 +Package: libappindicator0 Section: libs Architecture: any Depends: ${shlibs:Depends}, @@ -34,7 +34,7 @@ Description: cape-girardeau project . This package is the cape-girardeau project -Package: libcustomindicator-dev +Package: libappindicator-dev Section: libdevel Architecture: any Depends: ${shlibs:Depends}, diff --git a/debian/indicator-application.install b/debian/indicator-application.install new file mode 100644 index 0000000..4429197 --- /dev/null +++ b/debian/indicator-application.install @@ -0,0 +1,3 @@ +debian/tmp/usr/lib/indicators/* +debian/tmp/usr/lib/indicator-application/indicator-application-service +debian/tmp/usr/share/dbus-1/services/indicator-application.service diff --git a/debian/indicator-custom.install b/debian/indicator-custom.install deleted file mode 100644 index a4eeb0b..0000000 --- a/debian/indicator-custom.install +++ /dev/null @@ -1,3 +0,0 @@ -debian/tmp/usr/lib/indicators/* -debian/tmp/usr/lib/indicator-custom/indicator-custom-service -debian/tmp/usr/share/dbus-1/services/indicator-custom.service diff --git a/debian/libcustomindicator-dev.install b/debian/libcustomindicator-dev.install index 0f13680..ff27124 100644 --- a/debian/libcustomindicator-dev.install +++ b/debian/libcustomindicator-dev.install @@ -1,4 +1,4 @@ -debian/tmp/usr/include/libcustomindicator-0.1/* -debian/tmp/usr/lib/libcustomindicator.so -debian/tmp/usr/lib/libcustomindicator.a -debian/tmp/usr/lib/libcustomindicator.la +debian/tmp/usr/include/libappindicator-0.1/* +debian/tmp/usr/lib/libappindicator.so +debian/tmp/usr/lib/libappindicator.a +debian/tmp/usr/lib/libappindicator.la diff --git a/debian/libcustomindicator0.install b/debian/libcustomindicator0.install index 20b62d5..a0b5976 100644 --- a/debian/libcustomindicator0.install +++ b/debian/libcustomindicator0.install @@ -1 +1 @@ -debian/tmp/usr/lib/libcustomindicator.so.* +debian/tmp/usr/lib/libappindicator.so.* diff --git a/debian/watch b/debian/watch index f0f23d1..4d56068 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,2 @@ version=3 -http://launchpad.net/cape-girardeau/+download .*/indicator-custom-([0-9.]+)\.tar\.gz +http://launchpad.net/cape-girardeau/+download .*/indicator-application-([0-9.]+)\.tar\.gz -- cgit v1.2.3 From afd09042de2eb8e05af765373c5570af8bf0b8a0 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 9 Dec 2009 12:07:31 -0600 Subject: debian/control: Adding a build dep on gtk-doc-tools --- debian/changelog | 1 + debian/control | 1 + 2 files changed, 2 insertions(+) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 560f403..feb9837 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ indicator-application (0.0.2-0ubuntu1~ppa2) UNRELEASED; urgency=low * Adding in documentation * Adding a pkg-config .pc file for libappindicator * debian/libappindicator-dev.install: Adding pkgconfig files. + * debian/control: Adding a build dep on gtk-doc-tools -- Ted Gould Wed, 09 Dec 2009 12:01:29 -0600 diff --git a/debian/control b/debian/control index a6f0473..49b4a1c 100644 --- a/debian/control +++ b/debian/control @@ -8,6 +8,7 @@ Build-Depends: debhelper (>= 5.0), libdbus-glib-1-dev, gnome-doc-utils, scrollkeeper, + gtk-doc-tools, intltool, libindicate-dev (>= 0.2.0), libindicate-gtk-dev (>= 0.2.0), -- cgit v1.2.3 From 94cc8a79f51cdb15d83d2027955298c77c0f2f17 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 10 Dec 2009 13:23:43 -0600 Subject: debian/control: Increasing libdbusmenu requirements to 0.1.8 --- 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 2136b72..8fa307f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ indicator-application (0.0.3-0ubuntu1~ppa1) UNRELEASED; urgency=low * More GtkMenu support in libappindicator * debian/libappindicator-dev.install: Adding pkgconfig files. * debian/control: Adding a build dep on gtk-doc-tools + * debian/control: Increasing libdbusmenu requirements to 0.1.8 -- Ted Gould Thu, 10 Dec 2009 13:21:57 -0600 diff --git a/debian/control b/debian/control index 49b4a1c..9065244 100644 --- a/debian/control +++ b/debian/control @@ -13,8 +13,8 @@ Build-Depends: debhelper (>= 5.0), libindicate-dev (>= 0.2.0), libindicate-gtk-dev (>= 0.2.0), libindicator-dev (>= 0.2.0~bzr301), - libdbusmenu-gtk-dev (>= 0.1.1), - libdbusmenu-glib-dev (>= 0.1.1) + libdbusmenu-gtk-dev (>= 0.1.8), + libdbusmenu-glib-dev (>= 0.1.8) Standards-Version: 3.8.0 Homepage: https://launchpad.net/cape-girardeau Vcs-Bzr: http://bazaar.launchpa.net/~canonical-dx-team/cape-girardeau/karmic -- cgit v1.2.3 From fb2b3cf858bcae1ec284472c33e9d4d1cb2bda6d Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 10 Dec 2009 15:01:02 -0500 Subject: * debian/control - set Vcs-Bzr to ~ubuntu-desktop --- debian/changelog | 6 +++++- debian/control | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 6573574..1c05374 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-application (0.0.3-0ubuntu1~ppa1) karmic; urgency=low +indicator-application (0.0.3-0ubuntu1) karmic; urgency=low * Upstream release 0.0.3 * Adding in documentation @@ -8,6 +8,10 @@ indicator-application (0.0.3-0ubuntu1~ppa1) karmic; urgency=low * debian/control: Adding a build dep on gtk-doc-tools * debian/control: Increasing libdbusmenu requirements to 0.1.8 + [Ken VanDine] + * debian/control + - set Vcs-Bzr to ~ubuntu-desktop + -- Ted Gould Thu, 10 Dec 2009 13:34:40 -0600 indicator-application (0.0.2-0~ppa3) karmic; urgency=low diff --git a/debian/control b/debian/control index bd84152..039c721 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,7 @@ Build-Depends: debhelper (>= 5.0), libdbusmenu-glib-dev (>= 0.1.8) Standards-Version: 3.8.0 Homepage: https://launchpad.net/indicator-application -Vcs-Bzr: http://bazaar.launchpa.net/~indicator-applet-developers/indicator-application/karmic +Vcs-Bzr: http://bazaar.launchpa.net/~ubuntu-desktop/indicator-application/ubuntu Package: indicator-application Architecture: any -- cgit v1.2.3 From af738898f8690ca60dc6e689cd24d2b525cde906 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 10 Dec 2009 17:12:55 -0500 Subject: - set libappindicator-doc arch all - make libappindicator-dev depend on libappindicator0 --- debian/changelog | 2 ++ debian/control | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 7d06522..350d880 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,8 @@ indicator-application (0.0.3-0ubuntu1) UNRELEASED; urgency=low [Ken VanDine] * debian/control - set Vcs-Bzr to ~ubuntu-desktop + - set libappindicator-doc arch all + - make libappindicator-dev depend on libappindicator0 * debian/libappindicator-doc.install - install the developer docs * debian/rules diff --git a/debian/control b/debian/control index 039c721..5fd3db4 100644 --- a/debian/control +++ b/debian/control @@ -42,7 +42,8 @@ Section: libdevel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libdbus-glib-1-dev (>= 0.76) + libdbus-glib-1-dev (>= 0.76), + libappindicator0 (= ${binary:Version}) Description: Application Indicators A library and indicator to take menus from applications and place them in the panel. @@ -51,7 +52,7 @@ Description: Application Indicators Package: libappindicator-doc Section: doc -Architecture: any +Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends}, libappindicator0 (= ${binary:Version}) -- cgit v1.2.3 From 020d8bb3d154e182be7650405719ab2ac2e3ce9e Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Fri, 11 Dec 2009 09:22:32 -0500 Subject: * debian/control: - removed Build-Depend for scrollkeeper --- debian/changelog | 2 ++ debian/control | 1 - debian/patches/clean_up_docs.patch | 55 -------------------------------------- 3 files changed, 2 insertions(+), 56 deletions(-) delete mode 100644 debian/patches/clean_up_docs.patch (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 8114617..c60bea9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ indicator-application (0.0.4-0ubuntu1) lucid; urgency=low - set DOC_SERVER used for docs * debian/patches/clean_up_docs.patch - removed, merged upstream + * debian/control: + - removed Build-Depend for scrollkeeper -- Ken VanDine Fri, 11 Dec 2009 09:18:58 -0500 diff --git a/debian/control b/debian/control index 5fd3db4..746e569 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,6 @@ Build-Depends: debhelper (>= 5.0), libgtk2.0-dev (>= 2.12.0), libdbus-glib-1-dev, gnome-doc-utils, - scrollkeeper, gtk-doc-tools, intltool, libindicate-dev (>= 0.2.0), diff --git a/debian/patches/clean_up_docs.patch b/debian/patches/clean_up_docs.patch deleted file mode 100644 index 39ff62c..0000000 --- a/debian/patches/clean_up_docs.patch +++ /dev/null @@ -1,55 +0,0 @@ -=== modified file 'configure.ac' ---- configure.ac 2009-12-10 19:18:44 +0000 -+++ configure.ac 2009-12-11 14:17:10 +0000 -@@ -16,6 +16,7 @@ - AC_PROG_LIBTOOL - - AC_SUBST(VERSION) -+AC_SUBST(DOC_SERVER) - AC_CONFIG_MACRO_DIR([m4]) - - m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) -@@ -93,6 +94,7 @@ - docs/Makefile - docs/reference/Makefile - docs/reference/version.xml -+docs/reference/libappindicator-docs.sgml - ]) - - ########################### - -=== modified file 'docs/reference/Makefile.am' ---- docs/reference/Makefile.am 2009-12-08 22:02:28 +0000 -+++ docs/reference/Makefile.am 2009-12-11 14:09:14 +0000 -@@ -83,7 +83,7 @@ - - # Other files to distribute - # e.g. EXTRA_DIST += version.xml.in --EXTRA_DIST += version.xml.in -+EXTRA_DIST += version.xml.in libappindicator-docs.sgml.in - - # Files not to distribute - # for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types - -=== renamed file 'docs/reference/libappindicator-docs.sgml' => 'docs/reference/libappindicator-docs.sgml.in' ---- docs/reference/libappindicator-docs.sgml 2009-12-08 19:22:45 +0000 -+++ docs/reference/libappindicator-docs.sgml.in 2009-12-11 14:16:59 +0000 -@@ -8,14 +8,14 @@ - - libappindicator Reference Manual - -- for libappindicator [VERSION] -+ for libappindicator @VERSION@ - The latest version of this documentation can be found on-line at -- http://[SERVER]/libappindicator/. -+ http://@DOC_SERVER@/libappindicator/current/. - - - - -- [Insert title here] -+ Base Classes for Applications - - - - -- cgit v1.2.3 From 2da3664f35f00f5f1d53d780dc6242a7065738df Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Fri, 11 Dec 2009 12:31:39 -0500 Subject: libappindicator-dev needs to depend on libdbusmenu-glib-dev --- debian/changelog | 1 + debian/control | 1 + 2 files changed, 2 insertions(+) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index bb28504..f4ef9a6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ indicator-application (0.0.4-0ubuntu1) lucid; urgency=low - removed, merged upstream * debian/control: - removed Build-Depend for scrollkeeper + - libappindicator-dev needs to depend on libdbusmenu-glib-dev -- Ken VanDine Fri, 11 Dec 2009 09:18:58 -0500 diff --git a/debian/control b/debian/control index 746e569..a717e5b 100644 --- a/debian/control +++ b/debian/control @@ -41,6 +41,7 @@ Section: libdevel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, + libdbusmenu-glib-dev (>= 0.1.8), libdbus-glib-1-dev (>= 0.76), libappindicator0 (= ${binary:Version}) Description: Application Indicators -- cgit v1.2.3 From fd5003d889c64a42e24fc53355ffd5de2c271b6f Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Fri, 11 Dec 2009 12:39:56 -0500 Subject: - bump standards version to 3.8.3 - libappindicator-doc doesn't need to depend on libappindicator0 --- debian/changelog | 2 ++ debian/control | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index f4ef9a6..d641d68 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ indicator-application (0.0.4-0ubuntu1) lucid; urgency=low * debian/control: - removed Build-Depend for scrollkeeper - libappindicator-dev needs to depend on libdbusmenu-glib-dev + - bump standards version to 3.8.3 + - libappindicator-doc doesn't need to depend on libappindicator0 -- Ken VanDine Fri, 11 Dec 2009 09:18:58 -0500 diff --git a/debian/control b/debian/control index a717e5b..71aa84e 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ Build-Depends: debhelper (>= 5.0), libindicator-dev (>= 0.3.0), libdbusmenu-gtk-dev (>= 0.1.8), libdbusmenu-glib-dev (>= 0.1.8) -Standards-Version: 3.8.0 +Standards-Version: 3.8.3 Homepage: https://launchpad.net/indicator-application Vcs-Bzr: http://bazaar.launchpa.net/~ubuntu-desktop/indicator-application/ubuntu @@ -54,8 +54,7 @@ Package: libappindicator-doc Section: doc Architecture: all Depends: ${shlibs:Depends}, - ${misc:Depends}, - libappindicator0 (= ${binary:Version}) + ${misc:Depends} Description: Application Indicators A library and indicator to take menus from applications and place them in the panel. -- cgit v1.2.3 From 1c008f52a5c5f44576c0f1f9233c005165af937d Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Fri, 11 Dec 2009 17:04:11 -0500 Subject: fixed typo in the Vcs-Bzr line --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 71aa84e..fb41d6e 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 5.0), libdbusmenu-glib-dev (>= 0.1.8) Standards-Version: 3.8.3 Homepage: https://launchpad.net/indicator-application -Vcs-Bzr: http://bazaar.launchpa.net/~ubuntu-desktop/indicator-application/ubuntu +Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-application/ubuntu Package: indicator-application Architecture: any -- cgit v1.2.3 From c593131d2bf80c77a5f3bcdd78a24c1f4424545c Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Tue, 15 Dec 2009 10:39:56 -0500 Subject: * debian/control - make libappindicator0 depend on indicator-application --- 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 d641d68..5693619 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-application (0.0.4-0ubuntu2) UNRELEASED; urgency=low + + * debian/control + - make libappindicator0 depend on indicator-application + + -- Ken VanDine Tue, 15 Dec 2009 10:38:48 -0500 + indicator-application (0.0.4-0ubuntu1) lucid; urgency=low * Upstream release 0.0.4 diff --git a/debian/control b/debian/control index fb41d6e..6955490 100644 --- a/debian/control +++ b/debian/control @@ -29,7 +29,8 @@ Package: libappindicator0 Section: libs Architecture: any Depends: ${shlibs:Depends}, - ${misc:Depends} + ${misc:Depends}, + indicator-application (= ${binary:Version}) Description: Application Indicators A library and indicator to take menus from applications and place them in the panel. -- cgit v1.2.3 From 53d5f10ac0667f455de2b3e5553647545345b062 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Tue, 15 Dec 2009 11:33:37 -0500 Subject: make libappindicator0 recommend indicator-application --- debian/changelog | 2 +- debian/control | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index cbbbd94..d8bcdb0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ indicator-application (0.0.4-0ubuntu2) lucid; urgency=low * debian/control - - make libappindicator0 depend on indicator-application + - make libappindicator0 recommend indicator-application -- Ken VanDine Tue, 15 Dec 2009 10:40:07 -0500 diff --git a/debian/control b/debian/control index 6955490..f0efd54 100644 --- a/debian/control +++ b/debian/control @@ -29,8 +29,8 @@ Package: libappindicator0 Section: libs Architecture: any Depends: ${shlibs:Depends}, - ${misc:Depends}, - indicator-application (= ${binary:Version}) + ${misc:Depends} +Recommends: indicator-application (= ${binary:Version}) Description: Application Indicators A library and indicator to take menus from applications and place them in the panel. -- cgit v1.2.3 From 2a5cad3851390bf7a875d40cb525ddbe6ec8a6c2 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Wed, 16 Dec 2009 14:37:40 -0500 Subject: * debian/rules - don't use gnome.mk, specify all the targets to build python bindings for each supported python version * Adding in Python bindings. * debian/control, debian/python-appindicator.install: Building a binary package for the python bindings. * debian/control: Adding python building build deps --- debian/changelog | 14 ++++++++++ debian/control | 28 +++++++++++++++---- debian/python-appindicator.install | 2 ++ debian/rules | 56 ++++++++++++++++++++++++++++++++++++-- 4 files changed, 93 insertions(+), 7 deletions(-) create mode 100644 debian/python-appindicator.install (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index d8bcdb0..59b490a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +indicator-application (0.0.4.1-0ubuntu1) UNRELEASED; urgency=low + + * debian/rules + - don't use gnome.mk, specify all the targets to build python + bindings for each supported python version + + [Ted Gould] + * Adding in Python bindings. + * debian/control, debian/python-appindicator.install: Building + a binary package for the python bindings. + * debian/control: Adding python building build deps + + -- Ken VanDine Wed, 16 Dec 2009 14:36:05 -0500 + indicator-application (0.0.4-0ubuntu2) lucid; urgency=low * debian/control diff --git a/debian/control b/debian/control index f0efd54..03f2e49 100644 --- a/debian/control +++ b/debian/control @@ -1,14 +1,18 @@ Source: indicator-application Section: gnome Priority: optional +XS-Python-Version: all Maintainer: Ubuntu Core Developers Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.41), + python-central (>= 0.6), libgtk2.0-dev (>= 2.12.0), libdbus-glib-1-dev, gnome-doc-utils, gtk-doc-tools, intltool, + python-all-dev, + python-gtk2-dev, libindicate-dev (>= 0.2.0), libindicate-gtk-dev (>= 0.2.0), libindicator-dev (>= 0.3.0), @@ -18,11 +22,25 @@ Standards-Version: 3.8.3 Homepage: https://launchpad.net/indicator-application Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-application/ubuntu +Package: python-appindicator +Section: python +Architecture: any +XB-Python-Version: ${python:Versions} +Depends: ${shlibs:Depends}, + ${misc:Depends}, + ${python:Depends}, + libappindicator0 (= ${binary:Version}), + python-gobject +Provides: ${python:Provides} +Description: Python bindings for libappindicator + This package provides Python bindings so that you can use libappindicator from + a Python program. + Package: indicator-application Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: Application Indicators - A library and indicator to take menus from applications and place them in + A library and indicator to take menus from applications and place them in the panel. Package: libappindicator0 @@ -32,10 +50,10 @@ Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: indicator-application (= ${binary:Version}) Description: Application Indicators - A library and indicator to take menus from applications and place them in + A library and indicator to take menus from applications and place them in the panel. . - This package contains shared libraries to be used by applications. + This package contains shared libraries to be used by applications. Package: libappindicator-dev Section: libdevel @@ -46,7 +64,7 @@ Depends: ${shlibs:Depends}, libdbus-glib-1-dev (>= 0.76), libappindicator0 (= ${binary:Version}) Description: Application Indicators - A library and indicator to take menus from applications and place them in + A library and indicator to take menus from applications and place them in the panel. . This package contains files that are needed to build applications. @@ -60,4 +78,4 @@ Description: Application Indicators A library and indicator to take menus from applications and place them in the panel. . - This package contains development documentation. + diff --git a/debian/python-appindicator.install b/debian/python-appindicator.install new file mode 100644 index 0000000..7a7f049 --- /dev/null +++ b/debian/python-appindicator.install @@ -0,0 +1,2 @@ +debian/tmp/usr/lib/python2.6/* +debian/tmp/usr/share/pygtk/* diff --git a/debian/rules b/debian/rules index 1d2f7dd..41fbfb0 100755 --- a/debian/rules +++ b/debian/rules @@ -1,12 +1,64 @@ #!/usr/bin/make -f + +DEB_PYTHON_SYSTEM=pycentral +PY_VERSIONS = $(shell pyversions --requested debian/control) + include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/cdbs/1/class/autotools-vars.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc -LDFLAGS += -Wl,-z,defs -Wl,--as-needed + +configure-stamp-%: + mkdir build-$* + cd build-$* && PYTHON=`which $*` \ + $(DEB_CONFIGURE_SCRIPT) $(DEB_CONFIGURE_NORMAL_ARGS) --srcdir=.. + touch $@ + +configure/python-appindicator:: $(addprefix configure-stamp-, $(PY_VERSIONS)) + +build-stamp-%: + make -C build-$*/python + touch $@ + +build/python-appindicator:: $(addprefix build-stamp-, $(PY_VERSIONS)) + +install-stamp-%: + make -C build-$*/python install DESTDIR=$(CURDIR)/debian/tmp + touch $@ + +install/python-appindicator:: $(addprefix install-stamp-, $(PY_VERSIONS)) + + +binary-install/python-appindicator:: + dh_pycentral + +configure-stamp: + $(DEB_CONFIGURE_SCRIPT) $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_EXTRA_FLAGS) + touch $@ + +configure/indicator-application:: configure-stamp + +build-stamp: + make + touch $@ + +build/indicator-application:: build-stamp + +install-stamp: + make install DESTDIR=$(CURDIR)/debian/tmp + touch $@ + +install/indicator-application:: install-stamp binary-post-install/indicator-application:: find debian/indicator-application/usr/lib -name \*.la -exec rm {} \; find debian/indicator-application/usr/lib -name \*.a -exec rm {} \; + +clean:: + -rm -rf $(addprefix build-, $(PY_VERSIONS)) + -rm -rf $(addprefix configure-stamp-, $(PY_VERSIONS)) + -rm -rf $(addprefix build-stamp-, $(PY_VERSIONS)) + -rm -rf $(addprefix install-stamp-, $(PY_VERSIONS)) + -- cgit v1.2.3 From 2ba572c4055412bbe6072a8e09bbc94580d50c94 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Wed, 16 Dec 2009 16:56:19 -0500 Subject: Added mono bindings --- debian/changelog | 3 ++- debian/control | 33 +++++++++++++++++++++++++++++++++ debian/libappindicator-cil-dev.install | 1 + debian/libappindicator-dev.install | 2 +- debian/libappindicator0-cil.install | 1 + debian/rules | 16 ++++++++++++++-- 6 files changed, 52 insertions(+), 4 deletions(-) create mode 100644 debian/libappindicator-cil-dev.install create mode 100644 debian/libappindicator0-cil.install (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 59b490a..db8a4b3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -indicator-application (0.0.4.1-0ubuntu1) UNRELEASED; urgency=low +indicator-application (0.0.5-0ubuntu1) UNRELEASED; urgency=low + * Added mono bindings * debian/rules - don't use gnome.mk, specify all the targets to build python bindings for each supported python version diff --git a/debian/control b/debian/control index 03f2e49..a7853bd 100644 --- a/debian/control +++ b/debian/control @@ -18,6 +18,11 @@ Build-Depends: debhelper (>= 5.0), libindicator-dev (>= 0.3.0), libdbusmenu-gtk-dev (>= 0.1.8), libdbusmenu-glib-dev (>= 0.1.8) +Build-Depends-Indep: cli-common-dev (>= 0.5.7), + mono-devel (>= 2.0.1), + gtk-sharp2-gapi, + libmono-dev, + libgtk2.0-cil Standards-Version: 3.8.3 Homepage: https://launchpad.net/indicator-application Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-application/ubuntu @@ -78,4 +83,32 @@ Description: Application Indicators A library and indicator to take menus from applications and place them in the panel. . + This package contains developer documentation. + +Package: libappindicator0-cil +Section: cli-mono +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + ${cli:Depends}, + libappindicator0 (= ${binary:Version}) +Provides: ${cli:Provides} +Description: CLI bindings for libappindicator + This package provides the appindicator-sharp assembly that allows CLI (.NET) + programs to take menus from applications and place them in the panel. + . + This package contains assemblies to be used by applications. + +Package: libappindicator-cil-dev +Section: libdevel +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + ${cli:Depends}, + libappindicator0-cil (= ${binary:Version}) +Description: Application Indicators + A library and indicator to take menus from applications and place them in + the panel. + . + This package contains files that are needed to build applications. diff --git a/debian/libappindicator-cil-dev.install b/debian/libappindicator-cil-dev.install new file mode 100644 index 0000000..6185943 --- /dev/null +++ b/debian/libappindicator-cil-dev.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/pkgconfig/appindicator-sharp-0.1.pc diff --git a/debian/libappindicator-dev.install b/debian/libappindicator-dev.install index 9346bf6..88e3347 100644 --- a/debian/libappindicator-dev.install +++ b/debian/libappindicator-dev.install @@ -1,3 +1,3 @@ debian/tmp/usr/include/libappindicator-0.1/* debian/tmp/usr/lib/libappindicator.so -debian/tmp/usr/lib/pkgconfig/* +debian/tmp/usr/lib/pkgconfig/appindicator-0.1.pc diff --git a/debian/libappindicator0-cil.install b/debian/libappindicator0-cil.install new file mode 100644 index 0000000..17c04e9 --- /dev/null +++ b/debian/libappindicator0-cil.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/appindicator-sharp-0.1/* diff --git a/debian/rules b/debian/rules index 1f3053a..7936902 100755 --- a/debian/rules +++ b/debian/rules @@ -1,14 +1,16 @@ #!/usr/bin/make -f - DEB_PYTHON_SYSTEM=pycentral PY_VERSIONS = $(shell pyversions --requested debian/control) +export MONO_SHARED_DIR=$(CURDIR) include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools-vars.mk +include /usr/share/cdbs/1/rules/utils.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc +API_VERSION = 0.1 configure-stamp-%: mkdir build-$* @@ -30,7 +32,6 @@ install-stamp-%: install/python-appindicator:: $(addprefix install-stamp-, $(PY_VERSIONS)) - binary-install/python-appindicator:: dh_pycentral @@ -56,9 +57,20 @@ binary-post-install/indicator-application:: find debian/indicator-application/usr/lib -name \*.la -exec rm {} \; find debian/indicator-application/usr/lib -name \*.a -exec rm {} \; +binary/libappindicator0-cil:: binary-arch +binary-arch: + dh_clifixperms -i + dh_installdeb -i + dh_makeclilibs -m $(API_VERSION) + dh_clideps -i -d + + +common-binary-predeb-arch:: list-missing + clean:: -rm -rf $(addprefix build-, $(PY_VERSIONS)) -rm -rf $(addprefix configure-stamp-, $(PY_VERSIONS)) -rm -rf $(addprefix build-stamp-, $(PY_VERSIONS)) -rm -rf $(addprefix install-stamp-, $(PY_VERSIONS)) + rm -rf $(MONO_SHARED_DIR)/.wapi -- cgit v1.2.3 From f87e9355fa001f6a266015302deda87a1cdd9960 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 17 Dec 2009 10:22:30 -0500 Subject: Moved Build-Depend-indep to Build-Depends --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index a7853bd..aa09e98 100644 --- a/debian/control +++ b/debian/control @@ -17,8 +17,8 @@ Build-Depends: debhelper (>= 5.0), libindicate-gtk-dev (>= 0.2.0), libindicator-dev (>= 0.3.0), libdbusmenu-gtk-dev (>= 0.1.8), - libdbusmenu-glib-dev (>= 0.1.8) -Build-Depends-Indep: cli-common-dev (>= 0.5.7), + libdbusmenu-glib-dev (>= 0.1.8), + cli-common-dev (>= 0.5.7), mono-devel (>= 2.0.1), gtk-sharp2-gapi, libmono-dev, -- cgit v1.2.3 From c64d79b378ef28b99f7e934d54b4e129f1836e1b Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 17 Dec 2009 13:41:42 -0500 Subject: added libnunit2.4-cil build-depends --- debian/control | 1 + 1 file changed, 1 insertion(+) (limited to 'debian/control') diff --git a/debian/control b/debian/control index aa09e98..7e9550c 100644 --- a/debian/control +++ b/debian/control @@ -22,6 +22,7 @@ Build-Depends: debhelper (>= 5.0), mono-devel (>= 2.0.1), gtk-sharp2-gapi, libmono-dev, + libnunit2.4-cil, libgtk2.0-cil Standards-Version: 3.8.3 Homepage: https://launchpad.net/indicator-application -- cgit v1.2.3 From 820eb75985b54cd1e7d253ef6c009c5fe90c9446 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Fri, 8 Jan 2010 22:32:58 -0500 Subject: * debian/control - bump build depends version of libdbusmenu to 0.2.0 --- 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 89635e7..2d88e92 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,10 @@ indicator-application (0.0.7-0ubuntu1) lucid; urgency=low * Adding ChangeLog to dist * Adding check item support to menu parsing + [Ken VanDine] + * debian/control + - bump build depends version of libdbusmenu to 0.2.0 + -- Ted Gould Fri, 08 Jan 2010 16:05:39 -0600 indicator-application (0.0.6-0ubuntu1) lucid; urgency=low diff --git a/debian/control b/debian/control index 7e9550c..253b911 100644 --- a/debian/control +++ b/debian/control @@ -16,8 +16,8 @@ Build-Depends: debhelper (>= 5.0), libindicate-dev (>= 0.2.0), libindicate-gtk-dev (>= 0.2.0), libindicator-dev (>= 0.3.0), - libdbusmenu-gtk-dev (>= 0.1.8), - libdbusmenu-glib-dev (>= 0.1.8), + libdbusmenu-gtk-dev (>= 0.2.0), + libdbusmenu-glib-dev (>= 0.2.0), cli-common-dev (>= 0.5.7), mono-devel (>= 2.0.1), gtk-sharp2-gapi, -- cgit v1.2.3 From 6b648fd50fd1b7449fc29cfae7fca55ce7247017 Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Tue, 19 Jan 2010 22:57:32 +0100 Subject: releasing version 0.0.9-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 ea79dab..2fcbc65 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-application (0.0.9-0ubuntu3) lucid; urgency=low + + * debian/control: + - updated the build-depends for the gtk binding changes. + + -- Sebastien Bacher Tue, 19 Jan 2010 22:57:02 +0100 + indicator-application (0.0.9-0ubuntu2) lucid; urgency=low * Backport an upstream change to a fallback situation crasher diff --git a/debian/control b/debian/control index 253b911..f115a59 100644 --- a/debian/control +++ b/debian/control @@ -23,7 +23,7 @@ Build-Depends: debhelper (>= 5.0), gtk-sharp2-gapi, libmono-dev, libnunit2.4-cil, - libgtk2.0-cil + libgtk2.0-cil-dev Standards-Version: 3.8.3 Homepage: https://launchpad.net/indicator-application Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-application/ubuntu -- cgit v1.2.3 From 770afffd927421ced6e74d29a751dac394c2d5ec Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 21 Jan 2010 08:55:32 -0600 Subject: debian/control: Adding dependency for json-glib to build. --- debian/changelog | 6 ++++++ debian/control | 1 + 2 files changed, 7 insertions(+) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index b65cb14..9616370 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +indicator-application (0.0.9-0ubuntu1~ppa4~order2) UNRELEASED; urgency=low + + * debian/control: Adding dependency for json-glib to build. + + -- Ted Gould Thu, 21 Jan 2010 08:55:06 -0600 + indicator-application (0.0.9-0ubuntu1~ppa4~order1) karmic; urgency=low * Upstream merge diff --git a/debian/control b/debian/control index 253b911..49e67dd 100644 --- a/debian/control +++ b/debian/control @@ -8,6 +8,7 @@ Build-Depends: debhelper (>= 5.0), python-central (>= 0.6), libgtk2.0-dev (>= 2.12.0), libdbus-glib-1-dev, + libjson-glib-dev, gnome-doc-utils, gtk-doc-tools, intltool, -- cgit v1.2.3 From f5582e9259c2cab7519c6bcfc900f7b06989b266 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 21 Jan 2010 14:19:21 -0600 Subject: debian/control: Adjusted back changes in 0.0.9-0ubuntu3 as this branch is still on Karmic. Changes are in Lucid. --- debian/changelog | 2 ++ debian/control | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index eab47d7..cd77561 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ indicator-application (0.0.10-0ubuntu1~ppa1) UNRELEASED; urgency=low * Use the right callback function for fallback (LP: #507975) * Support getting the app list from a running service. * debian/control: Adding dependency for json-glib to build. + * debian/control: Adjusted back changes in 0.0.9-0ubuntu3 as this + branch is still on Karmic. Changes are in Lucid. -- Ted Gould Thu, 21 Jan 2010 14:15:32 -0600 diff --git a/debian/control b/debian/control index 02eed84..49e67dd 100644 --- a/debian/control +++ b/debian/control @@ -24,7 +24,7 @@ Build-Depends: debhelper (>= 5.0), gtk-sharp2-gapi, libmono-dev, libnunit2.4-cil, - libgtk2.0-cil-dev + libgtk2.0-cil Standards-Version: 3.8.3 Homepage: https://launchpad.net/indicator-application Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-application/ubuntu -- cgit v1.2.3 From 10c9c763d83386c7a0dea94868d7238acee18ba9 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 21 Jan 2010 16:38:43 -0500 Subject: releasing version 0.0.10-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 01b66f8..543d815 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-application (0.0.10-0ubuntu2) lucid; urgency=low + + * debian/control + - bumped build depends version for libindicator-dev to 0.3.1 + + -- Ken VanDine Thu, 21 Jan 2010 16:38:18 -0500 + indicator-application (0.0.10-0ubuntu1) lucid; urgency=low * Upstream release 0.0.10 diff --git a/debian/control b/debian/control index 02eed84..b646a21 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 5.0), python-gtk2-dev, libindicate-dev (>= 0.2.0), libindicate-gtk-dev (>= 0.2.0), - libindicator-dev (>= 0.3.0), + libindicator-dev (>= 0.3.1), libdbusmenu-gtk-dev (>= 0.2.0), libdbusmenu-glib-dev (>= 0.2.0), cli-common-dev (>= 0.5.7), -- cgit v1.2.3 From 1e12054922cbe1af7cbcfda18d9449573a7717f5 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 4 Feb 2010 16:46:05 -0800 Subject: debian/control: Increasing dbusmenu* deps to 0.2.2 --- 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 4498a47..0226ffe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ indicator-application (0.0.11-0ubuntu1~ppa1) UNRELEASED; urgency=low * Interoperability Fixes * Adding in XVFB support for tests * Adding support for icons with the '-panel' suffix + * debian/control: Increasing dbusmenu* deps to 0.2.2 -- Ted Gould Thu, 04 Feb 2010 16:44:15 -0800 diff --git a/debian/control b/debian/control index 49e67dd..93e1436 100644 --- a/debian/control +++ b/debian/control @@ -17,8 +17,8 @@ Build-Depends: debhelper (>= 5.0), libindicate-dev (>= 0.2.0), libindicate-gtk-dev (>= 0.2.0), libindicator-dev (>= 0.3.0), - libdbusmenu-gtk-dev (>= 0.2.0), - libdbusmenu-glib-dev (>= 0.2.0), + libdbusmenu-gtk-dev (>= 0.2.2), + libdbusmenu-glib-dev (>= 0.2.2), cli-common-dev (>= 0.5.7), mono-devel (>= 2.0.1), gtk-sharp2-gapi, -- cgit v1.2.3 From 0d3da8efc1b3a2457ca0a3943a51c035e055fb84 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 23 Feb 2010 10:28:19 -0600 Subject: debian/control: Checking for dbus-glib >= 0.82 --- 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 764015f..efe3326 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ indicator-application (0.0.13-0ubuntu8~ppa1) UNRELEASED; urgency=low * Upstream Merge * Checking for dbus-glib version 0.82 + * debian/control: Checking for dbus-glib >= 0.82 -- Ted Gould Tue, 23 Feb 2010 10:27:09 -0600 diff --git a/debian/control b/debian/control index 1a68874..68893c8 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.41), python-central (>= 0.6), libgtk2.0-dev (>= 2.12.0), - libdbus-glib-1-dev, + libdbus-glib-1-dev (>= 0.82), libjson-glib-dev, gnome-doc-utils, gtk-doc-tools, -- cgit v1.2.3 From 079ae0377eed08ee2e521011b6258c8c7650ed4d Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 11 Mar 2010 16:19:37 -0600 Subject: debian/control: Increasing the libindicator-dev dependency to 0.3.5 to match upstream. --- debian/changelog | 2 ++ debian/control | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 581733c..2a64030 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ indicator-application (0.0.16-0ubuntu1~ppa1) UNRELEASED; urgency=low * Use libindicator icon loading helper * Workaround for label changes on GtkActions * Testing fix for using xvfb + * debian/control: Increasing the libindicator-dev dependency to + 0.3.5 to match upstream. -- Ted Gould Thu, 11 Mar 2010 16:17:51 -0600 diff --git a/debian/control b/debian/control index 68893c8..8b1e17f 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 5.0), python-gtk2-dev, libindicate-dev (>= 0.2.0), libindicate-gtk-dev (>= 0.2.0), - libindicator-dev (>= 0.3.1), + libindicator-dev (>= 0.3.5), libdbusmenu-gtk-dev (>= 0.2.2), libdbusmenu-glib-dev (>= 0.2.2), cli-common-dev (>= 0.5.7), -- cgit v1.2.3 From d38c39a4e8bb745061507616cea3f83da5ed1e04 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 14 Apr 2010 08:43:40 -0500 Subject: * debian/control: + Set libappindicator0-cil and libappindicator-cil-dev to Arch: all + Make libappindicator0-cil depend on libappindicator0 >= ${source:Version} instead * debian/rules: + Fix ordering of dh_*cli* (LP: #560095) * debian/libappindicator0-cil.install, debian/libappindicator0-cil.installcligac: + Fix CLI policy breakage: - Wrong installation paths for GAC'd CLI libraries - Direct installation of GAC'd libraries --- debian/changelog | 16 ++++++++++++++++ debian/control | 7 +++---- debian/libappindicator0-cil.install | 3 +-- debian/libappindicator0-cil.installcligac | 1 + debian/rules | 11 ++++++----- 5 files changed, 27 insertions(+), 11 deletions(-) create mode 100644 debian/libappindicator0-cil.installcligac (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 0920364..1c8d572 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,19 @@ +indicator-application (0.0.19-0ubuntu2) lucid; urgency=low + + * debian/control: + + Set libappindicator0-cil and libappindicator-cil-dev to Arch: all + + Make libappindicator0-cil depend on libappindicator0 >= ${source:Version} + instead + * debian/rules: + + Fix ordering of dh_*cli* (LP: #560095) + * debian/libappindicator0-cil.install, + debian/libappindicator0-cil.installcligac: + + Fix CLI policy breakage: + - Wrong installation paths for GAC'd CLI libraries + - Direct installation of GAC'd libraries + + -- Chow Loong Jin Wed, 14 Apr 2010 18:44:22 +0800 + indicator-application (0.0.19-0ubuntu1) lucid; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index 8b1e17f..e64f6ad 100644 --- a/debian/control +++ b/debian/control @@ -89,12 +89,11 @@ Description: Application Indicators Package: libappindicator0-cil Section: cli-mono -Architecture: any +Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, - libappindicator0 (= ${binary:Version}) -Provides: ${cli:Provides} + libappindicator0 (>= ${source:Version}) Description: CLI bindings for libappindicator This package provides the appindicator-sharp assembly that allows CLI (.NET) programs to take menus from applications and place them in the panel. @@ -103,7 +102,7 @@ Description: CLI bindings for libappindicator Package: libappindicator-cil-dev Section: libdevel -Architecture: any +Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, diff --git a/debian/libappindicator0-cil.install b/debian/libappindicator0-cil.install index 6158914..6382d9e 100644 --- a/debian/libappindicator0-cil.install +++ b/debian/libappindicator0-cil.install @@ -1,2 +1 @@ -debian/tmp/usr/lib/appindicator-sharp-0.1/* -debian/tmp/usr/lib/mono/* +debian/tmp/usr/lib/appindicator-sharp-0.1 /usr/lib/cli diff --git a/debian/libappindicator0-cil.installcligac b/debian/libappindicator0-cil.installcligac new file mode 100644 index 0000000..7e66dd2 --- /dev/null +++ b/debian/libappindicator0-cil.installcligac @@ -0,0 +1 @@ +/usr/lib/cli/appindicator-sharp-0.1/appindicator-sharp.dll diff --git a/debian/rules b/debian/rules index 7936902..2fe0be6 100755 --- a/debian/rules +++ b/debian/rules @@ -57,12 +57,13 @@ binary-post-install/indicator-application:: find debian/indicator-application/usr/lib -name \*.la -exec rm {} \; find debian/indicator-application/usr/lib -name \*.a -exec rm {} \; -binary/libappindicator0-cil:: binary-arch -binary-arch: - dh_clifixperms -i - dh_installdeb -i +binary-fixup/libappindicator0-cil:: + dh_clifixperms + +binary-predeb/libappindicator0-cil:: dh_makeclilibs -m $(API_VERSION) - dh_clideps -i -d + dh_installcligac + dh_clideps common-binary-predeb-arch:: list-missing -- cgit v1.2.3 From 04a9942b4d950964f74e3bfcc09ca9cefe15d600 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 16 Apr 2010 17:24:51 -0500 Subject: Patch for package names --- bindings/mono/appindicator-sharp-0.1.pc.in | 2 +- debian/changelog | 25 +++++++++++++++++++++++++ debian/control | 15 +++++++++------ debian/libappindicator-cil-dev.install | 1 - debian/libappindicator0-cil.install | 1 - debian/libappindicator0-cil.installcligac | 1 - debian/libappindicator0.0-cil.install | 1 + debian/libappindicator0.0-cil.installcligac | 1 + debian/libappindicator0.1-cil-dev.install | 1 + debian/rules | 21 ++++++++++++--------- 10 files changed, 50 insertions(+), 19 deletions(-) delete mode 100644 debian/libappindicator-cil-dev.install delete mode 100644 debian/libappindicator0-cil.install delete mode 100644 debian/libappindicator0-cil.installcligac create mode 100644 debian/libappindicator0.0-cil.install create mode 100644 debian/libappindicator0.0-cil.installcligac create mode 100644 debian/libappindicator0.1-cil-dev.install (limited to 'debian/control') diff --git a/bindings/mono/appindicator-sharp-0.1.pc.in b/bindings/mono/appindicator-sharp-0.1.pc.in index 33ff1d7..cd0525e 100644 --- a/bindings/mono/appindicator-sharp-0.1.pc.in +++ b/bindings/mono/appindicator-sharp-0.1.pc.in @@ -1,7 +1,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ -assemblies_dir=${libdir}/appindicator-sharp-0.1 +assemblies_dir=${libdir}/cli/appindicator-sharp-0.0 Name: appindicator-sharp Description: application indicators for .NET diff --git a/debian/changelog b/debian/changelog index 385872b..33e4127 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,28 @@ +indicator-application (0.0.19-0ubuntu4) UNRELEASED; urgency=low + + * bindings/mono/appindicator-sharp-0.1.pc.in: + + Fix pcfile to point to library install location (LP: #564506) + * debian/control, + debian/libappindicator0-cil.install, + debian/libappindicator0-cil.installcligac, + debian/libappindicator-cil-dev.install, + debian/libappindicator0.0-cil.install, + debian/libappindicator0.0-cil.installcligac, + debian/libappindicator0.1-cil-dev.install: + + Rename packages to comply with Debian CLI policy + * debian/libappindicator0.0-cil.install, + debian/libappindicator0.0-cil.installcligac: + + Fix library install location to comply with Debian CLI policy + * debian/control, + debian/rules: + + Pass CSC variable to use mono-csc default compiler from mono-devel + 2.4.3, rather than the default 2.0-only compiler + * debian/rules: + + Fix processing of rules to track dependency information on Mono + binding, by running rules in correct order + + -- Jo Shields Fri, 16 Apr 2010 10:42:48 +0100 + indicator-application (0.0.19-0ubuntu3) lucid; urgency=low * Merging patch to add assembly information to Mono binding (LP: #547195) diff --git a/debian/control b/debian/control index e64f6ad..64ca500 100644 --- a/debian/control +++ b/debian/control @@ -20,7 +20,7 @@ Build-Depends: debhelper (>= 5.0), libdbusmenu-gtk-dev (>= 0.2.2), libdbusmenu-glib-dev (>= 0.2.2), cli-common-dev (>= 0.5.7), - mono-devel (>= 2.0.1), + mono-devel (>= 2.4.3), gtk-sharp2-gapi, libmono-dev, libnunit-cil-dev, @@ -87,26 +87,29 @@ Description: Application Indicators . This package contains developer documentation. -Package: libappindicator0-cil +Package: libappindicator0.0-cil Section: cli-mono Architecture: all +Replaces: libappindicator0-cil (<= 0.0.19-0ubuntu4~) +Conflicts: libappindicator0-cil (<= 0.0.19-0ubuntu4~) Depends: ${shlibs:Depends}, ${misc:Depends}, - ${cli:Depends}, - libappindicator0 (>= ${source:Version}) + ${cli:Depends} Description: CLI bindings for libappindicator This package provides the appindicator-sharp assembly that allows CLI (.NET) programs to take menus from applications and place them in the panel. . This package contains assemblies to be used by applications. -Package: libappindicator-cil-dev +Package: libappindicator0.1-cil-dev Section: libdevel Architecture: all +Replaces: libappindicator-cil-dev (<= 0.0.19-0ubuntu4~) +Conflicts: libappindicator-cil-dev (<= 0.0.19-0ubuntu4~) Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, - libappindicator0-cil (= ${binary:Version}) + libappindicator0.0-cil (= ${binary:Version}) Description: Application Indicators A library and indicator to take menus from applications and place them in the panel. diff --git a/debian/libappindicator-cil-dev.install b/debian/libappindicator-cil-dev.install deleted file mode 100644 index 6185943..0000000 --- a/debian/libappindicator-cil-dev.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/pkgconfig/appindicator-sharp-0.1.pc diff --git a/debian/libappindicator0-cil.install b/debian/libappindicator0-cil.install deleted file mode 100644 index 6382d9e..0000000 --- a/debian/libappindicator0-cil.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/appindicator-sharp-0.1 /usr/lib/cli diff --git a/debian/libappindicator0-cil.installcligac b/debian/libappindicator0-cil.installcligac deleted file mode 100644 index 7e66dd2..0000000 --- a/debian/libappindicator0-cil.installcligac +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/cli/appindicator-sharp-0.1/appindicator-sharp.dll diff --git a/debian/libappindicator0.0-cil.install b/debian/libappindicator0.0-cil.install new file mode 100644 index 0000000..994d951 --- /dev/null +++ b/debian/libappindicator0.0-cil.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/appindicator-sharp-0.1/* /usr/lib/cli/appindicator-sharp-0.0 diff --git a/debian/libappindicator0.0-cil.installcligac b/debian/libappindicator0.0-cil.installcligac new file mode 100644 index 0000000..b818d51 --- /dev/null +++ b/debian/libappindicator0.0-cil.installcligac @@ -0,0 +1 @@ +/usr/lib/cli/appindicator-sharp-0.0/appindicator-sharp.dll diff --git a/debian/libappindicator0.1-cil-dev.install b/debian/libappindicator0.1-cil-dev.install new file mode 100644 index 0000000..6185943 --- /dev/null +++ b/debian/libappindicator0.1-cil-dev.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/pkgconfig/appindicator-sharp-0.1.pc diff --git a/debian/rules b/debian/rules index 2fe0be6..e2e4215 100755 --- a/debian/rules +++ b/debian/rules @@ -3,6 +3,7 @@ DEB_PYTHON_SYSTEM=pycentral PY_VERSIONS = $(shell pyversions --requested debian/control) export MONO_SHARED_DIR=$(CURDIR) +export CSC=/usr/bin/mono-csc include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools-vars.mk @@ -12,6 +13,8 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc API_VERSION = 0.1 +DEB_DH_MAKESHLIBS_ARGS_libappindicator0 := -V 'libappindicator0 (>= 0.0.19)' + configure-stamp-%: mkdir build-$* cd build-$* && PYTHON=`which $*` \ @@ -35,6 +38,15 @@ install/python-appindicator:: $(addprefix install-stamp-, $(PY_VERSIONS)) binary-install/python-appindicator:: dh_pycentral +binary-install/libappindicator0.0-cil:: + dh_clistrip + dh_clifixperms + dh_makeclilibs -V + dh_installcligac + +binary-predeb/libappindicator0.0-cil:: binary-fixup/libappindicator0 + dh_clideps -plibappindicator0.0-cil + configure-stamp: $(DEB_CONFIGURE_SCRIPT) $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_EXTRA_FLAGS) touch $@ @@ -57,15 +69,6 @@ binary-post-install/indicator-application:: find debian/indicator-application/usr/lib -name \*.la -exec rm {} \; find debian/indicator-application/usr/lib -name \*.a -exec rm {} \; -binary-fixup/libappindicator0-cil:: - dh_clifixperms - -binary-predeb/libappindicator0-cil:: - dh_makeclilibs -m $(API_VERSION) - dh_installcligac - dh_clideps - - common-binary-predeb-arch:: list-missing clean:: -- cgit v1.2.3 From f50f08a0bd251c489c574e6ade088b30fdcf4c58 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 3 Jun 2010 14:14:23 -0500 Subject: debian/control: Add GObject Introspection and Vala build dependencies. --- debian/changelog | 4 +++- debian/control | 8 +++++++- 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 3f67f35..6778f32 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,8 +5,10 @@ indicator-application (0.2.0-0ubuntu1~ppa1) UNRELEASED; urgency=low * Build GIR and VAPI files * Fixes to documentation and enum construction * Fix distcheck + * debian/control: Add GObject Introspection and Vala build + dependencies. - -- Ted Gould Thu, 03 Jun 2010 13:55:12 -0500 + -- Ted Gould Thu, 03 Jun 2010 14:13:56 -0500 indicator-application (0.0.21-0ubuntu1~ppa1) lucid; urgency=low diff --git a/debian/control b/debian/control index 64ca500..6260fea 100644 --- a/debian/control +++ b/debian/control @@ -24,7 +24,13 @@ Build-Depends: debhelper (>= 5.0), gtk-sharp2-gapi, libmono-dev, libnunit-cil-dev, - libgtk2.0-cil-dev + libgtk2.0-cil-dev, + gobject-introspection, + gir-repository-dev, + libgirepository1.0-dev, + gir1.0-glib-2.0, + gir1.0-gtk-2.0, + valac Standards-Version: 3.8.4 Homepage: https://launchpad.net/indicator-application Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-application/ubuntu -- cgit v1.2.3 From ead73d059c5a82a5d03217f88315fe80305cf085 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 3 Jun 2010 14:20:45 -0500 Subject: Added debian/gir1.0-libappindicator-0.1.install and modified debian/control and debian/libappindicator-dev.install to handle the VAPI and GI files. --- debian/changelog | 5 ++++- debian/control | 12 ++++++++++++ debian/gir1.0-libappindicator-0.1.install | 1 + debian/libappindicator-dev.install | 2 ++ 4 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 debian/gir1.0-libappindicator-0.1.install (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index b740be0..48a5de5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,8 +7,11 @@ indicator-application (0.2.0-0ubuntu1~ppa1) UNRELEASED; urgency=low * Fix distcheck * debian/control: Add GObject Introspection and Vala build dependencies. + * Added debian/gir1.0-libappindicator-0.1.install and modified + debian/control and debian/libappindicator-dev.install to handle + the VAPI and GI files. - -- Ted Gould Thu, 03 Jun 2010 14:13:56 -0500 + -- Ted Gould Thu, 03 Jun 2010 14:19:48 -0500 indicator-application (0.0.21-0ubuntu1~ppa1) lucid; urgency=low diff --git a/debian/control b/debian/control index 6260fea..aac4fdb 100644 --- a/debian/control +++ b/debian/control @@ -122,3 +122,15 @@ Description: Application Indicators . This package contains files that are needed to build applications. +Package: gir1.0-libappindicator-0.1.install +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + gir1.0-glib-2.0, + gir1.0-gtk-2.0, + libappindicator0 (= ${binary:Version}) +Description: Typelib files for libappindicator0. + . + This package can be used by other packages using the GIRepository format + to generate dynamic bindings. diff --git a/debian/gir1.0-libappindicator-0.1.install b/debian/gir1.0-libappindicator-0.1.install new file mode 100644 index 0000000..0791348 --- /dev/null +++ b/debian/gir1.0-libappindicator-0.1.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/girepository-1.0/* diff --git a/debian/libappindicator-dev.install b/debian/libappindicator-dev.install index 88e3347..28598a4 100644 --- a/debian/libappindicator-dev.install +++ b/debian/libappindicator-dev.install @@ -1,3 +1,5 @@ debian/tmp/usr/include/libappindicator-0.1/* debian/tmp/usr/lib/libappindicator.so debian/tmp/usr/lib/pkgconfig/appindicator-0.1.pc +debian/tmp/usr/share/gir-1.0/* +debian/tmp/usr/share/vala/vapi/* -- cgit v1.2.3 From 5ffc5c97d59f4ac3ba9dc703c034bf887b3c50a8 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 3 Jun 2010 14:48:08 -0500 Subject: Fixing control file --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index aac4fdb..f3d57c0 100644 --- a/debian/control +++ b/debian/control @@ -122,7 +122,7 @@ Description: Application Indicators . This package contains files that are needed to build applications. -Package: gir1.0-libappindicator-0.1.install +Package: gir1.0-libappindicator-0.1 Section: libs Architecture: any Depends: ${shlibs:Depends}, -- cgit v1.2.3 From 52ebd1796cc5b17c856504ea9b2a89a404265c40 Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Tue, 8 Jun 2010 11:03:40 +0200 Subject: releasing version 0.2.0-0ubuntu2 --- debian/changelog | 6 ++++++ debian/control | 2 +- debian/gir1.0-appindicator-0.1.install | 1 + debian/gir1.0-libappindicator-0.1.install | 1 - 4 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 debian/gir1.0-appindicator-0.1.install delete mode 100644 debian/gir1.0-libappindicator-0.1.install (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 8c5d660..2790da8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +indicator-application (0.2.0-0ubuntu2) maverick; urgency=low + + * Renamed the gir binary to gir1.0-appindicator-0.1 to match the typelib + + -- Sebastien Bacher Tue, 08 Jun 2010 11:01:04 +0200 + indicator-application (0.2.0-0ubuntu1) maverick; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index 4bd1570..17560a5 100644 --- a/debian/control +++ b/debian/control @@ -122,7 +122,7 @@ Description: Application Indicators . This package contains files that are needed to build applications. -Package: gir1.0-libappindicator-0.1 +Package: gir1.0-appindicator-0.1 Section: libs Architecture: any Depends: ${shlibs:Depends}, diff --git a/debian/gir1.0-appindicator-0.1.install b/debian/gir1.0-appindicator-0.1.install new file mode 100644 index 0000000..0791348 --- /dev/null +++ b/debian/gir1.0-appindicator-0.1.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/girepository-1.0/* diff --git a/debian/gir1.0-libappindicator-0.1.install b/debian/gir1.0-libappindicator-0.1.install deleted file mode 100644 index 0791348..0000000 --- a/debian/gir1.0-libappindicator-0.1.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/girepository-1.0/* -- cgit v1.2.3 From 0eb105da91f3f41692a2ea3504d177bb77b90806 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Fri, 11 Jun 2010 11:11:19 -0400 Subject: renamed cil binary to libappindicator0.1 to match the assembly version --- debian/changelog | 6 ++++++ debian/control | 4 ++-- debian/libappindicator0.0-cil.install | 1 - debian/libappindicator0.0-cil.installcligac | 1 - debian/libappindicator0.1-cil.install | 1 + debian/libappindicator0.1-cil.installcligac | 1 + debian/rules | 6 +++--- 7 files changed, 13 insertions(+), 7 deletions(-) delete mode 100644 debian/libappindicator0.0-cil.install delete mode 100644 debian/libappindicator0.0-cil.installcligac create mode 100644 debian/libappindicator0.1-cil.install create mode 100644 debian/libappindicator0.1-cil.installcligac (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 2790da8..b2dc6de 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +indicator-application (0.2.0-0ubuntu3) UNRELEASED; urgency=low + + * renamed cil binary to libappindicator0.1 to match the assembly version + + -- Ken VanDine Fri, 11 Jun 2010 10:56:46 -0400 + indicator-application (0.2.0-0ubuntu2) maverick; urgency=low * Renamed the gir binary to gir1.0-appindicator-0.1 to match the typelib diff --git a/debian/control b/debian/control index 17560a5..2a80792 100644 --- a/debian/control +++ b/debian/control @@ -93,7 +93,7 @@ Description: Application Indicators . This package contains developer documentation. -Package: libappindicator0.0-cil +Package: libappindicator0.1-cil Section: cli-mono Architecture: all Replaces: libappindicator0-cil (<= 0.0.19-0ubuntu4~) @@ -115,7 +115,7 @@ Conflicts: libappindicator-cil-dev (<= 0.0.19-0ubuntu4~) Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, - libappindicator0.0-cil (= ${binary:Version}) + libappindicator0.1-cil (= ${binary:Version}) Description: Application Indicators A library and indicator to take menus from applications and place them in the panel. diff --git a/debian/libappindicator0.0-cil.install b/debian/libappindicator0.0-cil.install deleted file mode 100644 index f61b26c..0000000 --- a/debian/libappindicator0.0-cil.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/cli/appindicator-sharp-0.1/* /usr/lib/cli/appindicator-sharp-0.0 diff --git a/debian/libappindicator0.0-cil.installcligac b/debian/libappindicator0.0-cil.installcligac deleted file mode 100644 index b818d51..0000000 --- a/debian/libappindicator0.0-cil.installcligac +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/cli/appindicator-sharp-0.0/appindicator-sharp.dll diff --git a/debian/libappindicator0.1-cil.install b/debian/libappindicator0.1-cil.install new file mode 100644 index 0000000..106b727 --- /dev/null +++ b/debian/libappindicator0.1-cil.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/cli/appindicator-sharp-0.1/* diff --git a/debian/libappindicator0.1-cil.installcligac b/debian/libappindicator0.1-cil.installcligac new file mode 100644 index 0000000..7e66dd2 --- /dev/null +++ b/debian/libappindicator0.1-cil.installcligac @@ -0,0 +1 @@ +/usr/lib/cli/appindicator-sharp-0.1/appindicator-sharp.dll diff --git a/debian/rules b/debian/rules index e2e4215..074da71 100755 --- a/debian/rules +++ b/debian/rules @@ -38,14 +38,14 @@ install/python-appindicator:: $(addprefix install-stamp-, $(PY_VERSIONS)) binary-install/python-appindicator:: dh_pycentral -binary-install/libappindicator0.0-cil:: +binary-install/libappindicator0.1-cil:: dh_clistrip dh_clifixperms dh_makeclilibs -V dh_installcligac -binary-predeb/libappindicator0.0-cil:: binary-fixup/libappindicator0 - dh_clideps -plibappindicator0.0-cil +binary-predeb/libappindicator0.1-cil:: binary-fixup/libappindicator0 + dh_clideps -plibappindicator0.1-cil configure-stamp: $(DEB_CONFIGURE_SCRIPT) $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_EXTRA_FLAGS) -- cgit v1.2.3 From d2a540c35b1aa21645b5c02a7f1e65ccd616d7dc Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 18 Jun 2010 17:00:15 -0500 Subject: debian/control: Fixing version numbers --- debian/changelog | 6 ++++++ debian/control | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index f20fd54..ab8c4ab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +indicator-application (0.2.0-0ubuntu4~ppa6) UNRELEASED; urgency=low + + * debian/control: Fixing version numbers + + -- Ted Gould Fri, 18 Jun 2010 16:59:58 -0500 + indicator-application (0.2.0-0ubuntu4~ppa5) lucid; urgency=low * Upstream merge diff --git a/debian/control b/debian/control index 2a80792..c107309 100644 --- a/debian/control +++ b/debian/control @@ -96,8 +96,8 @@ Description: Application Indicators Package: libappindicator0.1-cil Section: cli-mono Architecture: all -Replaces: libappindicator0-cil (<= 0.0.19-0ubuntu4~) -Conflicts: libappindicator0-cil (<= 0.0.19-0ubuntu4~) +Replaces: libappindicator0-cil (<= 0.0.19-0ubuntu4) +Conflicts: libappindicator0-cil (<= 0.0.19-0ubuntu4) Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends} @@ -110,8 +110,8 @@ Description: CLI bindings for libappindicator Package: libappindicator0.1-cil-dev Section: libdevel Architecture: all -Replaces: libappindicator-cil-dev (<= 0.0.19-0ubuntu4~) -Conflicts: libappindicator-cil-dev (<= 0.0.19-0ubuntu4~) +Replaces: libappindicator-cil-dev (<= 0.0.19-0ubuntu4) +Conflicts: libappindicator-cil-dev (<= 0.0.19-0ubuntu4) Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, -- cgit v1.2.3 From 591b40794d02bf8eb58c96e6c970f16d8bb7e2a8 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 18 Jun 2010 17:12:21 -0500 Subject: debian/control: Making the 0.1-cil replace and provide the 0.0-cil --- debian/changelog | 3 ++- debian/control | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index ab8c4ab..b1f3745 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ indicator-application (0.2.0-0ubuntu4~ppa6) UNRELEASED; urgency=low * debian/control: Fixing version numbers + * debian/control: Making the 0.1-cil replace and provide the 0.0-cil - -- Ted Gould Fri, 18 Jun 2010 16:59:58 -0500 + -- Ted Gould Fri, 18 Jun 2010 17:11:53 -0500 indicator-application (0.2.0-0ubuntu4~ppa5) lucid; urgency=low diff --git a/debian/control b/debian/control index c107309..fde63cf 100644 --- a/debian/control +++ b/debian/control @@ -96,8 +96,10 @@ Description: Application Indicators Package: libappindicator0.1-cil Section: cli-mono Architecture: all -Replaces: libappindicator0-cil (<= 0.0.19-0ubuntu4) +Replaces: libappindicator0-cil (<= 0.0.19-0ubuntu4), + libappindicator0.0-cil Conflicts: libappindicator0-cil (<= 0.0.19-0ubuntu4) +Provides: libappindicator0.0-cil Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends} -- cgit v1.2.3 From bec7e4eb48111237dd750914cc10e81c361cb92d Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 18 Jun 2010 20:13:52 -0500 Subject: Conflicts as well --- debian/control | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index fde63cf..6f4e729 100644 --- a/debian/control +++ b/debian/control @@ -98,7 +98,8 @@ Section: cli-mono Architecture: all Replaces: libappindicator0-cil (<= 0.0.19-0ubuntu4), libappindicator0.0-cil -Conflicts: libappindicator0-cil (<= 0.0.19-0ubuntu4) +Conflicts: libappindicator0-cil (<= 0.0.19-0ubuntu4), + libappindicator0.0-cil Provides: libappindicator0.0-cil Depends: ${shlibs:Depends}, ${misc:Depends}, -- cgit v1.2.3 From e48a4c724a3b7f3791b5b294cf92111761716b66 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Mon, 21 Jun 2010 13:45:46 -0400 Subject: Specify versions for Replaces/Conflicts for libappindicator0.0-cil --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 6f4e729..cf3b26e 100644 --- a/debian/control +++ b/debian/control @@ -97,9 +97,9 @@ Package: libappindicator0.1-cil Section: cli-mono Architecture: all Replaces: libappindicator0-cil (<= 0.0.19-0ubuntu4), - libappindicator0.0-cil + libappindicator0.0-cil (<= 0.2.0-0ubuntu4~ppa5) Conflicts: libappindicator0-cil (<= 0.0.19-0ubuntu4), - libappindicator0.0-cil + libappindicator0.0-cil (<= 0.2.0-0ubuntu4~ppa5) Provides: libappindicator0.0-cil Depends: ${shlibs:Depends}, ${misc:Depends}, -- cgit v1.2.3 From db008b0419d26adcab1e9737381fce40109072f2 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Mon, 21 Jun 2010 14:54:05 -0400 Subject: Don't conflict with libappindicator0.0-cil, just replace and provide --- debian/control | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index cf3b26e..bdd065d 100644 --- a/debian/control +++ b/debian/control @@ -97,9 +97,8 @@ Package: libappindicator0.1-cil Section: cli-mono Architecture: all Replaces: libappindicator0-cil (<= 0.0.19-0ubuntu4), - libappindicator0.0-cil (<= 0.2.0-0ubuntu4~ppa5) -Conflicts: libappindicator0-cil (<= 0.0.19-0ubuntu4), - libappindicator0.0-cil (<= 0.2.0-0ubuntu4~ppa5) + libappindicator0.0-cil (<= 0.2.0-0ubuntu4) +Conflicts: libappindicator0-cil (<= 0.0.19-0ubuntu4) Provides: libappindicator0.0-cil Depends: ${shlibs:Depends}, ${misc:Depends}, -- cgit v1.2.3 From 294f162865095ba70f30f6dd987505d080f4f9ad Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 10 Aug 2010 09:34:08 -0500 Subject: debian/control: Moving libappindicator0 to libappindicator1 --- debian/changelog | 3 ++- debian/control | 8 ++++---- debian/libappindicator0.install | 1 - debian/libappindicator1.install | 1 + 4 files changed, 7 insertions(+), 6 deletions(-) delete mode 100644 debian/libappindicator0.install create mode 100644 debian/libappindicator1.install (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 720e2db..ccceaf6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,9 @@ indicator-application (0.2.3-0ubuntu2~ppa4) UNRELEASED; urgency=low * Upstream Merge * Breaking the ABI in order to get more space in the class structure. + * debian/control: Moving libappindicator0 to libappindicator1 - -- Ted Gould Tue, 10 Aug 2010 09:32:07 -0500 + -- Ted Gould Tue, 10 Aug 2010 09:33:52 -0500 indicator-application (0.2.3-0ubuntu2~ppa3) maverick; urgency=low diff --git a/debian/control b/debian/control index 8ea4878..bfd75b6 100644 --- a/debian/control +++ b/debian/control @@ -41,7 +41,7 @@ XB-Python-Version: ${python:Versions} Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, - libappindicator0 (= ${binary:Version}), + libappindicator1 (= ${binary:Version}), python-gobject Provides: ${python:Provides} Description: Python bindings for libappindicator @@ -55,7 +55,7 @@ Description: Application Indicators A library and indicator to take menus from applications and place them in the panel. -Package: libappindicator0 +Package: libappindicator1 Section: libs Architecture: any Depends: ${shlibs:Depends}, @@ -74,7 +74,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, libdbusmenu-glib-dev (>= 0.1.8), libdbus-glib-1-dev (>= 0.76), - libappindicator0 (= ${binary:Version}) + libappindicator1 (= ${binary:Version}) Description: Application Indicators A library and indicator to take menus from applications and place them in the panel. @@ -129,7 +129,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${gir:Depends} -Description: Typelib files for libappindicator0. +Description: Typelib files for libappindicator1. . This package can be used by other packages using the GIRepository format to generate dynamic bindings. diff --git a/debian/libappindicator0.install b/debian/libappindicator0.install deleted file mode 100644 index a0b5976..0000000 --- a/debian/libappindicator0.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libappindicator.so.* diff --git a/debian/libappindicator1.install b/debian/libappindicator1.install new file mode 100644 index 0000000..a0b5976 --- /dev/null +++ b/debian/libappindicator1.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libappindicator.so.* -- cgit v1.2.3 From 2b4effa2ed40148826816885068c7e6e6f5f7097 Mon Sep 17 00:00:00 2001 From: Didier Roche Date: Wed, 22 Sep 2010 19:58:13 +0200 Subject: * debian/libappindicator0.1-cil.installcligac: Add the 0.1 policy file. * debian/control: - build with latest libindicator-dev for ABI breakage (LP: #637692) --- debian/changelog | 18 +++++++++--------- debian/control | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 02735ec..75e8d88 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,18 +1,18 @@ -indicator-application (0.2.9-0ubuntu1~ppa2) maverick; urgency=low - - * debian/libappindicator0.1-cil.installcligac: Add the 0.1 - policy file. - - -- Ted Gould Wed, 22 Sep 2010 11:55:08 -0500 - -indicator-application (0.2.9-0ubuntu1~ppa1) maverick; urgency=low +indicator-application (0.2.9-0ubuntu1) maverick; urgency=low + [ Ted Gould ] * New upstream release. * Fix Mono binding versioning and build (LP: #636132) * Fix submenus with Glade applications (LP: #608219) * Add new functions to Mono and Python bindings + * debian/libappindicator0.1-cil.installcligac: Add the 0.1 + policy file. + + [ Didier Roche ] + * debian/control: + - build with latest libindicator-dev for ABI breakage (LP: #637692) - -- Ted Gould Wed, 22 Sep 2010 11:18:37 -0500 + -- Didier Roche Wed, 22 Sep 2010 19:57:57 +0200 indicator-application (0.2.8-0ubuntu1) maverick; urgency=low diff --git a/debian/control b/debian/control index bfd75b6..87682af 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 5.0), python-gtk2-dev, libindicate-dev (>= 0.2.0), libindicate-gtk-dev (>= 0.2.0), - libindicator-dev (>= 0.3.5), + libindicator-dev (>= 0.3.14), libdbusmenu-gtk-dev (>= 0.2.2), libdbusmenu-glib-dev (>= 0.2.2), cli-common-dev (>= 0.5.7), -- cgit v1.2.3 From a227646d51c40f97e0c3b56d7b9440d198a121ff Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Wed, 8 Dec 2010 13:10:00 -0500 Subject: releasing version 0.2.90-0ubuntu2 --- debian/changelog | 9 +++++++++ debian/control | 1 - debian/rules | 9 ++++++--- 3 files changed, 15 insertions(+), 4 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 3098337..3936136 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +indicator-application (0.2.90-0ubuntu2) natty; urgency=low + + * debian/rules + - Convert to dh_python2 + * debian/control + - Dropped build depends for python-central + + -- Ken VanDine Wed, 08 Dec 2010 12:03:47 -0500 + indicator-application (0.2.90-0ubuntu1) natty; urgency=low [ Ted Gould ] diff --git a/debian/control b/debian/control index 2114116..1a24f2b 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,6 @@ XS-Python-Version: all Maintainer: Ubuntu Desktop Team Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.41), - python-central (>= 0.6), libgtk2.0-dev (>= 2.12.0), libdbus-glib-1-dev (>= 0.82), libjson-glib-dev, diff --git a/debian/rules b/debian/rules index 23237d2..cfb2f4b 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,7 @@ DEB_SRCDIR = . DEB_BUILDDIR = $(DEB_SRCDIR)/build -DEB_PYTHON_SYSTEM=pycentral +DEB_PYTHON_SYSTEM=dh_python2 PY_VERSIONS = $(shell pyversions --requested debian/control) export MONO_SHARED_DIR=$(CURDIR) export CSC=/usr/bin/mono-csc @@ -42,7 +42,9 @@ install-stamp-%: install/python-appindicator:: $(addprefix install-stamp-, $(PY_VERSIONS)) binary-predeb/python-appindicator:: - DH_PYCENTRAL=include-links dh_pycentral -ppython-appindicator -s + dh_python2 -ppython-appindicator + find debian/python-appindicator/usr/lib -name \*.la -exec rm {} \; + find debian/python-appindicator/usr/lib -name \*.a -exec rm {} \; binary-install/libappindicator0.1-cil:: dh_clistrip @@ -84,6 +86,8 @@ binary-post-install/indicator-application:: find debian/indicator-application/usr/lib -name \*.a -exec rm {} \; common-binary-predeb-arch:: list-missing + dh_fixperms + dh_strip clean:: -rm -rf $(addprefix build-, $(PY_VERSIONS)) @@ -91,4 +95,3 @@ clean:: -rm -rf $(addprefix build-stamp-, $(PY_VERSIONS)) -rm -rf $(addprefix install-stamp-, $(PY_VERSIONS)) rm -rf $(MONO_SHARED_DIR)/.wapi - -- cgit v1.2.3 From b917f6f3aba462d98c6690d650ef8555e736c4f8 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Wed, 8 Dec 2010 13:49:13 -0500 Subject: * debian/control - build depend on dbusmenu >= 0.3.90 --- debian/changelog | 7 +++++++ debian/control | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 3936136..643534e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-application (0.2.90-0ubuntu3) UNRELEASED; urgency=low + + * debian/control + - build depend on dbusmenu >= 0.3.90 + + -- Ken VanDine Wed, 08 Dec 2010 13:32:07 -0500 + indicator-application (0.2.90-0ubuntu2) natty; urgency=low * debian/rules diff --git a/debian/control b/debian/control index 1a24f2b..44e5ea1 100644 --- a/debian/control +++ b/debian/control @@ -16,8 +16,8 @@ Build-Depends: debhelper (>= 5.0), libindicate-dev (>= 0.2.0), libindicate-gtk-dev (>= 0.2.0), libindicator-dev (>= 0.3.14), - libdbusmenu-gtk-dev (>= 0.2.2), - libdbusmenu-glib-dev (>= 0.2.2), + libdbusmenu-gtk-dev (>= 0.3.90), + libdbusmenu-glib-dev (>= 0.3.90), cli-common-dev (>= 0.5.7), mono-devel (>= 2.4.3), gtk-sharp2-gapi, -- cgit v1.2.3 From 39febd03eed94737446daf69ab0b273a4433bc56 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 8 Dec 2010 13:19:20 -0600 Subject: debian/control: Removing all libappindicator packages --- debian/changelog | 3 +- debian/control | 111 +--------------------------- debian/libappindicator-dev.install | 5 -- debian/libappindicator-doc.install | 1 - debian/libappindicator0.1-cil-dev.install | 1 - debian/libappindicator0.1-cil.install | 1 - debian/libappindicator0.1-cil.installcligac | 3 - debian/libappindicator1.install | 1 - 8 files changed, 3 insertions(+), 123 deletions(-) delete mode 100644 debian/libappindicator-dev.install delete mode 100644 debian/libappindicator-doc.install delete mode 100644 debian/libappindicator0.1-cil-dev.install delete mode 100644 debian/libappindicator0.1-cil.install delete mode 100644 debian/libappindicator0.1-cil.installcligac delete mode 100644 debian/libappindicator1.install (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 11b2451..68d1bdb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,9 @@ indicator-application (0.2.90-0ubuntu4~ppa1~nolib1) UNRELEASED; urgency=low * Upstream Merge * Removing libappindicator from the tarball * Autogen + * debian/control: Removing all libappindicator packages - -- Ted Gould Wed, 08 Dec 2010 13:17:23 -0600 + -- Ted Gould Wed, 08 Dec 2010 13:19:05 -0600 indicator-application (0.2.90-0ubuntu3) UNRELEASED; urgency=low diff --git a/debian/control b/debian/control index 44e5ea1..c843d36 100644 --- a/debian/control +++ b/debian/control @@ -8,45 +8,14 @@ Build-Depends: debhelper (>= 5.0), libgtk2.0-dev (>= 2.12.0), libdbus-glib-1-dev (>= 0.82), libjson-glib-dev, - gnome-doc-utils, - gtk-doc-tools, intltool, - python-all-dev, - python-gtk2-dev, - libindicate-dev (>= 0.2.0), - libindicate-gtk-dev (>= 0.2.0), libindicator-dev (>= 0.3.14), libdbusmenu-gtk-dev (>= 0.3.90), - libdbusmenu-glib-dev (>= 0.3.90), - cli-common-dev (>= 0.5.7), - mono-devel (>= 2.4.3), - gtk-sharp2-gapi, - libmono-dev, - libnunit-cil-dev, - libgtk2.0-cil-dev, - gobject-introspection, - libgirepository1.0-dev, - gir1.0-glib-2.0, - gir1.0-gtk-2.0, - valac-0.12 + libdbusmenu-glib-dev (>= 0.3.90) Standards-Version: 3.8.4 Homepage: https://launchpad.net/indicator-application Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-application/ubuntu -Package: python-appindicator -Section: python -Architecture: any -XB-Python-Version: ${python:Versions} -Depends: ${shlibs:Depends}, - ${misc:Depends}, - ${python:Depends}, - libappindicator1 (= ${binary:Version}), - python-gobject -Provides: ${python:Provides} -Description: Python bindings for libappindicator - This package provides Python bindings so that you can use libappindicator from - a Python program. - Package: indicator-application Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} @@ -54,81 +23,3 @@ Description: Application Indicators A library and indicator to take menus from applications and place them in the panel. -Package: libappindicator1 -Section: libs -Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends} -Recommends: indicator-application (= ${binary:Version}) -Description: Application Indicators - A library and indicator to take menus from applications and place them in - the panel. - . - This package contains shared libraries to be used by applications. - -Package: libappindicator-dev -Section: libdevel -Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends}, - libdbusmenu-glib-dev (>= 0.1.8), - libdbus-glib-1-dev (>= 0.76), - libappindicator1 (= ${binary:Version}) -Description: Application Indicators - A library and indicator to take menus from applications and place them in - the panel. - . - This package contains files that are needed to build applications. - -Package: libappindicator-doc -Section: doc -Architecture: all -Depends: ${shlibs:Depends}, - ${misc:Depends} -Description: Application Indicators - A library and indicator to take menus from applications and place them in - the panel. - . - This package contains developer documentation. - -Package: libappindicator0.1-cil -Section: cli-mono -Architecture: all -Replaces: libappindicator0-cil (<= 0.0.19-0ubuntu4), - libappindicator0.0-cil (<= 0.2.0-0ubuntu4) -Conflicts: libappindicator0-cil (<= 0.0.19-0ubuntu4) -Provides: libappindicator0.0-cil -Depends: ${shlibs:Depends}, - ${misc:Depends}, - ${cli:Depends} -Description: CLI bindings for libappindicator - This package provides the appindicator-sharp assembly that allows CLI (.NET) - programs to take menus from applications and place them in the panel. - . - This package contains assemblies to be used by applications. - -Package: libappindicator0.1-cil-dev -Section: libdevel -Architecture: all -Replaces: libappindicator-cil-dev (<= 0.0.19-0ubuntu4) -Conflicts: libappindicator-cil-dev (<= 0.0.19-0ubuntu4) -Depends: ${shlibs:Depends}, - ${misc:Depends}, - ${cli:Depends}, - libappindicator0.1-cil (= ${binary:Version}) -Description: Application Indicators - A library and indicator to take menus from applications and place them in - the panel. - . - This package contains files that are needed to build applications. - -Package: gir1.0-appindicator-0.1 -Section: libs -Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends}, - ${gir:Depends} -Description: Typelib files for libappindicator1. - . - This package can be used by other packages using the GIRepository format - to generate dynamic bindings. diff --git a/debian/libappindicator-dev.install b/debian/libappindicator-dev.install deleted file mode 100644 index 28598a4..0000000 --- a/debian/libappindicator-dev.install +++ /dev/null @@ -1,5 +0,0 @@ -debian/tmp/usr/include/libappindicator-0.1/* -debian/tmp/usr/lib/libappindicator.so -debian/tmp/usr/lib/pkgconfig/appindicator-0.1.pc -debian/tmp/usr/share/gir-1.0/* -debian/tmp/usr/share/vala/vapi/* diff --git a/debian/libappindicator-doc.install b/debian/libappindicator-doc.install deleted file mode 100644 index 313fe33..0000000 --- a/debian/libappindicator-doc.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/share/gtk-doc/html/libappindicator/* diff --git a/debian/libappindicator0.1-cil-dev.install b/debian/libappindicator0.1-cil-dev.install deleted file mode 100644 index 6185943..0000000 --- a/debian/libappindicator0.1-cil-dev.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/pkgconfig/appindicator-sharp-0.1.pc diff --git a/debian/libappindicator0.1-cil.install b/debian/libappindicator0.1-cil.install deleted file mode 100644 index 106b727..0000000 --- a/debian/libappindicator0.1-cil.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/cli/appindicator-sharp-0.1/* diff --git a/debian/libappindicator0.1-cil.installcligac b/debian/libappindicator0.1-cil.installcligac deleted file mode 100644 index f3e5bfc..0000000 --- a/debian/libappindicator0.1-cil.installcligac +++ /dev/null @@ -1,3 +0,0 @@ -/usr/lib/cli/appindicator-sharp-0.1/appindicator-sharp.dll -/usr/lib/cli/appindicator-sharp-0.1/policy.0.0.appindicator-sharp.dll -/usr/lib/cli/appindicator-sharp-0.1/policy.0.1.appindicator-sharp.dll diff --git a/debian/libappindicator1.install b/debian/libappindicator1.install deleted file mode 100644 index a0b5976..0000000 --- a/debian/libappindicator1.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libappindicator.so.* -- cgit v1.2.3 From bc0f5cc4c4fbf12ec5a9441ea3e69a1edcf066e4 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Fri, 10 Dec 2010 18:05:00 -0500 Subject: releasing version 0.2.90+r170-0ubuntu1 --- debian/changelog | 12 ++++- debian/control | 5 +- debian/gir1.0-appindicator-0.1.install | 1 - debian/indicator-application.install | 4 -- debian/python-appindicator.install | 2 - debian/rules | 92 +--------------------------------- 6 files changed, 15 insertions(+), 101 deletions(-) delete mode 100644 debian/gir1.0-appindicator-0.1.install delete mode 100644 debian/indicator-application.install delete mode 100644 debian/python-appindicator.install (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 0176c5f..63357fa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,19 @@ -indicator-application (0.2.90-0ubuntu4~ppa1) natty; urgency=low +indicator-application (0.2.90+r170-0ubuntu1) natty; urgency=low + [ Ted Gould ] * Upstream Merge * Removing libappindicator from the tarball * Autogen * debian/control: Removing all libappindicator packages - -- Ted Gould Wed, 08 Dec 2010 14:26:42 -0600 + [ Ken VanDine ] + * debian/control + - bump build depends for dbusmenu to >= 0.3.90+r175 + * debian/rules + - Removed all the extra build targets, we don't build those + packages anymore + + -- Ken VanDine Fri, 10 Dec 2010 17:10:05 -0500 indicator-application (0.2.90-0ubuntu3) UNRELEASED; urgency=low diff --git a/debian/control b/debian/control index c843d36..9f4b532 100644 --- a/debian/control +++ b/debian/control @@ -10,8 +10,9 @@ Build-Depends: debhelper (>= 5.0), libjson-glib-dev, intltool, libindicator-dev (>= 0.3.14), - libdbusmenu-gtk-dev (>= 0.3.90), - libdbusmenu-glib-dev (>= 0.3.90) + libdbusmenu-gtk-dev (>= 0.3.90+r175), + libdbusmenu-glib-dev (>= 0.3.90+r175), + libappindicator-dev (>= 0.2.90+r170) Standards-Version: 3.8.4 Homepage: https://launchpad.net/indicator-application Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-application/ubuntu diff --git a/debian/gir1.0-appindicator-0.1.install b/debian/gir1.0-appindicator-0.1.install deleted file mode 100644 index 0791348..0000000 --- a/debian/gir1.0-appindicator-0.1.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/girepository-1.0/* diff --git a/debian/indicator-application.install b/debian/indicator-application.install deleted file mode 100644 index c525a81..0000000 --- a/debian/indicator-application.install +++ /dev/null @@ -1,4 +0,0 @@ -debian/tmp/usr/lib/indicators/* -debian/tmp/usr/lib/indicator-application/indicator-application-service -debian/tmp/usr/share/dbus-1/services/indicator-application.service -debian/tmp/usr/share/indicator-application/ordering-override.keyfile diff --git a/debian/python-appindicator.install b/debian/python-appindicator.install deleted file mode 100644 index 00bdd51..0000000 --- a/debian/python-appindicator.install +++ /dev/null @@ -1,2 +0,0 @@ -debian/tmp/usr/lib/python2.* -debian/tmp/usr/share/pygtk/* diff --git a/debian/rules b/debian/rules index cfb2f4b..80009dd 100755 --- a/debian/rules +++ b/debian/rules @@ -1,97 +1,9 @@ #!/usr/bin/make -f -DEB_SRCDIR = . -DEB_BUILDDIR = $(DEB_SRCDIR)/build - -DEB_PYTHON_SYSTEM=dh_python2 -PY_VERSIONS = $(shell pyversions --requested debian/control) -export MONO_SHARED_DIR=$(CURDIR) -export CSC=/usr/bin/mono-csc - include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/autotools-vars.mk +include /usr/share/cdbs/1/class/gnome.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc -API_VERSION = 0.1 - -DEB_DH_MAKESHLIBS_ARGS_libappindicator1 := -V 'libappindicator1 (>= 0.0.19)' - -configure-stamp-%: - mkdir build-$* - cd build-$* && PYTHON=`which $*` \ - $(DEB_CONFIGURE_SCRIPT) $(DEB_CONFIGURE_NORMAL_ARGS) --srcdir=.. - touch $@ - -configure/python-appindicator:: $(addprefix configure-stamp-, $(PY_VERSIONS)) - -build-stamp-%: - PYTHON=`which $*` \ - $(MAKE) -C build-$* - touch $@ - -build/python-appindicator:: $(addprefix build-stamp-, $(PY_VERSIONS)) - -install-stamp-%: - PYTHON=`which $*` \ - $(MAKE) -C build-$*/bindings/python install DESTDIR=$(CURDIR)/debian/tmp - dh_installdirs -ppython-appindicator -s - dh_install -ppython-appindicator -s - touch $@ - -install/python-appindicator:: $(addprefix install-stamp-, $(PY_VERSIONS)) - -binary-predeb/python-appindicator:: - dh_python2 -ppython-appindicator - find debian/python-appindicator/usr/lib -name \*.la -exec rm {} \; - find debian/python-appindicator/usr/lib -name \*.a -exec rm {} \; - -binary-install/libappindicator0.1-cil:: - dh_clistrip - dh_clifixperms - dh_makeclilibs -V - dh_installcligac - -binary-predeb/gir1.0-appindicator-0.1:: - dh_girepository -p$(cdbs_curpkg) - -binary-predeb/libappindicator0.1-cil:: binary-fixup/libappindicator1 - dh_clideps -plibappindicator0.1-cil - -configure-stamp: - cd $(DEB_BUILDDIR) && \ - $(DEB_CONFIGURE_SCRIPT) $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_EXTRA_FLAGS) - touch $@ - -configure/indicator-application:: configure-stamp - -build-stamp: - $(MAKE) -C $(DEB_BUILDDIR) - touch $@ - -build/indicator-application:: build-stamp - -install-stamp: - $(MAKE) -C $(DEB_BUILDDIR) install DESTDIR=$(CURDIR)/debian/tmp - touch $@ - -install/indicator-application:: install-stamp - -binary-predeb/libappindicator1:: install-stamp - dh_fixperms - dh_strip - -binary-post-install/indicator-application:: - find debian/indicator-application/usr/lib -name \*.la -exec rm {} \; - find debian/indicator-application/usr/lib -name \*.a -exec rm {} \; +LDFLAGS += -Wl,-z,defs -Wl,--as-needed common-binary-predeb-arch:: list-missing - dh_fixperms - dh_strip - -clean:: - -rm -rf $(addprefix build-, $(PY_VERSIONS)) - -rm -rf $(addprefix configure-stamp-, $(PY_VERSIONS)) - -rm -rf $(addprefix build-stamp-, $(PY_VERSIONS)) - -rm -rf $(addprefix install-stamp-, $(PY_VERSIONS)) - rm -rf $(MONO_SHARED_DIR)/.wapi -- cgit v1.2.3 From 1434c5b32951ebdaa01003b8ac28488e4d8a1887 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Tue, 11 Jan 2011 17:34:22 -0600 Subject: check for dbusmenu 0.3.90 --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 9f4b532..723bdcd 100644 --- a/debian/control +++ b/debian/control @@ -10,8 +10,8 @@ Build-Depends: debhelper (>= 5.0), libjson-glib-dev, intltool, libindicator-dev (>= 0.3.14), - libdbusmenu-gtk-dev (>= 0.3.90+r175), - libdbusmenu-glib-dev (>= 0.3.90+r175), + libdbusmenu-gtk-dev (>= 0.3.90), + libdbusmenu-glib-dev (>= 0.3.90), libappindicator-dev (>= 0.2.90+r170) Standards-Version: 3.8.4 Homepage: https://launchpad.net/indicator-application -- cgit v1.2.3 From 1fa55060a9ecf5638f11aea359650b85408a804a Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 17 Feb 2011 15:58:51 -0500 Subject: releasing version 0.2.93-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 ec65ba8..b787a8c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-application (0.2.93-0ubuntu3) natty; urgency=low + + * debian/control + - bump build depends for libindicator-dev to >= 0.3.19 + + -- Ken VanDine Thu, 17 Feb 2011 15:01:57 -0500 + indicator-application (0.2.93-0ubuntu2) natty; urgency=low * src/application-service-appstore.c diff --git a/debian/control b/debian/control index 62a270e..b806b99 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 5.0), libdbus-glib-1-dev (>= 0.82), libjson-glib-dev, intltool, - libindicator-dev (>= 0.3.16), + libindicator-dev (>= 0.3.19), libdbusmenu-gtk-dev (>= 0.3.91), libdbusmenu-glib-dev (>= 0.3.91), libappindicator-dev (>= 0.2.91) -- cgit v1.2.3 From c6384725e5580e021a9d6f95685c54dad9619153 Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Fri, 25 Feb 2011 08:57:27 -0500 Subject: * debian/control, debian/rules: - Add quilt as a patch system * debian/patches/fix-null-string-to-variant-crash.patch: - Don't pass a null string to GVariant, it hates it. LP: #724767 --- debian/changelog | 9 +++++++++ debian/control | 1 + debian/patches/fix-null-string-to-variant-crash.patch | 19 +++++++++++++++++++ debian/patches/series | 1 + debian/rules | 1 + 5 files changed, 31 insertions(+) create mode 100644 debian/patches/fix-null-string-to-variant-crash.patch create mode 100644 debian/patches/series (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index d215213..89cc5e8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +indicator-application (0.2.94-0ubuntu2) natty; urgency=low + + * debian/control, debian/rules: + - Add quilt as a patch system + * debian/patches/fix-null-string-to-variant-crash.patch: + - Don't pass a null string to GVariant, it hates it. LP: #724767 + + -- Michael Terry Fri, 25 Feb 2011 08:53:58 -0500 + indicator-application (0.2.94-0ubuntu1) natty; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index b806b99..a1f6be0 100644 --- a/debian/control +++ b/debian/control @@ -5,6 +5,7 @@ XS-Python-Version: all Maintainer: Ubuntu Desktop Team Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.41), + quilt, libgtk2.0-dev (>= 2.12.0), libdbus-glib-1-dev (>= 0.82), libjson-glib-dev, diff --git a/debian/patches/fix-null-string-to-variant-crash.patch b/debian/patches/fix-null-string-to-variant-crash.patch new file mode 100644 index 0000000..ebcad4c --- /dev/null +++ b/debian/patches/fix-null-string-to-variant-crash.patch @@ -0,0 +1,19 @@ +=== modified file 'src/application-service-appstore.c' +Index: indicator-application.ubu/src/application-service-appstore.c +=================================================================== +--- indicator-application.ubu.orig/src/application-service-appstore.c 2011-02-25 08:50:32.170749000 -0500 ++++ indicator-application.ubu/src/application-service-appstore.c 2011-02-25 08:53:26.313552982 -0500 +@@ -1238,9 +1238,10 @@ + } + + g_variant_builder_add (&builder, "(sisossss)", app->icon, +- position++, app->dbus_name, app->menu, +- app->icon_theme_path, app->label, +- app->guide, app->icon_desc); ++ position++, app->dbus_name, app->menu, ++ app->icon_theme_path, app->label, ++ app->guide, ++ (app->icon_desc != NULL) ? app->icon_desc : ""); + } + + out = g_variant_builder_end(&builder); diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..8d2cb6b --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +fix-null-string-to-variant-crash.patch diff --git a/debian/rules b/debian/rules index dd456c1..7a7c9e8 100755 --- a/debian/rules +++ b/debian/rules @@ -3,6 +3,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk include /usr/share/cdbs/1/rules/utils.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk LDFLAGS += -Wl,-z,defs -Wl,--as-needed -- cgit v1.2.3 From f2c00ec02764df9af713482b63712f1058c6d19f Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Wed, 22 Jun 2011 13:26:15 -0400 Subject: releasing version 0.3.90-0ubuntu1 --- debian/changelog | 17 +++++++++++++++-- debian/control | 24 +++++++++++++++++++----- debian/indicator-application-gtk2.install | 1 + debian/indicator-application.install | 1 + debian/rules | 24 +++++++++++++++--------- 5 files changed, 51 insertions(+), 16 deletions(-) create mode 100644 debian/indicator-application-gtk2.install create mode 100644 debian/indicator-application.install (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index f4e81ac..48b0a6b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,22 @@ -indicator-application (0.3.90-0ubuntu1~ppa1) oneiric; urgency=low +indicator-application (0.3.90-0ubuntu1) oneiric; urgency=low + [ Ted Gould ] * New upstream release. * GTK3 Port - -- Ted Gould Wed, 22 Jun 2011 11:37:43 -0500 + [ Ken VanDine ] + * debian/control + - Bumped standards version to 3.9.2 + - Add new binary for indicator-application-gtk2 + - Make indicator-application recommend indicator-application-gtk2 (until + unity can load gtk3 indicators) + - indicator-application-gtk2 replaces indicator-application << 0.2.90 + - Added build depends for libdbusmenu-gtk3-dev, libindicator3-dev + and libappindicator3-dev + * debian/rules + - build for both gtk2 and gtk3 + + -- Ken VanDine Wed, 22 Jun 2011 13:07:06 -0400 indicator-application (0.3.2-0ubuntu1) natty; urgency=low diff --git a/debian/control b/debian/control index a1f6be0..a1e7a78 100644 --- a/debian/control +++ b/debian/control @@ -5,22 +5,36 @@ XS-Python-Version: all Maintainer: Ubuntu Desktop Team Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.41), - quilt, libgtk2.0-dev (>= 2.12.0), + libgtk-3-dev (>= 2.91), libdbus-glib-1-dev (>= 0.82), libjson-glib-dev, intltool, + libappindicator-dev (>= 0.2.91), + libappindicator3-dev (>= 0.2.91), libindicator-dev (>= 0.3.19), - libdbusmenu-gtk-dev (>= 0.3.91), - libdbusmenu-glib-dev (>= 0.3.91), - libappindicator-dev (>= 0.2.91) -Standards-Version: 3.8.4 + libindicator3-dev (>= 0.3.19), + libdbusmenu-glib-dev (>= 0.3.94), + libdbusmenu-gtk-dev (>= 0.3.94), + libdbusmenu-gtk3-dev (>= 0.3.94) +Standards-Version: 3.9.2 Homepage: https://launchpad.net/indicator-application Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-application/ubuntu Package: indicator-application Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Recommends: indicator-application-gtk2 +Description: Application Indicators + A library and indicator to take menus from applications and place them in + the panel. + +Package: indicator-application-gtk2 +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + indicator-application (= ${binary:Version}) +Replaces: indicator-application (<< 0.3.90) Description: Application Indicators A library and indicator to take menus from applications and place them in the panel. diff --git a/debian/indicator-application-gtk2.install b/debian/indicator-application-gtk2.install new file mode 100644 index 0000000..8d1fc9f --- /dev/null +++ b/debian/indicator-application-gtk2.install @@ -0,0 +1 @@ +debian/tmp/gtk2/usr/lib/indicators /usr/lib/ diff --git a/debian/indicator-application.install b/debian/indicator-application.install new file mode 100644 index 0000000..19a45de --- /dev/null +++ b/debian/indicator-application.install @@ -0,0 +1 @@ +debian/tmp/gtk3/usr / diff --git a/debian/rules b/debian/rules index 7a7c9e8..7950ed1 100755 --- a/debian/rules +++ b/debian/rules @@ -1,17 +1,23 @@ #!/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/utils.mk -include /usr/share/cdbs/1/rules/patchsys-quilt.mk -LDFLAGS += -Wl,-z,defs -Wl,--as-needed +DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/tmp/@FLAVOR@ +DEB_DESTDIR = $(CURDIR)/debian/tmp/$(cdbs_make_curflavor)/ -common-binary-predeb-arch:: list-missing +DEB_CONFIGURE_FLAGS_gtk2 = --with-gtk=2 +DEB_CONFIGURE_FLAGS_gtk3 = --with-gtk=3 +DEB_CONFIGURE_EXTRA_FLAGS = --disable-static + +LDFLAGS += -Wl,-z,defs -Wl,--as-needed -DEB_DH_MAKESHLIBS_ARGS = -Xusr/lib/indicators +debian/stamp-autotools/gtk2: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk2) +debian/stamp-autotools/gtk3: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk3) -binary-install/indicator-application:: - # remove .a/.la clutter - rm -f debian/$(cdbs_curpkg)/usr/lib/indicators/*/*.a - rm -f debian/$(cdbs_curpkg)/usr/lib/indicators/*/*.la +common-install-arch:: + find debian/tmp -name \*.la -delete + find debian/tmp -name \*.a -delete -- cgit v1.2.3 From f099efd0cd93363218430b32e422f21a5aec7b50 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Tue, 28 Jun 2011 10:42:26 -0400 Subject: releasing version 0.3.90-0ubuntu2 --- debian/changelog | 8 ++++++++ debian/control | 1 - 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 48b0a6b..d5cdd1b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +indicator-application (0.3.90-0ubuntu2) oneiric; urgency=low + + * Rebuild for libdbusmenu-gtk3-4 + * debian/control + - Dropped build depends on indicator-application-gtk2 + + -- Ken VanDine Tue, 28 Jun 2011 09:02:01 -0400 + indicator-application (0.3.90-0ubuntu1) oneiric; urgency=low [ Ted Gould ] diff --git a/debian/control b/debian/control index a1e7a78..d79b35a 100644 --- a/debian/control +++ b/debian/control @@ -24,7 +24,6 @@ Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-application/ubunt Package: indicator-application Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Recommends: indicator-application-gtk2 Description: Application Indicators A library and indicator to take menus from applications and place them in the panel. -- cgit v1.2.3 From 0bf3d06e9607b38285cd459749086b073bfcc5d9 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 8 Feb 2012 11:40:57 -0600 Subject: debian/control: Dbusmenu bump to 0.5.90 --- debian/changelog | 3 ++- debian/control | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 1dfdc32..f1bbbfa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,8 +6,9 @@ indicator-application (0.4.90-0ubuntu1~ppa1) UNRELEASED; urgency=low * Fixing variant usage * Adding support for the Title property * Fixing to work with Dbusmenu 0.5.90 + * debian/control: Dbusmenu bump to 0.5.90 - -- Ted Gould Wed, 08 Feb 2012 11:31:13 -0600 + -- Ted Gould Wed, 08 Feb 2012 11:32:34 -0600 indicator-application (0.4.0-0ubuntu2) precise; urgency=low diff --git a/debian/control b/debian/control index c83899d..b25bb5a 100644 --- a/debian/control +++ b/debian/control @@ -14,9 +14,9 @@ Build-Depends: debhelper (>= 5.0), libappindicator3-dev (>= 0.2.91), libindicator-dev (>= 0.3.90), libindicator3-dev (>= 0.3.90), - libdbusmenu-glib-dev (>= 0.3.94), - libdbusmenu-gtk-dev (>= 0.3.94), - libdbusmenu-gtk3-dev (>= 0.3.94) + libdbusmenu-glib-dev (>= 0.5.90), + libdbusmenu-gtk-dev (>= 0.5.90), + libdbusmenu-gtk3-dev (>= 0.5.90) Standards-Version: 3.9.2 Homepage: https://launchpad.net/indicator-application Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-application/ubuntu -- cgit v1.2.3 From e863c24378fcf310e62f0c3a5c126d88764c3702 Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Wed, 22 Aug 2012 14:44:52 +0200 Subject: debian/control: Build-Depends on dbus-test-runner and xvfb, dh9 runs make check for us and the tests require those --- debian/changelog | 7 +++++++ debian/control | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 3142e94..fb058ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-application (12.10.0-0ubuntu2) UNRELEASED; urgency=low + + * debian/control: Build-Depends on dbus-test-runner and xvfb, + dh9 runs make check for us and the tests require those + + -- Sebastien Bacher Wed, 22 Aug 2012 14:44:06 +0200 + indicator-application (12.10.0-0ubuntu1) quantal; urgency=low * New upstream release: diff --git a/debian/control b/debian/control index 8050c9e..a204988 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,9 @@ Build-Depends: debhelper (>= 9.0), libappindicator3-dev (>= 0.2.91), libindicator3-dev (>= 0.3.90), libdbusmenu-glib-dev (>= 0.5.90), - libdbusmenu-gtk3-dev (>= 0.5.90) + libdbusmenu-gtk3-dev (>= 0.5.90), + xvfb, + dbus-test-runner Standards-Version: 3.9.3 Homepage: https://launchpad.net/indicator-application Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-application/ubuntu -- cgit v1.2.3