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/rules | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100755 debian/rules (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..9d0676a --- /dev/null +++ b/debian/rules @@ -0,0 +1,12 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/gnome.mk + +DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper +LDFLAGS += -Wl,-z,defs -Wl,--as-needed + +#binary-install/indicator-messages:: +# # remove .a/.la clutter +# rm -f debian/$(cdbs_curpkg)/usr/lib/indicators/*/*.a +# rm -f debian/$(cdbs_curpkg)/usr/lib/indicators/*/*.la -- cgit v1.2.3 From 86e4f6e168e6e0ae096334e2cf861b9981285c0c Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 10 Dec 2009 15:11:18 -0500 Subject: * debian/libappindicator-doc.install - install the developer docs * debian/rules - enable-gtk-doc --- debian/changelog | 4 ++++ debian/libappindicator-doc.install | 1 + debian/rules | 6 +----- 3 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 debian/libappindicator-doc.install (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index 1c05374..c7805cc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,10 @@ indicator-application (0.0.3-0ubuntu1) karmic; urgency=low [Ken VanDine] * debian/control - set Vcs-Bzr to ~ubuntu-desktop + * debian/libappindicator-doc.install + - install the developer docs + * debian/rules + - enable-gtk-doc -- Ted Gould Thu, 10 Dec 2009 13:34:40 -0600 diff --git a/debian/libappindicator-doc.install b/debian/libappindicator-doc.install new file mode 100644 index 0000000..5a4209f --- /dev/null +++ b/debian/libappindicator-doc.install @@ -0,0 +1 @@ +debian/tmp/usr/share/gtk-doc/html/libappindicate/* diff --git a/debian/rules b/debian/rules index 9d0676a..0d1001c 100755 --- a/debian/rules +++ b/debian/rules @@ -3,10 +3,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk -DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper +DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc LDFLAGS += -Wl,-z,defs -Wl,--as-needed -#binary-install/indicator-messages:: -# # remove .a/.la clutter -# rm -f debian/$(cdbs_curpkg)/usr/lib/indicators/*/*.a -# rm -f debian/$(cdbs_curpkg)/usr/lib/indicators/*/*.la -- cgit v1.2.3 From ff35c76b57fe278dcdd160995eb1157dc2c75f27 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 10 Dec 2009 15:44:51 -0500 Subject: added simple-patchsys.mk --- debian/changelog | 1 + debian/rules | 1 + 2 files changed, 2 insertions(+) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index 3c57fb7..b924e8d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,7 @@ indicator-application (0.0.3-0ubuntu1) karmic; urgency=low - 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 diff --git a/debian/rules b/debian/rules index 0d1001c..c42359e 100755 --- a/debian/rules +++ b/debian/rules @@ -2,6 +2,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc LDFLAGS += -Wl,-z,defs -Wl,--as-needed -- cgit v1.2.3 From 7263623ea488e23ec6316a82bd966158e0e39fcd Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Fri, 11 Dec 2009 09:21:42 -0500 Subject: * Upstream release 0.0.4 * debian/rules: - removed disable-scrollkeeper - set DOC_SERVER used for docs * debian/patches/clean_up_docs.patch - removed, merged upstream --- debian/changelog | 11 ++++++++- debian/patches/clean_up_docs.patch | 48 ++++++++++++++++++++++++++++++++------ debian/rules | 3 ++- 3 files changed, 53 insertions(+), 9 deletions(-) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index f3f118e..8114617 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,13 @@ -indicator-application (0.0.3-0ubuntu1) lucid; urgency=low +indicator-application (0.0.4-0ubuntu1) lucid; urgency=low + + * Upstream release 0.0.4 + * debian/rules: + - removed disable-scrollkeeper + - set DOC_SERVER used for docs + * debian/patches/clean_up_docs.patch + - removed, merged upstream + + -- Ken VanDine Fri, 11 Dec 2009 09:18:58 -0500 * Upstream release 0.0.3 * Adding in documentation diff --git a/debian/patches/clean_up_docs.patch b/debian/patches/clean_up_docs.patch index 0b054fe..39ff62c 100644 --- a/debian/patches/clean_up_docs.patch +++ b/debian/patches/clean_up_docs.patch @@ -1,15 +1,49 @@ -=== modified file 'docs/reference/libappindicator-docs.sgml' +=== 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 2009-12-10 20:40:50 +0000 -@@ -7,15 +7,10 @@ - ++++ docs/reference/libappindicator-docs.sgml.in 2009-12-11 14:16:59 +0000 +@@ -8,14 +8,14 @@ libappindicator Reference Manual -- + - for libappindicator [VERSION] -- The latest version of this documentation can be found on-line at ++ for libappindicator @VERSION@ + The latest version of this documentation can be found on-line at - http://[SERVER]/libappindicator/. -- ++ http://@DOC_SERVER@/libappindicator/current/. + diff --git a/debian/rules b/debian/rules index c42359e..3a44cbe 100755 --- a/debian/rules +++ b/debian/rules @@ -4,6 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc +DOC_SERVER = people.canonical.com/~ted +DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc LDFLAGS += -Wl,-z,defs -Wl,--as-needed -- cgit v1.2.3 From f9d90d24d572fd58e96e4f3543a2e8a1046bccef Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Fri, 11 Dec 2009 11:31:58 -0500 Subject: removed the disable-scrollkeeper configure arg --- debian/changelog | 3 +-- debian/rules | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index 2e5b94c..e3cc52f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,7 @@ indicator-application (0.0.4-0ubuntu1) lucid; urgency=low * Upstream release 0.0.4 * debian/rules: - - removed disable-scrollkeeper - - set DOC_SERVER used for docs + - removed the disable-scrollkeeper configure arg * debian/patches/clean_up_docs.patch - removed, merged upstream * debian/control: diff --git a/debian/rules b/debian/rules index 3a44cbe..30ee9cc 100755 --- a/debian/rules +++ b/debian/rules @@ -4,7 +4,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -DOC_SERVER = people.canonical.com/~ted DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc LDFLAGS += -Wl,-z,defs -Wl,--as-needed -- cgit v1.2.3 From 54099ef5260d1412e0597c9355df26cda1c50227 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Fri, 11 Dec 2009 12:06:34 -0500 Subject: don't include .la and .a files --- debian/changelog | 1 + debian/libappindicator-dev.install | 2 -- debian/rules | 3 +++ 3 files changed, 4 insertions(+), 2 deletions(-) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index e3cc52f..bb28504 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ 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: diff --git a/debian/libappindicator-dev.install b/debian/libappindicator-dev.install index 9268631..9346bf6 100644 --- a/debian/libappindicator-dev.install +++ b/debian/libappindicator-dev.install @@ -1,5 +1,3 @@ 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 debian/tmp/usr/lib/pkgconfig/* diff --git a/debian/rules b/debian/rules index 30ee9cc..a88e7e2 100755 --- a/debian/rules +++ b/debian/rules @@ -7,3 +7,6 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc LDFLAGS += -Wl,-z,defs -Wl,--as-needed +binary-post-install/indicator-application:: + find debian/tmp/usr/lib -name \*.la -exec rm {} \; + find debian/tmp/usr/lib -name \*.a -exec rm {} \; -- cgit v1.2.3 From 2f0f25f8a6cc1891eb70b75b484177aa106a2dff Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Fri, 11 Dec 2009 12:28:32 -0500 Subject: fix the path used for deleting the .la and .a files --- debian/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index a88e7e2..1d2f7dd 100755 --- a/debian/rules +++ b/debian/rules @@ -8,5 +8,5 @@ DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc LDFLAGS += -Wl,-z,defs -Wl,--as-needed binary-post-install/indicator-application:: - find debian/tmp/usr/lib -name \*.la -exec rm {} \; - find debian/tmp/usr/lib -name \*.a -exec rm {} \; + find debian/indicator-application/usr/lib -name \*.la -exec rm {} \; + find debian/indicator-application/usr/lib -name \*.a -exec rm {} \; -- 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/rules') 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 23b19e990aca3bfe31f01bb960f4cfd390d6e294 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Wed, 16 Dec 2009 14:39:39 -0500 Subject: fixed path to python bindings --- debian/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 41fbfb0..1f3053a 100755 --- a/debian/rules +++ b/debian/rules @@ -19,13 +19,13 @@ configure-stamp-%: configure/python-appindicator:: $(addprefix configure-stamp-, $(PY_VERSIONS)) build-stamp-%: - make -C build-$*/python + make -C build-$*/bindings/python touch $@ build/python-appindicator:: $(addprefix build-stamp-, $(PY_VERSIONS)) install-stamp-%: - make -C build-$*/python install DESTDIR=$(CURDIR)/debian/tmp + make -C build-$*/bindings/python install DESTDIR=$(CURDIR)/debian/tmp touch $@ install/python-appindicator:: $(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/rules') 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 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/rules') 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/rules') 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 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/rules') 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 352c666d8459a02ca206c12b75f82b5263543072 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 10 Aug 2010 10:05:52 -0500 Subject: debian/rules: Moving libappindicator0 to libappindicator1 --- debian/changelog | 3 ++- debian/rules | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index ccceaf6..d2a77b0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,9 @@ indicator-application (0.2.3-0ubuntu2~ppa4) UNRELEASED; urgency=low * Breaking the ABI in order to get more space in the class structure. * debian/control: Moving libappindicator0 to libappindicator1 + * debian/rules: Moving libappindicator0 to libappindicator1 - -- Ted Gould Tue, 10 Aug 2010 09:33:52 -0500 + -- Ted Gould Tue, 10 Aug 2010 10:05:31 -0500 indicator-application (0.2.3-0ubuntu2~ppa3) maverick; urgency=low diff --git a/debian/rules b/debian/rules index f34e925..6e31d41 100755 --- a/debian/rules +++ b/debian/rules @@ -13,7 +13,7 @@ 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)' +DEB_DH_MAKESHLIBS_ARGS_libappindicator1 := -V 'libappindicator1 (>= 0.0.19)' configure-stamp-%: mkdir build-$* @@ -47,7 +47,7 @@ binary-install/libappindicator0.1-cil:: binary-predeb/gir1.0-appindicator-0.1:: dh_girepository -p$(cdbs_curpkg) -binary-predeb/libappindicator0.1-cil:: binary-fixup/libappindicator0 +binary-predeb/libappindicator0.1-cil:: binary-fixup/libappindicator1 dh_clideps -plibappindicator0.1-cil configure-stamp: -- cgit v1.2.3 From 1860f397fba552cfa443413e543a8b5d583ca2f0 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Wed, 8 Dec 2010 04:47:55 -0500 Subject: releasing version 0.2.90-0ubuntu1 --- debian/changelog | 3 +-- debian/rules | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index dc2de87..3098337 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-application (0.2.90-0ubuntu1) UNRELEASED; urgency=low +indicator-application (0.2.90-0ubuntu1) natty; urgency=low [ Ted Gould ] * New upstream release. @@ -14,7 +14,6 @@ indicator-application (0.2.90-0ubuntu1) UNRELEASED; urgency=low - Make sure python2.6 and python2.7 files get included * debian/rules - Fix builds for multiple python versions - - disable parallel builds, it breaks the mono binding generation -- Ken VanDine Wed, 08 Dec 2010 00:42:58 -0500 diff --git a/debian/rules b/debian/rules index 267a43b..23237d2 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,5 @@ #!/usr/bin/make -f -export DH_VERBOSE=1 DEB_SRCDIR = . DEB_BUILDDIR = $(DEB_SRCDIR)/build @@ -12,8 +11,7 @@ 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/rules/utils.mk -DEB_BUILD_PARALLEL = no -DEB_PARALLEL_JOBS:=1 + DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc API_VERSION = 0.1 -- 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/rules') 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 3fc08a0eb8b8d0f61d578a76797dead17d9227e2 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Wed, 8 Dec 2010 17:24:01 -0500 Subject: fixed some targets for multipass builds --- debian/rules | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index cfb2f4b..324b6ff 100755 --- a/debian/rules +++ b/debian/rules @@ -63,28 +63,24 @@ configure-stamp: $(DEB_CONFIGURE_SCRIPT) $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_EXTRA_FLAGS) touch $@ -configure/indicator-application:: configure-stamp +configure/libappindicator:: configure-stamp build-stamp: $(MAKE) -C $(DEB_BUILDDIR) touch $@ -build/indicator-application:: build-stamp +build/libappindicator:: build-stamp install-stamp: $(MAKE) -C $(DEB_BUILDDIR) install DESTDIR=$(CURDIR)/debian/tmp touch $@ -install/indicator-application:: install-stamp +install/libappindicator:: install-stamp binary-predeb/libappindicator1:: install-stamp dh_fixperms dh_strip -binary-post-install/indicator-application:: - find debian/indicator-application/usr/lib -name \*.la -exec rm {} \; - find debian/indicator-application/usr/lib -name \*.a -exec rm {} \; - common-binary-predeb-arch:: list-missing dh_fixperms dh_strip -- 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/rules') 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 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/rules') 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/rules') 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/rules') 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/rules') 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 b93c2b2980c187d7276994ea4974c1095e2179b4 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Tue, 8 Feb 2011 22:14:58 -0500 Subject: Manually run dh_makeshlibs for libappindicator1 and libappindicator3-1 --- debian/rules | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index f34e1ad..5394f82 100755 --- a/debian/rules +++ b/debian/rules @@ -14,9 +14,6 @@ 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-%: @@ -61,11 +58,10 @@ install-stamp: touch $@ binary-install/libappindicator1:: install-stamp install-stamp-gtk3 - dh_makeshlibs DEB_DH_MAKESHLIBS_ARGS_libappindicator1 + dh_makeshlibs -plibappindicator1 configure-stamp-gtk3: : # configure for GTK+ 3.0 - set -e; \ rm -rf build-gtk3; \ mkdir build-gtk3; \ cd build-gtk3; \ @@ -90,7 +86,7 @@ install-stamp-gtk3: touch $@ binary-install/libappindicator3-1:: install-stamp-gtk3 - dh_makeshlibs DEB_DH_MAKESHLIBS_ARGS_libappindicator3_1 + dh_makeshlibs -plibappindicator3-1 binary-install/libappindicator0.1-cil:: binary-fixup/libappindicator1 dh_clistrip -- cgit v1.2.3 From 76953125793ea91d3fc145607d4e11d246c7e326 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 10 Feb 2011 22:40:03 -0600 Subject: debian/rules: Not building libappindicator3-dev until we've got the GTK3 build all put together. --- debian/changelog | 4 +++- debian/rules | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index a175356..4131e3c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,8 +9,10 @@ libappindicator (0.2.95-0ubuntu1~ppa1) UNRELEASED; urgency=low ∘ Fixing build for GTK2/3 dual build * debian/libappindicator-dev.install, debian/libappindicator3-dev.install: switching the file name of the vapi files. + * debian/rules: Not building libappindicator3-dev until we've got the GTK3 + build all put together. - -- Ted Gould Thu, 10 Feb 2011 22:29:47 -0600 + -- Ted Gould Thu, 10 Feb 2011 22:39:44 -0600 libappindicator (0.2.92-0ubuntu2) natty; urgency=low diff --git a/debian/rules b/debian/rules index 5394f82..c381e8d 100755 --- a/debian/rules +++ b/debian/rules @@ -73,6 +73,8 @@ configure-stamp-gtk3: configure/libappindicator3-1:: configure-stamp-gtk3 +configure/libappindicator3-dev:: configure-stamp-gtk3 + build-stamp-gtk3: : # build for GTK+ 3.0 $(MAKE) -C build-gtk3/src; @@ -80,6 +82,8 @@ build-stamp-gtk3: build/libappindicator3-1:: build-stamp-gtk3 +build/libappindicator3-dev:: build-stamp-gtk3 + install-stamp-gtk3: : # install for GTK+ 3.0 $(MAKE) -C build-gtk3/src DESTDIR=$(CURDIR)/debian/tmp install @@ -88,6 +92,8 @@ install-stamp-gtk3: binary-install/libappindicator3-1:: install-stamp-gtk3 dh_makeshlibs -plibappindicator3-1 +binary-install/libappindicator3-dev:: install-stamp-gtk3 + binary-install/libappindicator0.1-cil:: binary-fixup/libappindicator1 dh_clistrip dh_clifixperms -- cgit v1.2.3 From 26b952114c696b0f373d848c6de6b1c9bd937b46 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Fri, 11 Feb 2011 10:14:54 -0500 Subject: * New upstream release (0.2.95) * debian/rules - build and install the vapi for gtk3 --- debian/changelog | 15 ++++++++------- debian/rules | 8 ++------ 2 files changed, 10 insertions(+), 13 deletions(-) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index 4131e3c..f791713 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,18 +1,19 @@ -libappindicator (0.2.95-0ubuntu1~ppa1) UNRELEASED; urgency=low +libappindicator (0.2.95-0ubuntu1) UNRELEASED; urgency=low - * New upstream release (0.2.93) + [ Ted Gould ] + * New upstream release (0.2.95) ∘ Fix Vala bindings ∘ Add support for scroll events - * New upstream release (0.2.94) ∘ Include vala example files as well - * New upstream release (0.2.95) ∘ Fixing build for GTK2/3 dual build * debian/libappindicator-dev.install, debian/libappindicator3-dev.install: switching the file name of the vapi files. - * debian/rules: Not building libappindicator3-dev until we've got the GTK3 - build all put together. - -- Ted Gould Thu, 10 Feb 2011 22:39:44 -0600 + [ Ken VanDine ] + * debian/rules + - build and install the vapi for gtk3 + + -- Ken VanDine Fri, 11 Feb 2011 10:03:17 -0500 libappindicator (0.2.92-0ubuntu2) natty; urgency=low diff --git a/debian/rules b/debian/rules index c381e8d..3f266b0 100755 --- a/debian/rules +++ b/debian/rules @@ -73,27 +73,23 @@ configure-stamp-gtk3: configure/libappindicator3-1:: configure-stamp-gtk3 -configure/libappindicator3-dev:: configure-stamp-gtk3 - build-stamp-gtk3: : # build for GTK+ 3.0 $(MAKE) -C build-gtk3/src; + $(MAKE) -C build-gtk3/bindings/vala; touch $@ build/libappindicator3-1:: build-stamp-gtk3 -build/libappindicator3-dev:: build-stamp-gtk3 - install-stamp-gtk3: : # install for GTK+ 3.0 $(MAKE) -C build-gtk3/src DESTDIR=$(CURDIR)/debian/tmp install + $(MAKE) -C build-gtk3/bindings/vala DESTDIR=$(CURDIR)/debian/tmp install touch $@ binary-install/libappindicator3-1:: install-stamp-gtk3 dh_makeshlibs -plibappindicator3-1 -binary-install/libappindicator3-dev:: install-stamp-gtk3 - binary-install/libappindicator0.1-cil:: binary-fixup/libappindicator1 dh_clistrip dh_clifixperms -- 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/rules') 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 967fd704226b12a4f1c020e52920d5ba232eb833 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 21 Jun 2011 17:48:47 +0100 Subject: Call dh_python2 from binary-fixup rather than binary-predeb, so that generated maintainer script snippets actually end up in the package. --- debian/changelog | 7 +++++++ debian/rules | 10 +++++----- 2 files changed, 12 insertions(+), 5 deletions(-) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index 7812819..eb57e09 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +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. + + -- Colin Watson Tue, 21 Jun 2011 17:13:49 +0100 + libappindicator (0.3.0-0ubuntu1) natty; urgency=low * New upstream release. diff --git a/debian/rules b/debian/rules index a149c98..c0e407f 100755 --- a/debian/rules +++ b/debian/rules @@ -97,17 +97,17 @@ binary-install/libappindicator0.1-cil:: binary-fixup/libappindicator1 dh_makeclilibs -V dh_installcligac +binary-fixup/python-appindicator:: + dh_python2 -ppython-appindicator + find debian/python-appindicator/usr/lib -name \*.la -exec rm {} \; + find debian/python-appindicator/usr/lib -name \*.a -exec rm {} \; + binary-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-binary-predeb-arch:: list-missing dh_fixperms dh_strip -- cgit v1.2.3 From 8c1f7649c4163ffe0a9e023fa33139bfa914965b Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Thu, 11 Aug 2011 21:19:20 +0200 Subject: * debian/rules: - update the translations template after build, dh_translations doesn't work for builds out of the source directory --- debian/changelog | 5 +++++ debian/rules | 1 + 2 files changed, 6 insertions(+) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index 71cd68a..793db01 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,10 @@ libappindicator (0.3.91-0ubuntu1) UNRELEASED; urgency=low + * debian/rules: + - update the translations template after build, dh_translations doesn't + work for builds out of the source directory + + [ Ted Gould ] * New upstream release. * Secondary activate support * Better GIR file annotations diff --git a/debian/rules b/debian/rules index c0e407f..599b53e 100755 --- a/debian/rules +++ b/debian/rules @@ -111,6 +111,7 @@ binary-predeb/libappindicator0.1-cil:: binary-fixup/libappindicator1 common-binary-predeb-arch:: list-missing dh_fixperms dh_strip + cd po; intltool-update --pot --verbose clean:: rm -f configure-stamp* -- cgit v1.2.3 From 55b03b48590b950c23090b35e27ecd47c17bd2ba Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Fri, 9 Mar 2012 20:05:47 +0100 Subject: * debian/rules: - run make check during the build --- debian/changelog | 6 +++++- debian/rules | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index 6a2a304..e840844 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,9 @@ libappindicator (0.4.91-0ubuntu1) UNRELEASED; urgency=low + * debian/rules: + - run make check during the build + + [ Ted Gould ] * New upstream release. * Set name and title in fallback status item (LP: #885080) * Fix build in non-source dir cases (LP: #931764) @@ -8,7 +12,7 @@ libappindicator (0.4.91-0ubuntu1) UNRELEASED; urgency=low * Fix test suite to work with libindicator 0.4.93 * Fix the mono binding properties - -- Ted Gould Fri, 09 Mar 2012 12:17:14 -0600 + -- Sebastien Bacher Fri, 09 Mar 2012 19:45:54 +0100 libappindicator (0.4.90-0ubuntu2) precise; urgency=low diff --git a/debian/rules b/debian/rules index b2507f5..026fc6d 100755 --- a/debian/rules +++ b/debian/rules @@ -15,6 +15,8 @@ include /usr/share/cdbs/1/rules/patchsys-quilt.mk API_VERSION = 0.1 +DEB_MAKE_CHECK_TARGET := check + DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc --enable-introspection configure-stamp-%: -- cgit v1.2.3 From ac1487a684470d29206652e8ab515cdf57a2ef20 Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Fri, 9 Mar 2012 21:47:45 +0100 Subject: debian/rules: build without make check until the builder environment issues are sorted --- debian/changelog | 7 +++++++ debian/rules | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index 1626d82..1f32ee2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libappindicator (0.4.91-0ubuntu3) UNRELEASED; urgency=low + + * debian/rules: build without make check until the builder environment + issues are sorted + + -- Sebastien Bacher Fri, 09 Mar 2012 21:36:36 +0100 + libappindicator (0.4.91-0ubuntu2) precise; urgency=low * debian/control: build-depends on dbus-test-runner diff --git a/debian/rules b/debian/rules index 026fc6d..65a2860 100755 --- a/debian/rules +++ b/debian/rules @@ -15,7 +15,7 @@ include /usr/share/cdbs/1/rules/patchsys-quilt.mk API_VERSION = 0.1 -DEB_MAKE_CHECK_TARGET := check +#DEB_MAKE_CHECK_TARGET := check DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc --enable-introspection -- cgit v1.2.3 From 8d0330b70fdf7a36185cec6451c7d5094f4a1ff0 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 22 May 2012 08:17:53 +0200 Subject: use autoreconf.mk instead of calling dh_autoreconf by hand - fixes FTBFS when there are multiple Python versions (dh_autoreconf would be called multiple times in this case, which isn't allowed) - properly cleans autoreconf'ed files in the clean target - patchsys-quilt.mk needs to be included *before* autoreconf.mk or debhelper will leave uncleaned files in debian/, leading to E: libappindicator source: temporary-debhelper-file python-appindicator.debhelper.log and 9 others from lintian --- debian/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 65a2860..666d331 100755 --- a/debian/rules +++ b/debian/rules @@ -8,10 +8,11 @@ PY_VERSIONS = $(shell pyversions --requested debian/control) export MONO_SHARED_DIR=$(CURDIR) export CSC=/usr/bin/mono-csc +include /usr/share/cdbs/1/rules/patchsys-quilt.mk +include /usr/share/cdbs/1/rules/autoreconf.mk 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 @@ -20,7 +21,6 @@ API_VERSION = 0.1 DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc --enable-introspection configure-stamp-%: - dh_autoreconf mkdir build-$* cd build-$* && PYTHON=`which $*` \ $(DEB_CONFIGURE_SCRIPT) $(DEB_CONFIGURE_NORMAL_ARGS) --srcdir=.. -- cgit v1.2.3