diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 21 | ||||
| -rwxr-xr-x | debian/rules | 4 |
2 files changed, 23 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 9d34249..091c2d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,24 @@ +libdbusmenu (0.3.3-1) unstable; urgency=low + + * Merge Ubuntu. + Preserve Maintainer and Vcs-* fields. + + -- Evgeni Golov <evgeni@debian.org> Thu, 01 Jul 2010 11:28:16 +0200 + +libdbusmenu (0.3.3-0ubuntu1) maverick; urgency=low + + * New upstream release. + * Adding support for menu shortcuts (LP: #591293) + * Fixing distcheck of documentation builds + * Autogen.sh fix for adding custom prefix (LP: #595565) + * Fixing children property name to match spec (LP: #597321) + * Merging in Debian branch + * debian/control: Switching branch on this branch to be the + dbusmenu-team. + * debian/rules: Updating shlibs to 0.3.3 for shortcut API additions + + -- Ted Gould <ted@ubuntu.com> Thu, 24 Jun 2010 09:32:42 -0500 + libdbusmenu (0.3.2-1) unstable; urgency=low * Merge from Ubuntu. diff --git a/debian/rules b/debian/rules index 4f08dbf..e274757 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 --enable-gtk-doc LDFLAGS += -Wl,-z,defs -Wl,--as-needed -DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk1 += -V 'libdbusmenu-gtk1 (>= 0.3.1)' -DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-glib1 += -V 'libdbusmenu-glib1 (>= 0.2.8)' +DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk1 += -V 'libdbusmenu-gtk1 (>= 0.3.3)' +DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-glib1 += -V 'libdbusmenu-glib1 (>= 0.3.3)' |