aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog7
-rw-r--r--debian/control7
-rwxr-xr-xdebian/rules3
3 files changed, 14 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 1a66f60..522cfe8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,13 @@ libdbusmenu (0.3.15-0ubuntu1) UNRELEASED; urgency=low
-- Didier Roche <didrocks@ubuntu.com> Wed, 22 Sep 2010 14:55:44 +0200
+libdbusmenu (0.3.14-0ubuntu2~ppa1) maverick; urgency=low
+
+ * Upstream Merge
+ * Passing up About-to-show as an activate signal (LP: #637692)
+
+ -- Ted Gould <ted@ubuntu.com> Tue, 21 Sep 2010 16:52:17 -0500
+
libdbusmenu (0.3.14-0ubuntu1) maverick; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index 9fe2dd8..7c17933 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,10 @@ Build-Depends: debhelper (>= 5.0),
gir1.0-glib-2.0,
gir1.0-gtk-2.0,
libx11-dev (>= 1.3),
- valac
+ valac,
+# Check dependencies
+ xvfb,
+ dbus-test-runner
Standards-Version: 3.9.1
Homepage: https://launchpad.net/dbusmenu
Vcs-Bzr: https://code.launchpad.net/~dbusmenu-team/dbusmenu/ubuntu
@@ -39,7 +42,7 @@ Description: library for passing menus over DBus
create a menu simply without worrying about how it is displayed on the
other side of the bus.
.
- This package contains shared libraries to be used by applications.
+ This package contains shared libraries to be used by applications.
Package: libdbusmenu-glib-dev
Section: libdevel
diff --git a/debian/rules b/debian/rules
index 496facc..830c8f5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,8 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/gnome.mk
-DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc
+DEB_MAKE_CHECK_TARGET := check
+DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc
LDFLAGS += -Wl,-z,defs -Wl,--as-needed
DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk1 += -V 'libdbusmenu-gtk1 (>= 0.3.12)'