diff options
| -rw-r--r-- | debian/changelog | 21 | ||||
| -rw-r--r-- | debian/control | 13 | ||||
| -rw-r--r-- | debian/libdbusmenu-glib1.install (renamed from debian/libdbusmenu-glib0.install) | 0 | ||||
| -rw-r--r-- | debian/libdbusmenu-gtk1.install (renamed from debian/libdbusmenu-gtk0.install) | 0 | ||||
| -rwxr-xr-x | debian/rules | 4 |
5 files changed, 28 insertions, 10 deletions
diff --git a/debian/changelog b/debian/changelog index 4c9b347..1bdf8ae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,22 @@ -libdbusmenu (0.2.2-0ubuntu1~ppa1) lucid; urgency=low +libdbusmenu (0.2.2-0ubuntu3) lucid; urgency=low + * debian/control: + - let libdbusmenu-glib1 breaks libdbusmenu-glib0 since they are create + issues at runtime if both got loaded + + -- Sebastien Bacher <seb128@ubuntu.com> Thu, 04 Feb 2010 18:10:56 -0800 + +libdbusmenu (0.2.2-0ubuntu2) lucid; urgency=low + + * debian/control: fix a typo in the tools depends + + -- Sebastien Bacher <seb128@ubuntu.com> Thu, 04 Feb 2010 14:18:47 -0800 + +libdbusmenu (0.2.2-0ubuntu1) lucid; urgency=low + + * Updated for the soname changes + + [ Ted Gould ] * Upstream Release 0.2.2 * Interoperability fixes * Adding timestamps to events @@ -8,7 +25,7 @@ libdbusmenu (0.2.2-0ubuntu1~ppa1) lucid; urgency=low * debian/libdbusmenu-tools.install: Adding a wildcard to get all of the tools in libexec - -- Ted Gould <ted@ubuntu.com> Thu, 04 Feb 2010 12:18:26 -0800 + -- Sebastien Bacher <seb128@ubuntu.com> Thu, 04 Feb 2010 13:56:49 -0800 libdbusmenu (0.2.1-0ubuntu1) lucid; urgency=low diff --git a/debian/control b/debian/control index 80f22f6..561429f 100644 --- a/debian/control +++ b/debian/control @@ -16,13 +16,14 @@ Homepage: https://launchpad.net/libdbusmenu Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/dbusmenu/ubuntu Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/dbusmenu/ubuntu -Package: libdbusmenu-glib0 +Package: libdbusmenu-glib1 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Breaks: indicator-messages (<< 0.3.0), - indicator-session (<< 0.2.0) + indicator-session (<< 0.2.0), + libdbusmenu-glib0 Description: Menus over DBus shared library for glib This package contains shared libraries to be used by applications. @@ -31,7 +32,7 @@ Section: libdevel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libdbusmenu-glib0 (= ${binary:Version}), + libdbusmenu-glib1 (= ${binary:Version}), libdbus-glib-1-dev (>= 0.76), libgtk2.0-dev (>= 2.12.0) Description: Menus over DBus shared library @@ -39,7 +40,7 @@ Description: Menus over DBus shared library . This package provides the development files. -Package: libdbusmenu-gtk0 +Package: libdbusmenu-gtk1 Section: libs Architecture: any Depends: ${shlibs:Depends}, @@ -52,7 +53,7 @@ Section: libdevel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libdbusmenu-gtk0 (= ${binary:Version}), + libdbusmenu-gtk1 (= ${binary:Version}), libdbus-glib-1-dev (>= 0.76), libgtk2.0-dev (>= 2.12.0), libdbusmenu-glib-dev @@ -66,7 +67,7 @@ Section: devel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libdbusmenu-glib0 (= ${binary:Version}) + libdbusmenu-glib1 (= ${binary:Version}) Description: Tools useful during development with libdbusmenu . This package contains tools that are useful when building applications. diff --git a/debian/libdbusmenu-glib0.install b/debian/libdbusmenu-glib1.install index acdbacf..acdbacf 100644 --- a/debian/libdbusmenu-glib0.install +++ b/debian/libdbusmenu-glib1.install diff --git a/debian/libdbusmenu-gtk0.install b/debian/libdbusmenu-gtk1.install index d677935..d677935 100644 --- a/debian/libdbusmenu-gtk0.install +++ b/debian/libdbusmenu-gtk1.install diff --git a/debian/rules b/debian/rules index 0611a62..cc20837 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-gtk0 += -V 'libdbusmenu-gtk0 (>= 0.2)' -DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-glib0 += -V 'libdbusmenu-glib0 (>= 0.2)' +DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk1 += -V 'libdbusmenu-gtk1 (>= 0.2.2)' +DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-glib1 += -V 'libdbusmenu-glib1 (>= 0.2.2)' |