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 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