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 2a0070acc1c3e9f57ecf9615540fac18901bb880 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 8 Dec 2010 15:35:51 -0600 Subject: debian/control: Removing the indicator-application bin package. --- debian/changelog | 3 ++- debian/control | 7 ------- debian/indicator-application.install | 4 ---- 3 files changed, 2 insertions(+), 12 deletions(-) delete mode 100644 debian/indicator-application.install (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 8a795e1..0bc774a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,9 @@ indicator-application (0.2.90-0ubuntu4~ppa1) UNRELEASED; urgency=low * Removing service, lib only * Switching from dbus-glib to GDBus * Autogen + * debian/control: Removing the indicator-application bin package. - -- Ted Gould Wed, 08 Dec 2010 15:34:18 -0600 + -- Ted Gould Wed, 08 Dec 2010 15:35:32 -0600 indicator-application (0.2.90-0ubuntu3) UNRELEASED; urgency=low diff --git a/debian/control b/debian/control index 44e5ea1..f0eec91 100644 --- a/debian/control +++ b/debian/control @@ -47,13 +47,6 @@ 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 - the panel. - Package: libappindicator1 Section: libs Architecture: any 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 -- cgit v1.2.3 From 86419fbda78c03528f96fcb17602276b2d2cfc3f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 8 Dec 2010 16:01:51 -0600 Subject: Converting over to libappindicator with a dummy commit for merge upstream --- debian/changelog | 602 +------------------------------------------------------ debian/control | 2 +- 2 files changed, 4 insertions(+), 600 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 0bc774a..c651525 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,601 +1,5 @@ -indicator-application (0.2.90-0ubuntu4~ppa1) UNRELEASED; urgency=low +libappindicator (0.2.90-0ubuntu1) natty; urgency=low - * Upstream Merge - * Removing service, lib only - * Switching from dbus-glib to GDBus - * Autogen - * debian/control: Removing the indicator-application bin package. + * Dummy commit - -- Ted Gould Wed, 08 Dec 2010 15:35:32 -0600 - -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 - - 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 ] - * New upstream release. - * A race fix on the dbus name (LP: #526499) - * Fixing the Watcher Interface - * Fixes to build with GTK 2/3 - * Fixes to build with valac-0.12 - - [ Ken VanDine ] - * debian/control - - Changed the valac build depends to valac-0.12 - * debian/python-appindicator.install - - Make sure python2.6 and python2.7 files get included - * debian/rules - - Fix builds for multiple python versions - - -- Ken VanDine Wed, 08 Dec 2010 00:42:58 -0500 - -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) - - -- Didier Roche Wed, 22 Sep 2010 20:01:04 +0200 - -indicator-application (0.2.8-0ubuntu1) maverick; urgency=low - - * New upstream release. - * Update the icon if the item is visible (LP: #639643) - - -- Ted Gould Wed, 15 Sep 2010 15:05:15 -0500 - -indicator-application (0.2.7-0ubuntu1) maverick; urgency=low - - * New upstream release. - * Handle double registration of indicators (LP: #621838) - - -- Ted Gould Thu, 09 Sep 2010 13:00:37 -0500 - -indicator-application (0.2.6-0ubuntu1) maverick; urgency=low - - * New upstream release. - * Fixing the position of new indicators (LP: #623205) - * Position the ibus and keyboard layout indicators correctly. - - -- Ted Gould Thu, 26 Aug 2010 14:56:27 -0500 - -indicator-application (0.2.5-0ubuntu1) maverick; urgency=low - - * New upstream release. - * Making it so the approver actually approves indicators - * Fixing a small memory leak - * Allowing approvers to change thier mind - - -- Ted Gould Thu, 19 Aug 2010 14:00:03 -0500 - -indicator-application (0.2.4-0ubuntu1) maverick; urgency=low - - * New upstream release. - * Add in ordering IDs - * Adding label support into the library - * Adding label support into the indicator - * Breaking the ABI in order to get more space in the class - structure. - * Allow the icon theme path to be changed dynamically (LP: #607831) - * debian/control: Moving libappindicator0 to libappindicator1 - * debian/rules: Moving libappindicator0 to libappindicator1 - - -- Ted Gould Thu, 12 Aug 2010 13:57:17 -0500 - -indicator-application (0.2.3-0ubuntu2) maverick; urgency=low - - * Rebuild with the new gobject introspection - - -- Sebastien Bacher Wed, 11 Aug 2010 11:07:51 +0200 - -indicator-application (0.2.3-0ubuntu1) maverick; urgency=low - - * New upstream release. - * Fixing test for slower machines - * Adding an Approver API to remove things from the AppIndicators. - - -- Ted Gould Thu, 15 Jul 2010 10:22:33 -0500 - -indicator-application (0.2.2-0ubuntu1) maverick; urgency=low - - * debian/control, debian/rules: - - use dh_girepository and gir:Depends to get the gir depends, - clean the build-depends on gir-repository-dev not required - - [ Ted Gould ] - * New upstream release. - ∘ Work with updated container signal names (lp: #558841) - - -- Sebastien Bacher Thu, 08 Jul 2010 18:12:00 +0200 - -indicator-application (0.2.1-0ubuntu1) maverick; urgency=low - - [ Ted Gould ] - * New upstream release. - * Fix icon updating (LP: #594199) - * Change Mono bindings to only parse particular files (LP: #592706) - * Make a policy for migrating the mono bindings - * Test fixes to make them more reliable - * debian/control: Fixing version numbers - * debian/control: Making the 0.1-cil replace and provide the 0.0-cil - * debian/libappindicator0.1-cil.installcligac: Add the policy.dll - file to the install. - - [Ken VanDine] - * renamed cil binary to libappindicator0.1 to match the assembly - version (LP: #592706) - - -- Didier Roche Tue, 22 Jun 2010 09:31:43 +0200 - -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. - * Unref the child that was created - * Build GIR and VAPI files (LP: #510610) - * Fixes to documentation and enum construction - * Fix distcheck - * Merging patch to add assembly information to Mono - binding (LP: #547195) - * 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. - * debian/libappindicator0.0-cil.install: Fixing directory of cli files - - -- Ted Gould Thu, 03 Jun 2010 14:49:48 -0500 - -indicator-application (0.0.19-0ubuntu5) lucid-proposed; urgency=low - - * debian/patches/child-leakage.patch - - Fixes a memory leak (LP: #569273) - - -- Ken VanDine Thu, 20 May 2010 07:35:33 -0400 - -indicator-application (0.0.19-0ubuntu4) lucid; 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) - - -- Ted Gould Wed, 14 Apr 2010 11:48:49 -0500 - -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. - * Setup the icons to use the -panel variants even when falling - back to status icons. (LP: #547072) - * Change python bindings to use _with_path so that they can set - the icon path. (LP: #527061) - * Don't set the fallback timer if we're already in a fallback - mode to avoid unfalling back excessively. (LP: #529052) - * Fix distcheck of documentation - - -- Ted Gould Thu, 01 Apr 2010 15:56:02 -0500 - -indicator-application (0.0.18-0ubuntu1) lucid; urgency=low - - * Upstream Release 0.0.18 - * Change when there are updates to Check and Radio buttons via - their actions. (LP: #542221) - * Fixing icon updating with themes and naming fallbacks with - the status icon fallback. (LP: #532858) - - -- Ted Gould Thu, 25 Mar 2010 12:14:23 -0500 - -indicator-application (0.0.17-0ubuntu1) lucid; urgency=low - - * Upstream Release 0.0.17 - * Support GTK's show menu items property (LP: #528527) - * Fix status and category nicks in Python bindings (LP: #539858) - * Switch domains to org.kde instead of org.freedesktop as spec - was never officially approved by that body. - - -- Ted Gould Thu, 18 Mar 2010 13:11:00 -0500 - -indicator-application (0.0.16-0ubuntu2) lucid; urgency=low - - * Backported upstream change to respect gtk "always-show-image" (lp: #528527) - - -- Sebastien Bacher Mon, 15 Mar 2010 16:39:09 +0100 - -indicator-application (0.0.16-0ubuntu1) lucid; urgency=low - - * Upstream release 0.0.16 - * 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:22:06 -0600 - -indicator-application (0.0.15-0ubuntu1) lucid; urgency=low - - * Upstream release 0.0.15 - * Icon size fix to 22 px - * Status icon correctly removed in fallback - * Fixed test suite to run better on slow machines. - - -- Ted Gould Thu, 04 Mar 2010 11:42:40 -0600 - -indicator-application (0.0.14-0ubuntu1) lucid; urgency=low - - * Upstream release 0.0.14 - ∘ Fix mono bindings to include proper metadata (LP: #526620) - ∘ Send connection changed signal when the proxy is created - and destroyed (LP: #527082) - ∘ Hide the fallback status icon before unrefing it. (LP: #526041) - ∘ Increase dbus-glib version check to 0.82 - ∘ Handle menu layout changes and visibility changes better. - ∘ Improve testing stability - ∘ Read menu sensitivity on startup. - ∘ Handle null strings when evaluating whether we have an - attention icon. - ∘ Remove dbus objects when we fallback - ∘ Disconnect client_menu_changed signal handlers on cleanup. - ∘ Handle cases where the menu gets unset on updates. - ∘ Fix custom labels on stock items. - ∘ Adds support for submenus - - -- Ted Gould Thu, 25 Feb 2010 15:22:28 -0600 - -indicator-application (0.0.13-0ubuntu8) lucid; 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:30:27 -0600 - -indicator-application (0.0.13-0ubuntu7) lucid; urgency=low - - * Backported upstream change to fix menu item sensitivity update, - thanks to Jan Arne Petersen (lp: #522151) - - -- Sebastien Bacher Mon, 22 Feb 2010 17:49:23 +0100 - -indicator-application (0.0.13-0ubuntu6) lucid; urgency=low - - * Cherrypick fix to check for a null string as the attention icon - * Cherrypick fix to remove the registration of dbus objects (LP: #497870) - - lets us drop debian/patches/unregister.patch - - -- Ken VanDine Fri, 19 Feb 2010 18:52:40 +0100 - -indicator-application (0.0.13-0ubuntu5) lucid; urgency=low - - * debian/patches/unregister.patch - - Fix to remove the registration of dbus objects (LP: #497870) - - -- Ken VanDine Fri, 19 Feb 2010 17:55:11 +0100 - -indicator-application (0.0.13-0ubuntu4) lucid; urgency=low - - * Backport Cody Russell's change to fix rhythmbox crashing on closing - (lp: #522942) - - -- Sebastien Bacher Wed, 17 Feb 2010 23:13:10 +0100 - -indicator-application (0.0.13-0ubuntu3) lucid; urgency=low - - * Backport trunk change to fix stock items labels (lp: #520048) - * Backport trunk change to fix menus update issues (lp: #521181) - * debian/control: updated standards-version - - -- Sebastien Bacher Tue, 16 Feb 2010 16:22:31 +0100 - -indicator-application (0.0.13-0ubuntu2) lucid; urgency=low - - * Backported lp:~bratsche/indicator-application/submenus to make the submenus - working in the application indicators (lp: #519625) - - -- Sebastien Bacher Fri, 12 Feb 2010 17:12:58 +0100 - -indicator-application (0.0.13-0ubuntu1) lucid; urgency=low - - * Upstream release 0.0.13 - * Changing the menu property to be a proper DBus object path - * Make object paths unique by including application IDs in them - - -- Ted Gould Thu, 11 Feb 2010 10:41:53 -0600 - -indicator-application (0.0.12-0ubuntu1) lucid; urgency=low - - * Upstream release 0.0.12 - * Handling the service restarting better by removing the icons - after a small delay to ensure they don't return. - * Fixing a crash where a proxy was created while the previous - one was being destroyed. - * Fixing copying of the attention icon - * Adding status changing to the example application - * Adding a test for status changing getting sent over DBus. - - -- Ted Gould Mon, 08 Feb 2010 10:01:42 -0600 - -indicator-application (0.0.11-0ubuntu1) lucid; urgency=low - - * debian/control: - - updated libunit-cil build-depends - - [ Ted Gould ] - * Upstream release 0.0.11 - * 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 - - -- Sebastien Bacher Thu, 04 Feb 2010 17:35:19 -0800 - -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 - * Adding in a file to position the indicators - * Ref counting theme directories as they get added and removed - * 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. - - -- Ted Gould Thu, 21 Jan 2010 14:21:00 -0600 - -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 - (lp: #507975) - - -- Sebastien Bacher Tue, 19 Jan 2010 20:52:41 +0100 - -indicator-application (0.0.9-0ubuntu1) lucid; urgency=low - - * Upstream Release 0.0.9 - * Add fallback support for situations where the NotificationWatcher - isn't available. - - -- Ted Gould Thu, 14 Jan 2010 10:39:43 -0600 - -indicator-application (0.0.8-0ubuntu1) lucid; urgency=low - - * Upstream Release 0.0.8 - - Mono bindings fixes (LP: #505923) - - -- Ken VanDine Tue, 12 Jan 2010 01:35:44 -0500 - -indicator-application (0.0.7-0ubuntu1) lucid; urgency=low - - * Upstream Release 0.0.7 - * Making the Notification Watcher register for it's own DBus - name to keep the service one unique. - * Adding support for icons changing through the service and - in the indicator. - * Fixing the generated headers for DBus Properties calls - * Fixing libappindicator set_icon to set the right icon. - * Adding in icon path support. - * Switching DBus interface to org.freedesktop - * Adding check/radio support to menu parsing - * 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 - - * Upstream release 0.0.6 - * Include Python binding - * Include Mono binding - * Minor bug fixes - * Fixing when menus are set twice. (LP: #497812) - * Keeping a constant signature for the library instead of - building it each time. - * debian/control, debian/python-appindicator.install: Building - a binary package for the python bindings. - * debian/control: Adding python building build deps - * debian/control, debian/libappindicator0-cil.install: Building - a binary package for the Mono bindings. - * debian/control: Adding Mono building build deps - - [Ken VanDine] - * Added mono bindings - - debian/libappindicator0-cil.install - - debian/libappindicator0-cil-dev.install - - debian/control - * debian/rules - - don't use gnome.mk, specify all the targets to build python - bindings for each supported python version - - -- Ted Gould Thu, 17 Dec 2009 14:45:50 -0600 - -indicator-application (0.0.4-0ubuntu2) lucid; urgency=low - - * debian/control - - make libappindicator0 recommend indicator-application - - -- Ken VanDine Tue, 15 Dec 2009 10:40:07 -0500 - -indicator-application (0.0.4-0ubuntu1) lucid; urgency=low - - * Upstream release 0.0.4 - * debian/rules: - - removed the disable-scrollkeeper configure arg - - don't include .la and .a files - * debian/patches/clean_up_docs.patch - - removed, merged upstream - * 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 - -indicator-application (0.0.3-0ubuntu1) lucid; urgency=low - - * Upstream release 0.0.3 - * Adding in documentation - * Adding a pkg-config .pc file for libappindicator - * 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 - - [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 - - enable-gtk-doc - - added simple-patchsys.mk - * debian/patches/clean_up_docs.patch - - Remove template values and set a proper title - * debian/copyright - - Include the proper licenses (LGPL-2.1 and LGPL-3) - - -- Ted Gould Thu, 10 Dec 2009 13:34:40 -0600 - -indicator-application (0.0.2-0ubuntu1~ppa1) karmic; urgency=low - - * Upstream release 0.0.2 - * Updates API to use GTK instead of dbusmenu to make it - easier for upstream developers to use. - - -- Ted Gould Fri, 04 Dec 2009 14:50:45 -0600 - -indicator-application (0.0.2-0~ppa3) karmic; urgency=low - - * debian/watch: - - Updated url to point to the LP project - * debian/control - - Updated Vcs-Bzr, project urls and description - - -- Ken VanDine Thu, 10 Dec 2009 09:00:06 -0500 - -indicator-application (0.0.1-0ubuntu3~ppa4) karmic; urgency=low - - * Adding in copyright headers and licenses - - -- Ted Gould Wed, 02 Dec 2009 12:17:00 -0600 - -indicator-application (0.0.1-0ubuntu3~ppa3) karmic; urgency=low - - * Massive name change. - * debian/* changing packaging to not be "custom" anymore and now - everything is "application" - - -- Ted Gould Wed, 02 Dec 2009 12:06:25 -0600 - -indicator-application (0.0.1-0ubuntu3~ppa2) karmic; urgency=low - - * Implementing the service and having the indicator and app - library start using it. - - -- Ted Gould Wed, 02 Dec 2009 11:58:08 -0600 - -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-application (0.0.1-0ubuntu2) karmic; urgency=low - - * 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-application (0.0.1-0ubuntu1) karmic; urgency=low - - * Development packaging edition. - - -- Robert Collins Thu, 29 Oct 2009 15:44:14 +1100 + -- Ted Gould Wed, 08 Dec 2010 16:00:59 -0600 diff --git a/debian/control b/debian/control index f0eec91..c48cbc1 100644 --- a/debian/control +++ b/debian/control @@ -1,4 +1,4 @@ -Source: indicator-application +Source: libappindicator Section: gnome Priority: optional XS-Python-Version: all -- cgit v1.2.3 From d4236cd10ace941a85060e2f4be9902becde40b2 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Wed, 8 Dec 2010 17:51:34 -0500 Subject: move python-appindicator to the end --- debian/control | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index c48cbc1..f87b2aa 100644 --- a/debian/control +++ b/debian/control @@ -33,20 +33,6 @@ 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: libappindicator1 Section: libs Architecture: any @@ -125,3 +111,17 @@ Description: Typelib files for libappindicator1. . This package can be used by other packages using the GIRepository format to generate dynamic bindings. + +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. -- cgit v1.2.3 From 29871df079babc88c93255f101edb19d266efd30 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Fri, 10 Dec 2010 16:38:00 -0500 Subject: * debian/rules - Changes to build targets to get it building multipass for python 2.6 and 2.7 --- debian/changelog | 10 ++++++++-- debian/control | 32 ++++++++++++++++---------------- debian/rules | 6 +++--- 3 files changed, 27 insertions(+), 21 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index aa2f1a3..8e2a2e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,11 @@ -libappindicator (0.2.91-0ubuntu1~ppa1) UNRELEASED; urgency=low +libappindicator (0.2.90+r175-0ubuntu1) UNRELEASED; urgency=low + [ Ted Gould ] * Intial release. - -- Ted Gould Wed, 08 Dec 2010 16:28:55 -0600 + [ Ken VanDine ] + * debian/rules + - Changes to build targets to get it building multipass for + python 2.6 and 2.7 + + -- Ken VanDine Fri, 10 Dec 2010 16:37:17 -0500 diff --git a/debian/control b/debian/control index f87b2aa..bea497c 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.3.90), - libdbusmenu-glib-dev (>= 0.3.90), + libdbusmenu-gtk-dev (>= 0.3.90+r175), + libdbusmenu-glib-dev (>= 0.3.90+r175), cli-common-dev (>= 0.5.7), mono-devel (>= 2.4.3), gtk-sharp2-gapi, @@ -33,6 +33,20 @@ 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: libappindicator1 Section: libs Architecture: any @@ -111,17 +125,3 @@ Description: Typelib files for libappindicator1. . This package can be used by other packages using the GIRepository format to generate dynamic bindings. - -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. diff --git a/debian/rules b/debian/rules index 324b6ff..4c624b6 100755 --- a/debian/rules +++ b/debian/rules @@ -63,19 +63,19 @@ configure-stamp: $(DEB_CONFIGURE_SCRIPT) $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_EXTRA_FLAGS) touch $@ -configure/libappindicator:: configure-stamp +configure/libappindicator1:: configure-stamp build-stamp: $(MAKE) -C $(DEB_BUILDDIR) touch $@ -build/libappindicator:: build-stamp +build/libappindicator1:: build-stamp install-stamp: $(MAKE) -C $(DEB_BUILDDIR) install DESTDIR=$(CURDIR)/debian/tmp touch $@ -install/libappindicator:: install-stamp +install/libappindicator1:: install-stamp binary-predeb/libappindicator1:: install-stamp dh_fixperms -- cgit v1.2.3 From 54c9e642092a203b35f63acf915eef78d2cb1ef0 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 16 Dec 2010 10:10:13 -0500 Subject: releasing version 0.2.90-0ubuntu4 --- debian/changelog | 6 ++++++ debian/control | 8 +++++--- debian/gir1.0-appindicator-0.1.install | 1 - debian/gir1.2-appindicator-0.1.install | 1 + 4 files changed, 12 insertions(+), 4 deletions(-) delete mode 100644 debian/gir1.0-appindicator-0.1.install create mode 100644 debian/gir1.2-appindicator-0.1.install (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 44ffc1b..31c80a6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +indicator-application (0.2.90-0ubuntu4) natty; urgency=low + + * Updated for the gir abi transition + + -- Ken VanDine Thu, 16 Dec 2010 10:05:55 -0500 + indicator-application (0.2.90-0ubuntu3) natty; urgency=low * debian/control diff --git a/debian/control b/debian/control index 44e5ea1..02ca13c 100644 --- a/debian/control +++ b/debian/control @@ -26,8 +26,8 @@ Build-Depends: debhelper (>= 5.0), libgtk2.0-cil-dev, gobject-introspection, libgirepository1.0-dev, - gir1.0-glib-2.0, - gir1.0-gtk-2.0, + gir1.2-glib-2.0, + gir1.2-gtk-2.0, valac-0.12 Standards-Version: 3.8.4 Homepage: https://launchpad.net/indicator-application @@ -122,7 +122,9 @@ Description: Application Indicators . This package contains files that are needed to build applications. -Package: gir1.0-appindicator-0.1 +Package: gir1.2-appindicator-0.1 +Conflicts: gir1.0-appindicator-0.1 +Replaces: 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 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/gir1.2-appindicator-0.1.install b/debian/gir1.2-appindicator-0.1.install new file mode 100644 index 0000000..0791348 --- /dev/null +++ b/debian/gir1.2-appindicator-0.1.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/girepository-1.0/* -- cgit v1.2.3 From c7907613764c57dc8f423e9f75f703f75586152b Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Tue, 8 Feb 2011 14:32:48 -0500 Subject: * debian/control, debian/rules - Include new binaries for gtk3 builds - Added symbol files for libappindicator1 and libappdindicator3-1 --- debian/changelog | 8 +++ debian/control | 53 ++++++++++++++++++-- debian/gir1.2-appindicator-0.1.install | 2 +- debian/gir1.2-appindicator3-0.1.install | 1 + debian/libappindicator-dev.install | 4 +- debian/libappindicator3-1.install | 1 + debian/libappindicator3-1.symbols | 24 +++++++++ debian/libappindicator3-dev.install | 4 ++ debian/rules | 89 +++++++++++++++++++++++++-------- 9 files changed, 157 insertions(+), 29 deletions(-) create mode 100644 debian/gir1.2-appindicator3-0.1.install create mode 100644 debian/libappindicator3-1.install create mode 100644 debian/libappindicator3-1.symbols create mode 100644 debian/libappindicator3-dev.install (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index adcd7b0..10656c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +libappindicator (0.2.92-0ubuntu2) UNRELEASED; urgency=low + + * debian/control, debian/rules + - Include new binaries for gtk3 builds + - Added symbol files for libappindicator1 and libappdindicator3-1 + + -- Ken VanDine Tue, 08 Feb 2011 14:31:11 -0500 + libappindicator (0.2.92-0ubuntu1) natty; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index 3292efd..7ed1cb9 100644 --- a/debian/control +++ b/debian/control @@ -6,6 +6,7 @@ Maintainer: Ubuntu Desktop Team Build-Depends: debhelper (>= 7.0), cdbs (>= 0.4.41), libgtk2.0-dev (>= 2.12.0), + libgtk3.0-dev (>= 2.91.3), libdbus-glib-1-dev (>= 0.82), gnome-doc-utils, gtk-doc-tools, @@ -15,8 +16,10 @@ Build-Depends: debhelper (>= 7.0), libindicate-dev (>= 0.2.0), libindicate-gtk-dev (>= 0.2.0), libindicator-dev (>= 0.3.14), + libindicator3-dev (>= 0.3.14), + libdbusmenu-glib-dev (>= 0.3.94), libdbusmenu-gtk-dev (>= 0.3.94), - libdbusmenu-glib-dev (>= 0.3.91), + libdbusmenu-gtk3-dev (>= 0.3.94), cli-common-dev (>= 0.5.7), mono-devel (>= 2.4.3), gtk-sharp2-gapi, @@ -58,6 +61,19 @@ Description: Application Indicators . This package contains shared libraries to be used by applications. +Package: gir1.2-appindicator-0.1 +Conflicts: gir1.0-appindicator-0.1 +Replaces: 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. + Package: libappindicator-dev Section: libdevel Architecture: any @@ -114,15 +130,42 @@ Description: Application Indicators . This package contains files that are needed to build applications. -Package: gir1.2-appindicator-0.1 -Conflicts: gir1.0-appindicator-0.1 -Replaces: gir1.0-appindicator-0.1 +Package: libappindicator3-1 +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: libappindicator3-dev +Section: libdevel +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libdbusmenu-glib-dev (>= 0.1.8), + libdbus-glib-1-dev (>= 0.76), + libappindicator3-1 (= ${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.2-appindicator3-0.1 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${gir:Depends} -Description: Typelib files for libappindicator1. +Description: Typelib files for libappindicator3-1. . This package can be used by other packages using the GIRepository format to generate dynamic bindings. + + + diff --git a/debian/gir1.2-appindicator-0.1.install b/debian/gir1.2-appindicator-0.1.install index 0791348..13b1776 100644 --- a/debian/gir1.2-appindicator-0.1.install +++ b/debian/gir1.2-appindicator-0.1.install @@ -1 +1 @@ -debian/tmp/usr/lib/girepository-1.0/* +debian/tmp/usr/lib/girepository-1.0/AppIndicator-0.1.typelib diff --git a/debian/gir1.2-appindicator3-0.1.install b/debian/gir1.2-appindicator3-0.1.install new file mode 100644 index 0000000..54ce899 --- /dev/null +++ b/debian/gir1.2-appindicator3-0.1.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/girepository-1.0/AppIndicator3-0.1.typelib diff --git a/debian/libappindicator-dev.install b/debian/libappindicator-dev.install index 28598a4..ddd4220 100644 --- a/debian/libappindicator-dev.install +++ b/debian/libappindicator-dev.install @@ -1,5 +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/* +debian/tmp/usr/share/gir-1.0/AppIndicator-0.1.gir +debian/tmp/usr/share/vala/vapi/AppIndicator-0.1.vapi diff --git a/debian/libappindicator3-1.install b/debian/libappindicator3-1.install new file mode 100644 index 0000000..8773436 --- /dev/null +++ b/debian/libappindicator3-1.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libappindicator3.so.* diff --git a/debian/libappindicator3-1.symbols b/debian/libappindicator3-1.symbols new file mode 100644 index 0000000..a4ceae6 --- /dev/null +++ b/debian/libappindicator3-1.symbols @@ -0,0 +1,24 @@ +libappindicator3.so.1 libappindicator3-1 #MINVER# + app_indicator_build_menu_from_desktop@Base 0.2.92 + app_indicator_category_get_type@Base 0.2.92 + app_indicator_get_attention_icon@Base 0.2.92 + app_indicator_get_category@Base 0.2.92 + app_indicator_get_icon@Base 0.2.92 + app_indicator_get_icon_theme_path@Base 0.2.92 + app_indicator_get_id@Base 0.2.92 + app_indicator_get_label@Base 0.2.92 + app_indicator_get_label_guide@Base 0.2.92 + app_indicator_get_menu@Base 0.2.92 + app_indicator_get_ordering_index@Base 0.2.92 + app_indicator_get_status@Base 0.2.92 + app_indicator_get_type@Base 0.2.92 + app_indicator_new@Base 0.2.92 + app_indicator_new_with_path@Base 0.2.92 + app_indicator_set_attention_icon@Base 0.2.92 + app_indicator_set_icon@Base 0.2.92 + app_indicator_set_icon_theme_path@Base 0.2.92 + app_indicator_set_label@Base 0.2.92 + app_indicator_set_menu@Base 0.2.92 + app_indicator_set_ordering_index@Base 0.2.92 + app_indicator_set_status@Base 0.2.92 + app_indicator_status_get_type@Base 0.2.92 diff --git a/debian/libappindicator3-dev.install b/debian/libappindicator3-dev.install new file mode 100644 index 0000000..0d6700f --- /dev/null +++ b/debian/libappindicator3-dev.install @@ -0,0 +1,4 @@ +debian/tmp/usr/lib/libappindicator3.so +debian/tmp/usr/lib/pkgconfig/appindicator3-0.1.pc +debian/tmp/usr/share/gir-1.0/AppIndicator3-0.1.gir +debian/tmp/usr/share/vala/vapi/AppIndicator3-0.1.vapi diff --git a/debian/rules b/debian/rules index 4c624b6..08ea5b5 100755 --- a/debian/rules +++ b/debian/rules @@ -9,13 +9,12 @@ 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)' +DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc --enable-introspection configure-stamp-%: mkdir build-$* @@ -41,31 +40,48 @@ install-stamp-%: 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 {} \; +stamp-configure-gtk3: + : # configure for GTK+ 3.0 + set -e; \ + rm -rf build-gtk3; \ + mkdir build-gtk3; \ + cd build-gtk3; \ + $(DEB_CONFIGURE_SCRIPT_ENV) ../configure --with-gtk=3 \ + $(filter-out --enable-gtk-doc, $(filter-out --srcdir=%, $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_EXTRA_FLAGS))) \ + --enable-gtk-doc=no; \ + cd ..; + touch $@ -binary-install/libappindicator0.1-cil:: - dh_clistrip - dh_clifixperms - dh_makeclilibs -V - dh_installcligac +configure/libappindicator3-1:: stamp-configure-gtk3 -binary-predeb/gir1.0-appindicator-0.1:: - dh_girepository -p$(cdbs_curpkg) +stamp-build-gtk3: + : # build for GTK+ 3.0 + $(MAKE) -C build-gtk3/src; + touch $@ -binary-predeb/libappindicator0.1-cil:: binary-fixup/libappindicator1 - dh_clideps -plibappindicator0.1-cil +build/libappindicator3-1:: stamp-build-gtk3 + +stamp-install-gtk3: + : # install for GTK+ 3.0 + $(MAKE) -C build-gtk3/src DESTDIR=$(CURDIR)/debian/tmp install + dh_installdirs -plibappindicator3-1 -s + dh_installdirs -plibappindicator3-dev -s + dh_installdirs -pgir1.2-appindicator3-0.1 -s + dh_install -plibappindicator3-1 -s + dh_install -plibappindicator3-dev -s + dh_install -pgir1.2-appindicator3-0.1 -s + touch $@ + +binary-install/libappindicator3-1:: stamp-install-gtk3 -configure-stamp: +configure-stamp: cd $(DEB_BUILDDIR) && \ - $(DEB_CONFIGURE_SCRIPT) $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_EXTRA_FLAGS) + $(DEB_CONFIGURE_SCRIPT) $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_EXTRA_FLAGS) --enable-gtk-doc touch $@ configure/libappindicator1:: configure-stamp -build-stamp: +build-stamp: $(MAKE) -C $(DEB_BUILDDIR) touch $@ @@ -73,14 +89,45 @@ build/libappindicator1:: build-stamp install-stamp: $(MAKE) -C $(DEB_BUILDDIR) install DESTDIR=$(CURDIR)/debian/tmp + dh_installdirs -plibappindicator1 -s + dh_installdirs -plibappindicator-dev -s + dh_installdirs -plibappindicator-doc -s + dh_installdirs -pgir1.2-appindicator-0.1 -s + dh_install -plibappindicator1 -s + dh_install -plibappindicator-dev -s + dh_install -plibappindicator-doc -s + dh_install -pgir1.2-appindicator-0.1 -s touch $@ -install/libappindicator1:: install-stamp +binary-install/libappindicator1:: install-stamp + +binary-predeb/libappindicator1:: + dh_fixperms + dh_strip -binary-predeb/libappindicator1:: install-stamp +binary-predeb/libappindicator3-1:: binary-install/libappindicator3-1 dh_fixperms dh_strip +binary-install/libappindicator0.1-cil:: binary-install/libappindicator1 + dh_clistrip + dh_clifixperms + dh_makeclilibs -V + dh_installcligac + +binary-predeb/gir%:: + dh_girepository -p$(cdbs_curpkg) + +binary-predeb/libappindicator0.1-cil:: binary-fixup/libappindicator1 + dh_clideps -plibappindicator0.1-cil + +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 {} \; + +common-install-prehook-arch:: binary-install/libappindicator3-1 + common-binary-predeb-arch:: list-missing dh_fixperms dh_strip -- cgit v1.2.3 From d0ad1b8460f6ea1a1c408b047590e33299e93591 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Tue, 8 Feb 2011 16:40:57 -0500 Subject: gtk3 packaging fixes, still wip --- debian/control | 67 ++++++++++++++++++++++------------------------- debian/rules | 82 +++++++++++++++++++++------------------------------------- 2 files changed, 60 insertions(+), 89 deletions(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 7ed1cb9..a675dea 100644 --- a/debian/control +++ b/debian/control @@ -66,8 +66,7 @@ Conflicts: gir1.0-appindicator-0.1 Replaces: gir1.0-appindicator-0.1 Section: libs Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends}, +Depends: ${misc:Depends}, ${gir:Depends} Description: Typelib files for libappindicator1. . @@ -99,37 +98,6 @@ Description: Application Indicators . 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: libappindicator3-1 Section: libs Architecture: any @@ -159,13 +127,40 @@ Description: Application Indicators Package: gir1.2-appindicator3-0.1 Section: libs Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends}, +Depends: ${misc:Depends}, ${gir:Depends} Description: Typelib files for libappindicator3-1. . This package can be used by other packages using the GIRepository format to generate dynamic bindings. +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. diff --git a/debian/rules b/debian/rules index 08ea5b5..edb1a2f 100755 --- a/debian/rules +++ b/debian/rules @@ -1,5 +1,7 @@ #!/usr/bin/make -f +export DH_VERBOSE = 1 + DEB_SRCDIR = . DEB_BUILDDIR = $(DEB_SRCDIR)/build @@ -34,13 +36,30 @@ 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-install/python-appindicator:: $(addprefix install-stamp-, $(PY_VERSIONS)) + +configure-stamp: + cd $(DEB_BUILDDIR) && \ + $(DEB_CONFIGURE_SCRIPT) $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_EXTRA_FLAGS) --enable-gtk-doc + touch $@ + +configure/libappindicator1:: configure-stamp + +build-stamp: + $(MAKE) -C $(DEB_BUILDDIR) + touch $@ + +build/libappindicator1:: build-stamp -stamp-configure-gtk3: +install-stamp: + $(MAKE) -C $(DEB_BUILDDIR) install DESTDIR=$(CURDIR)/debian/tmp + touch $@ + +binary-install/libappindicator1:: install-stamp install-gtk3-stamp + +configure-gtk3-stamp: : # configure for GTK+ 3.0 set -e; \ rm -rf build-gtk3; \ @@ -52,64 +71,23 @@ stamp-configure-gtk3: cd ..; touch $@ -configure/libappindicator3-1:: stamp-configure-gtk3 +configure/libappindicator3-1:: configure-gtk3-stamp -stamp-build-gtk3: +build-gtk3-stamp: : # build for GTK+ 3.0 $(MAKE) -C build-gtk3/src; touch $@ -build/libappindicator3-1:: stamp-build-gtk3 +build/libappindicator3-1:: build-gtk3-stamp -stamp-install-gtk3: +install-gtk3-stamp: : # install for GTK+ 3.0 $(MAKE) -C build-gtk3/src DESTDIR=$(CURDIR)/debian/tmp install - dh_installdirs -plibappindicator3-1 -s - dh_installdirs -plibappindicator3-dev -s - dh_installdirs -pgir1.2-appindicator3-0.1 -s - dh_install -plibappindicator3-1 -s - dh_install -plibappindicator3-dev -s - dh_install -pgir1.2-appindicator3-0.1 -s - touch $@ - -binary-install/libappindicator3-1:: stamp-install-gtk3 - -configure-stamp: - cd $(DEB_BUILDDIR) && \ - $(DEB_CONFIGURE_SCRIPT) $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_EXTRA_FLAGS) --enable-gtk-doc - touch $@ - -configure/libappindicator1:: configure-stamp - -build-stamp: - $(MAKE) -C $(DEB_BUILDDIR) - touch $@ - -build/libappindicator1:: build-stamp - -install-stamp: - $(MAKE) -C $(DEB_BUILDDIR) install DESTDIR=$(CURDIR)/debian/tmp - dh_installdirs -plibappindicator1 -s - dh_installdirs -plibappindicator-dev -s - dh_installdirs -plibappindicator-doc -s - dh_installdirs -pgir1.2-appindicator-0.1 -s - dh_install -plibappindicator1 -s - dh_install -plibappindicator-dev -s - dh_install -plibappindicator-doc -s - dh_install -pgir1.2-appindicator-0.1 -s touch $@ -binary-install/libappindicator1:: install-stamp +binary-install/libappindicator3-1:: install-gtk3-stamp -binary-predeb/libappindicator1:: - dh_fixperms - dh_strip - -binary-predeb/libappindicator3-1:: binary-install/libappindicator3-1 - dh_fixperms - dh_strip - -binary-install/libappindicator0.1-cil:: binary-install/libappindicator1 +binary-install/libappindicator0.1-cil:: binary-fixup/libappindicator1 dh_clistrip dh_clifixperms dh_makeclilibs -V @@ -126,8 +104,6 @@ binary-predeb/python-appindicator:: find debian/python-appindicator/usr/lib -name \*.la -exec rm {} \; find debian/python-appindicator/usr/lib -name \*.a -exec rm {} \; -common-install-prehook-arch:: binary-install/libappindicator3-1 - common-binary-predeb-arch:: list-missing dh_fixperms dh_strip -- cgit v1.2.3 From 625332ec9cf2a69a49b8008f666f67e9c909a38a Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Tue, 8 Feb 2011 17:40:01 -0500 Subject: more gtk3 build fixes --- debian/control | 7 +++---- debian/rules | 9 +++++++-- 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index a675dea..6f11a36 100644 --- a/debian/control +++ b/debian/control @@ -54,7 +54,7 @@ Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Recommends: indicator-application (= ${binary:Version}) +Recommends: indicator-application (>= 0.2.93) Description: Application Indicators A library and indicator to take menus from applications and place them in the panel. @@ -90,8 +90,7 @@ Description: Application Indicators Package: libappindicator-doc Section: doc Architecture: all -Depends: ${shlibs:Depends}, - ${misc:Depends} +Depends: ${misc:Depends} Description: Application Indicators A library and indicator to take menus from applications and place them in the panel. @@ -103,7 +102,7 @@ Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Recommends: indicator-application (= ${binary:Version}) +Recommends: indicator-application (>= 0.2.93) Description: Application Indicators A library and indicator to take menus from applications and place them in the panel. diff --git a/debian/rules b/debian/rules index edb1a2f..f808769 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,5 @@ #!/usr/bin/make -f -export DH_VERBOSE = 1 - DEB_SRCDIR = . DEB_BUILDDIR = $(DEB_SRCDIR)/build @@ -16,6 +14,9 @@ include /usr/share/cdbs/1/rules/utils.mk API_VERSION = 0.1 +DEB_DH_MAKESHLIBS_ARGS_libappindicator1 := -V 'libappindicator1 (>= 0.2.91)' +DEB_DH_MAKESHLIBS_ARGS_libappindicator3_1 := -V 'libappindicator3-1 (>= 0.2.92)' + DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc --enable-introspection configure-stamp-%: @@ -36,6 +37,8 @@ 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 + dh_install -ppython-appindicator touch $@ binary-install/python-appindicator:: $(addprefix install-stamp-, $(PY_VERSIONS)) @@ -58,6 +61,7 @@ install-stamp: touch $@ binary-install/libappindicator1:: install-stamp install-gtk3-stamp + dh_makeshlibs DEB_DH_MAKESHLIBS_ARGS_libappindicator1 configure-gtk3-stamp: : # configure for GTK+ 3.0 @@ -86,6 +90,7 @@ install-gtk3-stamp: touch $@ binary-install/libappindicator3-1:: install-gtk3-stamp + dh_makeshlibs DEB_DH_MAKESHLIBS_ARGS_libappindicator3_1 binary-install/libappindicator0.1-cil:: binary-fixup/libappindicator1 dh_clistrip -- cgit v1.2.3 From ca3edb28872ce8e0c31e99beed3a19b562a9da14 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Tue, 8 Feb 2011 21:39:11 -0500 Subject: fixup the clean target --- debian/control | 1 + debian/rules | 24 +++++++++++++----------- 2 files changed, 14 insertions(+), 11 deletions(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 6f11a36..73e285e 100644 --- a/debian/control +++ b/debian/control @@ -30,6 +30,7 @@ Build-Depends: debhelper (>= 7.0), libgirepository1.0-dev, gir1.2-glib-2.0, gir1.2-gtk-2.0, + gir1.2-gtk-3.0, valac-0.12 Standards-Version: 3.9.1 Homepage: https://launchpad.net/libappindicator diff --git a/debian/rules b/debian/rules index f808769..f34e1ad 100755 --- a/debian/rules +++ b/debian/rules @@ -60,10 +60,10 @@ install-stamp: $(MAKE) -C $(DEB_BUILDDIR) install DESTDIR=$(CURDIR)/debian/tmp touch $@ -binary-install/libappindicator1:: install-stamp install-gtk3-stamp +binary-install/libappindicator1:: install-stamp install-stamp-gtk3 dh_makeshlibs DEB_DH_MAKESHLIBS_ARGS_libappindicator1 -configure-gtk3-stamp: +configure-stamp-gtk3: : # configure for GTK+ 3.0 set -e; \ rm -rf build-gtk3; \ @@ -75,21 +75,21 @@ configure-gtk3-stamp: cd ..; touch $@ -configure/libappindicator3-1:: configure-gtk3-stamp +configure/libappindicator3-1:: configure-stamp-gtk3 -build-gtk3-stamp: +build-stamp-gtk3: : # build for GTK+ 3.0 $(MAKE) -C build-gtk3/src; touch $@ -build/libappindicator3-1:: build-gtk3-stamp +build/libappindicator3-1:: build-stamp-gtk3 -install-gtk3-stamp: +install-stamp-gtk3: : # install for GTK+ 3.0 $(MAKE) -C build-gtk3/src DESTDIR=$(CURDIR)/debian/tmp install touch $@ -binary-install/libappindicator3-1:: install-gtk3-stamp +binary-install/libappindicator3-1:: install-stamp-gtk3 dh_makeshlibs DEB_DH_MAKESHLIBS_ARGS_libappindicator3_1 binary-install/libappindicator0.1-cil:: binary-fixup/libappindicator1 @@ -114,8 +114,10 @@ common-binary-predeb-arch:: list-missing 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 -f configure-stamp* + rm -f build-stamp* + rm -f install-stamp* + rm -rf build + rm -rf build-gtk3 + rm -rf build-python* rm -rf $(MONO_SHARED_DIR)/.wapi -- cgit v1.2.3 From eef147237bdb67e22b341e6f8cd2af626f7b8a61 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 17 Feb 2011 15:43:16 -0500 Subject: releasing version 0.2.95-0ubuntu2 --- 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 a7c5fd9..0e75260 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libappindicator (0.2.95-0ubuntu2) natty; urgency=low + + * debian/control + - Bump build depends for libindicator-dev and libindicator3-dev to >= 0.3.19 + + -- Ken VanDine Thu, 17 Feb 2011 15:05:29 -0500 + libappindicator (0.2.95-0ubuntu1) natty; urgency=low [ Ted Gould ] diff --git a/debian/control b/debian/control index 73e285e..ba9bfa9 100644 --- a/debian/control +++ b/debian/control @@ -15,8 +15,8 @@ Build-Depends: debhelper (>= 7.0), python-gtk2-dev, libindicate-dev (>= 0.2.0), libindicate-gtk-dev (>= 0.2.0), - libindicator-dev (>= 0.3.14), - libindicator3-dev (>= 0.3.14), + libindicator-dev (>= 0.3.19), + libindicator3-dev (>= 0.3.19), libdbusmenu-glib-dev (>= 0.3.94), libdbusmenu-gtk-dev (>= 0.3.94), libdbusmenu-gtk3-dev (>= 0.3.94), -- cgit v1.2.3 From 8ee230776792cc7c26c4c74f43b314a6ba39e5d4 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 22 Feb 2011 16:20:27 +1100 Subject: * debian/control: - Use new build-depends for libgtk-3-dev --- debian/changelog | 7 +++++++ debian/control | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 0e75260..c006e6c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libappindicator (0.2.95-0ubuntu3) UNRELEASED; urgency=low + + * debian/control: + - Use new build-depends for libgtk-3-dev + + -- Robert Ancell Tue, 22 Feb 2011 16:14:00 +1100 + libappindicator (0.2.95-0ubuntu2) natty; urgency=low * debian/control diff --git a/debian/control b/debian/control index ba9bfa9..4f608a9 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Maintainer: Ubuntu Desktop Team Build-Depends: debhelper (>= 7.0), cdbs (>= 0.4.41), libgtk2.0-dev (>= 2.12.0), - libgtk3.0-dev (>= 2.91.3), + libgtk-3-dev (>= 2.91.3), libdbus-glib-1-dev (>= 0.82), gnome-doc-utils, gtk-doc-tools, -- cgit v1.2.3 From 49874d38804ea6cc47d3a241600e4f0a12f9fc1a Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Mon, 28 Feb 2011 08:58:38 -0500 Subject: * debian/control, debian/rules: - Add quilt * debian/patches/disconnect-from-theme.patch: - Fix crash when switching themes by disconnecting a signal from the theme on dispose. LP: #708188 --- debian/changelog | 10 ++++++++++ debian/control | 1 + debian/patches/disconnect-from-theme.patch | 14 ++++++++++++++ debian/patches/series | 1 + debian/rules | 1 + src/app-indicator.c | 2 ++ 6 files changed, 29 insertions(+) create mode 100644 debian/patches/disconnect-from-theme.patch create mode 100644 debian/patches/series (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 920b151..3ae4dd0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +libappindicator (0.2.96-0ubuntu2) natty; urgency=low + + * debian/control, debian/rules: + - Add quilt + * debian/patches/disconnect-from-theme.patch: + - Fix crash when switching themes by disconnecting a signal from + the theme on dispose. LP: #708188 + + -- Michael Terry Mon, 28 Feb 2011 08:48:40 -0500 + libappindicator (0.2.96-0ubuntu1) natty; urgency=low [ Ted Gould ] diff --git a/debian/control b/debian/control index 4f608a9..acf6057 100644 --- a/debian/control +++ b/debian/control @@ -5,6 +5,7 @@ XS-Python-Version: all Maintainer: Ubuntu Desktop Team Build-Depends: debhelper (>= 7.0), cdbs (>= 0.4.41), + quilt, libgtk2.0-dev (>= 2.12.0), libgtk-3-dev (>= 2.91.3), libdbus-glib-1-dev (>= 0.82), diff --git a/debian/patches/disconnect-from-theme.patch b/debian/patches/disconnect-from-theme.patch new file mode 100644 index 0000000..a60502c --- /dev/null +++ b/debian/patches/disconnect-from-theme.patch @@ -0,0 +1,14 @@ +=== modified file 'src/app-indicator.c' +Index: libappindicator.ubu/src/app-indicator.c +=================================================================== +--- libappindicator.ubu.orig/src/app-indicator.c 2011-02-28 08:35:28.963390000 -0500 ++++ libappindicator.ubu/src/app-indicator.c 2011-02-28 08:46:54.147065973 -0500 +@@ -667,6 +667,8 @@ + priv->connection = NULL; + } + ++ g_signal_handlers_disconnect_by_func(gtk_icon_theme_get_default(), G_CALLBACK(theme_changed_cb), self); ++ + G_OBJECT_CLASS (app_indicator_parent_class)->dispose (object); + return; + } diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..d94f0d1 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +disconnect-from-theme.patch diff --git a/debian/rules b/debian/rules index 3f266b0..a149c98 100755 --- a/debian/rules +++ b/debian/rules @@ -11,6 +11,7 @@ export CSC=/usr/bin/mono-csc 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 API_VERSION = 0.1 diff --git a/src/app-indicator.c b/src/app-indicator.c index 167e17f..01fdd5a 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -667,6 +667,8 @@ app_indicator_dispose (GObject *object) priv->connection = NULL; } + g_signal_handlers_disconnect_by_func(gtk_icon_theme_get_default(), G_CALLBACK(theme_changed_cb), self); + G_OBJECT_CLASS (app_indicator_parent_class)->dispose (object); return; } -- cgit v1.2.3 From cde0e9cf86e720a0080a97a5b0d81f4780e78ee6 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 21 Jun 2011 17:49:41 +0100 Subject: Remove unused libmono-dev build-dependency (for Mono 2.10 transition). --- debian/changelog | 1 + debian/control | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index eb57e09..7efea4e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ libappindicator (0.3.0-0ubuntu2) UNRELEASED; urgency=low * Call dh_python2 from binary-fixup rather than binary-predeb, so that generated maintainer script snippets actually end up in the package. + * Remove unused libmono-dev build-dependency (for Mono 2.10 transition). -- Colin Watson Tue, 21 Jun 2011 17:13:49 +0100 diff --git a/debian/control b/debian/control index 142f80d..12aec6f 100644 --- a/debian/control +++ b/debian/control @@ -24,7 +24,6 @@ Build-Depends: debhelper (>= 7.0), 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, -- cgit v1.2.3 From ba84fd642cb93f5cd46fac00ccbddf33c7fe46cb Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Wed, 28 Sep 2011 14:57:38 -0400 Subject: releasing version 0.4.1-0ubuntu1 --- debian/changelog | 13 ++++++++----- debian/control | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 88621f2..c774a0a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,14 @@ -libappindicator (0.4.1-0ubuntu1~ppa1) oneiric; urgency=low +libappindicator (0.4.1-0ubuntu1) oneiric; urgency=low - * New upstream release (0.4.0). + [ Ted Gould ] + * New upstream release. * Fix VAPI file for Vala bindings (LP: #789588) - * New upstream release (0.4.1). - * Fix build. - -- Ted Gould Wed, 28 Sep 2011 12:53:44 -0500 + [ Ken VanDine ] + * debian/control + - build depend on valac-0.14 + + -- Ken VanDine Wed, 28 Sep 2011 14:41:38 -0400 libappindicator (0.3.91-0ubuntu1) oneiric; urgency=low diff --git a/debian/control b/debian/control index a61696a..d78f64d 100644 --- a/debian/control +++ b/debian/control @@ -31,7 +31,7 @@ Build-Depends: debhelper (>= 7.0), gir1.2-glib-2.0, gir1.2-gtk-2.0, gir1.2-gtk-3.0, - valac-0.12 + valac-0.14 Standards-Version: 3.9.1 Homepage: https://launchpad.net/libappindicator Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/libappindicator/ubuntu -- cgit v1.2.3 From 5ad59aaaa2004eb706751ac2bf8e2ed4467146b8 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 3 Feb 2012 14:50:50 -0600 Subject: debian/control: Dbusmneu Dep 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 74ce8a3..5f2624a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,8 +6,9 @@ libappindicator (0.4.90-0ubuntu1~ppa1) UNRELEASED; urgency=low * Add title property (LP: #923971) * Don't specify pyglib-2.0-python2.6 in LDFLAGS * fix fallback icon of the GtkStatusIcon (LP: #820080) + * debian/control: Dbusmneu Dep to 0.5.90 - -- Ted Gould Fri, 03 Feb 2012 14:39:36 -0600 + -- Ted Gould Fri, 03 Feb 2012 14:50:33 -0600 libappindicator (0.4.1-0ubuntu4) precise; urgency=low diff --git a/debian/control b/debian/control index 1f2a597..f7d7dc4 100644 --- a/debian/control +++ b/debian/control @@ -18,9 +18,9 @@ Build-Depends: debhelper (>= 7.0), libindicate-gtk-dev (>= 0.2.0), 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), cli-common-dev (>= 0.5.7), mono-devel (>= 2.4.3), gtk-sharp2-gapi, -- cgit v1.2.3 From 36ed77994e684d65a10d776f8c9faeec7a17205c Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Tue, 7 Feb 2012 12:50:09 +0100 Subject: * debian/control: - don't make libappindicator3-dev depends on libappindicator-dev * debian/libappindicator3-dev.install: - install the gtk3 include directory --- debian/changelog | 9 +++++++++ debian/control | 1 - debian/libappindicator3-dev.install | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index ed02723..595116e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +libappindicator (0.4.90-0ubuntu2) UNRELEASED; urgency=low + + * debian/control: + - don't make libappindicator3-dev depends on libappindicator-dev + * debian/libappindicator3-dev.install: + - install the gtk3 include directory + + -- Sebastien Bacher Tue, 07 Feb 2012 12:48:43 +0100 + libappindicator (0.4.90-0ubuntu1) precise; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index f7d7dc4..380e42b 100644 --- a/debian/control +++ b/debian/control @@ -118,7 +118,6 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, libdbusmenu-glib-dev (>= 0.1.8), libdbus-glib-1-dev (>= 0.76), - libappindicator-dev (= ${binary:Version}), libappindicator3-1 (= ${binary:Version}) Description: Application Indicators A library and indicator to take menus from applications and place them in diff --git a/debian/libappindicator3-dev.install b/debian/libappindicator3-dev.install index 664b7a1..b18c92c 100644 --- a/debian/libappindicator3-dev.install +++ b/debian/libappindicator3-dev.install @@ -1,4 +1,5 @@ debian/tmp/usr/lib/libappindicator3.so debian/tmp/usr/lib/pkgconfig/appindicator3-0.1.pc +debian/tmp/usr/include/libappindicator3-0.1/* debian/tmp/usr/share/gir-1.0/AppIndicator3-0.1.gir debian/tmp/usr/share/vala/vapi/appindicator3-0.1.vapi -- cgit v1.2.3 From 593ee90d57efda8fa42d4061655b9e59aeb3febd Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Fri, 9 Mar 2012 21:12:49 +0100 Subject: debian/control: build-depends on dbus-test-runner --- debian/changelog | 6 ++++++ debian/control | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index e4ac063..43bdac1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libappindicator (0.4.91-0ubuntu2) UNRELEASED; urgency=low + + * debian/control: build-depends on dbus-test-runner + + -- Sebastien Bacher Fri, 09 Mar 2012 21:11:50 +0100 + libappindicator (0.4.91-0ubuntu1) precise; urgency=low * debian/rules: diff --git a/debian/control b/debian/control index 380e42b..2e65961 100644 --- a/debian/control +++ b/debian/control @@ -32,7 +32,8 @@ Build-Depends: debhelper (>= 7.0), gir1.2-gtk-2.0, gir1.2-gtk-3.0, dh-autoreconf, - valac-0.14 + valac-0.14, + dbus-test-runner Standards-Version: 3.9.1 Homepage: https://launchpad.net/libappindicator Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/libappindicator/ubuntu -- cgit v1.2.3 From 61c3e01cd0339d399060ad009ce31b278b1d5ca9 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 21 Mar 2012 16:32:19 -0500 Subject: bump debian/control's valac dependency from 0.14 to 0.16 --- 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 cd8021e..f5e0502 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ libappindicator (0.4.92-0ubuntu1) UNRELEASED; urgency=low * New upstream release. * Fix a Coverity PW.BRANCH_PAST_INITIALIZATION error (LP: #957471) * Fix FTB bug from ambiguity between Glib.Menu and Gtk.Menu in the Vala code + * debian/control: Updating to valac-0.16 -- Charles Kerr Wed, 21 Mar 2012 16:23:23 -0500 diff --git a/debian/control b/debian/control index 2e65961..1bdaa4a 100644 --- a/debian/control +++ b/debian/control @@ -32,7 +32,7 @@ Build-Depends: debhelper (>= 7.0), gir1.2-gtk-2.0, gir1.2-gtk-3.0, dh-autoreconf, - valac-0.14, + valac-0.16, dbus-test-runner Standards-Version: 3.9.1 Homepage: https://launchpad.net/libappindicator -- cgit v1.2.3 From 501f677429837dfe76517ae48e4f85204223fcb9 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Mon, 26 Nov 2012 11:02:58 -0500 Subject: * debian/control: - Update style: use trailing commas at the end of dependency lists. --- debian/changelog | 7 +++++++ debian/control | 38 +++++++++++++++++++------------------- 2 files changed, 26 insertions(+), 19 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 283826c..15a8586 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libappindicator (12.10.0-0ubuntu2) UNRELEASED; urgency=low + + * debian/control: + - Update style: use trailing commas at the end of dependency lists. + + -- Mathieu Trudel-Lapierre Mon, 26 Nov 2012 11:02:18 -0500 + libappindicator (12.10.0-0ubuntu1) quantal; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index 1bdaa4a..8f863c4 100644 --- a/debian/control +++ b/debian/control @@ -33,7 +33,7 @@ Build-Depends: debhelper (>= 7.0), gir1.2-gtk-3.0, dh-autoreconf, valac-0.16, - dbus-test-runner + dbus-test-runner, Standards-Version: 3.9.1 Homepage: https://launchpad.net/libappindicator Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/libappindicator/ubuntu @@ -46,8 +46,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libappindicator1 (= ${binary:Version}), - python-gobject -Provides: ${python:Provides} + 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. @@ -56,8 +56,8 @@ Package: libappindicator1 Section: libs Architecture: any Depends: ${shlibs:Depends}, - ${misc:Depends} -Recommends: indicator-application (>= 0.2.93) + ${misc:Depends}, +Recommends: indicator-application (>= 0.2.93), Description: Application Indicators A library and indicator to take menus from applications and place them in the panel. @@ -70,7 +70,7 @@ Replaces: gir1.0-appindicator-0.1 Section: libs Architecture: any Depends: ${misc:Depends}, - ${gir:Depends} + ${gir:Depends}, Description: Typelib files for libappindicator1. . This package can be used by other packages using the GIRepository format @@ -83,7 +83,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, libdbusmenu-glib-dev (>= 0.1.8), libdbus-glib-1-dev (>= 0.76), - libappindicator1 (= ${binary:Version}) + libappindicator1 (= ${binary:Version}), Description: Application Indicators A library and indicator to take menus from applications and place them in the panel. @@ -93,7 +93,7 @@ Description: Application Indicators Package: libappindicator-doc Section: doc Architecture: all -Depends: ${misc:Depends} +Depends: ${misc:Depends}, Description: Application Indicators A library and indicator to take menus from applications and place them in the panel. @@ -104,8 +104,8 @@ Package: libappindicator3-1 Section: libs Architecture: any Depends: ${shlibs:Depends}, - ${misc:Depends} -Recommends: indicator-application (>= 0.2.93) + ${misc:Depends}, +Recommends: indicator-application (>= 0.2.93), Description: Application Indicators A library and indicator to take menus from applications and place them in the panel. @@ -119,7 +119,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, libdbusmenu-glib-dev (>= 0.1.8), libdbus-glib-1-dev (>= 0.76), - libappindicator3-1 (= ${binary:Version}) + libappindicator3-1 (= ${binary:Version}), Description: Application Indicators A library and indicator to take menus from applications and place them in the panel. @@ -130,7 +130,7 @@ Package: gir1.2-appindicator3-0.1 Section: libs Architecture: any Depends: ${misc:Depends}, - ${gir:Depends} + ${gir:Depends}, Description: Typelib files for libappindicator3-1. . This package can be used by other packages using the GIRepository format @@ -140,12 +140,12 @@ 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 + 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} + ${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. @@ -155,12 +155,12 @@ 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}, - libappindicator0.1-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. -- cgit v1.2.3 From 4e7dde6bc3f59c7c0bca2b435206aeefb511f4d4 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Mon, 26 Nov 2012 11:05:04 -0500 Subject: Reorganize Build-Depends for clarity. --- debian/changelog | 1 + debian/control | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 10 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 15a8586..efd94ce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ libappindicator (12.10.0-0ubuntu2) UNRELEASED; urgency=low * debian/control: - Update style: use trailing commas at the end of dependency lists. + - Reorganize Build-Depends for clarity. -- Mathieu Trudel-Lapierre Mon, 26 Nov 2012 11:02:18 -0500 diff --git a/debian/control b/debian/control index 8f863c4..6ef0a4f 100644 --- a/debian/control +++ b/debian/control @@ -4,14 +4,21 @@ Priority: optional XS-Python-Version: all Maintainer: Ubuntu Desktop Team Build-Depends: debhelper (>= 7.0), + dh-autoreconf, cdbs (>= 0.4.41), quilt, + intltool, + gnome-doc-utils, + gtk-doc-tools, + libnunit-cil-dev, + dbus-test-runner, + cli-common-dev (>= 0.5.7), + mono-devel (>= 2.4.3), + gtk-sharp2-gapi, + libgtk2.0-cil-dev, libgtk2.0-dev (>= 2.12.0), libgtk-3-dev (>= 2.91.3), libdbus-glib-1-dev (>= 0.82), - gnome-doc-utils, - gtk-doc-tools, - intltool, python-all-dev, python-gtk2-dev, libindicate-dev (>= 0.2.0), @@ -21,19 +28,12 @@ Build-Depends: debhelper (>= 7.0), libdbusmenu-glib-dev (>= 0.5.90), libdbusmenu-gtk-dev (>= 0.5.90), libdbusmenu-gtk3-dev (>= 0.5.90), - cli-common-dev (>= 0.5.7), - mono-devel (>= 2.4.3), - gtk-sharp2-gapi, - libnunit-cil-dev, - libgtk2.0-cil-dev, gobject-introspection, libgirepository1.0-dev, gir1.2-glib-2.0, gir1.2-gtk-2.0, gir1.2-gtk-3.0, - dh-autoreconf, valac-0.16, - dbus-test-runner, Standards-Version: 3.9.1 Homepage: https://launchpad.net/libappindicator Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/libappindicator/ubuntu -- cgit v1.2.3 From ca3d31219e3ebb3e42bbf815b5a15828cde7477d Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Mon, 26 Nov 2012 11:05:38 -0500 Subject: Bump Build-Depends on debhelper to (>= 9). --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index efd94ce..34aef1a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ libappindicator (12.10.0-0ubuntu2) UNRELEASED; urgency=low * debian/control: - Update style: use trailing commas at the end of dependency lists. - Reorganize Build-Depends for clarity. + - Bump Build-Depends on debhelper to (>= 9). -- Mathieu Trudel-Lapierre Mon, 26 Nov 2012 11:02:18 -0500 diff --git a/debian/control b/debian/control index 6ef0a4f..70b25ab 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: gnome Priority: optional XS-Python-Version: all Maintainer: Ubuntu Desktop Team -Build-Depends: debhelper (>= 7.0), +Build-Depends: debhelper (>= 9), dh-autoreconf, cdbs (>= 0.4.41), quilt, -- cgit v1.2.3 From a0917239a5d4b2ab25b1a2de0fb9f49bd2f9ce5d Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Mon, 26 Nov 2012 11:22:11 -0500 Subject: Drop Build-Depends on cdbs. --- debian/changelog | 1 + debian/control | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index def356d..4568946 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ libappindicator (12.10.0-0ubuntu2) UNRELEASED; urgency=low - Update style: use trailing commas at the end of dependency lists. - Reorganize Build-Depends for clarity. - Bump Build-Depends on debhelper to (>= 9). + - Drop Build-Depends on cdbs. * debian/compat: bump to compat level 9. -- Mathieu Trudel-Lapierre Mon, 26 Nov 2012 11:02:18 -0500 diff --git a/debian/control b/debian/control index 70b25ab..f08329b 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,6 @@ XS-Python-Version: all Maintainer: Ubuntu Desktop Team Build-Depends: debhelper (>= 9), dh-autoreconf, - cdbs (>= 0.4.41), quilt, intltool, gnome-doc-utils, -- cgit v1.2.3 From 6ccd3329d72fca557b77ef5cd3f36b89798ba5c0 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Mon, 26 Nov 2012 21:24:50 -0500 Subject: Drop old Conflicts, Replaces, Provides for old unsupported upgrade paths. --- debian/changelog | 1 + debian/control | 8 -------- 2 files changed, 1 insertion(+), 8 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index ef4532d..a35fa3f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ libappindicator (12.10.1-0ubuntu1) UNRELEASED; urgency=low - Reorganize Build-Depends for clarity. - Bump Build-Depends on debhelper to (>= 9). - Drop Build-Depends on cdbs. + - Drop old Conflicts, Replaces, Provides for old unsupported upgrade paths. * debian/compat: bump to compat level 9. * debian/rules: - Convert from cdbs to debhelper 9. diff --git a/debian/control b/debian/control index f08329b..590343e 100644 --- a/debian/control +++ b/debian/control @@ -64,8 +64,6 @@ Description: Application Indicators This package contains shared libraries to be used by applications. Package: gir1.2-appindicator-0.1 -Conflicts: gir1.0-appindicator-0.1 -Replaces: gir1.0-appindicator-0.1 Section: libs Architecture: any Depends: ${misc:Depends}, @@ -138,10 +136,6 @@ Description: Typelib files for libappindicator3-1. 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}, @@ -154,8 +148,6 @@ 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), Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, -- cgit v1.2.3 From ee4094487bceebe59f8b2fd1416fdfcdcea52222 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Mon, 26 Nov 2012 21:28:40 -0500 Subject: Update Vcs-Bzr, Vcs-Browser and add a notice to uploaders. --- debian/changelog | 1 + debian/control | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index a35fa3f..6826cf0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ libappindicator (12.10.1-0ubuntu1) UNRELEASED; urgency=low - Bump Build-Depends on debhelper to (>= 9). - Drop Build-Depends on cdbs. - Drop old Conflicts, Replaces, Provides for old unsupported upgrade paths. + - Update Vcs-Bzr, Vcs-Browser and add a notice to uploaders. * debian/compat: bump to compat level 9. * debian/rules: - Convert from cdbs to debhelper 9. diff --git a/debian/control b/debian/control index 590343e..a3fad26 100644 --- a/debian/control +++ b/debian/control @@ -35,7 +35,11 @@ Build-Depends: debhelper (>= 9), valac-0.16, Standards-Version: 3.9.1 Homepage: https://launchpad.net/libappindicator -Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/libappindicator/ubuntu +# If you aren't a member of ~indicator-applet-developers but need to upload +# packaging changes, just go ahead. ~indicator-applet-developers will notice +# and sync up the code again. +Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/libappindicator/trunk.13.04 +Vcs-Browser: https://bazaar.launchpad.net/~indicator-applet-developers/libappindicator/trunk.13.04/files Package: python-appindicator Section: python -- cgit v1.2.3 From 97eb2fd0abb21d25a80882a06b8853d682e7c42e Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Mon, 26 Nov 2012 22:26:17 -0500 Subject: Add a Pre-Depends on multiarch-support for libappindicator(3-)7. --- debian/changelog | 1 + debian/control | 2 ++ 2 files changed, 3 insertions(+) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 8de084c..d80fdd2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ libappindicator (12.10.1-0ubuntu1) UNRELEASED; urgency=low - Drop Build-Depends on cdbs. - Drop old Conflicts, Replaces, Provides for old unsupported upgrade paths. - Update Vcs-Bzr, Vcs-Browser and add a notice to uploaders. + - Add a Pre-Depends on multiarch-support for libappindicator(3-)7. * debian/compat: bump to compat level 9. * debian/rules: - Convert from cdbs to debhelper 9. diff --git a/debian/control b/debian/control index a3fad26..d0f8da0 100644 --- a/debian/control +++ b/debian/control @@ -58,6 +58,7 @@ Description: Python bindings for libappindicator Package: libappindicator1 Section: libs Architecture: any +Pre-Depends: multiarch-support, Depends: ${shlibs:Depends}, ${misc:Depends}, Recommends: indicator-application (>= 0.2.93), @@ -104,6 +105,7 @@ Description: Application Indicators Package: libappindicator3-1 Section: libs Architecture: any +Pre-Depends: multiarch-support, Depends: ${shlibs:Depends}, ${misc:Depends}, Recommends: indicator-application (>= 0.2.93), -- cgit v1.2.3 From 568791dcc481811a87082c7573ea2594fd454026 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Mon, 26 Nov 2012 22:31:53 -0500 Subject: Add xvfb to Build-Depends. --- debian/changelog | 1 + debian/control | 1 + 2 files changed, 2 insertions(+) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 29e1060..f12fa32 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ libappindicator (12.10.1-0ubuntu1) UNRELEASED; urgency=low - Drop old Conflicts, Replaces, Provides for old unsupported upgrade paths. - Update Vcs-Bzr, Vcs-Browser and add a notice to uploaders. - Add a Pre-Depends on multiarch-support for libappindicator(3-)7. + - Add xvfb to Build-Depends. * debian/compat: bump to compat level 9. * debian/rules: - Convert from cdbs to debhelper 9. diff --git a/debian/control b/debian/control index d0f8da0..4468d83 100644 --- a/debian/control +++ b/debian/control @@ -11,6 +11,7 @@ Build-Depends: debhelper (>= 9), gtk-doc-tools, libnunit-cil-dev, dbus-test-runner, + xvfb, cli-common-dev (>= 0.5.7), mono-devel (>= 2.4.3), gtk-sharp2-gapi, -- cgit v1.2.3 From 4f9fa5b60202e3869b9672d703f31428b44e7cd9 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Tue, 27 Nov 2012 09:51:20 -0500 Subject: More shuffling around of Build-Depends. --- debian/control | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 4468d83..a06d8b4 100644 --- a/debian/control +++ b/debian/control @@ -6,21 +6,23 @@ Maintainer: Ubuntu Desktop Team Build-Depends: debhelper (>= 9), dh-autoreconf, quilt, + python-all-dev, + cli-common-dev (>= 0.5.7), + gobject-introspection, intltool, gnome-doc-utils, gtk-doc-tools, libnunit-cil-dev, dbus-test-runner, xvfb, - cli-common-dev (>= 0.5.7), + valac-0.16, mono-devel (>= 2.4.3), + libgtk-3-dev (>= 2.91.3), + libgtk2.0-dev (>= 2.12.0), + python-gtk2-dev, gtk-sharp2-gapi, libgtk2.0-cil-dev, - libgtk2.0-dev (>= 2.12.0), - libgtk-3-dev (>= 2.91.3), libdbus-glib-1-dev (>= 0.82), - python-all-dev, - python-gtk2-dev, libindicate-dev (>= 0.2.0), libindicate-gtk-dev (>= 0.2.0), libindicator-dev (>= 0.3.90), @@ -28,12 +30,10 @@ Build-Depends: debhelper (>= 9), libdbusmenu-glib-dev (>= 0.5.90), libdbusmenu-gtk-dev (>= 0.5.90), libdbusmenu-gtk3-dev (>= 0.5.90), - gobject-introspection, libgirepository1.0-dev, gir1.2-glib-2.0, gir1.2-gtk-2.0, gir1.2-gtk-3.0, - valac-0.16, Standards-Version: 3.9.1 Homepage: https://launchpad.net/libappindicator # If you aren't a member of ~indicator-applet-developers but need to upload -- cgit v1.2.3