diff options
| author | Ted Gould <ted@gould.cx> | 2010-06-09 15:15:57 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-06-09 15:15:57 -0500 |
| commit | 5e878bd6c21fe366d122385217bc7d2ce1368f65 (patch) | |
| tree | 141ec782ff6aa91129824464624897c5968d2708 | |
| parent | 17450574de877f299e8d58fe4fb316f70bcc17f3 (diff) | |
| parent | 61ad4d5c68a37c07a9046640cfdf6f92e787c48c (diff) | |
| download | libdbusmenu-5e878bd6c21fe366d122385217bc7d2ce1368f65.tar.gz libdbusmenu-5e878bd6c21fe366d122385217bc7d2ce1368f65.tar.bz2 libdbusmenu-5e878bd6c21fe366d122385217bc7d2ce1368f65.zip | |
Merging in Ubuntu Desktop branch
| -rw-r--r-- | debian/changelog | 17 | ||||
| -rwxr-xr-x | debian/rules | 2 |
2 files changed, 18 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index c12f513..aef5d82 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,20 @@ +libdbusmenu (0.3.1-0ubuntu1) maverick; urgency=low + + * New upstream release. + * Fix annotations for GIR scanner + * Add function to get submenu of GTK-ified items + * Fix signal prototype of ID update + * Fixing up VAPI files to build them correctly + * Fixing the version string in the GIR file + * Fix documentation title page + * Reject text nodes early (warnings with Qt integration) + * debian/libdbusmenu-glib-dev.install: Updating gir and vapi file + names for package list. + * debian/gir1.0-dbusmenu-glib-0.2.install: Changing the name of the + typelib file. + + -- Ted Gould <ted@ubuntu.com> Fri, 04 Jun 2010 14:42:26 -0500 + libdbusmenu (0.3.1-0ubuntu1~ppa2) lucid; urgency=low * Upstream Merge diff --git a/debian/rules b/debian/rules index c23bde6..4b97c18 100755 --- a/debian/rules +++ b/debian/rules @@ -6,6 +6,6 @@ include /usr/share/cdbs/1/class/gnome.mk 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-gtk1 += -V 'libdbusmenu-gtk1 (>= 0.3.1)' DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-glib1 += -V 'libdbusmenu-glib1 (>= 0.2.8)' |