aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>2012-11-30 17:36:23 -0500
committerMathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>2012-11-30 17:36:23 -0500
commita640bfebd38b880a86d1ba7697c3b77f156869ee (patch)
treea7c95d6f914f796bb4e31a0604753e05356ee5b7
parent085a347978d50cce0400b968272a05f5c3afa272 (diff)
downloadlibayatana-appindicator-a640bfebd38b880a86d1ba7697c3b77f156869ee.tar.gz
libayatana-appindicator-a640bfebd38b880a86d1ba7697c3b77f156869ee.tar.bz2
libayatana-appindicator-a640bfebd38b880a86d1ba7697c3b77f156869ee.zip
Properly disable tests for gtk2 and gtk3, not the gtk2 build.
-rw-r--r--debian/changelog2
-rwxr-xr-xdebian/rules10
2 files changed, 6 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog
index 716fe22..7643608 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,7 +15,7 @@ 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 GTK2 tests.
+ - Temporarily disable tests.
* debian/*.install:
- Update paths for multiarch and for use with dh9 (remove debian/tmp...)
diff --git a/debian/rules b/debian/rules
index a7419ff..f6144f4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,8 +41,8 @@ dobuild-gtk2: $(PY_VERSIONS:%=dobuildgtk2-%)
# GTK2 flavor build was run on a per-python-version basis.
dobuildgtk2-%:
- #PYTHON=`which $*` \
- # dh_auto_build --builddirectory=build/gtk2
+ PYTHON=`which $*` \
+ dh_auto_build --builddirectory=build/gtk2
override_dh_auto_install: $(FLAVORS:%=doinstall-%)
@@ -68,14 +68,14 @@ override_dh_install:
override_dh_auto_test: $(FLAVORS:%=dotest-%)
dotest-%:
- dh_auto_test --builddirectory=build/$*
+ #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
+ #PYTHON=`which $*` \
+ # dh_auto_test --builddirectory=build/gtk2
override_dh_auto_clean:
dh_auto_clean