From b2a5f94bf7807e640d8b11dc33e0025c0f2036d5 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 14 Feb 2012 11:52:00 -0600 Subject: Dropping debian/patches --- debian/changelog | 3 ++- debian/patches/debian-changes | 40 ---------------------------------------- debian/patches/series | 1 - 3 files changed, 2 insertions(+), 42 deletions(-) delete mode 100644 debian/patches/debian-changes delete mode 100644 debian/patches/series (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 0f1395f..090c203 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,9 @@ libindicator (0.4.91-0ubuntu1~ppa1) UNRELEASED; urgency=low * 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 + * Dropping debian/patches - -- Ted Gould Tue, 14 Feb 2012 11:49:19 -0600 + -- Ted Gould Tue, 14 Feb 2012 11:51:52 -0600 libindicator (0.4.90-0ubuntu4) precise; urgency=low 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: - 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 -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: , -Bug: -Bug-Debian: http://bugs.debian.org/ -Bug-Ubuntu: https://launchpad.net/bugs/ -Forwarded: -Reviewed-By: -Last-Update: - ---- 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 -- cgit v1.2.3 From 36b39c96eac1bcadaf506a52b6c583155559458b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 14 Feb 2012 14:23:06 -0600 Subject: debian/control, debian/rules: Adding in autoreconf support --- debian/changelog | 3 ++- debian/control | 1 + debian/rules | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 37ed70f..c92d5d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,8 +7,9 @@ libindicator (0.4.91-0ubuntu1~ppa1) UNRELEASED; urgency=low * Dropping debian/patches * Upstream Merge * Explicitly add in gmodule as a required library + * debian/control, debian/rules: Adding in autoreconf support - -- Ted Gould Tue, 14 Feb 2012 14:21:17 -0600 + -- Ted Gould Tue, 14 Feb 2012 14:22:50 -0600 libindicator (0.4.90-0ubuntu4) precise; urgency=low diff --git a/debian/control b/debian/control index 90e1367..4816b56 100644 --- a/debian/control +++ b/debian/control @@ -5,6 +5,7 @@ Maintainer: Ubuntu Core Developers XSBC-Original-Maintainer: The Ayatana Packagers Uploaders: Evgeni Golov , Kartik Mistry Build-Depends: debhelper (>= 5.0), + dh-autoreconf, cdbs (>= 0.4.41), libglib2.0-dev (>= 2.22), libgtk2.0-dev (>= 2.18), diff --git a/debian/rules b/debian/rules index f62d05a..7e69bc0 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)/ -- cgit v1.2.3 From 7f1272a5681547e6a6cb083b699be4770c08ac96 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 14 Feb 2012 14:27:38 -0600 Subject: * debian/control, debian/rules: * Adding in autoreconf support * Adding a check rule and requiring new build deps --- debian/changelog | 6 ++++-- debian/control | 3 ++- debian/rules | 2 ++ 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index c92d5d9..3232851 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,9 +7,11 @@ libindicator (0.4.91-0ubuntu1~ppa1) UNRELEASED; urgency=low * Dropping debian/patches * Upstream Merge * Explicitly add in gmodule as a required library - * debian/control, debian/rules: Adding in autoreconf support + * debian/control, debian/rules: + * Adding in autoreconf support + * Adding a check rule and requiring new build deps - -- Ted Gould Tue, 14 Feb 2012 14:22:50 -0600 + -- Ted Gould Tue, 14 Feb 2012 14:27:03 -0600 libindicator (0.4.90-0ubuntu4) precise; urgency=low diff --git a/debian/control b/debian/control index 4816b56..998c41c 100644 --- a/debian/control +++ b/debian/control @@ -13,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/rules b/debian/rules index 7e69bc0..e74ddd1 100755 --- a/debian/rules +++ b/debian/rules @@ -13,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)' -- cgit v1.2.3 From 05f46d7e9a048f8427f3261ff3b52c0b9fdbcde7 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 14 Feb 2012 14:29:53 -0600 Subject: releasing version 0.4.91-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 3232851..6b66327 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libindicator (0.4.91-0ubuntu1~ppa1) UNRELEASED; urgency=low +libindicator (0.4.91-0ubuntu1~ppa1) precise; urgency=low * New upstream release. * Visibility fixes for indicators using that functionality @@ -11,7 +11,7 @@ libindicator (0.4.91-0ubuntu1~ppa1) UNRELEASED; urgency=low * Adding in autoreconf support * Adding a check rule and requiring new build deps - -- Ted Gould Tue, 14 Feb 2012 14:27:03 -0600 + -- Ted Gould Tue, 14 Feb 2012 14:29:51 -0600 libindicator (0.4.90-0ubuntu4) precise; urgency=low -- cgit v1.2.3