aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2012-11-16 12:55:58 -0600
committerCharles Kerr <charles.kerr@canonical.com>2012-11-16 12:55:58 -0600
commit0ad2ca4e77671f8a7279a58f0e477bac0fe6c554 (patch)
treee2fe29e0232f247820e47c2f84155eca0c638fec
parente327e99d20090889b848ca0aad450503fb18301e (diff)
downloadayatana-indicator-session-0ad2ca4e77671f8a7279a58f0e477bac0fe6c554.tar.gz
ayatana-indicator-session-0ad2ca4e77671f8a7279a58f0e477bac0fe6c554.tar.bz2
ayatana-indicator-session-0ad2ca4e77671f8a7279a58f0e477bac0fe6c554.zip
re-enable the tests/ directory
-rw-r--r--debian/changelog6
-rw-r--r--debian/control1
-rw-r--r--debian/rules3
3 files changed, 1 insertions, 9 deletions
diff --git a/debian/changelog b/debian/changelog
index 418d825..5fca7cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,14 +4,10 @@ indicator-session (12.10.5-0ubuntu1) UNRELEASED; urgency=low
- Add DPKG_GENSYMBOLS_CHECK_LEVEL=4.
- Use the dh sequencer with autoreconf.
- Override dh_autoreconf to run autogen.sh.
- - Temporarily disable running tests due to an issue with getting the
- gsettings schema for testing.
* debian/control:
- Add dh-autoreconf to Build-Depends.
- Add gnome-common to Build-Depends.
- - Add libdbustest1-dev, dbus-test-runner to Build-Depends.
- - Explicitly list libgtest-dev in Build-Depends, even though it does get
- pulled in via libxorg-gtest-dev.
+ - Add libgtest-dev, libdbustest1-dev, dbus-test-runner to Build-Depends.
- Adjust style to be consistent and use trailing commas in lists.
- Update Vcs-Bzr and Vcs-Browser fields and add notice for uploaders.
* Automatic snapshot from revision 373 (bootstrap):
diff --git a/debian/control b/debian/control
index de9dc22..2c6a551 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,6 @@ Build-Depends: debhelper (>= 9),
dh-translations,
intltool,
gnome-common,
- libxorg-gtest-dev,
libgtest-dev,
libdbustest1-dev,
dbus-test-runner,
diff --git a/debian/rules b/debian/rules
index cafefe7..54cfd06 100644
--- a/debian/rules
+++ b/debian/rules
@@ -5,9 +5,6 @@ export DPKG_GENSYMBOLS_CHECK_LEVEL=4
%:
dh $@ --with translations,autoreconf
-override_dh_auto_test:
- # TESTS TEMPORARILY DISABLED: need fixing for gsettings schema.
-
override_dh_autoreconf:
NOCONFIGURE=1 dh_autoreconf ./autogen.sh