From 6e9fee7d9bf54add240166f60f5c942184add408 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 9 Dec 2010 12:56:54 -0500 Subject: releasing version 0.2.90-0ubuntu3 --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 643534e..44ffc1b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,8 @@ -indicator-application (0.2.90-0ubuntu3) UNRELEASED; urgency=low +indicator-application (0.2.90-0ubuntu3) natty; urgency=low * debian/control - build depend on dbusmenu >= 0.3.90 + - Fixes FTBFS (LP: #684949) -- Ken VanDine Wed, 08 Dec 2010 13:32:07 -0500 -- 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') 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 54c9e642092a203b35f63acf915eef78d2cb1ef0 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 16 Dec 2010 10:10:13 -0500 Subject: releasing version 0.2.90-0ubuntu4 --- debian/changelog | 6 ++++++ debian/control | 8 +++++--- debian/gir1.0-appindicator-0.1.install | 1 - debian/gir1.2-appindicator-0.1.install | 1 + 4 files changed, 12 insertions(+), 4 deletions(-) delete mode 100644 debian/gir1.0-appindicator-0.1.install create mode 100644 debian/gir1.2-appindicator-0.1.install (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 44ffc1b..31c80a6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +indicator-application (0.2.90-0ubuntu4) natty; urgency=low + + * Updated for the gir abi transition + + -- Ken VanDine Thu, 16 Dec 2010 10:05:55 -0500 + indicator-application (0.2.90-0ubuntu3) natty; urgency=low * debian/control diff --git a/debian/control b/debian/control index 44e5ea1..02ca13c 100644 --- a/debian/control +++ b/debian/control @@ -26,8 +26,8 @@ Build-Depends: debhelper (>= 5.0), libgtk2.0-cil-dev, gobject-introspection, libgirepository1.0-dev, - gir1.0-glib-2.0, - gir1.0-gtk-2.0, + gir1.2-glib-2.0, + gir1.2-gtk-2.0, valac-0.12 Standards-Version: 3.8.4 Homepage: https://launchpad.net/indicator-application @@ -122,7 +122,9 @@ Description: Application Indicators . This package contains files that are needed to build applications. -Package: gir1.0-appindicator-0.1 +Package: gir1.2-appindicator-0.1 +Conflicts: gir1.0-appindicator-0.1 +Replaces: gir1.0-appindicator-0.1 Section: libs Architecture: any Depends: ${shlibs:Depends}, diff --git a/debian/gir1.0-appindicator-0.1.install b/debian/gir1.0-appindicator-0.1.install deleted file mode 100644 index 0791348..0000000 --- a/debian/gir1.0-appindicator-0.1.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/girepository-1.0/* diff --git a/debian/gir1.2-appindicator-0.1.install b/debian/gir1.2-appindicator-0.1.install new file mode 100644 index 0000000..0791348 --- /dev/null +++ b/debian/gir1.2-appindicator-0.1.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/girepository-1.0/* -- cgit v1.2.3 From 1434c5b32951ebdaa01003b8ac28488e4d8a1887 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Tue, 11 Jan 2011 17:34:22 -0600 Subject: check for dbusmenu 0.3.90 --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 9f4b532..723bdcd 100644 --- a/debian/control +++ b/debian/control @@ -10,8 +10,8 @@ Build-Depends: debhelper (>= 5.0), libjson-glib-dev, intltool, libindicator-dev (>= 0.3.14), - libdbusmenu-gtk-dev (>= 0.3.90+r175), - libdbusmenu-glib-dev (>= 0.3.90+r175), + libdbusmenu-gtk-dev (>= 0.3.90), + libdbusmenu-glib-dev (>= 0.3.90), libappindicator-dev (>= 0.2.90+r170) Standards-Version: 3.8.4 Homepage: https://launchpad.net/indicator-application -- cgit v1.2.3 From 93ada25fa1aa4b45f54c343ae34fa611d876d87b Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Fri, 14 Jan 2011 10:25:22 -0600 Subject: Reverted changelog for merge --- debian/changelog | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 63357fa..643534e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,20 +1,3 @@ -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 - - [ 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 * debian/control -- 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') 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