aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2012-03-21 16:22:33 -0500
committerCharles Kerr <charles.kerr@canonical.com>2012-03-21 16:22:33 -0500
commit03fa0726e8a97ef12f56c470dfa2b20ac72d0940 (patch)
tree7075ea12b569fd48d704f010a06c3a79fd3d46a2
parentb17679f5966a9c982d788416ada8429f52783c43 (diff)
parent73331d64cff60d8c96220bda4a088b67df01f652 (diff)
downloadlibayatana-appindicator-03fa0726e8a97ef12f56c470dfa2b20ac72d0940.tar.gz
libayatana-appindicator-03fa0726e8a97ef12f56c470dfa2b20ac72d0940.tar.bz2
libayatana-appindicator-03fa0726e8a97ef12f56c470dfa2b20ac72d0940.zip
Sync from Ubuntu Desktop
-rw-r--r--debian/changelog21
-rw-r--r--debian/control3
-rwxr-xr-xdebian/rules2
3 files changed, 23 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index c355a83..d39f5b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,22 @@
-libappindicator (0.4.91-0ubuntu1~ppa1) precise; urgency=low
+libappindicator (0.4.91-0ubuntu3) precise; urgency=low
+ * debian/rules: build without make check until the builder environment
+ issues are sorted
+
+ -- Sebastien Bacher <seb128@ubuntu.com> Fri, 09 Mar 2012 21:47:53 +0100
+
+libappindicator (0.4.91-0ubuntu2) precise; urgency=low
+
+ * debian/control: build-depends on dbus-test-runner
+
+ -- Sebastien Bacher <seb128@ubuntu.com> Fri, 09 Mar 2012 21:13:24 +0100
+
+libappindicator (0.4.91-0ubuntu1) precise; urgency=low
+
+ * debian/rules:
+ - run make check during the build
+
+ [ Ted Gould ]
* New upstream release.
* Set name and title in fallback status item (LP: #885080)
* Fix build in non-source dir cases (LP: #931764)
@@ -8,7 +25,7 @@ libappindicator (0.4.91-0ubuntu1~ppa1) precise; urgency=low
* Fix test suite to work with libindicator 0.4.93
* Fix the mono binding properties
- -- Ted Gould <ted@ubuntu.com> Fri, 09 Mar 2012 12:17:14 -0600
+ -- Sebastien Bacher <seb128@ubuntu.com> Fri, 09 Mar 2012 20:05:53 +0100
libappindicator (0.4.90-0ubuntu2) precise; urgency=low
diff --git a/debian/control b/debian/control
index 380e42b..2e65961 100644
--- a/debian/control
+++ b/debian/control
@@ -32,7 +32,8 @@ Build-Depends: debhelper (>= 7.0),
gir1.2-gtk-2.0,
gir1.2-gtk-3.0,
dh-autoreconf,
- valac-0.14
+ valac-0.14,
+ dbus-test-runner
Standards-Version: 3.9.1
Homepage: https://launchpad.net/libappindicator
Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/libappindicator/ubuntu
diff --git a/debian/rules b/debian/rules
index b2507f5..65a2860 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,6 +15,8 @@ include /usr/share/cdbs/1/rules/patchsys-quilt.mk
API_VERSION = 0.1
+#DEB_MAKE_CHECK_TARGET := check
+
DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc --enable-introspection
configure-stamp-%: