diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 15 | ||||
| -rw-r--r-- | debian/control | 4 | ||||
| -rw-r--r-- | debian/patches/debian-changes | 40 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rwxr-xr-x | debian/rules | 3 |
5 files changed, 21 insertions, 42 deletions
diff --git a/debian/changelog b/debian/changelog index af43b20..4f941d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +libindicator (0.4.91-0ubuntu1) precise; urgency=low + + * New upstream release. + * Visibility fixes for indicators using that functionality + * Ensure that parent_object is more aggressively set + * Fix memory leak on groups of items in desktop files (lp: #923629) + * Dropping debian/patches + * Upstream Merge + * Explicitly add in gmodule as a required library + * debian/control, debian/rules: + * Adding in autoreconf support + * Adding a check rule and requiring new build deps + + -- Ted Gould <ted@ubuntu.com> Tue, 14 Feb 2012 14:29:51 -0600 + libindicator (0.4.90-0ubuntu4) precise; urgency=low * libindicator/indicator-object.c diff --git a/debian/control b/debian/control index 90e1367..998c41c 100644 --- a/debian/control +++ b/debian/control @@ -5,6 +5,7 @@ Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com> XSBC-Original-Maintainer: The Ayatana Packagers <pkg-ayatana-devel@lists.alioth.debian.org> Uploaders: Evgeni Golov <evgeni@debian.org>, Kartik Mistry <kartik@debian.org> Build-Depends: debhelper (>= 5.0), + dh-autoreconf, cdbs (>= 0.4.41), libglib2.0-dev (>= 2.22), libgtk2.0-dev (>= 2.18), @@ -12,7 +13,8 @@ Build-Depends: debhelper (>= 5.0), libtool, intltool, gtk-doc-tools, - dh-autoreconf + dbus-test-runner, + xvfb Standards-Version: 3.9.2 Homepage: https://launchpad.net/libindicator Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/libindicator/ubuntu diff --git a/debian/patches/debian-changes b/debian/patches/debian-changes deleted file mode 100644 index 91e0322..0000000 --- a/debian/patches/debian-changes +++ /dev/null @@ -1,40 +0,0 @@ -Description: <short summary of the patch> - TODO: Put a short summary on the line above and replace this paragraph - with a longer explanation of this change. Complete the meta-information - with other relevant fields (see below for details). To make it easier, the - information below has been extracted from the changelog. Adjust it or drop - it. - . - libindicator (0.4.1-1) experimental; urgency=low - . - * Merge from Ubuntu. - + Re-enable GTK3 packages. - + Link to libm to prevent FTBFS. - Closes: #640459 - * Set single-debian-patch in debian/source/options. -Author: Evgeni Golov <evgeni@debian.org> -Bug-Debian: http://bugs.debian.org/640459 - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: <vendor|upstream|other>, <url of original patch> -Bug: <url in upstream bugtracker> -Bug-Debian: http://bugs.debian.org/<bugnumber> -Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> -Forwarded: <no|not-needed|url proving that it has been forwarded> -Reviewed-By: <name and email of someone who approved the patch> -Last-Update: <YYYY-MM-DD> - ---- libindicator-0.4.1.orig/tools/Makefile.am -+++ libindicator-0.4.1/tools/Makefile.am -@@ -19,6 +19,7 @@ indicator_loader_SOURCES = \ - indicator_loader_CFLAGS = \ - -Wall -Werror \ - $(LIBINDICATOR_CFLAGS) -I$(top_srcdir) \ -+ -Wall -Werror \ - -DBUILD_DIR="\"$(builddir)\"" - - indicator_loader_LDADD = \ diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 7bb8252..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -debian-changes diff --git a/debian/rules b/debian/rules index f62d05a..e74ddd1 100755 --- a/debian/rules +++ b/debian/rules @@ -5,6 +5,7 @@ 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/autoreconf.mk DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/tmp/@FLAVOR@ DEB_DESTDIR = $(CURDIR)/debian/tmp/$(cdbs_make_curflavor)/ @@ -12,6 +13,8 @@ DEB_DESTDIR = $(CURDIR)/debian/tmp/$(cdbs_make_curflavor)/ DEB_CONFIGURE_FLAGS_gtk2 = --with-gtk=2 DEB_CONFIGURE_FLAGS_gtk3 = --with-gtk=3 +DEB_MAKE_CHECK_TARGET := check + LDFLAGS += -Wl,-z,defs -Wl,--as-needed DEB_DH_MAKESHLIBS_ARGS_libindicator7 += -V 'libindicator7 (>= 0.4.90)' |