diff options
author | Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> | 2013-01-23 12:57:19 -0500 |
---|---|---|
committer | Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> | 2013-01-23 12:57:19 -0500 |
commit | 1c9c770b6f15b6743997eb5a9c9c8d1faa57ebd7 (patch) | |
tree | e6070a75b148a3c49aaa29c4b2cefcc9c886072e /debian/rules | |
parent | ee33a9adfc9c657c3be11a8bcaf25e687fdde026 (diff) | |
parent | 6a86412258be37bb971c41b8f0ebd0a19a1463d2 (diff) | |
download | libayatana-appindicator-1c9c770b6f15b6743997eb5a9c9c8d1faa57ebd7.tar.gz libayatana-appindicator-1c9c770b6f15b6743997eb5a9c9c8d1faa57ebd7.tar.bz2 libayatana-appindicator-1c9c770b6f15b6743997eb5a9c9c8d1faa57ebd7.zip |
resolve conflicts on acinclude.m4
Diffstat (limited to 'debian/rules')
-rwxr-xr-x | debian/rules | 12 |
1 files changed, 9 insertions, 3 deletions
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 |