aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-02-18 12:50:07 -0600
committerTed Gould <ted@gould.cx>2010-02-18 12:50:07 -0600
commit2fbb0fde5d48b456821e97394017aa6b85302bcd (patch)
tree18ee6d3f99611b8cc84327c338525df62ee5d2d2
parente3f137a695c7bb1e6636988479f5627ea4a23285 (diff)
parent0af5090188b1002d4cbca3e8a60b701153a8b391 (diff)
downloadlibdbusmenu-2fbb0fde5d48b456821e97394017aa6b85302bcd.tar.gz
libdbusmenu-2fbb0fde5d48b456821e97394017aa6b85302bcd.tar.bz2
libdbusmenu-2fbb0fde5d48b456821e97394017aa6b85302bcd.zip
Merging in Ubuntu Desktop
-rw-r--r--debian/changelog2
-rwxr-xr-xdebian/rules2
2 files changed, 2 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 0cbfe5e..c33bfa8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.2.5-0ubuntu1~ppa1) lucid; urgency=low
+libdbusmenu (0.2.5-0ubuntu1) lucid; urgency=low
* Upstream release 0.2.5
* Adding in menuitem proxy object.
diff --git a/debian/rules b/debian/rules
index 07187d4..90e7af5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,5 +7,5 @@ DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper
LDFLAGS += -Wl,-z,defs -Wl,--as-needed
DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk1 += -V 'libdbusmenu-gtk1 (>= 0.2.5)'
-DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-glib1 += -V 'libdbusmenu-glib1 (>= 0.2.5)'
+DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-glib1 += -V 'libdbusmenu-glib1 (>= 0.2.2)'