aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>2013-01-23 12:57:19 -0500
committerMathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>2013-01-23 12:57:19 -0500
commit1c9c770b6f15b6743997eb5a9c9c8d1faa57ebd7 (patch)
treee6070a75b148a3c49aaa29c4b2cefcc9c886072e /debian
parentee33a9adfc9c657c3be11a8bcaf25e687fdde026 (diff)
parent6a86412258be37bb971c41b8f0ebd0a19a1463d2 (diff)
downloadlibayatana-appindicator-1c9c770b6f15b6743997eb5a9c9c8d1faa57ebd7.tar.gz
libayatana-appindicator-1c9c770b6f15b6743997eb5a9c9c8d1faa57ebd7.tar.bz2
libayatana-appindicator-1c9c770b6f15b6743997eb5a9c9c8d1faa57ebd7.zip
resolve conflicts on acinclude.m4
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog15
-rwxr-xr-xdebian/rules12
2 files changed, 16 insertions, 11 deletions
diff --git a/debian/changelog b/debian/changelog
index b6890b4..789d128 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,6 @@
libappindicator (12.10.1-0ubuntu2) UNRELEASED; urgency=low
- * acinclude.m4: Fix python multi-arch include issues.
-
- -- Chris J Arges <chris.j.arges@canonical.com> Thu, 17 Jan 2013 15:25:28 -0600
-
-libappindicator (12.10.1-0ubuntu1) UNRELEASED; urgency=low
-
+ [ Mathieu Trudel-Lapierre ]
* debian/control:
- Update style: use trailing commas at the end of dependency lists.
- Reorganize Build-Depends for clarity.
@@ -21,11 +16,15 @@ libappindicator (12.10.1-0ubuntu1) UNRELEASED; urgency=low
- Add and export DPKG_GENSYMBOLS_CHECK_LEVEL.
- Override dh_autoreconf to run autogen.sh and not call configure.
- Override dh_auto_test to run tests per-flavor.
- - Temporarily disable tests.
* debian/*.install:
- Update paths for multiarch and for use with dh9 (remove debian/tmp...)
+ * Fix gtkdoc tests and building of the documentation given a separate build
+ directory.
+
+ [ Chris J Arges ]
+ * acinclude.m4: Fix python multi-arch include issues.
- -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> Mon, 26 Nov 2012 11:02:18 -0500
+ -- Chris J Arges <chris.j.arges@canonical.com> Thu, 17 Jan 2013 15:25:28 -0600
libappindicator (12.10.0-0ubuntu1) quantal; urgency=low
diff --git a/debian/rules b/debian/rules
index c4f16bc..f33046b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,6 +20,7 @@ CFLAGS += -fPIC
# Note: No cli here so that the pbuilder stuff works
clean:
dh_clean
+ dh_autoreconf_clean
override_dh_autoreconf:
NOCONFIGURE=1 dh_autoreconf ./autogen.sh
@@ -72,14 +73,19 @@ override_dh_install:
override_dh_auto_test: $(FLAVORS:%=dotest-%)
dotest-%:
- #dh_auto_test --builddirectory=build/$*
+ ps -ef
+ env
+ dh_auto_test --builddirectory=build/$* --
+
dotest-gtk2: $(PY_VERSIONS:%=dotestgtk2-%)
# GTK2 flavor test was run on a per-python-version basis.
dotestgtk2-%:
- #PYTHON=`which $*` \
- # dh_auto_test --builddirectory=build/gtk2
+ ps -ef
+ env
+ PYTHON=`which $*` \
+ dh_auto_test --builddirectory=build/gtk2 --
override_dh_auto_clean:
dh_auto_clean