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 bc0f5cc4c4fbf12ec5a9441ea3e69a1edcf066e4 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Fri, 10 Dec 2010 18:05:00 -0500 Subject: releasing version 0.2.90+r170-0ubuntu1 --- debian/changelog | 12 ++++- debian/control | 5 +- debian/gir1.0-appindicator-0.1.install | 1 - debian/indicator-application.install | 4 -- debian/python-appindicator.install | 2 - debian/rules | 92 +--------------------------------- 6 files changed, 15 insertions(+), 101 deletions(-) delete mode 100644 debian/gir1.0-appindicator-0.1.install delete mode 100644 debian/indicator-application.install delete mode 100644 debian/python-appindicator.install (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index 0176c5f..63357fa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,19 @@ -indicator-application (0.2.90-0ubuntu4~ppa1) natty; urgency=low +indicator-application (0.2.90+r170-0ubuntu1) natty; urgency=low + [ Ted Gould ] * Upstream Merge * Removing libappindicator from the tarball * Autogen * debian/control: Removing all libappindicator packages - -- Ted Gould Wed, 08 Dec 2010 14:26:42 -0600 + [ Ken VanDine ] + * debian/control + - bump build depends for dbusmenu to >= 0.3.90+r175 + * debian/rules + - Removed all the extra build targets, we don't build those + packages anymore + + -- Ken VanDine Fri, 10 Dec 2010 17:10:05 -0500 indicator-application (0.2.90-0ubuntu3) UNRELEASED; urgency=low diff --git a/debian/control b/debian/control index c843d36..9f4b532 100644 --- a/debian/control +++ b/debian/control @@ -10,8 +10,9 @@ Build-Depends: debhelper (>= 5.0), libjson-glib-dev, intltool, libindicator-dev (>= 0.3.14), - libdbusmenu-gtk-dev (>= 0.3.90), - libdbusmenu-glib-dev (>= 0.3.90) + libdbusmenu-gtk-dev (>= 0.3.90+r175), + libdbusmenu-glib-dev (>= 0.3.90+r175), + libappindicator-dev (>= 0.2.90+r170) Standards-Version: 3.8.4 Homepage: https://launchpad.net/indicator-application Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-application/ubuntu diff --git a/debian/gir1.0-appindicator-0.1.install b/debian/gir1.0-appindicator-0.1.install deleted file mode 100644 index 0791348..0000000 --- a/debian/gir1.0-appindicator-0.1.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/girepository-1.0/* diff --git a/debian/indicator-application.install b/debian/indicator-application.install deleted file mode 100644 index c525a81..0000000 --- a/debian/indicator-application.install +++ /dev/null @@ -1,4 +0,0 @@ -debian/tmp/usr/lib/indicators/* -debian/tmp/usr/lib/indicator-application/indicator-application-service -debian/tmp/usr/share/dbus-1/services/indicator-application.service -debian/tmp/usr/share/indicator-application/ordering-override.keyfile diff --git a/debian/python-appindicator.install b/debian/python-appindicator.install deleted file mode 100644 index 00bdd51..0000000 --- a/debian/python-appindicator.install +++ /dev/null @@ -1,2 +0,0 @@ -debian/tmp/usr/lib/python2.* -debian/tmp/usr/share/pygtk/* diff --git a/debian/rules b/debian/rules index cfb2f4b..80009dd 100755 --- a/debian/rules +++ b/debian/rules @@ -1,97 +1,9 @@ #!/usr/bin/make -f -DEB_SRCDIR = . -DEB_BUILDDIR = $(DEB_SRCDIR)/build - -DEB_PYTHON_SYSTEM=dh_python2 -PY_VERSIONS = $(shell pyversions --requested debian/control) -export MONO_SHARED_DIR=$(CURDIR) -export CSC=/usr/bin/mono-csc - include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/autotools-vars.mk +include /usr/share/cdbs/1/class/gnome.mk include /usr/share/cdbs/1/rules/utils.mk -DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc -API_VERSION = 0.1 - -DEB_DH_MAKESHLIBS_ARGS_libappindicator1 := -V 'libappindicator1 (>= 0.0.19)' - -configure-stamp-%: - mkdir build-$* - cd build-$* && PYTHON=`which $*` \ - $(DEB_CONFIGURE_SCRIPT) $(DEB_CONFIGURE_NORMAL_ARGS) --srcdir=.. - touch $@ - -configure/python-appindicator:: $(addprefix configure-stamp-, $(PY_VERSIONS)) - -build-stamp-%: - PYTHON=`which $*` \ - $(MAKE) -C build-$* - touch $@ - -build/python-appindicator:: $(addprefix build-stamp-, $(PY_VERSIONS)) - -install-stamp-%: - PYTHON=`which $*` \ - $(MAKE) -C build-$*/bindings/python install DESTDIR=$(CURDIR)/debian/tmp - dh_installdirs -ppython-appindicator -s - dh_install -ppython-appindicator -s - touch $@ - -install/python-appindicator:: $(addprefix install-stamp-, $(PY_VERSIONS)) - -binary-predeb/python-appindicator:: - dh_python2 -ppython-appindicator - find debian/python-appindicator/usr/lib -name \*.la -exec rm {} \; - find debian/python-appindicator/usr/lib -name \*.a -exec rm {} \; - -binary-install/libappindicator0.1-cil:: - dh_clistrip - dh_clifixperms - dh_makeclilibs -V - dh_installcligac - -binary-predeb/gir1.0-appindicator-0.1:: - dh_girepository -p$(cdbs_curpkg) - -binary-predeb/libappindicator0.1-cil:: binary-fixup/libappindicator1 - dh_clideps -plibappindicator0.1-cil - -configure-stamp: - cd $(DEB_BUILDDIR) && \ - $(DEB_CONFIGURE_SCRIPT) $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_EXTRA_FLAGS) - touch $@ - -configure/indicator-application:: configure-stamp - -build-stamp: - $(MAKE) -C $(DEB_BUILDDIR) - touch $@ - -build/indicator-application:: build-stamp - -install-stamp: - $(MAKE) -C $(DEB_BUILDDIR) install DESTDIR=$(CURDIR)/debian/tmp - touch $@ - -install/indicator-application:: install-stamp - -binary-predeb/libappindicator1:: install-stamp - dh_fixperms - dh_strip - -binary-post-install/indicator-application:: - find debian/indicator-application/usr/lib -name \*.la -exec rm {} \; - find debian/indicator-application/usr/lib -name \*.a -exec rm {} \; +LDFLAGS += -Wl,-z,defs -Wl,--as-needed common-binary-predeb-arch:: list-missing - dh_fixperms - dh_strip - -clean:: - -rm -rf $(addprefix build-, $(PY_VERSIONS)) - -rm -rf $(addprefix configure-stamp-, $(PY_VERSIONS)) - -rm -rf $(addprefix build-stamp-, $(PY_VERSIONS)) - -rm -rf $(addprefix install-stamp-, $(PY_VERSIONS)) - rm -rf $(MONO_SHARED_DIR)/.wapi -- cgit v1.2.3 From 7ac86017b815b015a994bfdf4e91fc5af7e53e10 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Fri, 14 Jan 2011 11:42:56 -0600 Subject: releasing version 0.2.91-0ubuntu2 --- debian/changelog | 7 +++++++ debian/rules | 7 +++++++ 2 files changed, 14 insertions(+) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index 6b028cf..5bae3da 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-application (0.2.91-0ubuntu2) natty; urgency=low + + * debian/rules + - Don't ship the .la files + + -- Ken VanDine Fri, 14 Jan 2011 11:42:13 -0600 + indicator-application (0.2.91-0ubuntu1) natty; urgency=low [ Ted Gould ] diff --git a/debian/rules b/debian/rules index 80009dd..dd456c1 100755 --- a/debian/rules +++ b/debian/rules @@ -7,3 +7,10 @@ include /usr/share/cdbs/1/rules/utils.mk LDFLAGS += -Wl,-z,defs -Wl,--as-needed common-binary-predeb-arch:: list-missing + +DEB_DH_MAKESHLIBS_ARGS = -Xusr/lib/indicators + +binary-install/indicator-application:: + # remove .a/.la clutter + rm -f debian/$(cdbs_curpkg)/usr/lib/indicators/*/*.a + rm -f debian/$(cdbs_curpkg)/usr/lib/indicators/*/*.la -- cgit v1.2.3 From c6384725e5580e021a9d6f95685c54dad9619153 Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Fri, 25 Feb 2011 08:57:27 -0500 Subject: * debian/control, debian/rules: - Add quilt as a patch system * debian/patches/fix-null-string-to-variant-crash.patch: - Don't pass a null string to GVariant, it hates it. LP: #724767 --- debian/changelog | 9 +++++++++ debian/control | 1 + debian/patches/fix-null-string-to-variant-crash.patch | 19 +++++++++++++++++++ debian/patches/series | 1 + debian/rules | 1 + 5 files changed, 31 insertions(+) create mode 100644 debian/patches/fix-null-string-to-variant-crash.patch create mode 100644 debian/patches/series (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index d215213..89cc5e8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +indicator-application (0.2.94-0ubuntu2) natty; urgency=low + + * debian/control, debian/rules: + - Add quilt as a patch system + * debian/patches/fix-null-string-to-variant-crash.patch: + - Don't pass a null string to GVariant, it hates it. LP: #724767 + + -- Michael Terry Fri, 25 Feb 2011 08:53:58 -0500 + indicator-application (0.2.94-0ubuntu1) natty; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index b806b99..a1f6be0 100644 --- a/debian/control +++ b/debian/control @@ -5,6 +5,7 @@ XS-Python-Version: all Maintainer: Ubuntu Desktop Team Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.41), + quilt, libgtk2.0-dev (>= 2.12.0), libdbus-glib-1-dev (>= 0.82), libjson-glib-dev, diff --git a/debian/patches/fix-null-string-to-variant-crash.patch b/debian/patches/fix-null-string-to-variant-crash.patch new file mode 100644 index 0000000..ebcad4c --- /dev/null +++ b/debian/patches/fix-null-string-to-variant-crash.patch @@ -0,0 +1,19 @@ +=== modified file 'src/application-service-appstore.c' +Index: indicator-application.ubu/src/application-service-appstore.c +=================================================================== +--- indicator-application.ubu.orig/src/application-service-appstore.c 2011-02-25 08:50:32.170749000 -0500 ++++ indicator-application.ubu/src/application-service-appstore.c 2011-02-25 08:53:26.313552982 -0500 +@@ -1238,9 +1238,10 @@ + } + + g_variant_builder_add (&builder, "(sisossss)", app->icon, +- position++, app->dbus_name, app->menu, +- app->icon_theme_path, app->label, +- app->guide, app->icon_desc); ++ position++, app->dbus_name, app->menu, ++ app->icon_theme_path, app->label, ++ app->guide, ++ (app->icon_desc != NULL) ? app->icon_desc : ""); + } + + out = g_variant_builder_end(&builder); diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..8d2cb6b --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +fix-null-string-to-variant-crash.patch diff --git a/debian/rules b/debian/rules index dd456c1..7a7c9e8 100755 --- a/debian/rules +++ b/debian/rules @@ -3,6 +3,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk include /usr/share/cdbs/1/rules/utils.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk LDFLAGS += -Wl,-z,defs -Wl,--as-needed -- cgit v1.2.3 From f2c00ec02764df9af713482b63712f1058c6d19f Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Wed, 22 Jun 2011 13:26:15 -0400 Subject: releasing version 0.3.90-0ubuntu1 --- debian/changelog | 17 +++++++++++++++-- debian/control | 24 +++++++++++++++++++----- debian/indicator-application-gtk2.install | 1 + debian/indicator-application.install | 1 + debian/rules | 24 +++++++++++++++--------- 5 files changed, 51 insertions(+), 16 deletions(-) create mode 100644 debian/indicator-application-gtk2.install create mode 100644 debian/indicator-application.install (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index f4e81ac..48b0a6b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,22 @@ -indicator-application (0.3.90-0ubuntu1~ppa1) oneiric; urgency=low +indicator-application (0.3.90-0ubuntu1) oneiric; urgency=low + [ Ted Gould ] * New upstream release. * GTK3 Port - -- Ted Gould Wed, 22 Jun 2011 11:37:43 -0500 + [ Ken VanDine ] + * debian/control + - Bumped standards version to 3.9.2 + - Add new binary for indicator-application-gtk2 + - Make indicator-application recommend indicator-application-gtk2 (until + unity can load gtk3 indicators) + - indicator-application-gtk2 replaces indicator-application << 0.2.90 + - Added build depends for libdbusmenu-gtk3-dev, libindicator3-dev + and libappindicator3-dev + * debian/rules + - build for both gtk2 and gtk3 + + -- Ken VanDine Wed, 22 Jun 2011 13:07:06 -0400 indicator-application (0.3.2-0ubuntu1) natty; urgency=low diff --git a/debian/control b/debian/control index a1f6be0..a1e7a78 100644 --- a/debian/control +++ b/debian/control @@ -5,22 +5,36 @@ XS-Python-Version: all Maintainer: Ubuntu Desktop Team Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.41), - quilt, libgtk2.0-dev (>= 2.12.0), + libgtk-3-dev (>= 2.91), libdbus-glib-1-dev (>= 0.82), libjson-glib-dev, intltool, + libappindicator-dev (>= 0.2.91), + libappindicator3-dev (>= 0.2.91), libindicator-dev (>= 0.3.19), - libdbusmenu-gtk-dev (>= 0.3.91), - libdbusmenu-glib-dev (>= 0.3.91), - libappindicator-dev (>= 0.2.91) -Standards-Version: 3.8.4 + libindicator3-dev (>= 0.3.19), + libdbusmenu-glib-dev (>= 0.3.94), + libdbusmenu-gtk-dev (>= 0.3.94), + libdbusmenu-gtk3-dev (>= 0.3.94) +Standards-Version: 3.9.2 Homepage: https://launchpad.net/indicator-application Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-application/ubuntu Package: indicator-application Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Recommends: indicator-application-gtk2 +Description: Application Indicators + A library and indicator to take menus from applications and place them in + the panel. + +Package: indicator-application-gtk2 +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + indicator-application (= ${binary:Version}) +Replaces: indicator-application (<< 0.3.90) Description: Application Indicators A library and indicator to take menus from applications and place them in the panel. diff --git a/debian/indicator-application-gtk2.install b/debian/indicator-application-gtk2.install new file mode 100644 index 0000000..8d1fc9f --- /dev/null +++ b/debian/indicator-application-gtk2.install @@ -0,0 +1 @@ +debian/tmp/gtk2/usr/lib/indicators /usr/lib/ diff --git a/debian/indicator-application.install b/debian/indicator-application.install new file mode 100644 index 0000000..19a45de --- /dev/null +++ b/debian/indicator-application.install @@ -0,0 +1 @@ +debian/tmp/gtk3/usr / diff --git a/debian/rules b/debian/rules index 7a7c9e8..7950ed1 100755 --- a/debian/rules +++ b/debian/rules @@ -1,17 +1,23 @@ #!/usr/bin/make -f +DEB_BUILDDIR = build +DEB_MAKE_FLAVORS = gtk2 gtk3 + include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk -include /usr/share/cdbs/1/rules/utils.mk -include /usr/share/cdbs/1/rules/patchsys-quilt.mk -LDFLAGS += -Wl,-z,defs -Wl,--as-needed +DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/tmp/@FLAVOR@ +DEB_DESTDIR = $(CURDIR)/debian/tmp/$(cdbs_make_curflavor)/ -common-binary-predeb-arch:: list-missing +DEB_CONFIGURE_FLAGS_gtk2 = --with-gtk=2 +DEB_CONFIGURE_FLAGS_gtk3 = --with-gtk=3 +DEB_CONFIGURE_EXTRA_FLAGS = --disable-static + +LDFLAGS += -Wl,-z,defs -Wl,--as-needed -DEB_DH_MAKESHLIBS_ARGS = -Xusr/lib/indicators +debian/stamp-autotools/gtk2: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk2) +debian/stamp-autotools/gtk3: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk3) -binary-install/indicator-application:: - # remove .a/.la clutter - rm -f debian/$(cdbs_curpkg)/usr/lib/indicators/*/*.a - rm -f debian/$(cdbs_curpkg)/usr/lib/indicators/*/*.la +common-install-arch:: + find debian/tmp -name \*.la -delete + find debian/tmp -name \*.a -delete -- cgit v1.2.3 From c538da379087c5543b7c45bd639be3f99757e157 Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Thu, 11 Aug 2011 21:48:35 +0200 Subject: * debian/rules: - update the translations template --- 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 75c41e7..8fda038 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,14 @@ indicator-application (0.3.92-0ubuntu1) UNRELEASED; urgency=low + * debian/rules: + - update the translations template + + [ Ted Gould ] * New upstream release. * Support middle click actions and send as Ayatana Activates * Fix signature for null sets - -- Ted Gould Thu, 11 Aug 2011 11:56:32 -0500 + -- Sebastien Bacher Thu, 11 Aug 2011 21:48:13 +0200 indicator-application (0.3.91-0ubuntu2) oneiric; urgency=low diff --git a/debian/rules b/debian/rules index 7950ed1..0c35db9 100755 --- a/debian/rules +++ b/debian/rules @@ -21,3 +21,5 @@ debian/stamp-autotools/gtk3: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk3) common-install-arch:: find debian/tmp -name \*.la -delete find debian/tmp -name \*.a -delete + cd po; intltool-update --pot --verbose + -- cgit v1.2.3 From a5c187b4bab4d9850140ebcee7be750fd195a26d Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Tue, 20 Nov 2012 13:59:06 -0500 Subject: * debian/rules: - Use dh_autoreconf with dh sequencer. --- debian/changelog | 2 ++ debian/rules | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index 05bb86b..71366e9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ indicator-application (12.10.1-0ubuntu1) UNRELEASED; urgency=low * debian/control: - Update style to match other indicator packages. + * debian/rules: + - Use dh_autoreconf with dh sequencer. -- Mathieu Trudel-Lapierre Tue, 20 Nov 2012 13:53:41 -0500 diff --git a/debian/rules b/debian/rules index 8e07208..44445ca 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f %: - dh $@ --with translations + dh $@ --with translations,autoreconf override_dh_install: find debian/indicator-application/usr/lib -name *.la -delete -- cgit v1.2.3 From 0688e47c6ea40693b5d054a36747a270e36a454a Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Tue, 20 Nov 2012 14:13:56 -0500 Subject: - Add dh-autoreconf to Build-Depends. - Override dh_autoreconf to call autogen.sh and not call configure. --- debian/changelog | 2 ++ debian/control | 1 + debian/rules | 3 +++ 3 files changed, 6 insertions(+) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index 71366e9..01c2f09 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,10 @@ indicator-application (12.10.1-0ubuntu1) UNRELEASED; urgency=low * debian/control: - Update style to match other indicator packages. + - Add dh-autoreconf to Build-Depends. * debian/rules: - Use dh_autoreconf with dh sequencer. + - Override dh_autoreconf to call autogen.sh and not call configure. -- Mathieu Trudel-Lapierre Tue, 20 Nov 2012 13:53:41 -0500 diff --git a/debian/control b/debian/control index 97a36a9..ecb7d8f 100644 --- a/debian/control +++ b/debian/control @@ -4,6 +4,7 @@ Priority: optional Maintainer: Ubuntu Desktop Team Build-Depends: debhelper (>= 9.0), dh-translations, + dh-autoreconf, dbus-test-runner, libgtk-3-dev (>= 2.91), libdbus-glib-1-dev (>= 0.82), diff --git a/debian/rules b/debian/rules index 44445ca..9414baf 100755 --- a/debian/rules +++ b/debian/rules @@ -3,6 +3,9 @@ %: dh $@ --with translations,autoreconf +override_dh_autoreconf: + NOCONFIGURE=1 dh_autoreconf ./autogen.sh + override_dh_install: find debian/indicator-application/usr/lib -name *.la -delete find debian/indicator-application/usr/lib -name *.a -delete -- cgit v1.2.3 From a90599b0cf03bdeb5c353596700d9a6d92879cb0 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Tue, 20 Nov 2012 14:18:49 -0500 Subject: Add and export DPKG_GENSYMBOLS_CHECK_LEVEL. --- debian/changelog | 1 + debian/rules | 2 ++ 2 files changed, 3 insertions(+) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index 01c2f09..2e6275b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ indicator-application (12.10.1-0ubuntu1) UNRELEASED; urgency=low * debian/rules: - Use dh_autoreconf with dh sequencer. - Override dh_autoreconf to call autogen.sh and not call configure. + - Add and export DPKG_GENSYMBOLS_CHECK_LEVEL. -- Mathieu Trudel-Lapierre Tue, 20 Nov 2012 13:53:41 -0500 diff --git a/debian/rules b/debian/rules index 9414baf..e3385df 100755 --- a/debian/rules +++ b/debian/rules @@ -1,5 +1,7 @@ #!/usr/bin/make -f +export DPKG_GENSYMBOLS_CHECK_LEVEL=4 + %: dh $@ --with translations,autoreconf -- cgit v1.2.3