From b83632a648ef96d295d494c07cf07be5457fd719 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 8 Dec 2009 14:15:23 -0600 Subject: debian/control, debian/libdbusmenu-tools.install: Setting up a package for the new dbusmenu-dumper tool. --- debian/control | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 69d6adf..7854be9 100644 --- a/debian/control +++ b/debian/control @@ -58,3 +58,11 @@ Description: Menus over DBus shared library for GTK This package contains files that are needed to build applications. . This package provides the development files. + +Package: libdbusmenu-tools +Section: devel +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libdbusmenu-glib0 (= ${binary:Version}) +Description: Need a better description. -- cgit v1.2.3 From 85842906707111c8e0869956f4fd29327de9a0a6 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 18 Dec 2009 14:30:21 -0600 Subject: debian/control: Mentioning nicely that this will cause indicator-messages << 0.3 and indicator-session << 0.2 to break. --- debian/changelog | 3 +++ debian/control | 2 ++ 2 files changed, 5 insertions(+) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 370acaa..1e6f70e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,9 @@ libdbusmenu (0.2.0~dev-0ubuntu1~ppa3) UNRELEASED; urgency=low * Updating trunk * Changing API to be V0.2 for reals + * debian/control: Mentioning nicely that this will cause + indicator-messages << 0.3 and indicator-session << 0.2 to + break. -- Ted Gould Fri, 18 Dec 2009 13:21:40 -0600 diff --git a/debian/control b/debian/control index 7854be9..c392b34 100644 --- a/debian/control +++ b/debian/control @@ -21,6 +21,8 @@ Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Breaks: indicator-messages (<< 0.3.0), + indicator-session (<< 0.2.0) Description: Menus over DBus shared library for glib This package contains shared libraries to be used by applications. -- cgit v1.2.3 From 995a27ae56fb63ec7835090e6264b3e489e38b64 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 18 Dec 2009 21:18:19 -0600 Subject: debian/control: Switching the breaks to be ~dev as those versions are not yet released. --- debian/changelog | 7 +++++++ debian/control | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 0bc0579..e8026b0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libdbusmenu (0.2.0~dev-0ubuntu1~ppa5) UNRELEASED; urgency=low + + * debian/control: Switching the breaks to be ~dev as those + versions are not yet released. + + -- Ted Gould Fri, 18 Dec 2009 21:17:31 -0600 + libdbusmenu (0.2.0~dev-0ubuntu1~ppa4) karmic; urgency=low * Updating trunk diff --git a/debian/control b/debian/control index c392b34..7e307d3 100644 --- a/debian/control +++ b/debian/control @@ -21,8 +21,8 @@ Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Breaks: indicator-messages (<< 0.3.0), - indicator-session (<< 0.2.0) +Breaks: indicator-messages (<< 0.3.0~dev), + indicator-session (<< 0.2.0~dev) Description: Menus over DBus shared library for glib This package contains shared libraries to be used by applications. -- cgit v1.2.3 From f3de0ef8eff09e02c81d86d0ce2c0912070c2af9 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Sat, 9 Jan 2010 09:09:31 -0500 Subject: * Added debian/libdbusmenu-tools.install * debian/control - improved description for libdbusmenu-tools --- debian/changelog | 8 ++++++++ debian/control | 5 ++++- debian/libdbusmenu-tools.install | 1 + 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 debian/libdbusmenu-tools.install (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 51362d2..4ed07a6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +libdbusmenu (0.2.0-0ubuntu2) lucid; urgency=low + + * Added debian/libdbusmenu-tools.install + * debian/control + - improved description for libdbusmenu-tools + + -- Ken VanDine Sat, 09 Jan 2010 09:05:47 -0500 + libdbusmenu (0.2.0-0ubuntu1) lucid; urgency=low * Upstream release 0.2.0 diff --git a/debian/control b/debian/control index c392b34..80f22f6 100644 --- a/debian/control +++ b/debian/control @@ -67,4 +67,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libdbusmenu-glib0 (= ${binary:Version}) -Description: Need a better description. +Description: Tools useful during development with libdbusmenu + . + This package contains tools that are useful when building applications. + diff --git a/debian/libdbusmenu-tools.install b/debian/libdbusmenu-tools.install new file mode 100644 index 0000000..9f680c7 --- /dev/null +++ b/debian/libdbusmenu-tools.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libdbusmenu/dbusmenu-dumper -- cgit v1.2.3 From 391b595afecea47fb36295c33cddaa6f5fbb0d4a Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Thu, 4 Feb 2010 14:19:05 -0800 Subject: releasing version 0.2.2-0ubuntu2 --- debian/changelog | 6 ++++++ debian/control | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index f69ee88..c1b1382 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libdbusmenu (0.2.2-0ubuntu2) lucid; urgency=low + + * debian/control: fix a typo in the tools depends + + -- Sebastien Bacher Thu, 04 Feb 2010 14:18:47 -0800 + libdbusmenu (0.2.2-0ubuntu1) lucid; urgency=low * Updated for the soname changes diff --git a/debian/control b/debian/control index c27756a..c4e4f3e 100644 --- a/debian/control +++ b/debian/control @@ -66,7 +66,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. -- cgit v1.2.3 From 730e7609ef6042130f945f8ac43a8220171fee37 Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Thu, 4 Feb 2010 18:12:21 -0800 Subject: releasing version 0.2.2-0ubuntu3 --- debian/changelog | 8 ++++++++ debian/control | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index c1b1382..1bdf8ae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +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 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 diff --git a/debian/control b/debian/control index c4e4f3e..561429f 100644 --- a/debian/control +++ b/debian/control @@ -22,7 +22,8 @@ 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. -- cgit v1.2.3 From 9d30df280c0f9ea924891ff9546a9f2743a79eb8 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sun, 28 Feb 2010 14:46:01 -0600 Subject: debian/control, debian/gir1.0-dbusmenu-glib-0.2.install, gir1.0-dbusmenu-gtk-0.2.install: Adding new packages to hold the typelib files generated by GObject introspection. --- debian/changelog | 3 +++ debian/control | 12 ++++++++++++ debian/gir1.0-dbusmenu-glib-0.2.install | 1 + debian/gir1.0-dbusmenu-gtk-0.2.install | 1 + 4 files changed, 17 insertions(+) create mode 100644 debian/gir1.0-dbusmenu-glib-0.2.install create mode 100644 debian/gir1.0-dbusmenu-gtk-0.2.install (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 2a55e3a..107b9d8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,9 @@ libdbusmenu (0.2.6-0ubuntu1~ppa2~gir1) UNRELEASED; urgency=low * Upstream Merge * Adding in building of the GObject Introspection details + * debian/control, debian/gir1.0-dbusmenu-glib-0.2.install, + gir1.0-dbusmenu-gtk-0.2.install: Adding new packages to hold + the typelib files generated by GObject introspection. -- Ted Gould Sun, 28 Feb 2010 14:35:59 -0600 diff --git a/debian/control b/debian/control index 561429f..8e72167 100644 --- a/debian/control +++ b/debian/control @@ -72,3 +72,15 @@ Description: Tools useful during development with libdbusmenu . This package contains tools that are useful when building applications. +Package: gir1.0-dbusmenu-glib-0.2 +Section: libs +Architecture: any +Depends: libdbusmenu-glib1 (= ${binary:Version}) +Description: Typelib file for libdbusmenu-glib1 + +Package: gir1.0-dbusmenu-gtk-0.2 +Section: libs +Architecture: any +Depends: libdbusmenu-gtk1 (= ${binary:Version}) +Description: Typelib file for libdbusmenu-gtk1 + diff --git a/debian/gir1.0-dbusmenu-glib-0.2.install b/debian/gir1.0-dbusmenu-glib-0.2.install new file mode 100644 index 0000000..a6c4fd0 --- /dev/null +++ b/debian/gir1.0-dbusmenu-glib-0.2.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/girepository-1.0/DbusmenuGlib-0.2.typelib diff --git a/debian/gir1.0-dbusmenu-gtk-0.2.install b/debian/gir1.0-dbusmenu-gtk-0.2.install new file mode 100644 index 0000000..829a344 --- /dev/null +++ b/debian/gir1.0-dbusmenu-gtk-0.2.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/girepository-1.0/DbusmenuGtk-0.2.typelib -- cgit v1.2.3 From fd15b2518b038e31c95f0ecad8f8331d3cba3914 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sun, 28 Feb 2010 14:52:48 -0600 Subject: debian/gir1.0-dbusmenu-gtk-0.2.install: Adding new packages to hold the typelib files generated by GObject introspection. * debian/control: Adding in build dependencies for GIR dev --- debian/changelog | 5 +++-- debian/control | 10 +++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 107b9d8..91938b0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,9 @@ libdbusmenu (0.2.6-0ubuntu1~ppa2~gir1) UNRELEASED; urgency=low * Upstream Merge * Adding in building of the GObject Introspection details * debian/control, debian/gir1.0-dbusmenu-glib-0.2.install, - gir1.0-dbusmenu-gtk-0.2.install: Adding new packages to hold - the typelib files generated by GObject introspection. + debian/gir1.0-dbusmenu-gtk-0.2.install: Adding new packages to + hold the typelib files generated by GObject introspection. + * debian/control: Adding in build dependencies for GIR dev -- Ted Gould Sun, 28 Feb 2010 14:35:59 -0600 diff --git a/debian/control b/debian/control index 8e72167..5575fb9 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,8 @@ Build-Depends: debhelper (>= 5.0), libtool, intltool, libxml2-dev, - libjson-glib-dev + libjson-glib-dev, + libgirepository1.0-dev Standards-Version: 3.8.0 Homepage: https://launchpad.net/libdbusmenu Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/dbusmenu/ubuntu @@ -75,12 +76,15 @@ Description: Tools useful during development with libdbusmenu Package: gir1.0-dbusmenu-glib-0.2 Section: libs Architecture: any -Depends: libdbusmenu-glib1 (= ${binary:Version}) +Depends: libdbusmenu-glib1 (= ${binary:Version}), + gir1.0-glib-2.0 Description: Typelib file for libdbusmenu-glib1 Package: gir1.0-dbusmenu-gtk-0.2 Section: libs Architecture: any -Depends: libdbusmenu-gtk1 (= ${binary:Version}) +Depends: libdbusmenu-gtk1 (= ${binary:Version}), + gir1.0-dbusmenu-glib-0.2 (= ${binary:Version}), + gir1.0-gtk-2.0 Description: Typelib file for libdbusmenu-gtk1 -- cgit v1.2.3 From 219065ec232985727a201fd1eac7cfd42ea72d22 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sun, 28 Feb 2010 14:58:31 -0600 Subject: Fixing deps --- debian/control | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 5575fb9..10a0d82 100644 --- a/debian/control +++ b/debian/control @@ -76,14 +76,16 @@ Description: Tools useful during development with libdbusmenu Package: gir1.0-dbusmenu-glib-0.2 Section: libs Architecture: any -Depends: libdbusmenu-glib1 (= ${binary:Version}), +Depends: ${misc:Depends}, + libdbusmenu-glib1 (= ${binary:Version}), gir1.0-glib-2.0 Description: Typelib file for libdbusmenu-glib1 Package: gir1.0-dbusmenu-gtk-0.2 Section: libs Architecture: any -Depends: libdbusmenu-gtk1 (= ${binary:Version}), +Depends: ${misc:Depends}, + libdbusmenu-gtk1 (= ${binary:Version}), gir1.0-dbusmenu-glib-0.2 (= ${binary:Version}), gir1.0-gtk-2.0 Description: Typelib file for libdbusmenu-gtk1 -- cgit v1.2.3 From 0f771fe8f7985930d4935de3208207f06a4aa78f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sun, 28 Feb 2010 20:30:21 -0600 Subject: debian/control: Adding in gir's as build dependencies. --- debian/changelog | 6 ++++++ debian/control | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 7700b4f..7b90555 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libdbusmenu (0.2.6-0ubuntu1~ppa2~gir2) UNRELEASED; urgency=low + + * debian/control: Adding in gir's as build dependencies. + + -- Ted Gould Sun, 28 Feb 2010 20:29:56 -0600 + libdbusmenu (0.2.6-0ubuntu1~ppa2~gir1) lucid; urgency=low * Upstream Merge diff --git a/debian/control b/debian/control index 10a0d82..ebd3ca9 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,9 @@ Build-Depends: debhelper (>= 5.0), intltool, libxml2-dev, libjson-glib-dev, - libgirepository1.0-dev + libgirepository1.0-dev, + gir1.0-glib-2.0, + gir1.0-gtk-2.0 Standards-Version: 3.8.0 Homepage: https://launchpad.net/libdbusmenu Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/dbusmenu/ubuntu -- cgit v1.2.3 From 61ff7d827555b8f8fc60122ebdc5b3cebb0e21de Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 1 Mar 2010 10:53:04 -0600 Subject: * debian/control: Adding dependency on valac * debian/libdbusmenu-glib-dev.install, debian/libdbusmenu-gtk-dev.install: Added VAPI files to the packages. --- debian/changelog | 4 ++++ debian/control | 3 ++- debian/libdbusmenu-glib-dev.install | 1 + debian/libdbusmenu-gtk-dev.install | 1 + 4 files changed, 8 insertions(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 1ad4ba5..cdf5e13 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,10 @@ libdbusmenu (0.2.6-0ubuntu1~ppa2~gir4) UNRELEASED; urgency=low * Upstream Merge * Adding in building of VAPI files + * debian/control: Adding dependency on valac + * debian/libdbusmenu-glib-dev.install, + debian/libdbusmenu-gtk-dev.install: Added VAPI files to + the packages. -- Ted Gould Mon, 01 Mar 2010 10:50:08 -0600 diff --git a/debian/control b/debian/control index ebd3ca9..869b3e8 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,8 @@ Build-Depends: debhelper (>= 5.0), libjson-glib-dev, libgirepository1.0-dev, gir1.0-glib-2.0, - gir1.0-gtk-2.0 + gir1.0-gtk-2.0, + valac Standards-Version: 3.8.0 Homepage: https://launchpad.net/libdbusmenu Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/dbusmenu/ubuntu diff --git a/debian/libdbusmenu-glib-dev.install b/debian/libdbusmenu-glib-dev.install index 64c14d8..724eb9c 100644 --- a/debian/libdbusmenu-glib-dev.install +++ b/debian/libdbusmenu-glib-dev.install @@ -3,3 +3,4 @@ debian/tmp/usr/lib/pkgconfig/dbusmenu-glib.pc debian/tmp/usr/lib/libdbusmenu-glib.a debian/tmp/usr/lib/libdbusmenu-glib.so debian/tmp/usr/share/gir-1.0/DbusmenuGlib-0.2.gir +debian/tmp/usr/share/vala/vapi/DbusmenuGlib-0.2.vapi diff --git a/debian/libdbusmenu-gtk-dev.install b/debian/libdbusmenu-gtk-dev.install index a235baa..3fa028f 100644 --- a/debian/libdbusmenu-gtk-dev.install +++ b/debian/libdbusmenu-gtk-dev.install @@ -3,3 +3,4 @@ debian/tmp/usr/lib/pkgconfig/dbusmenu-gtk.pc debian/tmp/usr/lib/libdbusmenu-gtk.a debian/tmp/usr/lib/libdbusmenu-gtk.so debian/tmp/usr/share/gir-1.0/DbusmenuGtk-0.2.gir +debian/tmp/usr/share/vala/vapi/DbusmenuGtk-0.2.vapi -- cgit v1.2.3 From e77ba68be1e4429a94ce5f6513fadb289cc9c987 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 1 Mar 2010 14:04:38 -0600 Subject: * debian/rules: Setting up to run autogen.sh * debian/control: Adding dep on gnome-common --- debian/changelog | 7 +++++++ debian/control | 1 + debian/rules | 1 + 3 files changed, 9 insertions(+) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index bf47970..b0e05cb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libdbusmenu (0.2.6-0ubuntu1~ppa2~gir5) UNRELEASED; urgency=low + + * debian/rules: Setting up to run autogen.sh + * debian/control: Adding dep on gnome-common + + -- Ted Gould Mon, 01 Mar 2010 14:04:01 -0600 + libdbusmenu (0.2.6-0ubuntu1~ppa2~gir4) lucid; urgency=low * Upstream Merge diff --git a/debian/control b/debian/control index 869b3e8..6c925e5 100644 --- a/debian/control +++ b/debian/control @@ -11,6 +11,7 @@ Build-Depends: debhelper (>= 5.0), intltool, libxml2-dev, libjson-glib-dev, + gnome-common, libgirepository1.0-dev, gir1.0-glib-2.0, gir1.0-gtk-2.0, diff --git a/debian/rules b/debian/rules index 90e7af5..3b6e341 100755 --- a/debian/rules +++ b/debian/rules @@ -3,6 +3,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk +DEB_CONFIGURE_SCRIPT=$(CURDIR)/$(DEB_SRCDIR)/autogen.sh DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper LDFLAGS += -Wl,-z,defs -Wl,--as-needed -- cgit v1.2.3 From a7e96d73d61223b26ec64186d33584a73428e763 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 2 Mar 2010 10:13:36 -0600 Subject: * debian/control: * Adding dependencies for gir-repository-dev and gobject-introspection to ensure we get all the GI goodies. --- debian/changelog | 8 ++++++++ debian/control | 2 ++ 2 files changed, 10 insertions(+) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index bf6e515..519e5da6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +libdbusmenu (0.2.6-0ubuntu2~ppa2) UNRELEASED; urgency=low + + * debian/control: + * Adding dependencies for gir-repository-dev and + gobject-introspection to ensure we get all the GI goodies. + + -- Ted Gould Tue, 02 Mar 2010 10:12:52 -0600 + libdbusmenu (0.2.6-0ubuntu2~ppa1) lucid; urgency=low * Upstream Merge diff --git a/debian/control b/debian/control index 869b3e8..cdc808d 100644 --- a/debian/control +++ b/debian/control @@ -11,6 +11,8 @@ Build-Depends: debhelper (>= 5.0), intltool, libxml2-dev, libjson-glib-dev, + gobject-introspection, + gir-repository-dev, libgirepository1.0-dev, gir1.0-glib-2.0, gir1.0-gtk-2.0, -- cgit v1.2.3 From aaf2c098253373978f5a42fedc37ead470d0bea9 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 15 Jun 2010 19:27:15 +0200 Subject: Merge from Ubuntu. * debian/control: - Set Maintainer to pkg-ayatana. - Add myself as Uploader. --- debian/changelog | 9 +++++++++ debian/control | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 773863f..5979a5f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +libdbusmenu (0.3.2-1) unstable; urgency=low + + * Merge from Ubuntu. + * debian/control: + - Set Maintainer to pkg-ayatana. + - Add myself as Uploader. + + -- Evgeni Golov Tue, 15 Jun 2010 19:25:56 +0200 + libdbusmenu (0.3.2-0ubuntu1) maverick; urgency=low * debian/control diff --git a/debian/control b/debian/control index 9ddb90b..44fcfb9 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,8 @@ Source: libdbusmenu Section: gnome Priority: optional -Maintainer: Ubuntu Core Developers +Maintainer: The Ayatana Packagers +Uploaders: Evgeni Golov Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.41), libgtk2.0-dev (>= 2.12.0), -- cgit v1.2.3 From 05c812550569d64b3573a5fcf2fe8b66bb5906a9 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 15 Jun 2010 19:30:24 +0200 Subject: Update package descriptions. --- debian/changelog | 3 ++- debian/control | 66 ++++++++++++++++++++++++++++++++++++++++---------------- 2 files changed, 49 insertions(+), 20 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index a1e2f75..b45ea54 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,10 +4,11 @@ libdbusmenu (0.3.2-1) unstable; urgency=low * debian/control: - Set Maintainer to pkg-ayatana. - Add myself as Uploader. + - Update package descriptions. * debian/copyright: - Convert to DEP5 format. - -- Evgeni Golov Tue, 15 Jun 2010 19:28:18 +0200 + -- Evgeni Golov Tue, 15 Jun 2010 19:30:08 +0200 libdbusmenu (0.3.2-0ubuntu1) maverick; urgency=low diff --git a/debian/control b/debian/control index 44fcfb9..8041076 100644 --- a/debian/control +++ b/debian/control @@ -32,7 +32,11 @@ Depends: ${shlibs:Depends}, Breaks: indicator-messages (<< 0.3.0), indicator-session (<< 0.2.0), libdbusmenu-glib0 -Description: Menus over DBus shared library for glib +Description: library for passing menus over DBus + libdbusmenu passes a menu structure across DBus so that a program can + 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. Package: libdbusmenu-glib-dev @@ -43,18 +47,24 @@ Depends: ${shlibs:Depends}, libdbusmenu-glib1 (= ${binary:Version}), libdbus-glib-1-dev (>= 0.76), libgtk2.0-dev (>= 2.12.0) -Description: Menus over DBus shared library - This package contains files that are needed to build applications. +Description: library for passing menus over DBus - development files + libdbusmenu passes a menu structure across DBus so that a program can + create a menu simply without worrying about how it is displayed on the + other side of the bus. . - This package provides the development files. + This package contains files that are needed to build applications. Package: libdbusmenu-gtk1 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Menus over DBus shared library for GTK - This package contains shared libraries to be used by applications. +Description: library for passing menus over DBus - GTK version + libdbusmenu passes a menu structure across DBus so that a program can + 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 GTK applications. Package: libdbusmenu-gtk-dev Section: libdevel @@ -65,10 +75,12 @@ Depends: ${shlibs:Depends}, libdbus-glib-1-dev (>= 0.76), libgtk2.0-dev (>= 2.12.0), libdbusmenu-glib-dev -Description: Menus over DBus shared library for GTK - This package contains files that are needed to build applications. +Description: library for passing menus over DBus - GTK version developement files + libdbusmenu passes a menu structure across DBus so that a program can + create a menu simply without worrying about how it is displayed on the + other side of the bus. . - This package provides the development files. + This package contains files that are needed to build GTK applications. Package: libdbusmenu-tools Section: devel @@ -77,9 +89,13 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, python, libdbusmenu-glib1 (= ${binary:Version}) -Description: Tools useful during development with libdbusmenu +Description: tools useful during development with libdbusmenu + libdbusmenu passes a menu structure across DBus so that a program can + create a menu simply without worrying about how it is displayed on the + other side of the bus. . - This package contains tools that are useful when building applications. + This package contains tools that are useful when developing and building + applications with libdbusmenu. Package: gir1.0-dbusmenu-glib-0.2 Section: libs @@ -87,10 +103,13 @@ Architecture: any Depends: ${misc:Depends}, libdbusmenu-glib1 (= ${binary:Version}), gir1.0-glib-2.0 -Description: Typelib file for libdbusmenu-glib1 +Description: typelib file for libdbusmenu-glib1 + libdbusmenu passes a menu structure across DBus so that a program can + create a menu simply without worrying about how it is displayed on the + other side of the bus. . This package can be used by other packages using the GIRepository format to - generate dynamic bindings + generate dynamic bindings for libdbusmenu-glib1. Package: gir1.0-dbusmenu-gtk-0.2 Section: libs @@ -99,24 +118,33 @@ Depends: ${misc:Depends}, libdbusmenu-gtk1 (= ${binary:Version}), gir1.0-dbusmenu-glib-0.2 (= ${binary:Version}), gir1.0-gtk-2.0 -Description: Typelib file for libdbusmenu-gtk1 +Description: typelib file for libdbusmenu-gtk1 + libdbusmenu passes a menu structure across DBus so that a program can + create a menu simply without worrying about how it is displayed on the + other side of the bus. . This package can be used by other packages using the GIRepository format to - generate dynamic bindings + generate dynamic bindings for libdbusmenu-gtk1. Package: libdbusmenu-glib-doc Section: doc Architecture: any Depends: ${misc:Depends} -Description: Docs for libdbusmenu-glib +Description: library for passing menus over DBus - documentation + libdbusmenu passes a menu structure across DBus so that a program can + create a menu simply without worrying about how it is displayed on the + other side of the bus. . - This package contains developer documentation. + This package contains developer documentation for libdbusmenu-glib. Package: libdbusmenu-gtk-doc Section: doc Architecture: any Depends: ${misc:Depends} -Description: Docs for libdbusmenu-gtk +Description: library for passing menus over DBus - GTK version documentation + libdbusmenu passes a menu structure across DBus so that a program can + create a menu simply without worrying about how it is displayed on the + other side of the bus. . - This package contains developer documentation. + This package contains developer documentation for libdbusmenu-gtk. -- cgit v1.2.3 From 5272ac12e39c3a45d9f5016df7c48b3b6508c400 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 15 Jun 2010 19:31:27 +0200 Subject: - Standards-Version: 3.8.4 - Fix Homepage URL. --- debian/changelog | 4 +++- debian/control | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index b45ea54..a31f749 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,10 +5,12 @@ libdbusmenu (0.3.2-1) unstable; urgency=low - Set Maintainer to pkg-ayatana. - Add myself as Uploader. - Update package descriptions. + - Standards-Version: 3.8.4 + - Fix Homepage URL. * debian/copyright: - Convert to DEP5 format. - -- Evgeni Golov Tue, 15 Jun 2010 19:30:08 +0200 + -- Evgeni Golov Tue, 15 Jun 2010 19:31:00 +0200 libdbusmenu (0.3.2-0ubuntu1) maverick; urgency=low diff --git a/debian/control b/debian/control index 8041076..47b64b1 100644 --- a/debian/control +++ b/debian/control @@ -19,8 +19,8 @@ Build-Depends: debhelper (>= 5.0), gir1.0-glib-2.0, gir1.0-gtk-2.0, valac -Standards-Version: 3.8.0 -Homepage: https://launchpad.net/libdbusmenu +Standards-Version: 3.8.4 +Homepage: https://launchpad.net/dbusmenu Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/dbusmenu/ubuntu Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/dbusmenu/ubuntu -- cgit v1.2.3 From c7155ebdb13500400902b0600c77115375c193f2 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 15 Jun 2010 19:39:34 +0200 Subject: Update Vcs-* fields. --- debian/changelog | 3 ++- debian/control | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index a31f749..47693e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,10 +7,11 @@ libdbusmenu (0.3.2-1) unstable; urgency=low - Update package descriptions. - Standards-Version: 3.8.4 - Fix Homepage URL. + - Update Vcs-* fields. * debian/copyright: - Convert to DEP5 format. - -- Evgeni Golov Tue, 15 Jun 2010 19:31:00 +0200 + -- Evgeni Golov Tue, 15 Jun 2010 19:39:15 +0200 libdbusmenu (0.3.2-0ubuntu1) maverick; urgency=low diff --git a/debian/control b/debian/control index 47b64b1..ed86b8a 100644 --- a/debian/control +++ b/debian/control @@ -21,8 +21,8 @@ Build-Depends: debhelper (>= 5.0), valac Standards-Version: 3.8.4 Homepage: https://launchpad.net/dbusmenu -Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/dbusmenu/ubuntu -Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/dbusmenu/ubuntu +Vcs-Bzr: http://bzr.debian.org/bzr/pkg-ayatana/libdbusmenu/debian +Vcs-Browser: http://bzr.debian.org/loggerhead/pkg-ayatana/libdbusmenu/debian Package: libdbusmenu-glib1 Section: libs -- cgit v1.2.3 From 2dfaa21730da0cb153d45bfa5a9d2110c7e1a379 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Sun, 20 Jun 2010 13:56:19 +0200 Subject: -doc packages are Arch:all --- debian/changelog | 3 ++- debian/control | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 9551d8f..9d34249 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,12 +9,13 @@ libdbusmenu (0.3.2-1) unstable; urgency=low - Standards-Version: 3.8.4 - Fix Homepage URL. - Update Vcs-* fields. + - -doc packages are Arch:all * debian/copyright: - Convert to DEP5 format. - Add Ken and Sebastien, according to changelog. - Add Aurélien Gâteau, according to headers. - -- Evgeni Golov Wed, 16 Jun 2010 11:37:08 +0200 + -- Evgeni Golov Sun, 20 Jun 2010 13:56:00 +0200 libdbusmenu (0.3.2-0ubuntu1) maverick; urgency=low diff --git a/debian/control b/debian/control index ed86b8a..f5e0b20 100644 --- a/debian/control +++ b/debian/control @@ -128,7 +128,7 @@ Description: typelib file for libdbusmenu-gtk1 Package: libdbusmenu-glib-doc Section: doc -Architecture: any +Architecture: all Depends: ${misc:Depends} Description: library for passing menus over DBus - documentation libdbusmenu passes a menu structure across DBus so that a program can @@ -139,7 +139,7 @@ Description: library for passing menus over DBus - documentation Package: libdbusmenu-gtk-doc Section: doc -Architecture: any +Architecture: all Depends: ${misc:Depends} Description: library for passing menus over DBus - GTK version documentation libdbusmenu passes a menu structure across DBus so that a program can -- cgit v1.2.3 From 5259846f36df1eb4703c56cae6a08a4bd0b4ed15 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Sun, 20 Jun 2010 14:17:47 +0200 Subject: s/GTK/GTK+/ --- debian/control | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index f5e0b20..8f4ca78 100644 --- a/debian/control +++ b/debian/control @@ -59,12 +59,12 @@ Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: library for passing menus over DBus - GTK version +Description: library for passing menus over DBus - GTK+ version libdbusmenu passes a menu structure across DBus so that a program can 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 GTK applications. + This package contains shared libraries to be used by GTK+ applications. Package: libdbusmenu-gtk-dev Section: libdevel @@ -75,12 +75,12 @@ Depends: ${shlibs:Depends}, libdbus-glib-1-dev (>= 0.76), libgtk2.0-dev (>= 2.12.0), libdbusmenu-glib-dev -Description: library for passing menus over DBus - GTK version developement files +Description: library for passing menus over DBus - GTK+ version developement files libdbusmenu passes a menu structure across DBus so that a program can create a menu simply without worrying about how it is displayed on the other side of the bus. . - This package contains files that are needed to build GTK applications. + This package contains files that are needed to build GTK+ applications. Package: libdbusmenu-tools Section: devel @@ -141,7 +141,7 @@ Package: libdbusmenu-gtk-doc Section: doc Architecture: all Depends: ${misc:Depends} -Description: library for passing menus over DBus - GTK version documentation +Description: library for passing menus over DBus - GTK+ version documentation libdbusmenu passes a menu structure across DBus so that a program can create a menu simply without worrying about how it is displayed on the other side of the bus. -- cgit v1.2.3 From fb676fe5663d49c0c4e15ec1785146082fa57202 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 28 Jun 2010 23:10:43 -0500 Subject: debian/control, debian/libdbusmenu-jsonloader*install: Adding two binary packages for the jsonloader test library. --- debian/changelog | 4 +++- debian/control | 29 +++++++++++++++++++++++++++++ debian/libdbusmenu-jsonloader-dev.install | 4 ++++ debian/libdbusmenu-jsonloader0.install | 1 + 4 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 debian/libdbusmenu-jsonloader-dev.install create mode 100644 debian/libdbusmenu-jsonloader0.install (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index d10c32d..02e7bd6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,10 @@ libdbusmenu (0.3.3-0ubuntu2~ppa2~json1) UNRELEASED; urgency=low * Upstream Merge * Adding more through JSON support for testing * Autogen + * debian/control, debian/libdbusmenu-jsonloader*install: Adding + two binary packages for the jsonloader test library. - -- Ted Gould Mon, 28 Jun 2010 23:05:22 -0500 + -- Ted Gould Mon, 28 Jun 2010 23:10:11 -0500 libdbusmenu (0.3.3-0ubuntu2~ppa1) lucid; urgency=low diff --git a/debian/control b/debian/control index 18222ae..f05a0e6 100644 --- a/debian/control +++ b/debian/control @@ -149,3 +149,32 @@ Description: library for passing menus over DBus - GTK version documentation . This package contains developer documentation for libdbusmenu-gtk. +Package: libdbusmenu-jsonloader0 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: library for passing menus over DBus - Test lib + libdbusmenu passes a menu structure across DBus so that a program can + 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 by test suites in applications + or libraries using dbusmenu. + +Package: libdbusmenu-jsonloader-dev +Section: libdevel +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libdbus-glib-1-dev (>= 0.76), + libdbusmenu-glib-dev (= ${binary:Version}), + libjson-glib-dev +Description: library for passing menus over DBus - Test lib + libdbusmenu passes a menu structure across DBus so that a program can + create a menu simply without worrying about how it is displayed on the + other side of the bus. + . + This package contains files that are needed to build test suites in applications + or libraries using dbusmenu. + diff --git a/debian/libdbusmenu-jsonloader-dev.install b/debian/libdbusmenu-jsonloader-dev.install new file mode 100644 index 0000000..27c41a5 --- /dev/null +++ b/debian/libdbusmenu-jsonloader-dev.install @@ -0,0 +1,4 @@ +debian/tmp/usr/include/libdbusmenu-0.1/libdbusmenu-jsonloader/* +debian/tmp/usr/lib/pkgconfig/dbusmenu-jsonloader.pc +debian/tmp/usr/lib/libdbusmenu-jsonloader.a +debian/tmp/usr/lib/libdbusmenu-jsonloader.so diff --git a/debian/libdbusmenu-jsonloader0.install b/debian/libdbusmenu-jsonloader0.install new file mode 100644 index 0000000..bff47f5 --- /dev/null +++ b/debian/libdbusmenu-jsonloader0.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libdbusmenu-jsonloader.so.* -- cgit v1.2.3 From 520bea0764aeec95396984cbc491a3ff1bea26d2 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 29 Jun 2010 08:21:55 -0500 Subject: debian/libdbusmenu-jsonloader0 moving to 1 to match library version. --- debian/changelog | 7 +++++++ debian/control | 2 +- debian/libdbusmenu-jsonloader0.install | 1 - debian/libdbusmenu-jsonloader1.install | 1 + 4 files changed, 9 insertions(+), 2 deletions(-) delete mode 100644 debian/libdbusmenu-jsonloader0.install create mode 100644 debian/libdbusmenu-jsonloader1.install (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 2213a6f..5ddaa4a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libdbusmenu (0.3.3-0ubuntu2~ppa2~json2) UNRELEASED; urgency=low + + * debian/libdbusmenu-jsonloader0 moving to 1 to match + library version. + + -- Ted Gould Tue, 29 Jun 2010 08:20:52 -0500 + libdbusmenu (0.3.3-0ubuntu2~ppa2~json1) lucid; urgency=low * Upstream Merge diff --git a/debian/control b/debian/control index f05a0e6..aefb40e 100644 --- a/debian/control +++ b/debian/control @@ -149,7 +149,7 @@ Description: library for passing menus over DBus - GTK version documentation . This package contains developer documentation for libdbusmenu-gtk. -Package: libdbusmenu-jsonloader0 +Package: libdbusmenu-jsonloader1 Section: libs Architecture: any Depends: ${shlibs:Depends}, diff --git a/debian/libdbusmenu-jsonloader0.install b/debian/libdbusmenu-jsonloader0.install deleted file mode 100644 index bff47f5..0000000 --- a/debian/libdbusmenu-jsonloader0.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libdbusmenu-jsonloader.so.* diff --git a/debian/libdbusmenu-jsonloader1.install b/debian/libdbusmenu-jsonloader1.install new file mode 100644 index 0000000..bff47f5 --- /dev/null +++ b/debian/libdbusmenu-jsonloader1.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libdbusmenu-jsonloader.so.* -- cgit v1.2.3 From fa92b7508f63678353a05024c3b30bc770716907 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Thu, 1 Jul 2010 11:40:19 +0200 Subject: Standards-Version: 3.9.0 --- debian/changelog | 3 ++- debian/control | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 091c2d1..43e4eff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ libdbusmenu (0.3.3-1) unstable; urgency=low * Merge Ubuntu. Preserve Maintainer and Vcs-* fields. + * Standards-Version: 3.9.0 - -- Evgeni Golov Thu, 01 Jul 2010 11:28:16 +0200 + -- Evgeni Golov Thu, 01 Jul 2010 11:40:04 +0200 libdbusmenu (0.3.3-0ubuntu1) maverick; urgency=low diff --git a/debian/control b/debian/control index 8f4ca78..c11bb1c 100644 --- a/debian/control +++ b/debian/control @@ -19,7 +19,7 @@ Build-Depends: debhelper (>= 5.0), gir1.0-glib-2.0, gir1.0-gtk-2.0, valac -Standards-Version: 3.8.4 +Standards-Version: 3.9.0 Homepage: https://launchpad.net/dbusmenu Vcs-Bzr: http://bzr.debian.org/bzr/pkg-ayatana/libdbusmenu/debian Vcs-Browser: http://bzr.debian.org/loggerhead/pkg-ayatana/libdbusmenu/debian -- cgit v1.2.3 From 04371b23ce5172db703bbeeedd9a730c29eae514 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 14 Jul 2010 10:21:55 +0200 Subject: Add missing "used" to the json package description. --- debian/changelog | 6 ++++-- debian/control | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index bf3ed67..70b4fa9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ libdbusmenu (0.3.5-1) unstable; urgency=low - * + * Merge new upstream and changes from Ubuntu. + * debian/control: + + Add missing "used" to the json package description. - -- Evgeni Golov Wed, 14 Jul 2010 10:19:38 +0200 + -- Evgeni Golov Wed, 14 Jul 2010 10:21:29 +0200 libdbusmenu (0.3.5-0ubuntu1) maverick; urgency=low diff --git a/debian/control b/debian/control index 17ec9bf..abbe597 100644 --- a/debian/control +++ b/debian/control @@ -158,8 +158,8 @@ Description: library for passing menus over DBus - Test lib 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 by test suites in applications - or libraries using dbusmenu. + This package contains shared libraries to be used by test suites in + applications or libraries using dbusmenu. Package: libdbusmenu-jsonloader-dev Section: libdevel -- cgit v1.2.3 From 267513170831eeff1bc8fa76e5a6c6f56414da8c Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 14 Jul 2010 21:07:54 +0200 Subject: more description updates --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index abbe597..8e2234e 100644 --- a/debian/control +++ b/debian/control @@ -169,7 +169,7 @@ Depends: ${shlibs:Depends}, libdbus-glib-1-dev (>= 0.76), libdbusmenu-glib-dev (= ${binary:Version}), libjson-glib-dev -Description: library for passing menus over DBus - Test lib +Description: library for passing menus over DBus - Test lib development files libdbusmenu passes a menu structure across DBus so that a program can create a menu simply without worrying about how it is displayed on the other side of the bus. -- cgit v1.2.3 From d9fdc575e49d357c425826740e919447c4f1eb24 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Thu, 29 Jul 2010 12:00:16 +0200 Subject: Standards-Version: 3.9.1 --- debian/changelog | 3 ++- debian/control | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 417559a..fc0cb2b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ libdbusmenu (0.3.7-1) unstable; urgency=low * Merge latest upstream from Ubuntu. + * Standards-Version: 3.9.1 - -- Evgeni Golov Thu, 29 Jul 2010 11:53:46 +0200 + -- Evgeni Golov Thu, 29 Jul 2010 12:00:04 +0200 libdbusmenu (0.3.7-0ubuntu1) maverick; urgency=low diff --git a/debian/control b/debian/control index 8e29045..c10b31a 100644 --- a/debian/control +++ b/debian/control @@ -20,7 +20,7 @@ Build-Depends: debhelper (>= 5.0), gir1.0-gtk-2.0, libx11-dev (>= 1.3), valac -Standards-Version: 3.9.0 +Standards-Version: 3.9.1 Homepage: https://launchpad.net/dbusmenu Vcs-Bzr: http://bzr.debian.org/bzr/pkg-ayatana/libdbusmenu/debian Vcs-Browser: http://bzr.debian.org/loggerhead/pkg-ayatana/libdbusmenu/debian -- cgit v1.2.3 From aeac8ff44a799bf17dc9e2e7b52d9ea52bfa9c58 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sat, 7 Aug 2010 16:22:18 -0500 Subject: debian/control: Adding build deps xvfb and dbus-test-runner for new make check rules --- debian/changelog | 7 +++++++ debian/control | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 24bd923..e7d2465 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libdbusmenu (0.3.9-0ubuntu1~ppa2~check2) UNRELEASED; urgency=low + + * debian/control: Adding build deps xvfb and dbus-test-runner for new + make check rules + + -- Ted Gould Sat, 07 Aug 2010 16:21:38 -0500 + libdbusmenu (0.3.9-0ubuntu1~ppa2~check1) lucid; urgency=low * debian/rules: Enabling running check at build time diff --git a/debian/control b/debian/control index 9fe2dd8..1039d9e 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 -- cgit v1.2.3 From ba14febc25e422922d0b9b45ddb80579355f6ba3 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 9 Sep 2010 12:34:05 -0400 Subject: releasing version 0.3.13-0ubuntu1 --- debian/changelog | 7 ++++++- debian/control | 5 +---- debian/rules | 1 - 3 files changed, 7 insertions(+), 6 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index b8813cf..c270d4e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libdbusmenu (0.3.13-0ubuntu1) UNRELEASED; urgency=low +libdbusmenu (0.3.13-0ubuntu1) maverick; urgency=low * New upstream release. * Handling window grabs on activated signals (LP: #633275) @@ -7,6 +7,11 @@ libdbusmenu (0.3.13-0ubuntu1) UNRELEASED; urgency=low * Changing the timeouts on event calls for better detection of failing applications + [Ken VanDine] + * debian/control + - Dropped build depends for dbus-test-runner, it isn't in the archive + yet, we should add that next cycle + -- Ted Gould Thu, 09 Sep 2010 09:50:15 -0500 libdbusmenu (0.3.12-0ubuntu1) maverick; urgency=low diff --git a/debian/control b/debian/control index 1039d9e..9fe2dd8 100644 --- a/debian/control +++ b/debian/control @@ -20,10 +20,7 @@ Build-Depends: debhelper (>= 5.0), gir1.0-glib-2.0, gir1.0-gtk-2.0, libx11-dev (>= 1.3), - valac, -# Check dependencies - xvfb, - dbus-test-runner + valac Standards-Version: 3.9.1 Homepage: https://launchpad.net/dbusmenu Vcs-Bzr: https://code.launchpad.net/~dbusmenu-team/dbusmenu/ubuntu diff --git a/debian/rules b/debian/rules index 1578fbf..496facc 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk -DEB_MAKE_CHECK_TARGET := check DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc LDFLAGS += -Wl,-z,defs -Wl,--as-needed -- cgit v1.2.3 From 4f4949c181a88e41354e338061c5be73dff6bbaf Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 13 Oct 2010 12:45:37 -0500 Subject: debian/control, debian/libdbusmenu-glib2.install, debian/libdbusmenu-gtk2.install: Switching package names to match .so bump. --- debian/changelog | 5 ++++- debian/control | 22 +++++++++++----------- debian/libdbusmenu-glib1.install | 1 - debian/libdbusmenu-glib2.install | 1 + debian/libdbusmenu-gtk1.install | 1 - debian/libdbusmenu-gtk2.install | 1 + 6 files changed, 17 insertions(+), 14 deletions(-) delete mode 100644 debian/libdbusmenu-glib1.install create mode 100644 debian/libdbusmenu-glib2.install delete mode 100644 debian/libdbusmenu-gtk1.install create mode 100644 debian/libdbusmenu-gtk2.install (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 82206cb..ebeed5a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,11 @@ libdbusmenu (0.4.0~dev-0ubuntu1~ppa1) UNRELEASED; urgency=low * Upstream Merge * Breaking ABI and getting reserved back + * debian/control, debian/libdbusmenu-glib2.install, + debian/libdbusmenu-gtk2.install: Switching package names to + match .so bump. - -- Ted Gould Wed, 13 Oct 2010 12:41:39 -0500 + -- Ted Gould Wed, 13 Oct 2010 12:44:07 -0500 libdbusmenu (0.3.16-0ubuntu1) maverick; urgency=low diff --git a/debian/control b/debian/control index 1039d9e..b162015 100644 --- a/debian/control +++ b/debian/control @@ -29,7 +29,7 @@ Homepage: https://launchpad.net/dbusmenu Vcs-Bzr: https://code.launchpad.net/~dbusmenu-team/dbusmenu/ubuntu Vcs-Browser: http://bazaar.launchpad.net/~dbusmenu-team/dbusmenu/ubuntu -Package: libdbusmenu-glib1 +Package: libdbusmenu-glib2 Section: libs Architecture: any Depends: ${shlibs:Depends}, @@ -49,7 +49,7 @@ Section: libdevel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libdbusmenu-glib1 (= ${binary:Version}), + libdbusmenu-glib2 (= ${binary:Version}), libdbus-glib-1-dev (>= 0.76), libgtk2.0-dev (>= 2.12.0) Description: library for passing menus over DBus - development files @@ -59,7 +59,7 @@ Description: library for passing menus over DBus - development files . This package contains files that are needed to build applications. -Package: libdbusmenu-gtk1 +Package: libdbusmenu-gtk2 Section: libs Architecture: any Depends: ${shlibs:Depends}, @@ -76,7 +76,7 @@ Section: libdevel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libdbusmenu-gtk1 (= ${binary:Version}), + libdbusmenu-gtk2 (= ${binary:Version}), libdbus-glib-1-dev (>= 0.76), libgtk2.0-dev (>= 2.12.0), libdbusmenu-glib-dev @@ -93,7 +93,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, python, - libdbusmenu-glib1 (= ${binary:Version}) + libdbusmenu-glib2 (= ${binary:Version}) Description: tools useful during development with libdbusmenu libdbusmenu passes a menu structure across DBus so that a program can create a menu simply without worrying about how it is displayed on the @@ -106,30 +106,30 @@ Package: gir1.0-dbusmenu-glib-0.2 Section: libs Architecture: any Depends: ${misc:Depends}, - libdbusmenu-glib1 (= ${binary:Version}), + libdbusmenu-glib2 (= ${binary:Version}), gir1.0-glib-2.0 -Description: typelib file for libdbusmenu-glib1 +Description: typelib file for libdbusmenu-glib2 libdbusmenu passes a menu structure across DBus so that a program can create a menu simply without worrying about how it is displayed on the other side of the bus. . This package can be used by other packages using the GIRepository format to - generate dynamic bindings for libdbusmenu-glib1. + generate dynamic bindings for libdbusmenu-glib2. Package: gir1.0-dbusmenu-gtk-0.2 Section: libs Architecture: any Depends: ${misc:Depends}, - libdbusmenu-gtk1 (= ${binary:Version}), + libdbusmenu-gtk2 (= ${binary:Version}), gir1.0-dbusmenu-glib-0.2 (= ${binary:Version}), gir1.0-gtk-2.0 -Description: typelib file for libdbusmenu-gtk1 +Description: typelib file for libdbusmenu-gtk2 libdbusmenu passes a menu structure across DBus so that a program can create a menu simply without worrying about how it is displayed on the other side of the bus. . This package can be used by other packages using the GIRepository format to - generate dynamic bindings for libdbusmenu-gtk1. + generate dynamic bindings for libdbusmenu-gtk2. Package: libdbusmenu-glib-doc Section: doc diff --git a/debian/libdbusmenu-glib1.install b/debian/libdbusmenu-glib1.install deleted file mode 100644 index acdbacf..0000000 --- a/debian/libdbusmenu-glib1.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libdbusmenu-glib.so.* diff --git a/debian/libdbusmenu-glib2.install b/debian/libdbusmenu-glib2.install new file mode 100644 index 0000000..acdbacf --- /dev/null +++ b/debian/libdbusmenu-glib2.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libdbusmenu-glib.so.* diff --git a/debian/libdbusmenu-gtk1.install b/debian/libdbusmenu-gtk1.install deleted file mode 100644 index d677935..0000000 --- a/debian/libdbusmenu-gtk1.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libdbusmenu-gtk.so.* diff --git a/debian/libdbusmenu-gtk2.install b/debian/libdbusmenu-gtk2.install new file mode 100644 index 0000000..d677935 --- /dev/null +++ b/debian/libdbusmenu-gtk2.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libdbusmenu-gtk.so.* -- cgit v1.2.3 From 95e4fc742556e9cdb56ee1459549abd764ea30d8 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Wed, 24 Nov 2010 12:04:18 -0500 Subject: Initial work on building with gtk3 as well as gtk2 --- debian/changelog | 6 ++++ debian/control | 55 +++++++++++++++++++++++++++++---- debian/gir1.0-dbusmenu-gtk3-0.2.install | 1 + debian/libdbusmenu-gtk3-dev.install | 5 +++ debian/libdbusmenu-gtk3.install | 1 + debian/rules | 41 +++++++++++++++++++++--- 6 files changed, 99 insertions(+), 10 deletions(-) create mode 100644 debian/gir1.0-dbusmenu-gtk3-0.2.install create mode 100644 debian/libdbusmenu-gtk3-dev.install create mode 100644 debian/libdbusmenu-gtk3.install (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 3fc5e60..f62f1da 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libdbusmenu (0.3.90.1-0ubuntu1) UNRELEASED; urgency=low + + * New upstream release + + -- Ken VanDine Wed, 24 Nov 2010 12:00:04 -0500 + libdbusmenu (0.3.90-0ubuntu1~ppa1) maverick; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index b162015..bec5001 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,8 @@ XSBC-Original-Maintainer: The Ayatana Packagers Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.41), - libgtk2.0-dev (>= 2.12.0), + libgtk2.0-dev (>= 2.23.2-0ubuntu2), + libgtk3.0-dev (>= 2.91.4-0ubuntu1), libdbus-glib-1-dev, gnome-doc-utils, gtk-doc-tools, @@ -16,14 +17,12 @@ Build-Depends: debhelper (>= 5.0), libjson-glib-dev, gobject-introspection, gir-repository-dev, - libgirepository1.0-dev, + libgirepository1.0-dev (>= 0.9.3), gir1.0-glib-2.0, gir1.0-gtk-2.0, + gir1.0-gtk-3.0, libx11-dev (>= 1.3), - valac, -# Check dependencies - xvfb, - dbus-test-runner + valac Standards-Version: 3.9.1 Homepage: https://launchpad.net/dbusmenu Vcs-Bzr: https://code.launchpad.net/~dbusmenu-team/dbusmenu/ubuntu @@ -181,3 +180,47 @@ Description: library for passing menus over DBus - Test lib development files . This package contains files that are needed to build test suites in applications or libraries using dbusmenu. + +Package: libdbusmenu-gtk3 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: library for passing menus over DBus - GTK+ version + libdbusmenu passes a menu structure across DBus so that a program can + 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 GTK+ applications. + +Package: libdbusmenu-gtk3-dev +Section: libdevel +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libdbusmenu-gtk3 (= ${binary:Version}), + libdbus-glib-1-dev (>= 0.76), + libgtk3.0-dev (>= 2.91.4-0ubuntu1), + libdbusmenu-glib-dev +Description: library for passing menus over DBus - GTK+ version developement files + libdbusmenu passes a menu structure across DBus so that a program can + create a menu simply without worrying about how it is displayed on the + other side of the bus. + . + This package contains files that are needed to build GTK+ applications. + +Package: gir1.0-dbusmenu-gtk3-0.2 +Section: libs +Architecture: any +Depends: ${misc:Depends}, + libdbusmenu-gtk3 (= ${binary:Version}), + gir1.0-dbusmenu-glib-0.2 (= ${binary:Version}), + gir1.0-gtk-3.0 +Description: typelib file for libdbusmenu-gtk2 + libdbusmenu passes a menu structure across DBus so that a program can + create a menu simply without worrying about how it is displayed on the + other side of the bus. + . + This package can be used by other packages using the GIRepository format to + generate dynamic bindings for libdbusmenu-gtk2. + diff --git a/debian/gir1.0-dbusmenu-gtk3-0.2.install b/debian/gir1.0-dbusmenu-gtk3-0.2.install new file mode 100644 index 0000000..2da3933 --- /dev/null +++ b/debian/gir1.0-dbusmenu-gtk3-0.2.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/girepository-1.0/DbusmenuGtk3-0.2.typelib diff --git a/debian/libdbusmenu-gtk3-dev.install b/debian/libdbusmenu-gtk3-dev.install new file mode 100644 index 0000000..d81ce8b --- /dev/null +++ b/debian/libdbusmenu-gtk3-dev.install @@ -0,0 +1,5 @@ +debian/tmp/usr/lib/pkgconfig/dbusmenu-gtk3.pc +debian/tmp/usr/lib/libdbusmenu-gtk3.a +debian/tmp/usr/lib/libdbusmenu-gtk3.so +debian/tmp/usr/share/gir-1.0/DbusmenuGtk3-0.2.gir +debian/tmp/usr/share/vala/vapi/DbusmenuGtk3-0.2.vapi diff --git a/debian/libdbusmenu-gtk3.install b/debian/libdbusmenu-gtk3.install new file mode 100644 index 0000000..af2e9a3 --- /dev/null +++ b/debian/libdbusmenu-gtk3.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libdbusmenu-gtk3.so.* diff --git a/debian/rules b/debian/rules index 1578fbf..7a88781 100755 --- a/debian/rules +++ b/debian/rules @@ -3,10 +3,43 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk -DEB_MAKE_CHECK_TARGET := check -DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc +DEB_SRCDIR = . +DEB_BUILDDIR = $(DEB_SRCDIR)/build + +DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc --enable-introspection LDFLAGS += -Wl,-z,defs -Wl,--as-needed -DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk1 += -V 'libdbusmenu-gtk1 (>= 0.3.12)' -DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-glib1 += -V 'libdbusmenu-glib1 (>= 0.3.12)' +DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk2 += -V 'libdbusmenu-gtk2 (>= 0.3.90)' +DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk3 += -V 'libdbusmenu-gtk3 (>= 0.3.90)' +DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-glib2 += -V 'libdbusmenu-glib2 (>= 0.3.90)' + +configure/libdbusmenu-gtk3:: stamp-configure-gtk3 +stamp-configure-gtk3: + : # configure for GTK+ 3.0 + set -e; \ + rm -rf build-gtk3; \ + mkdir build-gtk3; \ + cd build-gtk3; \ + $(DEB_CONFIGURE_SCRIPT_ENV) ../configure --with-gtk=3 \ + $(filter-out --srcdir=%, $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_EXTRA_FLAGS)) \ + --enable-gtk-doc=no; \ + cd ..; + touch stamp-configure-gtk3 + +build/libdbusmenu-gtk3:: stamp-build-gtk3 +stamp-build-gtk3: stamp-configure-gtk3 + : # build for GTK+ 3.0 + $(MAKE) -C build-gtk3; + touch stamp-build-gtk3 + +binary-install/libdbusmenu:: binary-install/libdbusmenu-gtk2 stamp-build-gtk3 + : # install for GTK+ 3.0 + $(MAKE) -C build-gtk3 DESTDIR=$(CURDIR)/debian/tmp install + $(MAKE) -C build DESTDIR=$(CURDIR)/debian/tmp install + +binary-predeb/gir%:: + dh_girepository -p$(cdbs_curpkg) +clean:: + rm -f stamp-*-gtk3 + rm -rf build-gtk3 -- cgit v1.2.3 From 0d98749cbe9f405e4579adf0c30d534c277c2686 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Wed, 24 Nov 2010 14:07:15 -0500 Subject: * debian/rules - Added build targets to build with gtk3 enabled in additional to default build with gtk2 * debian/control - Updated build depends to support building with gtk+-3.0 - Added dh-autoreconf build depends - Added libdbusmenu-gtk3-2, libdbusmenu-gtk3-dev, gir1.0-dbusmenu-gtk3-0.2 binaries - build depend on libgdk-pixbuf2.0-dev >= 2.22.1-0ubuntu4, needed for GIR fixes * docs/libdbusmenu-gtk/reference/Makefile.am, libdbusmenu-glib/Makefile.am, libdbusmenu-gtk/Makefile.am - Fixes needed for building with-gtk=3 --- debian/changelog | 19 +++++++++++++++++-- debian/control | 10 ++++++---- debian/libdbusmenu-gtk3-2.install | 1 + debian/libdbusmenu-gtk3.install | 1 - debian/libdbusmenu-jsonloader1.install | 1 - debian/libdbusmenu-jsonloader2.install | 1 + debian/rules | 10 +++++----- docs/libdbusmenu-gtk/reference/Makefile.am | 11 +++++++++-- libdbusmenu-glib/Makefile.am | 11 ++++++++--- libdbusmenu-gtk/Makefile.am | 15 +++++++++++---- 10 files changed, 58 insertions(+), 22 deletions(-) create mode 100644 debian/libdbusmenu-gtk3-2.install delete mode 100644 debian/libdbusmenu-gtk3.install delete mode 100644 debian/libdbusmenu-jsonloader1.install create mode 100644 debian/libdbusmenu-jsonloader2.install (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 3fc5e60..857b8c6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,20 @@ -libdbusmenu (0.3.90-0ubuntu1~ppa1) maverick; urgency=low +libdbusmenu (0.3.90-0ubuntu1) UNRELEASED; urgency=low + * debian/rules + - Added build targets to build with gtk3 enabled in additional to + default build with gtk2 + * debian/control + - Updated build depends to support building with gtk+-3.0 + - Added dh-autoreconf build depends + - Added libdbusmenu-gtk3-2, libdbusmenu-gtk3-dev, gir1.0-dbusmenu-gtk3-0.2 + binaries + - build depend on libgdk-pixbuf2.0-dev >= 2.22.1-0ubuntu4, needed + for GIR fixes + * docs/libdbusmenu-gtk/reference/Makefile.am, libdbusmenu-glib/Makefile.am, + libdbusmenu-gtk/Makefile.am + - Fixes needed for building with-gtk=3 + + [ Ted Gould ] * New upstream release. * Breaking ABI and getting reserved back * Adding build support for GTK2/3 builds @@ -9,7 +24,7 @@ libdbusmenu (0.3.90-0ubuntu1~ppa1) maverick; urgency=low debian/libdbusmenu-gtk2.install: Switching package names to match .so bump. - -- Ted Gould Thu, 11 Nov 2010 11:34:00 -0600 + -- Ken VanDine Wed, 24 Nov 2010 12:05:39 -0500 libdbusmenu (0.3.16-0ubuntu1) maverick; urgency=low diff --git a/debian/control b/debian/control index bec5001..6a16de9 100644 --- a/debian/control +++ b/debian/control @@ -8,6 +8,7 @@ Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.41), libgtk2.0-dev (>= 2.23.2-0ubuntu2), libgtk3.0-dev (>= 2.91.4-0ubuntu1), + libgdk-pixbuf2.0-dev (>= 2.22.1-0ubuntu4), libdbus-glib-1-dev, gnome-doc-utils, gtk-doc-tools, @@ -22,6 +23,7 @@ Build-Depends: debhelper (>= 5.0), gir1.0-gtk-2.0, gir1.0-gtk-3.0, libx11-dev (>= 1.3), + dh-autoreconf, valac Standards-Version: 3.9.1 Homepage: https://launchpad.net/dbusmenu @@ -152,7 +154,7 @@ Description: library for passing menus over DBus - GTK+ version documentation . This package contains developer documentation for libdbusmenu-gtk. -Package: libdbusmenu-jsonloader1 +Package: libdbusmenu-jsonloader2 Section: libs Architecture: any Depends: ${shlibs:Depends}, @@ -181,7 +183,7 @@ Description: library for passing menus over DBus - Test lib development files This package contains files that are needed to build test suites in applications or libraries using dbusmenu. -Package: libdbusmenu-gtk3 +Package: libdbusmenu-gtk3-2 Section: libs Architecture: any Depends: ${shlibs:Depends}, @@ -198,7 +200,7 @@ Section: libdevel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libdbusmenu-gtk3 (= ${binary:Version}), + libdbusmenu-gtk3-2 (= ${binary:Version}), libdbus-glib-1-dev (>= 0.76), libgtk3.0-dev (>= 2.91.4-0ubuntu1), libdbusmenu-glib-dev @@ -213,7 +215,7 @@ Package: gir1.0-dbusmenu-gtk3-0.2 Section: libs Architecture: any Depends: ${misc:Depends}, - libdbusmenu-gtk3 (= ${binary:Version}), + libdbusmenu-gtk3-2 (= ${binary:Version}), gir1.0-dbusmenu-glib-0.2 (= ${binary:Version}), gir1.0-gtk-3.0 Description: typelib file for libdbusmenu-gtk2 diff --git a/debian/libdbusmenu-gtk3-2.install b/debian/libdbusmenu-gtk3-2.install new file mode 100644 index 0000000..af2e9a3 --- /dev/null +++ b/debian/libdbusmenu-gtk3-2.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libdbusmenu-gtk3.so.* diff --git a/debian/libdbusmenu-gtk3.install b/debian/libdbusmenu-gtk3.install deleted file mode 100644 index af2e9a3..0000000 --- a/debian/libdbusmenu-gtk3.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libdbusmenu-gtk3.so.* diff --git a/debian/libdbusmenu-jsonloader1.install b/debian/libdbusmenu-jsonloader1.install deleted file mode 100644 index bff47f5..0000000 --- a/debian/libdbusmenu-jsonloader1.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libdbusmenu-jsonloader.so.* diff --git a/debian/libdbusmenu-jsonloader2.install b/debian/libdbusmenu-jsonloader2.install new file mode 100644 index 0000000..bff47f5 --- /dev/null +++ b/debian/libdbusmenu-jsonloader2.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libdbusmenu-jsonloader.so.* diff --git a/debian/rules b/debian/rules index 7a88781..cd1d01f 100755 --- a/debian/rules +++ b/debian/rules @@ -2,6 +2,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/cdbs/1/rules/autoreconf.mk DEB_SRCDIR = . DEB_BUILDDIR = $(DEB_SRCDIR)/build @@ -10,10 +11,10 @@ DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc --enable-in LDFLAGS += -Wl,-z,defs -Wl,--as-needed DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk2 += -V 'libdbusmenu-gtk2 (>= 0.3.90)' -DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk3 += -V 'libdbusmenu-gtk3 (>= 0.3.90)' +DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk3-2 += -V 'libdbusmenu-gtk3-2 (>= 0.3.90)' DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-glib2 += -V 'libdbusmenu-glib2 (>= 0.3.90)' -configure/libdbusmenu-gtk3:: stamp-configure-gtk3 +configure/libdbusmenu-gtk3-2:: stamp-configure-gtk3 stamp-configure-gtk3: : # configure for GTK+ 3.0 set -e; \ @@ -26,16 +27,15 @@ stamp-configure-gtk3: cd ..; touch stamp-configure-gtk3 -build/libdbusmenu-gtk3:: stamp-build-gtk3 +build/libdbusmenu-gtk3-2:: stamp-build-gtk3 stamp-build-gtk3: stamp-configure-gtk3 : # build for GTK+ 3.0 $(MAKE) -C build-gtk3; touch stamp-build-gtk3 -binary-install/libdbusmenu:: binary-install/libdbusmenu-gtk2 stamp-build-gtk3 +common-install-prehook-arch:: stamp-build-gtk3 : # install for GTK+ 3.0 $(MAKE) -C build-gtk3 DESTDIR=$(CURDIR)/debian/tmp install - $(MAKE) -C build DESTDIR=$(CURDIR)/debian/tmp install binary-predeb/gir%:: dh_girepository -p$(cdbs_curpkg) diff --git a/docs/libdbusmenu-gtk/reference/Makefile.am b/docs/libdbusmenu-gtk/reference/Makefile.am index ec1bd28..6e44a23 100644 --- a/docs/libdbusmenu-gtk/reference/Makefile.am +++ b/docs/libdbusmenu-gtk/reference/Makefile.am @@ -1,5 +1,12 @@ + ## Process this file with automake to produce Makefile.in +if USE_GTK3 +VER=3 +else +VER= +endif + # We require automake 1.6 at least. AUTOMAKE_OPTIONS = 1.6 @@ -9,7 +16,7 @@ AUTOMAKE_OPTIONS = 1.6 # of using the various options. # The name of the module, e.g. 'glib'. -DOC_MODULE=libdbusmenu-gtk +DOC_MODULE=libdbusmenu-gtk$(VER) # The top-level SGML file. You can change this if you want to. DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml @@ -68,7 +75,7 @@ expand_content_files= # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) INCLUDES=-I$(top_srcdir) $(DBUSMENUGLIB_CFLAGS) $(DBUSMENUGTK_CFLAGS) -GTKDOC_LIBS=$(top_builddir)/libdbusmenu-gtk/libdbusmenu-gtk.la +GTKDOC_LIBS=$(top_builddir)/libdbusmenu-gtk/libdbusmenu-gtk$(VER).la $(DBUSMENUGLIB_LIBS) $(DBUSMENUGTK_LIBS) # This includes the standard gtk-doc make rules, copied by gtkdocize. include $(top_srcdir)/gtk-doc.local.make diff --git a/libdbusmenu-glib/Makefile.am b/libdbusmenu-glib/Makefile.am index 0a6513f..adf4607 100644 --- a/libdbusmenu-glib/Makefile.am +++ b/libdbusmenu-glib/Makefile.am @@ -114,9 +114,12 @@ menuitem-marshal.c: $(srcdir)/menuitem-marshal.list -include $(INTROSPECTION_MAKEFILE) INTROSPECTION_GIRS = -INTROSPECTION_SCANNER_ARGS = \ - --add-include-path=$(srcdir) \ - $(addprefix --c-include=libdbusmenu-glib/, $(introspection_sources)) +INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) \ + --add-include-path=$(srcdir) \ + $(addprefix --c-include=libdbusmenu-glib/, $(introspection_sources)) \ + --symbol-prefix=dbusmenu \ + --identifier-prefix=Dbusmenu + INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir) if HAVE_INTROSPECTION @@ -131,6 +134,8 @@ Dbusmenu_Glib_0_2_gir_LIBS = libdbusmenu-glib.la Dbusmenu_Glib_0_2_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources)) Dbusmenu_Glib_0_2_gir_NAMESPACE = Dbusmenu Dbusmenu_Glib_0_2_gir_VERSION = Glib-0.2 +Dbusmenu_Glib_0_2_gir_PACKAGES = dbusmenu-glib +Dbusmenu_Glib_0_2_gir_SCANNER_FLAGS = $(INTROSPECTION_SCANNER_ARGS) INTROSPECTION_GIRS += Dbusmenu-Glib-0.2.gir diff --git a/libdbusmenu-gtk/Makefile.am b/libdbusmenu-gtk/Makefile.am index b30cac9..e539aa6 100644 --- a/libdbusmenu-gtk/Makefile.am +++ b/libdbusmenu-gtk/Makefile.am @@ -66,10 +66,11 @@ pkgconfigdir = $(libdir)/pkgconfig -include $(INTROSPECTION_MAKEFILE) INTROSPECTION_GIRS = -INTROSPECTION_SCANNER_ARGS = \ - --add-include-path=$(srcdir) \ +INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) \ --add-include-path=$(top_builddir)/libdbusmenu-glib \ - $(addprefix --c-include=libdbusmenu-gtk/, $(introspection_sources)) + $(addprefix --c-include=libdbusmenu-gtk/, $(introspection_sources)) \ + --symbol-prefix=dbusmenu \ + --identifier-prefix=DbusmenuGtk INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir) --includedir=$(top_builddir)/libdbusmenu-glib if HAVE_INTROSPECTION @@ -80,16 +81,22 @@ DbusmenuGtk$(VER)-0.2.gir: libdbusmenu-gtk$(VER).la DbusmenuGtk_0_2_gir_INCLUDES = \ GObject-2.0 \ $(GTKGIR) \ - Dbusmenu-Glib-0.2 + Dbusmenu-Glib-0.2 DbusmenuGtk_0_2_gir_CFLAGS = $(DBUSMENUGTK_CFLAGS) -I$(top_srcdir) DbusmenuGtk_0_2_gir_LIBS = libdbusmenu-gtk$(VER).la DbusmenuGtk_0_2_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources)) +DbusmenuGtk_0_2_gir_NAMESPACE = DbusmenuGtk$(VER) +DbusmenuGtk_0_2_gir_SCANNERFLAGS = $(INTROSPECTION_SCANNER_ARGS) +DbusmenuGtk_0_2_gir_PACKAGES = dbusmenu-gtk$(VER) # We duplicate these for the same reason as libdbusmenu_gtk3includedir above DbusmenuGtk3_0_2_gir_INCLUDES = $(DbusmenuGtk_0_2_gir_INCLUDES) DbusmenuGtk3_0_2_gir_CFLAGS = $(DbusmenuGtk_0_2_gir_CFLAGS) DbusmenuGtk3_0_2_gir_LIBS = $(DbusmenuGtk_0_2_gir_LIBS) DbusmenuGtk3_0_2_gir_FILES = $(DbusmenuGtk_0_2_gir_FILES) +DbusmenuGtk3_0_2_gir_NAMESPACE = $(DbusmenuGtk_0_2_gir_NAMESPACE) +DbusmenuGtk3_0_2_gir_SCANNERFLAGS = $(DbusmenuGtk_0_2_gir_SCANNERFLAGS) +DbusmenuGtk3_0_2_gir_PACKAGES = $(DbusmenuGtk_0_2_gir_PACKAGES) INTROSPECTION_GIRS += DbusmenuGtk$(VER)-0.2.gir -- cgit v1.2.3 From de669471f0df99a6ea165d3e13b50410f7aaa500 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Wed, 1 Dec 2010 15:17:32 -0500 Subject: - Removed build depends for gir-repository-dev (LP: #677382) - Use gir:Depends --- debian/changelog | 2 ++ debian/control | 11 ++++------- 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 857b8c6..5b24f81 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ libdbusmenu (0.3.90-0ubuntu1) UNRELEASED; urgency=low binaries - build depend on libgdk-pixbuf2.0-dev >= 2.22.1-0ubuntu4, needed for GIR fixes + - Removed build depends for gir-repository-dev (LP: #677382) + - Use gir:Depends * docs/libdbusmenu-gtk/reference/Makefile.am, libdbusmenu-glib/Makefile.am, libdbusmenu-gtk/Makefile.am - Fixes needed for building with-gtk=3 diff --git a/debian/control b/debian/control index 6a16de9..bef3fd0 100644 --- a/debian/control +++ b/debian/control @@ -17,14 +17,13 @@ Build-Depends: debhelper (>= 5.0), libxml2-dev, libjson-glib-dev, gobject-introspection, - gir-repository-dev, libgirepository1.0-dev (>= 0.9.3), gir1.0-glib-2.0, gir1.0-gtk-2.0, gir1.0-gtk-3.0, libx11-dev (>= 1.3), dh-autoreconf, - valac + valac-0.12 Standards-Version: 3.9.1 Homepage: https://launchpad.net/dbusmenu Vcs-Bzr: https://code.launchpad.net/~dbusmenu-team/dbusmenu/ubuntu @@ -108,7 +107,7 @@ Section: libs Architecture: any Depends: ${misc:Depends}, libdbusmenu-glib2 (= ${binary:Version}), - gir1.0-glib-2.0 + ${gir:Depends} Description: typelib file for libdbusmenu-glib2 libdbusmenu passes a menu structure across DBus so that a program can create a menu simply without worrying about how it is displayed on the @@ -122,8 +121,7 @@ Section: libs Architecture: any Depends: ${misc:Depends}, libdbusmenu-gtk2 (= ${binary:Version}), - gir1.0-dbusmenu-glib-0.2 (= ${binary:Version}), - gir1.0-gtk-2.0 + ${gir:Depends} Description: typelib file for libdbusmenu-gtk2 libdbusmenu passes a menu structure across DBus so that a program can create a menu simply without worrying about how it is displayed on the @@ -216,8 +214,7 @@ Section: libs Architecture: any Depends: ${misc:Depends}, libdbusmenu-gtk3-2 (= ${binary:Version}), - gir1.0-dbusmenu-glib-0.2 (= ${binary:Version}), - gir1.0-gtk-3.0 + ${gir:Depends} Description: typelib file for libdbusmenu-gtk2 libdbusmenu passes a menu structure across DBus so that a program can create a menu simply without worrying about how it is displayed on the -- cgit v1.2.3 From 38c611a94f1bf07f33e5e9470c06812bce32088f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 9 Dec 2010 16:54:26 -0600 Subject: debian/control: Bumping ABI version in package names --- debian/changelog | 3 ++- debian/control | 32 ++++++++++++++++---------------- debian/libdbusmenu-glib2.install | 1 - debian/libdbusmenu-glib3.install | 1 + debian/libdbusmenu-gtk2.install | 1 - debian/libdbusmenu-gtk3-2.install | 1 - debian/libdbusmenu-gtk3-3.install | 1 + debian/libdbusmenu-gtk3.install | 1 + 8 files changed, 21 insertions(+), 20 deletions(-) delete mode 100644 debian/libdbusmenu-glib2.install create mode 100644 debian/libdbusmenu-glib3.install delete mode 100644 debian/libdbusmenu-gtk2.install delete mode 100644 debian/libdbusmenu-gtk3-2.install create mode 100644 debian/libdbusmenu-gtk3-3.install create mode 100644 debian/libdbusmenu-gtk3.install (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 3edcafd..9079b54 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,9 @@ libdbusmenu (0.3.90-0ubuntu2~ppa2) UNRELEASED; urgency=low * Upstream Merge * Fixing check items * Bumping the library ABI version + * debian/control: Bumping ABI version in package names - -- Ted Gould Thu, 09 Dec 2010 16:50:31 -0600 + -- Ted Gould Thu, 09 Dec 2010 16:54:05 -0600 libdbusmenu (0.3.90-0ubuntu2~ppa1) natty; urgency=low diff --git a/debian/control b/debian/control index bef3fd0..b8f965c 100644 --- a/debian/control +++ b/debian/control @@ -29,7 +29,7 @@ Homepage: https://launchpad.net/dbusmenu Vcs-Bzr: https://code.launchpad.net/~dbusmenu-team/dbusmenu/ubuntu Vcs-Browser: http://bazaar.launchpad.net/~dbusmenu-team/dbusmenu/ubuntu -Package: libdbusmenu-glib2 +Package: libdbusmenu-glib3 Section: libs Architecture: any Depends: ${shlibs:Depends}, @@ -49,7 +49,7 @@ Section: libdevel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libdbusmenu-glib2 (= ${binary:Version}), + libdbusmenu-glib3 (= ${binary:Version}), libdbus-glib-1-dev (>= 0.76), libgtk2.0-dev (>= 2.12.0) Description: library for passing menus over DBus - development files @@ -59,7 +59,7 @@ Description: library for passing menus over DBus - development files . This package contains files that are needed to build applications. -Package: libdbusmenu-gtk2 +Package: libdbusmenu-gtk3 Section: libs Architecture: any Depends: ${shlibs:Depends}, @@ -76,7 +76,7 @@ Section: libdevel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libdbusmenu-gtk2 (= ${binary:Version}), + libdbusmenu-gtk3 (= ${binary:Version}), libdbus-glib-1-dev (>= 0.76), libgtk2.0-dev (>= 2.12.0), libdbusmenu-glib-dev @@ -93,7 +93,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, python, - libdbusmenu-glib2 (= ${binary:Version}) + libdbusmenu-glib3 (= ${binary:Version}) Description: tools useful during development with libdbusmenu libdbusmenu passes a menu structure across DBus so that a program can create a menu simply without worrying about how it is displayed on the @@ -106,29 +106,29 @@ Package: gir1.0-dbusmenu-glib-0.2 Section: libs Architecture: any Depends: ${misc:Depends}, - libdbusmenu-glib2 (= ${binary:Version}), + libdbusmenu-glib3 (= ${binary:Version}), ${gir:Depends} -Description: typelib file for libdbusmenu-glib2 +Description: typelib file for libdbusmenu-glib3 libdbusmenu passes a menu structure across DBus so that a program can create a menu simply without worrying about how it is displayed on the other side of the bus. . This package can be used by other packages using the GIRepository format to - generate dynamic bindings for libdbusmenu-glib2. + generate dynamic bindings for libdbusmenu-glib3. Package: gir1.0-dbusmenu-gtk-0.2 Section: libs Architecture: any Depends: ${misc:Depends}, - libdbusmenu-gtk2 (= ${binary:Version}), + libdbusmenu-gtk3 (= ${binary:Version}), ${gir:Depends} -Description: typelib file for libdbusmenu-gtk2 +Description: typelib file for libdbusmenu-gtk3 libdbusmenu passes a menu structure across DBus so that a program can create a menu simply without worrying about how it is displayed on the other side of the bus. . This package can be used by other packages using the GIRepository format to - generate dynamic bindings for libdbusmenu-gtk2. + generate dynamic bindings for libdbusmenu-gtk3. Package: libdbusmenu-glib-doc Section: doc @@ -181,7 +181,7 @@ Description: library for passing menus over DBus - Test lib development files This package contains files that are needed to build test suites in applications or libraries using dbusmenu. -Package: libdbusmenu-gtk3-2 +Package: libdbusmenu-gtk3-3 Section: libs Architecture: any Depends: ${shlibs:Depends}, @@ -198,7 +198,7 @@ Section: libdevel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libdbusmenu-gtk3-2 (= ${binary:Version}), + libdbusmenu-gtk3-3 (= ${binary:Version}), libdbus-glib-1-dev (>= 0.76), libgtk3.0-dev (>= 2.91.4-0ubuntu1), libdbusmenu-glib-dev @@ -213,13 +213,13 @@ Package: gir1.0-dbusmenu-gtk3-0.2 Section: libs Architecture: any Depends: ${misc:Depends}, - libdbusmenu-gtk3-2 (= ${binary:Version}), + libdbusmenu-gtk3-3 (= ${binary:Version}), ${gir:Depends} -Description: typelib file for libdbusmenu-gtk2 +Description: typelib file for libdbusmenu-gtk3-3 libdbusmenu passes a menu structure across DBus so that a program can create a menu simply without worrying about how it is displayed on the other side of the bus. . This package can be used by other packages using the GIRepository format to - generate dynamic bindings for libdbusmenu-gtk2. + generate dynamic bindings for libdbusmenu-gtk3. diff --git a/debian/libdbusmenu-glib2.install b/debian/libdbusmenu-glib2.install deleted file mode 100644 index acdbacf..0000000 --- a/debian/libdbusmenu-glib2.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libdbusmenu-glib.so.* diff --git a/debian/libdbusmenu-glib3.install b/debian/libdbusmenu-glib3.install new file mode 100644 index 0000000..acdbacf --- /dev/null +++ b/debian/libdbusmenu-glib3.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libdbusmenu-glib.so.* diff --git a/debian/libdbusmenu-gtk2.install b/debian/libdbusmenu-gtk2.install deleted file mode 100644 index d677935..0000000 --- a/debian/libdbusmenu-gtk2.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libdbusmenu-gtk.so.* diff --git a/debian/libdbusmenu-gtk3-2.install b/debian/libdbusmenu-gtk3-2.install deleted file mode 100644 index af2e9a3..0000000 --- a/debian/libdbusmenu-gtk3-2.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libdbusmenu-gtk3.so.* diff --git a/debian/libdbusmenu-gtk3-3.install b/debian/libdbusmenu-gtk3-3.install new file mode 100644 index 0000000..af2e9a3 --- /dev/null +++ b/debian/libdbusmenu-gtk3-3.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libdbusmenu-gtk3.so.* diff --git a/debian/libdbusmenu-gtk3.install b/debian/libdbusmenu-gtk3.install new file mode 100644 index 0000000..d677935 --- /dev/null +++ b/debian/libdbusmenu-gtk3.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libdbusmenu-gtk.so.* -- cgit v1.2.3 From 8b80249372e0050fd6daf2ad73b4abd94feda477 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 9 Dec 2010 16:58:17 -0600 Subject: debian/control: Forgot jsonloader --- debian/changelog | 6 ++++++ debian/control | 2 +- debian/libdbusmenu-jsonloader2.install | 1 - debian/libdbusmenu-jsonloader3.install | 1 + 4 files changed, 8 insertions(+), 2 deletions(-) delete mode 100644 debian/libdbusmenu-jsonloader2.install create mode 100644 debian/libdbusmenu-jsonloader3.install (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 14669d8..318a782 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libdbusmenu (0.3.90-0ubuntu2~ppa3) UNRELEASED; urgency=low + + * debian/control: Forgot jsonloader + + -- Ted Gould Thu, 09 Dec 2010 16:58:02 -0600 + libdbusmenu (0.3.90-0ubuntu2~ppa2) natty; urgency=low * Upstream Merge diff --git a/debian/control b/debian/control index b8f965c..084f794 100644 --- a/debian/control +++ b/debian/control @@ -152,7 +152,7 @@ Description: library for passing menus over DBus - GTK+ version documentation . This package contains developer documentation for libdbusmenu-gtk. -Package: libdbusmenu-jsonloader2 +Package: libdbusmenu-jsonloader3 Section: libs Architecture: any Depends: ${shlibs:Depends}, diff --git a/debian/libdbusmenu-jsonloader2.install b/debian/libdbusmenu-jsonloader2.install deleted file mode 100644 index bff47f5..0000000 --- a/debian/libdbusmenu-jsonloader2.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libdbusmenu-jsonloader.so.* diff --git a/debian/libdbusmenu-jsonloader3.install b/debian/libdbusmenu-jsonloader3.install new file mode 100644 index 0000000..bff47f5 --- /dev/null +++ b/debian/libdbusmenu-jsonloader3.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libdbusmenu-jsonloader.so.* -- cgit v1.2.3 From 6cc24ff51aab2888b854fb61d2c5b12d89b77f29 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 16 Dec 2010 10:10:58 -0500 Subject: releasing version 0.3.90-0ubuntu3 --- debian/changelog | 6 ++++++ debian/control | 18 ++++++++++++------ debian/gir1.0-dbusmenu-glib-0.2.install | 1 - debian/gir1.0-dbusmenu-gtk-0.2.install | 1 - debian/gir1.0-dbusmenu-gtk3-0.2.install | 1 - debian/gir1.2-dbusmenu-glib-0.2.install | 1 + debian/gir1.2-dbusmenu-gtk-0.2.install | 1 + debian/gir1.2-dbusmenu-gtk3-0.2.install | 1 + 8 files changed, 21 insertions(+), 9 deletions(-) delete mode 100644 debian/gir1.0-dbusmenu-glib-0.2.install delete mode 100644 debian/gir1.0-dbusmenu-gtk-0.2.install delete mode 100644 debian/gir1.0-dbusmenu-gtk3-0.2.install create mode 100644 debian/gir1.2-dbusmenu-glib-0.2.install create mode 100644 debian/gir1.2-dbusmenu-gtk-0.2.install create mode 100644 debian/gir1.2-dbusmenu-gtk3-0.2.install (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index ee204ca..86e7dfb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libdbusmenu (0.3.90-0ubuntu3) natty; urgency=low + + * Updated for the gir abi transition + + -- Ken VanDine Thu, 16 Dec 2010 10:06:26 -0500 + libdbusmenu (0.3.90-0ubuntu2) natty; urgency=low * libdbusmenu-gtk/genericmenuitem.c diff --git a/debian/control b/debian/control index bef3fd0..e63b108 100644 --- a/debian/control +++ b/debian/control @@ -18,9 +18,9 @@ Build-Depends: debhelper (>= 5.0), libjson-glib-dev, gobject-introspection, libgirepository1.0-dev (>= 0.9.3), - gir1.0-glib-2.0, - gir1.0-gtk-2.0, - gir1.0-gtk-3.0, + gir1.2-glib-2.0, + gir1.2-gtk-2.0, + gir1.2-gtk-3.0, libx11-dev (>= 1.3), dh-autoreconf, valac-0.12 @@ -102,7 +102,9 @@ Description: tools useful during development with libdbusmenu This package contains tools that are useful when developing and building applications with libdbusmenu. -Package: gir1.0-dbusmenu-glib-0.2 +Package: gir1.2-dbusmenu-glib-0.2 +Conflicts: gir1.0-dbusmenu-glib-0.2 +Replaces: gir1.0-dbusmenu-glib-0.2 Section: libs Architecture: any Depends: ${misc:Depends}, @@ -116,7 +118,9 @@ Description: typelib file for libdbusmenu-glib2 This package can be used by other packages using the GIRepository format to generate dynamic bindings for libdbusmenu-glib2. -Package: gir1.0-dbusmenu-gtk-0.2 +Package: gir1.2-dbusmenu-gtk-0.2 +Conflicts: gir1.0-dbusmenu-gtk-0.2 +Replaces: gir1.0-dbusmenu-gtk-0.2 Section: libs Architecture: any Depends: ${misc:Depends}, @@ -209,7 +213,9 @@ Description: library for passing menus over DBus - GTK+ version developement fil . This package contains files that are needed to build GTK+ applications. -Package: gir1.0-dbusmenu-gtk3-0.2 +Package: gir1.2-dbusmenu-gtk3-0.2 +Conflicts: gir1.0-dbusmenu-gtk3-0.2 +Replaces: gir1.0-dbusmenu-gtk3-0.2 Section: libs Architecture: any Depends: ${misc:Depends}, diff --git a/debian/gir1.0-dbusmenu-glib-0.2.install b/debian/gir1.0-dbusmenu-glib-0.2.install deleted file mode 100644 index 86f7711..0000000 --- a/debian/gir1.0-dbusmenu-glib-0.2.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/girepository-1.0/Dbusmenu-Glib-0.2.typelib diff --git a/debian/gir1.0-dbusmenu-gtk-0.2.install b/debian/gir1.0-dbusmenu-gtk-0.2.install deleted file mode 100644 index 829a344..0000000 --- a/debian/gir1.0-dbusmenu-gtk-0.2.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/girepository-1.0/DbusmenuGtk-0.2.typelib diff --git a/debian/gir1.0-dbusmenu-gtk3-0.2.install b/debian/gir1.0-dbusmenu-gtk3-0.2.install deleted file mode 100644 index 2da3933..0000000 --- a/debian/gir1.0-dbusmenu-gtk3-0.2.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/girepository-1.0/DbusmenuGtk3-0.2.typelib diff --git a/debian/gir1.2-dbusmenu-glib-0.2.install b/debian/gir1.2-dbusmenu-glib-0.2.install new file mode 100644 index 0000000..86f7711 --- /dev/null +++ b/debian/gir1.2-dbusmenu-glib-0.2.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/girepository-1.0/Dbusmenu-Glib-0.2.typelib diff --git a/debian/gir1.2-dbusmenu-gtk-0.2.install b/debian/gir1.2-dbusmenu-gtk-0.2.install new file mode 100644 index 0000000..829a344 --- /dev/null +++ b/debian/gir1.2-dbusmenu-gtk-0.2.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/girepository-1.0/DbusmenuGtk-0.2.typelib diff --git a/debian/gir1.2-dbusmenu-gtk3-0.2.install b/debian/gir1.2-dbusmenu-gtk3-0.2.install new file mode 100644 index 0000000..2da3933 --- /dev/null +++ b/debian/gir1.2-dbusmenu-gtk3-0.2.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/girepository-1.0/DbusmenuGtk3-0.2.typelib -- cgit v1.2.3 From 1f9dddfbc341fc73cce1854c5d3ca949f346e1ef Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 5 Jan 2011 21:53:31 -0600 Subject: debian/control: Changing the GIR package names from "0.2" to "0.4" which now the names of the actual files. --- debian/changelog | 7 +++++++ debian/control | 12 +++--------- debian/gir1.2-dbusmenu-glib-0.2.install | 1 - debian/gir1.2-dbusmenu-glib-0.4.install | 1 + debian/gir1.2-dbusmenu-gtk-0.2.install | 1 - debian/gir1.2-dbusmenu-gtk-0.4.install | 1 + debian/gir1.2-dbusmenu-gtk3-0.2.install | 1 - debian/gir1.2-dbusmenu-gtk3-0.4.install | 1 + 8 files changed, 13 insertions(+), 12 deletions(-) delete mode 100644 debian/gir1.2-dbusmenu-glib-0.2.install create mode 100644 debian/gir1.2-dbusmenu-glib-0.4.install delete mode 100644 debian/gir1.2-dbusmenu-gtk-0.2.install create mode 100644 debian/gir1.2-dbusmenu-gtk-0.4.install delete mode 100644 debian/gir1.2-dbusmenu-gtk3-0.2.install create mode 100644 debian/gir1.2-dbusmenu-gtk3-0.4.install (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 2a8b0af..3a6d3ab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libdbusmenu (0.3.90-0ubuntu4~ppa1) UNRELEASED; urgency=low + + * debian/control: Changing the GIR package names from "0.2" to + "0.4" which now the names of the actual files. + + -- Ted Gould Wed, 05 Jan 2011 21:52:50 -0600 + libdbusmenu (0.3.90-0ubuntu3) natty; urgency=low * Updated for the gir abi transition diff --git a/debian/control b/debian/control index a93dc6a..5d96966 100644 --- a/debian/control +++ b/debian/control @@ -102,9 +102,7 @@ Description: tools useful during development with libdbusmenu This package contains tools that are useful when developing and building applications with libdbusmenu. -Package: gir1.2-dbusmenu-glib-0.2 -Conflicts: gir1.0-dbusmenu-glib-0.2 -Replaces: gir1.0-dbusmenu-glib-0.2 +Package: gir1.2-dbusmenu-glib-0.4 Section: libs Architecture: any Depends: ${misc:Depends}, @@ -118,9 +116,7 @@ Description: typelib file for libdbusmenu-glib3 This package can be used by other packages using the GIRepository format to generate dynamic bindings for libdbusmenu-glib3. -Package: gir1.2-dbusmenu-gtk-0.2 -Conflicts: gir1.0-dbusmenu-gtk-0.2 -Replaces: gir1.0-dbusmenu-gtk-0.2 +Package: gir1.2-dbusmenu-gtk-0.4 Section: libs Architecture: any Depends: ${misc:Depends}, @@ -213,9 +209,7 @@ Description: library for passing menus over DBus - GTK+ version developement fil . This package contains files that are needed to build GTK+ applications. -Package: gir1.2-dbusmenu-gtk3-0.2 -Conflicts: gir1.0-dbusmenu-gtk3-0.2 -Replaces: gir1.0-dbusmenu-gtk3-0.2 +Package: gir1.2-dbusmenu-gtk3-0.4 Section: libs Architecture: any Depends: ${misc:Depends}, diff --git a/debian/gir1.2-dbusmenu-glib-0.2.install b/debian/gir1.2-dbusmenu-glib-0.2.install deleted file mode 100644 index bca065f..0000000 --- a/debian/gir1.2-dbusmenu-glib-0.2.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/girepository-1.0/Dbusmenu-Glib-0.4.typelib diff --git a/debian/gir1.2-dbusmenu-glib-0.4.install b/debian/gir1.2-dbusmenu-glib-0.4.install new file mode 100644 index 0000000..bca065f --- /dev/null +++ b/debian/gir1.2-dbusmenu-glib-0.4.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/girepository-1.0/Dbusmenu-Glib-0.4.typelib diff --git a/debian/gir1.2-dbusmenu-gtk-0.2.install b/debian/gir1.2-dbusmenu-gtk-0.2.install deleted file mode 100644 index 16bad97..0000000 --- a/debian/gir1.2-dbusmenu-gtk-0.2.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/girepository-1.0/DbusmenuGtk-0.4.typelib diff --git a/debian/gir1.2-dbusmenu-gtk-0.4.install b/debian/gir1.2-dbusmenu-gtk-0.4.install new file mode 100644 index 0000000..16bad97 --- /dev/null +++ b/debian/gir1.2-dbusmenu-gtk-0.4.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/girepository-1.0/DbusmenuGtk-0.4.typelib diff --git a/debian/gir1.2-dbusmenu-gtk3-0.2.install b/debian/gir1.2-dbusmenu-gtk3-0.2.install deleted file mode 100644 index abf6fab..0000000 --- a/debian/gir1.2-dbusmenu-gtk3-0.2.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/girepository-1.0/DbusmenuGtk3-0.4.typelib diff --git a/debian/gir1.2-dbusmenu-gtk3-0.4.install b/debian/gir1.2-dbusmenu-gtk3-0.4.install new file mode 100644 index 0000000..abf6fab --- /dev/null +++ b/debian/gir1.2-dbusmenu-gtk3-0.4.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/girepository-1.0/DbusmenuGtk3-0.4.typelib -- cgit v1.2.3 From 2bfb5ca0d47f56df86bb96c768e5952316cccb00 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 17 Feb 2011 11:06:37 -0600 Subject: debian/control: Removing libxml2 Build-Dep --- debian/changelog | 3 ++- debian/control | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 80d143e..09cef34 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,8 +6,9 @@ libdbusmenu (0.3.98-0ubuntu1~ppa1) UNRELEASED; urgency=low ∘ Removing XML from the GetLayout function ∘ Clean up icon handling in the parser (LP: #715864) ∘ Fixing signatures on dbusmenu-dumper + * debian/control: Removing libxml2 Build-Dep - -- Ted Gould Thu, 17 Feb 2011 11:05:30 -0600 + -- Ted Gould Thu, 17 Feb 2011 11:06:22 -0600 libdbusmenu (0.3.97-0ubuntu1) natty; urgency=low diff --git a/debian/control b/debian/control index 90af90f..3b01816 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,6 @@ Build-Depends: debhelper (>= 5.0), gtk-doc-tools, libtool, intltool, - libxml2-dev, libjson-glib-dev, gobject-introspection, libgirepository1.0-dev (>= 0.9.3), -- cgit v1.2.3 From 29af5b7724fa9ec4eda16a96a9d65bbf73905d57 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 22 Feb 2011 16:17:07 +1100 Subject: * debian/control: - Use new libgtk-3-dev build-depends --- debian/changelog | 7 +++++++ debian/control | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 7f11a77..948aeca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libdbusmenu (0.3.98-0ubuntu2) natty; urgency=low + + * debian/control: + - Use new libgtk-3-dev build-depends + + -- Robert Ancell Tue, 22 Feb 2011 16:16:44 +1100 + libdbusmenu (0.3.98-0ubuntu1~ppa1) natty; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index 3b01816..0703fed 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Uploaders: Evgeni Golov Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.41), libgtk2.0-dev (>= 2.23.2-0ubuntu2), - libgtk3.0-dev (>= 2.99.2-1ubuntu2), + libgtk-3-dev (>= 2.99.2-1ubuntu2), libgdk-pixbuf2.0-dev (>= 2.22.1-0ubuntu4), libdbus-glib-1-dev, gnome-doc-utils, @@ -199,7 +199,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, libdbusmenu-gtk3-3 (= ${binary:Version}), libdbus-glib-1-dev (>= 0.76), - libgtk3.0-dev (>= 2.91.4-0ubuntu1), + libgtk-3-dev (>= 2.91.4-0ubuntu1), libdbusmenu-glib-dev Description: library for passing menus over DBus - GTK+ version developement files libdbusmenu passes a menu structure across DBus so that a program can -- cgit v1.2.3 From 5788fe09fa3a433ac617690c5ed27abf591f608d Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Tue, 1 Mar 2011 12:09:57 -0500 Subject: releasing version 0.3.99-0ubuntu3 --- debian/changelog | 17 ++++++++ debian/control | 1 + debian/patches/disconnect-more-signals.patch | 18 ++++++++ debian/patches/fix-defaults-in-client.patch | 65 ++++++++++++++++++++++++++++ debian/patches/series | 2 + debian/rules | 1 + 6 files changed, 104 insertions(+) create mode 100644 debian/patches/disconnect-more-signals.patch create mode 100644 debian/patches/fix-defaults-in-client.patch create mode 100644 debian/patches/series (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 132e39d..74b174e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,20 @@ +libdbusmenu (0.3.99-0ubuntu3) natty; urgency=low + + * Fix LP: #723873 - ensure that changing a menuitem property to a default + value gets propagated properly in the client + - add debian/patches/fix-defaults-in-client.patch + - update debian/patches/series + + -- Chris Coulson Tue, 01 Mar 2011 00:47:24 +0000 + +libdbusmenu (0.3.99-0ubuntu2) natty; urgency=low + + * debian/patches/disconnect-more-signals.patch: + - Fix some crashes by disconnecting more signals when a menuitem is + deleted. LP: #725980 and LP: #726153 + + -- Michael Terry Mon, 28 Feb 2011 10:09:57 -0500 + libdbusmenu (0.3.99-0ubuntu1) natty; urgency=low [ Ted Gould ] diff --git a/debian/control b/debian/control index 0703fed..6d879d8 100644 --- a/debian/control +++ b/debian/control @@ -6,6 +6,7 @@ XSBC-Original-Maintainer: The Ayatana Packagers Build-Depends: debhelper (>= 5.0), cdbs (>= 0.4.41), + quilt, libgtk2.0-dev (>= 2.23.2-0ubuntu2), libgtk-3-dev (>= 2.99.2-1ubuntu2), libgdk-pixbuf2.0-dev (>= 2.22.1-0ubuntu4), diff --git a/debian/patches/disconnect-more-signals.patch b/debian/patches/disconnect-more-signals.patch new file mode 100644 index 0000000..653d32c --- /dev/null +++ b/debian/patches/disconnect-more-signals.patch @@ -0,0 +1,18 @@ +=== modified file 'libdbusmenu-gtk/parser.c' +Index: libdbusmenu-0.3.99/libdbusmenu-gtk/parser.c +=================================================================== +--- libdbusmenu-0.3.99.orig/libdbusmenu-gtk/parser.c 2011-02-28 10:09:40.907065942 -0500 ++++ libdbusmenu-0.3.99/libdbusmenu-gtk/parser.c 2011-02-28 10:09:43.037065942 -0500 +@@ -129,6 +129,12 @@ + if (pdata != NULL && pdata->widget != NULL) { + g_signal_handlers_disconnect_matched(pdata->widget, (GSignalMatchType)G_SIGNAL_MATCH_FUNC, + 0, 0, NULL, G_CALLBACK(widget_notify_cb), NULL); ++ g_signal_handlers_disconnect_matched(pdata->widget, (GSignalMatchType)G_SIGNAL_MATCH_FUNC, ++ 0, 0, NULL, G_CALLBACK(accel_changed), NULL); ++ g_signal_handlers_disconnect_matched(pdata->widget, (GSignalMatchType)G_SIGNAL_MATCH_FUNC, ++ 0, 0, NULL, G_CALLBACK(checkbox_toggled), NULL); ++ g_signal_handlers_disconnect_matched(pdata->widget, (GSignalMatchType)G_SIGNAL_MATCH_FUNC, ++ 0, 0, NULL, G_CALLBACK(menuitem_notify_cb), NULL); + g_object_remove_weak_pointer(G_OBJECT(pdata->widget), (gpointer*)&pdata->widget); + } + diff --git a/debian/patches/fix-defaults-in-client.patch b/debian/patches/fix-defaults-in-client.patch new file mode 100644 index 0000000..a299b32 --- /dev/null +++ b/debian/patches/fix-defaults-in-client.patch @@ -0,0 +1,65 @@ +=== modified file 'libdbusmenu-glib/menuitem.c' +Index: libdbusmenu-0.3.99/libdbusmenu-glib/menuitem.c +=================================================================== +--- libdbusmenu-0.3.99.orig/libdbusmenu-glib/menuitem.c 2011-02-25 03:30:16 +0000 ++++ libdbusmenu-0.3.99/libdbusmenu-glib/menuitem.c 2011-02-28 22:51:34 +0000 +@@ -1150,9 +1150,9 @@ + DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi); + GVariant * default_value = NULL; + ++ const gchar * type = menuitem_get_type(mi); ++ + if (value != NULL) { +- const gchar * type = menuitem_get_type(mi); +- + /* Check the expected type to see if we want to have a warning */ + GVariantType * default_type = dbusmenu_defaults_default_get_type(priv->defaults, type, property); + if (default_type != NULL) { +@@ -1163,22 +1163,23 @@ + g_warning("Setting menuitem property '%s' with value of type '%s' when expecting '%s'", property, g_variant_get_type_string(value), g_variant_type_peek_string(default_type)); + } + } ++ } + +- /* Check the defaults database to see if we have a default +- for this property. */ +- default_value = dbusmenu_defaults_default_get(priv->defaults, type, property); +- if (default_value != NULL) { +- /* Now see if we're setting this to the same value as the +- default. If we are then we just want to swallow this variant +- and make the function behave like we're clearing it. */ +- if (g_variant_equal(default_value, value)) { +- g_variant_ref_sink(value); +- g_variant_unref(value); +- value = NULL; +- } ++ /* Check the defaults database to see if we have a default ++ for this property. */ ++ default_value = dbusmenu_defaults_default_get(priv->defaults, type, property); ++ if (default_value != NULL && value != NULL) { ++ /* Now see if we're setting this to the same value as the ++ default. If we are then we just want to swallow this variant ++ and make the function behave like we're clearing it. */ ++ if (g_variant_equal(default_value, value)) { ++ g_variant_ref_sink(value); ++ g_variant_unref(value); ++ value = NULL; + } + } + ++ + gboolean replaced = FALSE; + gpointer currentval = g_hash_table_lookup(priv->properties, property); + +@@ -1371,9 +1372,7 @@ + g_return_if_fail(DBUSMENU_IS_MENUITEM(mi)); + g_return_if_fail(property != NULL); + +- DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi); +- +- g_hash_table_remove(priv->properties, property); ++ dbusmenu_menuitem_property_set_variant(mi, property, NULL); + + return; + } + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..ab2b338 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +disconnect-more-signals.patch +fix-defaults-in-client.patch diff --git a/debian/rules b/debian/rules index cd1d01f..10140ea 100755 --- a/debian/rules +++ b/debian/rules @@ -3,6 +3,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk include /usr/share/cdbs/1/rules/autoreconf.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk DEB_SRCDIR = . DEB_BUILDDIR = $(DEB_SRCDIR)/build -- cgit v1.2.3 From 0d6b61d67b331fd86cf489d4beceee39c0e9e60e Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 26 Apr 2011 08:52:48 -0500 Subject: debian/control, debian/*: Renaming packages for library version bump from 3 to 4. --- debian/changelog | 4 +- debian/control | 35 ++++---- debian/libdbusmenu-glib3.install | 1 - debian/libdbusmenu-glib3.symbols | 141 --------------------------------- debian/libdbusmenu-glib4.install | 1 + debian/libdbusmenu-glib4.symbols | 141 +++++++++++++++++++++++++++++++++ debian/libdbusmenu-gtk3-3.install | 1 - debian/libdbusmenu-gtk3-4.install | 1 + debian/libdbusmenu-gtk3.install | 1 - debian/libdbusmenu-gtk3.symbols | 141 --------------------------------- debian/libdbusmenu-gtk4.install | 1 + debian/libdbusmenu-gtk4.symbols | 141 +++++++++++++++++++++++++++++++++ debian/libdbusmenu-jsonloader3.install | 1 - debian/libdbusmenu-jsonloader4.install | 1 + 14 files changed, 307 insertions(+), 304 deletions(-) delete mode 100644 debian/libdbusmenu-glib3.install delete mode 100644 debian/libdbusmenu-glib3.symbols create mode 100644 debian/libdbusmenu-glib4.install create mode 100644 debian/libdbusmenu-glib4.symbols delete mode 100644 debian/libdbusmenu-gtk3-3.install create mode 100644 debian/libdbusmenu-gtk3-4.install delete mode 100644 debian/libdbusmenu-gtk3.install delete mode 100644 debian/libdbusmenu-gtk3.symbols create mode 100644 debian/libdbusmenu-gtk4.install create mode 100644 debian/libdbusmenu-gtk4.symbols delete mode 100644 debian/libdbusmenu-jsonloader3.install create mode 100644 debian/libdbusmenu-jsonloader4.install (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 0145b18..9f55fcc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,10 @@ libdbusmenu (0.4.90~pre1-0ubuntu1~ppa1) UNRELEASED; urgency=low * Upstream Merge * Bumping library revision for ABI/API changes expected in this release cycle + * debian/control, debian/*: Renaming packages for library version + bump from 3 to 4. - -- Ted Gould Tue, 26 Apr 2011 08:46:54 -0500 + -- Ted Gould Tue, 26 Apr 2011 08:52:18 -0500 libdbusmenu (0.4.4-0ubuntu1~ppa1) natty; urgency=low diff --git a/debian/control b/debian/control index a2cd3d3..da0842d 100644 --- a/debian/control +++ b/debian/control @@ -29,7 +29,7 @@ Homepage: https://launchpad.net/dbusmenu Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/dbusmenu/ubuntu Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/dbusmenu/ubuntu -Package: libdbusmenu-glib3 +Package: libdbusmenu-glib4 Section: libs Architecture: any Depends: ${shlibs:Depends}, @@ -49,7 +49,7 @@ Section: libdevel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libdbusmenu-glib3 (= ${binary:Version}), + libdbusmenu-glib4 (= ${binary:Version}), libdbus-glib-1-dev (>= 0.76), libgtk2.0-dev (>= 2.12.0) Description: library for passing menus over DBus - development files @@ -59,7 +59,7 @@ Description: library for passing menus over DBus - development files . This package contains files that are needed to build applications. -Package: libdbusmenu-gtk3 +Package: libdbusmenu-gtk4 Section: libs Architecture: any Depends: ${shlibs:Depends}, @@ -76,7 +76,7 @@ Section: libdevel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libdbusmenu-gtk3 (= ${binary:Version}), + libdbusmenu-gtk4 (= ${binary:Version}), libdbus-glib-1-dev (>= 0.76), libgtk2.0-dev (>= 2.12.0), libdbusmenu-glib-dev @@ -93,7 +93,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, python, - libdbusmenu-glib3 (= ${binary:Version}) + libdbusmenu-glib4 (= ${binary:Version}) Description: tools useful during development with libdbusmenu libdbusmenu passes a menu structure across DBus so that a program can create a menu simply without worrying about how it is displayed on the @@ -106,29 +106,29 @@ Package: gir1.2-dbusmenu-glib-0.4 Section: libs Architecture: any Depends: ${misc:Depends}, - libdbusmenu-glib3 (= ${binary:Version}), + libdbusmenu-glib4 (= ${binary:Version}), ${gir:Depends} -Description: typelib file for libdbusmenu-glib3 +Description: typelib file for libdbusmenu-glib4 libdbusmenu passes a menu structure across DBus so that a program can create a menu simply without worrying about how it is displayed on the other side of the bus. . This package can be used by other packages using the GIRepository format to - generate dynamic bindings for libdbusmenu-glib3. + generate dynamic bindings for libdbusmenu-glib4. Package: gir1.2-dbusmenu-gtk-0.4 Section: libs Architecture: any Depends: ${misc:Depends}, - libdbusmenu-gtk3 (= ${binary:Version}), + libdbusmenu-gtk4 (= ${binary:Version}), ${gir:Depends} -Description: typelib file for libdbusmenu-gtk3 +Description: typelib file for libdbusmenu-gtk4 libdbusmenu passes a menu structure across DBus so that a program can create a menu simply without worrying about how it is displayed on the other side of the bus. . This package can be used by other packages using the GIRepository format to - generate dynamic bindings for libdbusmenu-gtk3. + generate dynamic bindings for libdbusmenu-gtk4. Package: libdbusmenu-glib-doc Section: doc @@ -152,7 +152,7 @@ Description: library for passing menus over DBus - GTK+ version documentation . This package contains developer documentation for libdbusmenu-gtk. -Package: libdbusmenu-jsonloader3 +Package: libdbusmenu-jsonloader4 Section: libs Architecture: any Depends: ${shlibs:Depends}, @@ -170,6 +170,7 @@ Section: libdevel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, + libdbusmenu-jsonloader4 (= ${binary:Version}), libdbus-glib-1-dev (>= 0.76), libdbusmenu-glib-dev (= ${binary:Version}), libjson-glib-dev @@ -181,7 +182,7 @@ Description: library for passing menus over DBus - Test lib development files This package contains files that are needed to build test suites in applications or libraries using dbusmenu. -Package: libdbusmenu-gtk3-3 +Package: libdbusmenu-gtk3-4 Section: libs Architecture: any Depends: ${shlibs:Depends}, @@ -198,7 +199,7 @@ Section: libdevel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libdbusmenu-gtk3-3 (= ${binary:Version}), + libdbusmenu-gtk3-4 (= ${binary:Version}), libdbus-glib-1-dev (>= 0.76), libgtk-3-dev (>= 2.91.4-0ubuntu1), libdbusmenu-glib-dev @@ -213,13 +214,13 @@ Package: gir1.2-dbusmenu-gtk3-0.4 Section: libs Architecture: any Depends: ${misc:Depends}, - libdbusmenu-gtk3-3 (= ${binary:Version}), + libdbusmenu-gtk3-4 (= ${binary:Version}), ${gir:Depends} -Description: typelib file for libdbusmenu-gtk3-3 +Description: typelib file for libdbusmenu-gtk3-4 libdbusmenu passes a menu structure across DBus so that a program can create a menu simply without worrying about how it is displayed on the other side of the bus. . This package can be used by other packages using the GIRepository format to - generate dynamic bindings for libdbusmenu-gtk3. + generate dynamic bindings for libdbusmenu-gtk4. diff --git a/debian/libdbusmenu-glib3.install b/debian/libdbusmenu-glib3.install deleted file mode 100644 index acdbacf..0000000 --- a/debian/libdbusmenu-glib3.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libdbusmenu-glib.so.* diff --git a/debian/libdbusmenu-glib3.symbols b/debian/libdbusmenu-glib3.symbols deleted file mode 100644 index 5cac25d..0000000 --- a/debian/libdbusmenu-glib3.symbols +++ /dev/null @@ -1,141 +0,0 @@ -libdbusmenu-glib.so.3 libdbusmenu-glib3 #MINVER# - dbus_menu_clean_xml@Base 0.4.2 - dbusmenu_client_add_type_handler@Base 0.4.2 - dbusmenu_client_add_type_handler_full@Base 0.4.2 - dbusmenu_client_get_icon_paths@Base 0.4.2 - dbusmenu_client_get_root@Base 0.4.2 - dbusmenu_client_get_status@Base 0.4.2 - dbusmenu_client_get_text_direction@Base 0.4.2 - dbusmenu_client_get_type@Base 0.4.2 - dbusmenu_client_menuitem_get_type@Base 0.4.2 - dbusmenu_client_menuitem_new@Base 0.4.2 - dbusmenu_client_new@Base 0.4.2 - dbusmenu_client_send_about_to_show@Base 0.4.2 - dbusmenu_client_send_event@Base 0.4.2 - dbusmenu_defaults_default_get@Base 0.4.2 - dbusmenu_defaults_default_get_type@Base 0.4.2 - dbusmenu_defaults_default_set@Base 0.4.2 - dbusmenu_defaults_get_type@Base 0.4.2 - dbusmenu_defaults_ref_default@Base 0.4.2 - dbusmenu_menuitem_build_variant@Base 0.4.2 - dbusmenu_menuitem_child_add_position@Base 0.4.2 - dbusmenu_menuitem_child_append@Base 0.4.2 - dbusmenu_menuitem_child_delete@Base 0.4.2 - dbusmenu_menuitem_child_find@Base 0.4.2 - dbusmenu_menuitem_child_prepend@Base 0.4.2 - dbusmenu_menuitem_child_reorder@Base 0.4.2 - dbusmenu_menuitem_exposed@Base 0.4.2 - dbusmenu_menuitem_find_id@Base 0.4.2 - dbusmenu_menuitem_foreach@Base 0.4.2 - dbusmenu_menuitem_get_children@Base 0.4.2 - dbusmenu_menuitem_get_id@Base 0.4.2 - dbusmenu_menuitem_get_parent@Base 0.4.2 - dbusmenu_menuitem_get_position@Base 0.4.2 - dbusmenu_menuitem_get_position_realized@Base 0.4.2 - dbusmenu_menuitem_get_root@Base 0.4.2 - dbusmenu_menuitem_get_type@Base 0.4.2 - dbusmenu_menuitem_handle_event@Base 0.4.2 - dbusmenu_menuitem_new@Base 0.4.2 - dbusmenu_menuitem_new_with_id@Base 0.4.2 - dbusmenu_menuitem_properties_copy@Base 0.4.2 - dbusmenu_menuitem_properties_list@Base 0.4.2 - dbusmenu_menuitem_properties_variant@Base 0.4.2 - dbusmenu_menuitem_property_exist@Base 0.4.2 - dbusmenu_menuitem_property_get@Base 0.4.2 - dbusmenu_menuitem_property_get_bool@Base 0.4.2 - dbusmenu_menuitem_property_get_int@Base 0.4.2 - dbusmenu_menuitem_property_get_variant@Base 0.4.2 - dbusmenu_menuitem_property_is_default@Base 0.4.2 - dbusmenu_menuitem_property_remove@Base 0.4.2 - dbusmenu_menuitem_property_set@Base 0.4.2 - dbusmenu_menuitem_property_set_bool@Base 0.4.2 - dbusmenu_menuitem_property_set_int@Base 0.4.2 - dbusmenu_menuitem_property_set_variant@Base 0.4.2 - dbusmenu_menuitem_proxy_get_type@Base 0.4.2 - dbusmenu_menuitem_proxy_get_wrapped@Base 0.4.2 - dbusmenu_menuitem_proxy_new@Base 0.4.2 - dbusmenu_menuitem_realized@Base 0.4.2 - dbusmenu_menuitem_send_about_to_show@Base 0.4.2 - dbusmenu_menuitem_set_parent@Base 0.4.2 - dbusmenu_menuitem_set_realized@Base 0.4.2 - dbusmenu_menuitem_set_root@Base 0.4.2 - dbusmenu_menuitem_show_to_user@Base 0.4.2 - dbusmenu_menuitem_take_children@Base 0.4.2 - dbusmenu_menuitem_unparent@Base 0.4.2 - dbusmenu_server_get_icon_paths@Base 0.4.2 - dbusmenu_server_get_status@Base 0.4.2 - dbusmenu_server_get_text_direction@Base 0.4.2 - dbusmenu_server_get_type@Base 0.4.2 - dbusmenu_server_new@Base 0.4.2 - dbusmenu_server_set_icon_paths@Base 0.4.2 - dbusmenu_server_set_root@Base 0.4.2 - dbusmenu_server_set_status@Base 0.4.2 - dbusmenu_server_set_text_direction@Base 0.4.2 - dbusmenu_status_get_nick@Base 0.4.2 - dbusmenu_status_get_type@Base 0.4.2 - dbusmenu_status_get_value_from_nick@Base 0.4.2 - dbusmenu_text_direction_get_nick@Base 0.4.2 - dbusmenu_text_direction_get_type@Base 0.4.2 - dbusmenu_text_direction_get_value_from_nick@Base 0.4.2 - session_bus_cb@Base 0.4.2 -libdbusmenu-gtk.so.3 libdbusmenu-glib3 #MINVER# - dbusmenu_gtk_parse_get_cached_item@Base 0.4.2 - dbusmenu_gtk_parse_menu_structure@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_build_menuitem@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_get_type@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_register_to_client@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_set_menuitem@Base 0.4.2 - dbusmenu_gtkclient_get_accel_group@Base 0.4.2 - dbusmenu_gtkclient_get_type@Base 0.4.2 - dbusmenu_gtkclient_menuitem_get@Base 0.4.2 - dbusmenu_gtkclient_menuitem_get_submenu@Base 0.4.2 - dbusmenu_gtkclient_new@Base 0.4.2 - dbusmenu_gtkclient_newitem_base@Base 0.4.2 - dbusmenu_gtkclient_set_accel_group@Base 0.4.2 - dbusmenu_gtkmenu_get_client@Base 0.4.2 - dbusmenu_gtkmenu_get_type@Base 0.4.2 - dbusmenu_gtkmenu_new@Base 0.4.2 - dbusmenu_menuitem_property_get_image@Base 0.4.2 - dbusmenu_menuitem_property_get_shortcut@Base 0.4.2 - dbusmenu_menuitem_property_set_image@Base 0.4.2 - dbusmenu_menuitem_property_set_shortcut@Base 0.4.2 - dbusmenu_menuitem_property_set_shortcut_menuitem@Base 0.4.2 - dbusmenu_menuitem_property_set_shortcut_string@Base 0.4.2 - genericmenuitem_get_image@Base 0.4.2 - genericmenuitem_get_type@Base 0.4.2 - genericmenuitem_set_check_type@Base 0.4.2 - genericmenuitem_set_image@Base 0.4.2 - genericmenuitem_set_state@Base 0.4.2 - theme_dir_db@Base 0.4.2 -libdbusmenu-gtk3.so.3 libdbusmenu-glib3 #MINVER# - dbusmenu_gtk_parse_get_cached_item@Base 0.4.2 - dbusmenu_gtk_parse_menu_structure@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_build_menuitem@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_get_type@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_register_to_client@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_set_menuitem@Base 0.4.2 - dbusmenu_gtkclient_get_accel_group@Base 0.4.2 - dbusmenu_gtkclient_get_type@Base 0.4.2 - dbusmenu_gtkclient_menuitem_get@Base 0.4.2 - dbusmenu_gtkclient_menuitem_get_submenu@Base 0.4.2 - dbusmenu_gtkclient_new@Base 0.4.2 - dbusmenu_gtkclient_newitem_base@Base 0.4.2 - dbusmenu_gtkclient_set_accel_group@Base 0.4.2 - dbusmenu_gtkmenu_get_client@Base 0.4.2 - dbusmenu_gtkmenu_get_type@Base 0.4.2 - dbusmenu_gtkmenu_new@Base 0.4.2 - dbusmenu_menuitem_property_get_image@Base 0.4.2 - dbusmenu_menuitem_property_get_shortcut@Base 0.4.2 - dbusmenu_menuitem_property_set_image@Base 0.4.2 - dbusmenu_menuitem_property_set_shortcut@Base 0.4.2 - dbusmenu_menuitem_property_set_shortcut_menuitem@Base 0.4.2 - dbusmenu_menuitem_property_set_shortcut_string@Base 0.4.2 - genericmenuitem_get_image@Base 0.4.2 - genericmenuitem_get_type@Base 0.4.2 - genericmenuitem_set_check_type@Base 0.4.2 - genericmenuitem_set_image@Base 0.4.2 - genericmenuitem_set_state@Base 0.4.2 - theme_dir_db@Base 0.4.2 -libdbusmenu-jsonloader.so.3 libdbusmenu-glib3 #MINVER# - dbusmenu_json_build_from_file@Base 0.4.2 - dbusmenu_json_build_from_node@Base 0.4.2 diff --git a/debian/libdbusmenu-glib4.install b/debian/libdbusmenu-glib4.install new file mode 100644 index 0000000..acdbacf --- /dev/null +++ b/debian/libdbusmenu-glib4.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libdbusmenu-glib.so.* diff --git a/debian/libdbusmenu-glib4.symbols b/debian/libdbusmenu-glib4.symbols new file mode 100644 index 0000000..5cac25d --- /dev/null +++ b/debian/libdbusmenu-glib4.symbols @@ -0,0 +1,141 @@ +libdbusmenu-glib.so.3 libdbusmenu-glib3 #MINVER# + dbus_menu_clean_xml@Base 0.4.2 + dbusmenu_client_add_type_handler@Base 0.4.2 + dbusmenu_client_add_type_handler_full@Base 0.4.2 + dbusmenu_client_get_icon_paths@Base 0.4.2 + dbusmenu_client_get_root@Base 0.4.2 + dbusmenu_client_get_status@Base 0.4.2 + dbusmenu_client_get_text_direction@Base 0.4.2 + dbusmenu_client_get_type@Base 0.4.2 + dbusmenu_client_menuitem_get_type@Base 0.4.2 + dbusmenu_client_menuitem_new@Base 0.4.2 + dbusmenu_client_new@Base 0.4.2 + dbusmenu_client_send_about_to_show@Base 0.4.2 + dbusmenu_client_send_event@Base 0.4.2 + dbusmenu_defaults_default_get@Base 0.4.2 + dbusmenu_defaults_default_get_type@Base 0.4.2 + dbusmenu_defaults_default_set@Base 0.4.2 + dbusmenu_defaults_get_type@Base 0.4.2 + dbusmenu_defaults_ref_default@Base 0.4.2 + dbusmenu_menuitem_build_variant@Base 0.4.2 + dbusmenu_menuitem_child_add_position@Base 0.4.2 + dbusmenu_menuitem_child_append@Base 0.4.2 + dbusmenu_menuitem_child_delete@Base 0.4.2 + dbusmenu_menuitem_child_find@Base 0.4.2 + dbusmenu_menuitem_child_prepend@Base 0.4.2 + dbusmenu_menuitem_child_reorder@Base 0.4.2 + dbusmenu_menuitem_exposed@Base 0.4.2 + dbusmenu_menuitem_find_id@Base 0.4.2 + dbusmenu_menuitem_foreach@Base 0.4.2 + dbusmenu_menuitem_get_children@Base 0.4.2 + dbusmenu_menuitem_get_id@Base 0.4.2 + dbusmenu_menuitem_get_parent@Base 0.4.2 + dbusmenu_menuitem_get_position@Base 0.4.2 + dbusmenu_menuitem_get_position_realized@Base 0.4.2 + dbusmenu_menuitem_get_root@Base 0.4.2 + dbusmenu_menuitem_get_type@Base 0.4.2 + dbusmenu_menuitem_handle_event@Base 0.4.2 + dbusmenu_menuitem_new@Base 0.4.2 + dbusmenu_menuitem_new_with_id@Base 0.4.2 + dbusmenu_menuitem_properties_copy@Base 0.4.2 + dbusmenu_menuitem_properties_list@Base 0.4.2 + dbusmenu_menuitem_properties_variant@Base 0.4.2 + dbusmenu_menuitem_property_exist@Base 0.4.2 + dbusmenu_menuitem_property_get@Base 0.4.2 + dbusmenu_menuitem_property_get_bool@Base 0.4.2 + dbusmenu_menuitem_property_get_int@Base 0.4.2 + dbusmenu_menuitem_property_get_variant@Base 0.4.2 + dbusmenu_menuitem_property_is_default@Base 0.4.2 + dbusmenu_menuitem_property_remove@Base 0.4.2 + dbusmenu_menuitem_property_set@Base 0.4.2 + dbusmenu_menuitem_property_set_bool@Base 0.4.2 + dbusmenu_menuitem_property_set_int@Base 0.4.2 + dbusmenu_menuitem_property_set_variant@Base 0.4.2 + dbusmenu_menuitem_proxy_get_type@Base 0.4.2 + dbusmenu_menuitem_proxy_get_wrapped@Base 0.4.2 + dbusmenu_menuitem_proxy_new@Base 0.4.2 + dbusmenu_menuitem_realized@Base 0.4.2 + dbusmenu_menuitem_send_about_to_show@Base 0.4.2 + dbusmenu_menuitem_set_parent@Base 0.4.2 + dbusmenu_menuitem_set_realized@Base 0.4.2 + dbusmenu_menuitem_set_root@Base 0.4.2 + dbusmenu_menuitem_show_to_user@Base 0.4.2 + dbusmenu_menuitem_take_children@Base 0.4.2 + dbusmenu_menuitem_unparent@Base 0.4.2 + dbusmenu_server_get_icon_paths@Base 0.4.2 + dbusmenu_server_get_status@Base 0.4.2 + dbusmenu_server_get_text_direction@Base 0.4.2 + dbusmenu_server_get_type@Base 0.4.2 + dbusmenu_server_new@Base 0.4.2 + dbusmenu_server_set_icon_paths@Base 0.4.2 + dbusmenu_server_set_root@Base 0.4.2 + dbusmenu_server_set_status@Base 0.4.2 + dbusmenu_server_set_text_direction@Base 0.4.2 + dbusmenu_status_get_nick@Base 0.4.2 + dbusmenu_status_get_type@Base 0.4.2 + dbusmenu_status_get_value_from_nick@Base 0.4.2 + dbusmenu_text_direction_get_nick@Base 0.4.2 + dbusmenu_text_direction_get_type@Base 0.4.2 + dbusmenu_text_direction_get_value_from_nick@Base 0.4.2 + session_bus_cb@Base 0.4.2 +libdbusmenu-gtk.so.3 libdbusmenu-glib3 #MINVER# + dbusmenu_gtk_parse_get_cached_item@Base 0.4.2 + dbusmenu_gtk_parse_menu_structure@Base 0.4.2 + dbusmenu_gtk_serializable_menu_item_build_menuitem@Base 0.4.2 + dbusmenu_gtk_serializable_menu_item_get_type@Base 0.4.2 + dbusmenu_gtk_serializable_menu_item_register_to_client@Base 0.4.2 + dbusmenu_gtk_serializable_menu_item_set_menuitem@Base 0.4.2 + dbusmenu_gtkclient_get_accel_group@Base 0.4.2 + dbusmenu_gtkclient_get_type@Base 0.4.2 + dbusmenu_gtkclient_menuitem_get@Base 0.4.2 + dbusmenu_gtkclient_menuitem_get_submenu@Base 0.4.2 + dbusmenu_gtkclient_new@Base 0.4.2 + dbusmenu_gtkclient_newitem_base@Base 0.4.2 + dbusmenu_gtkclient_set_accel_group@Base 0.4.2 + dbusmenu_gtkmenu_get_client@Base 0.4.2 + dbusmenu_gtkmenu_get_type@Base 0.4.2 + dbusmenu_gtkmenu_new@Base 0.4.2 + dbusmenu_menuitem_property_get_image@Base 0.4.2 + dbusmenu_menuitem_property_get_shortcut@Base 0.4.2 + dbusmenu_menuitem_property_set_image@Base 0.4.2 + dbusmenu_menuitem_property_set_shortcut@Base 0.4.2 + dbusmenu_menuitem_property_set_shortcut_menuitem@Base 0.4.2 + dbusmenu_menuitem_property_set_shortcut_string@Base 0.4.2 + genericmenuitem_get_image@Base 0.4.2 + genericmenuitem_get_type@Base 0.4.2 + genericmenuitem_set_check_type@Base 0.4.2 + genericmenuitem_set_image@Base 0.4.2 + genericmenuitem_set_state@Base 0.4.2 + theme_dir_db@Base 0.4.2 +libdbusmenu-gtk3.so.3 libdbusmenu-glib3 #MINVER# + dbusmenu_gtk_parse_get_cached_item@Base 0.4.2 + dbusmenu_gtk_parse_menu_structure@Base 0.4.2 + dbusmenu_gtk_serializable_menu_item_build_menuitem@Base 0.4.2 + dbusmenu_gtk_serializable_menu_item_get_type@Base 0.4.2 + dbusmenu_gtk_serializable_menu_item_register_to_client@Base 0.4.2 + dbusmenu_gtk_serializable_menu_item_set_menuitem@Base 0.4.2 + dbusmenu_gtkclient_get_accel_group@Base 0.4.2 + dbusmenu_gtkclient_get_type@Base 0.4.2 + dbusmenu_gtkclient_menuitem_get@Base 0.4.2 + dbusmenu_gtkclient_menuitem_get_submenu@Base 0.4.2 + dbusmenu_gtkclient_new@Base 0.4.2 + dbusmenu_gtkclient_newitem_base@Base 0.4.2 + dbusmenu_gtkclient_set_accel_group@Base 0.4.2 + dbusmenu_gtkmenu_get_client@Base 0.4.2 + dbusmenu_gtkmenu_get_type@Base 0.4.2 + dbusmenu_gtkmenu_new@Base 0.4.2 + dbusmenu_menuitem_property_get_image@Base 0.4.2 + dbusmenu_menuitem_property_get_shortcut@Base 0.4.2 + dbusmenu_menuitem_property_set_image@Base 0.4.2 + dbusmenu_menuitem_property_set_shortcut@Base 0.4.2 + dbusmenu_menuitem_property_set_shortcut_menuitem@Base 0.4.2 + dbusmenu_menuitem_property_set_shortcut_string@Base 0.4.2 + genericmenuitem_get_image@Base 0.4.2 + genericmenuitem_get_type@Base 0.4.2 + genericmenuitem_set_check_type@Base 0.4.2 + genericmenuitem_set_image@Base 0.4.2 + genericmenuitem_set_state@Base 0.4.2 + theme_dir_db@Base 0.4.2 +libdbusmenu-jsonloader.so.3 libdbusmenu-glib3 #MINVER# + dbusmenu_json_build_from_file@Base 0.4.2 + dbusmenu_json_build_from_node@Base 0.4.2 diff --git a/debian/libdbusmenu-gtk3-3.install b/debian/libdbusmenu-gtk3-3.install deleted file mode 100644 index af2e9a3..0000000 --- a/debian/libdbusmenu-gtk3-3.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libdbusmenu-gtk3.so.* diff --git a/debian/libdbusmenu-gtk3-4.install b/debian/libdbusmenu-gtk3-4.install new file mode 100644 index 0000000..af2e9a3 --- /dev/null +++ b/debian/libdbusmenu-gtk3-4.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libdbusmenu-gtk3.so.* diff --git a/debian/libdbusmenu-gtk3.install b/debian/libdbusmenu-gtk3.install deleted file mode 100644 index d677935..0000000 --- a/debian/libdbusmenu-gtk3.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libdbusmenu-gtk.so.* diff --git a/debian/libdbusmenu-gtk3.symbols b/debian/libdbusmenu-gtk3.symbols deleted file mode 100644 index fd2d6aa..0000000 --- a/debian/libdbusmenu-gtk3.symbols +++ /dev/null @@ -1,141 +0,0 @@ -libdbusmenu-glib.so.3 libdbusmenu-gtk3 #MINVER# - dbus_menu_clean_xml@Base 0.4.2 - dbusmenu_client_add_type_handler@Base 0.4.2 - dbusmenu_client_add_type_handler_full@Base 0.4.2 - dbusmenu_client_get_icon_paths@Base 0.4.2 - dbusmenu_client_get_root@Base 0.4.2 - dbusmenu_client_get_status@Base 0.4.2 - dbusmenu_client_get_text_direction@Base 0.4.2 - dbusmenu_client_get_type@Base 0.4.2 - dbusmenu_client_menuitem_get_type@Base 0.4.2 - dbusmenu_client_menuitem_new@Base 0.4.2 - dbusmenu_client_new@Base 0.4.2 - dbusmenu_client_send_about_to_show@Base 0.4.2 - dbusmenu_client_send_event@Base 0.4.2 - dbusmenu_defaults_default_get@Base 0.4.2 - dbusmenu_defaults_default_get_type@Base 0.4.2 - dbusmenu_defaults_default_set@Base 0.4.2 - dbusmenu_defaults_get_type@Base 0.4.2 - dbusmenu_defaults_ref_default@Base 0.4.2 - dbusmenu_menuitem_build_variant@Base 0.4.2 - dbusmenu_menuitem_child_add_position@Base 0.4.2 - dbusmenu_menuitem_child_append@Base 0.4.2 - dbusmenu_menuitem_child_delete@Base 0.4.2 - dbusmenu_menuitem_child_find@Base 0.4.2 - dbusmenu_menuitem_child_prepend@Base 0.4.2 - dbusmenu_menuitem_child_reorder@Base 0.4.2 - dbusmenu_menuitem_exposed@Base 0.4.2 - dbusmenu_menuitem_find_id@Base 0.4.2 - dbusmenu_menuitem_foreach@Base 0.4.2 - dbusmenu_menuitem_get_children@Base 0.4.2 - dbusmenu_menuitem_get_id@Base 0.4.2 - dbusmenu_menuitem_get_parent@Base 0.4.2 - dbusmenu_menuitem_get_position@Base 0.4.2 - dbusmenu_menuitem_get_position_realized@Base 0.4.2 - dbusmenu_menuitem_get_root@Base 0.4.2 - dbusmenu_menuitem_get_type@Base 0.4.2 - dbusmenu_menuitem_handle_event@Base 0.4.2 - dbusmenu_menuitem_new@Base 0.4.2 - dbusmenu_menuitem_new_with_id@Base 0.4.2 - dbusmenu_menuitem_properties_copy@Base 0.4.2 - dbusmenu_menuitem_properties_list@Base 0.4.2 - dbusmenu_menuitem_properties_variant@Base 0.4.2 - dbusmenu_menuitem_property_exist@Base 0.4.2 - dbusmenu_menuitem_property_get@Base 0.4.2 - dbusmenu_menuitem_property_get_bool@Base 0.4.2 - dbusmenu_menuitem_property_get_int@Base 0.4.2 - dbusmenu_menuitem_property_get_variant@Base 0.4.2 - dbusmenu_menuitem_property_is_default@Base 0.4.2 - dbusmenu_menuitem_property_remove@Base 0.4.2 - dbusmenu_menuitem_property_set@Base 0.4.2 - dbusmenu_menuitem_property_set_bool@Base 0.4.2 - dbusmenu_menuitem_property_set_int@Base 0.4.2 - dbusmenu_menuitem_property_set_variant@Base 0.4.2 - dbusmenu_menuitem_proxy_get_type@Base 0.4.2 - dbusmenu_menuitem_proxy_get_wrapped@Base 0.4.2 - dbusmenu_menuitem_proxy_new@Base 0.4.2 - dbusmenu_menuitem_realized@Base 0.4.2 - dbusmenu_menuitem_send_about_to_show@Base 0.4.2 - dbusmenu_menuitem_set_parent@Base 0.4.2 - dbusmenu_menuitem_set_realized@Base 0.4.2 - dbusmenu_menuitem_set_root@Base 0.4.2 - dbusmenu_menuitem_show_to_user@Base 0.4.2 - dbusmenu_menuitem_take_children@Base 0.4.2 - dbusmenu_menuitem_unparent@Base 0.4.2 - dbusmenu_server_get_icon_paths@Base 0.4.2 - dbusmenu_server_get_status@Base 0.4.2 - dbusmenu_server_get_text_direction@Base 0.4.2 - dbusmenu_server_get_type@Base 0.4.2 - dbusmenu_server_new@Base 0.4.2 - dbusmenu_server_set_icon_paths@Base 0.4.2 - dbusmenu_server_set_root@Base 0.4.2 - dbusmenu_server_set_status@Base 0.4.2 - dbusmenu_server_set_text_direction@Base 0.4.2 - dbusmenu_status_get_nick@Base 0.4.2 - dbusmenu_status_get_type@Base 0.4.2 - dbusmenu_status_get_value_from_nick@Base 0.4.2 - dbusmenu_text_direction_get_nick@Base 0.4.2 - dbusmenu_text_direction_get_type@Base 0.4.2 - dbusmenu_text_direction_get_value_from_nick@Base 0.4.2 - session_bus_cb@Base 0.4.2 -libdbusmenu-gtk.so.3 libdbusmenu-gtk3 #MINVER# - dbusmenu_gtk_parse_get_cached_item@Base 0.4.2 - dbusmenu_gtk_parse_menu_structure@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_build_menuitem@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_get_type@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_register_to_client@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_set_menuitem@Base 0.4.2 - dbusmenu_gtkclient_get_accel_group@Base 0.4.2 - dbusmenu_gtkclient_get_type@Base 0.4.2 - dbusmenu_gtkclient_menuitem_get@Base 0.4.2 - dbusmenu_gtkclient_menuitem_get_submenu@Base 0.4.2 - dbusmenu_gtkclient_new@Base 0.4.2 - dbusmenu_gtkclient_newitem_base@Base 0.4.2 - dbusmenu_gtkclient_set_accel_group@Base 0.4.2 - dbusmenu_gtkmenu_get_client@Base 0.4.2 - dbusmenu_gtkmenu_get_type@Base 0.4.2 - dbusmenu_gtkmenu_new@Base 0.4.2 - dbusmenu_menuitem_property_get_image@Base 0.4.2 - dbusmenu_menuitem_property_get_shortcut@Base 0.4.2 - dbusmenu_menuitem_property_set_image@Base 0.4.2 - dbusmenu_menuitem_property_set_shortcut@Base 0.4.2 - dbusmenu_menuitem_property_set_shortcut_menuitem@Base 0.4.2 - dbusmenu_menuitem_property_set_shortcut_string@Base 0.4.2 - genericmenuitem_get_image@Base 0.4.2 - genericmenuitem_get_type@Base 0.4.2 - genericmenuitem_set_check_type@Base 0.4.2 - genericmenuitem_set_image@Base 0.4.2 - genericmenuitem_set_state@Base 0.4.2 - theme_dir_db@Base 0.4.2 -libdbusmenu-gtk3.so.3 libdbusmenu-gtk3 #MINVER# - dbusmenu_gtk_parse_get_cached_item@Base 0.4.2 - dbusmenu_gtk_parse_menu_structure@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_build_menuitem@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_get_type@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_register_to_client@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_set_menuitem@Base 0.4.2 - dbusmenu_gtkclient_get_accel_group@Base 0.4.2 - dbusmenu_gtkclient_get_type@Base 0.4.2 - dbusmenu_gtkclient_menuitem_get@Base 0.4.2 - dbusmenu_gtkclient_menuitem_get_submenu@Base 0.4.2 - dbusmenu_gtkclient_new@Base 0.4.2 - dbusmenu_gtkclient_newitem_base@Base 0.4.2 - dbusmenu_gtkclient_set_accel_group@Base 0.4.2 - dbusmenu_gtkmenu_get_client@Base 0.4.2 - dbusmenu_gtkmenu_get_type@Base 0.4.2 - dbusmenu_gtkmenu_new@Base 0.4.2 - dbusmenu_menuitem_property_get_image@Base 0.4.2 - dbusmenu_menuitem_property_get_shortcut@Base 0.4.2 - dbusmenu_menuitem_property_set_image@Base 0.4.2 - dbusmenu_menuitem_property_set_shortcut@Base 0.4.2 - dbusmenu_menuitem_property_set_shortcut_menuitem@Base 0.4.2 - dbusmenu_menuitem_property_set_shortcut_string@Base 0.4.2 - genericmenuitem_get_image@Base 0.4.2 - genericmenuitem_get_type@Base 0.4.2 - genericmenuitem_set_check_type@Base 0.4.2 - genericmenuitem_set_image@Base 0.4.2 - genericmenuitem_set_state@Base 0.4.2 - theme_dir_db@Base 0.4.2 -libdbusmenu-jsonloader.so.3 libdbusmenu-gtk3 #MINVER# - dbusmenu_json_build_from_file@Base 0.4.2 - dbusmenu_json_build_from_node@Base 0.4.2 diff --git a/debian/libdbusmenu-gtk4.install b/debian/libdbusmenu-gtk4.install new file mode 100644 index 0000000..d677935 --- /dev/null +++ b/debian/libdbusmenu-gtk4.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libdbusmenu-gtk.so.* diff --git a/debian/libdbusmenu-gtk4.symbols b/debian/libdbusmenu-gtk4.symbols new file mode 100644 index 0000000..fd2d6aa --- /dev/null +++ b/debian/libdbusmenu-gtk4.symbols @@ -0,0 +1,141 @@ +libdbusmenu-glib.so.3 libdbusmenu-gtk3 #MINVER# + dbus_menu_clean_xml@Base 0.4.2 + dbusmenu_client_add_type_handler@Base 0.4.2 + dbusmenu_client_add_type_handler_full@Base 0.4.2 + dbusmenu_client_get_icon_paths@Base 0.4.2 + dbusmenu_client_get_root@Base 0.4.2 + dbusmenu_client_get_status@Base 0.4.2 + dbusmenu_client_get_text_direction@Base 0.4.2 + dbusmenu_client_get_type@Base 0.4.2 + dbusmenu_client_menuitem_get_type@Base 0.4.2 + dbusmenu_client_menuitem_new@Base 0.4.2 + dbusmenu_client_new@Base 0.4.2 + dbusmenu_client_send_about_to_show@Base 0.4.2 + dbusmenu_client_send_event@Base 0.4.2 + dbusmenu_defaults_default_get@Base 0.4.2 + dbusmenu_defaults_default_get_type@Base 0.4.2 + dbusmenu_defaults_default_set@Base 0.4.2 + dbusmenu_defaults_get_type@Base 0.4.2 + dbusmenu_defaults_ref_default@Base 0.4.2 + dbusmenu_menuitem_build_variant@Base 0.4.2 + dbusmenu_menuitem_child_add_position@Base 0.4.2 + dbusmenu_menuitem_child_append@Base 0.4.2 + dbusmenu_menuitem_child_delete@Base 0.4.2 + dbusmenu_menuitem_child_find@Base 0.4.2 + dbusmenu_menuitem_child_prepend@Base 0.4.2 + dbusmenu_menuitem_child_reorder@Base 0.4.2 + dbusmenu_menuitem_exposed@Base 0.4.2 + dbusmenu_menuitem_find_id@Base 0.4.2 + dbusmenu_menuitem_foreach@Base 0.4.2 + dbusmenu_menuitem_get_children@Base 0.4.2 + dbusmenu_menuitem_get_id@Base 0.4.2 + dbusmenu_menuitem_get_parent@Base 0.4.2 + dbusmenu_menuitem_get_position@Base 0.4.2 + dbusmenu_menuitem_get_position_realized@Base 0.4.2 + dbusmenu_menuitem_get_root@Base 0.4.2 + dbusmenu_menuitem_get_type@Base 0.4.2 + dbusmenu_menuitem_handle_event@Base 0.4.2 + dbusmenu_menuitem_new@Base 0.4.2 + dbusmenu_menuitem_new_with_id@Base 0.4.2 + dbusmenu_menuitem_properties_copy@Base 0.4.2 + dbusmenu_menuitem_properties_list@Base 0.4.2 + dbusmenu_menuitem_properties_variant@Base 0.4.2 + dbusmenu_menuitem_property_exist@Base 0.4.2 + dbusmenu_menuitem_property_get@Base 0.4.2 + dbusmenu_menuitem_property_get_bool@Base 0.4.2 + dbusmenu_menuitem_property_get_int@Base 0.4.2 + dbusmenu_menuitem_property_get_variant@Base 0.4.2 + dbusmenu_menuitem_property_is_default@Base 0.4.2 + dbusmenu_menuitem_property_remove@Base 0.4.2 + dbusmenu_menuitem_property_set@Base 0.4.2 + dbusmenu_menuitem_property_set_bool@Base 0.4.2 + dbusmenu_menuitem_property_set_int@Base 0.4.2 + dbusmenu_menuitem_property_set_variant@Base 0.4.2 + dbusmenu_menuitem_proxy_get_type@Base 0.4.2 + dbusmenu_menuitem_proxy_get_wrapped@Base 0.4.2 + dbusmenu_menuitem_proxy_new@Base 0.4.2 + dbusmenu_menuitem_realized@Base 0.4.2 + dbusmenu_menuitem_send_about_to_show@Base 0.4.2 + dbusmenu_menuitem_set_parent@Base 0.4.2 + dbusmenu_menuitem_set_realized@Base 0.4.2 + dbusmenu_menuitem_set_root@Base 0.4.2 + dbusmenu_menuitem_show_to_user@Base 0.4.2 + dbusmenu_menuitem_take_children@Base 0.4.2 + dbusmenu_menuitem_unparent@Base 0.4.2 + dbusmenu_server_get_icon_paths@Base 0.4.2 + dbusmenu_server_get_status@Base 0.4.2 + dbusmenu_server_get_text_direction@Base 0.4.2 + dbusmenu_server_get_type@Base 0.4.2 + dbusmenu_server_new@Base 0.4.2 + dbusmenu_server_set_icon_paths@Base 0.4.2 + dbusmenu_server_set_root@Base 0.4.2 + dbusmenu_server_set_status@Base 0.4.2 + dbusmenu_server_set_text_direction@Base 0.4.2 + dbusmenu_status_get_nick@Base 0.4.2 + dbusmenu_status_get_type@Base 0.4.2 + dbusmenu_status_get_value_from_nick@Base 0.4.2 + dbusmenu_text_direction_get_nick@Base 0.4.2 + dbusmenu_text_direction_get_type@Base 0.4.2 + dbusmenu_text_direction_get_value_from_nick@Base 0.4.2 + session_bus_cb@Base 0.4.2 +libdbusmenu-gtk.so.3 libdbusmenu-gtk3 #MINVER# + dbusmenu_gtk_parse_get_cached_item@Base 0.4.2 + dbusmenu_gtk_parse_menu_structure@Base 0.4.2 + dbusmenu_gtk_serializable_menu_item_build_menuitem@Base 0.4.2 + dbusmenu_gtk_serializable_menu_item_get_type@Base 0.4.2 + dbusmenu_gtk_serializable_menu_item_register_to_client@Base 0.4.2 + dbusmenu_gtk_serializable_menu_item_set_menuitem@Base 0.4.2 + dbusmenu_gtkclient_get_accel_group@Base 0.4.2 + dbusmenu_gtkclient_get_type@Base 0.4.2 + dbusmenu_gtkclient_menuitem_get@Base 0.4.2 + dbusmenu_gtkclient_menuitem_get_submenu@Base 0.4.2 + dbusmenu_gtkclient_new@Base 0.4.2 + dbusmenu_gtkclient_newitem_base@Base 0.4.2 + dbusmenu_gtkclient_set_accel_group@Base 0.4.2 + dbusmenu_gtkmenu_get_client@Base 0.4.2 + dbusmenu_gtkmenu_get_type@Base 0.4.2 + dbusmenu_gtkmenu_new@Base 0.4.2 + dbusmenu_menuitem_property_get_image@Base 0.4.2 + dbusmenu_menuitem_property_get_shortcut@Base 0.4.2 + dbusmenu_menuitem_property_set_image@Base 0.4.2 + dbusmenu_menuitem_property_set_shortcut@Base 0.4.2 + dbusmenu_menuitem_property_set_shortcut_menuitem@Base 0.4.2 + dbusmenu_menuitem_property_set_shortcut_string@Base 0.4.2 + genericmenuitem_get_image@Base 0.4.2 + genericmenuitem_get_type@Base 0.4.2 + genericmenuitem_set_check_type@Base 0.4.2 + genericmenuitem_set_image@Base 0.4.2 + genericmenuitem_set_state@Base 0.4.2 + theme_dir_db@Base 0.4.2 +libdbusmenu-gtk3.so.3 libdbusmenu-gtk3 #MINVER# + dbusmenu_gtk_parse_get_cached_item@Base 0.4.2 + dbusmenu_gtk_parse_menu_structure@Base 0.4.2 + dbusmenu_gtk_serializable_menu_item_build_menuitem@Base 0.4.2 + dbusmenu_gtk_serializable_menu_item_get_type@Base 0.4.2 + dbusmenu_gtk_serializable_menu_item_register_to_client@Base 0.4.2 + dbusmenu_gtk_serializable_menu_item_set_menuitem@Base 0.4.2 + dbusmenu_gtkclient_get_accel_group@Base 0.4.2 + dbusmenu_gtkclient_get_type@Base 0.4.2 + dbusmenu_gtkclient_menuitem_get@Base 0.4.2 + dbusmenu_gtkclient_menuitem_get_submenu@Base 0.4.2 + dbusmenu_gtkclient_new@Base 0.4.2 + dbusmenu_gtkclient_newitem_base@Base 0.4.2 + dbusmenu_gtkclient_set_accel_group@Base 0.4.2 + dbusmenu_gtkmenu_get_client@Base 0.4.2 + dbusmenu_gtkmenu_get_type@Base 0.4.2 + dbusmenu_gtkmenu_new@Base 0.4.2 + dbusmenu_menuitem_property_get_image@Base 0.4.2 + dbusmenu_menuitem_property_get_shortcut@Base 0.4.2 + dbusmenu_menuitem_property_set_image@Base 0.4.2 + dbusmenu_menuitem_property_set_shortcut@Base 0.4.2 + dbusmenu_menuitem_property_set_shortcut_menuitem@Base 0.4.2 + dbusmenu_menuitem_property_set_shortcut_string@Base 0.4.2 + genericmenuitem_get_image@Base 0.4.2 + genericmenuitem_get_type@Base 0.4.2 + genericmenuitem_set_check_type@Base 0.4.2 + genericmenuitem_set_image@Base 0.4.2 + genericmenuitem_set_state@Base 0.4.2 + theme_dir_db@Base 0.4.2 +libdbusmenu-jsonloader.so.3 libdbusmenu-gtk3 #MINVER# + dbusmenu_json_build_from_file@Base 0.4.2 + dbusmenu_json_build_from_node@Base 0.4.2 diff --git a/debian/libdbusmenu-jsonloader3.install b/debian/libdbusmenu-jsonloader3.install deleted file mode 100644 index bff47f5..0000000 --- a/debian/libdbusmenu-jsonloader3.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libdbusmenu-jsonloader.so.* diff --git a/debian/libdbusmenu-jsonloader4.install b/debian/libdbusmenu-jsonloader4.install new file mode 100644 index 0000000..bff47f5 --- /dev/null +++ b/debian/libdbusmenu-jsonloader4.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libdbusmenu-jsonloader.so.* -- cgit v1.2.3 From 4a1791ecf45589924462e444a1a44a7770003c21 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Fri, 24 Jun 2011 15:58:51 -0400 Subject: releasing version 0.4.90-0ubuntu1 --- debian/changelog | 19 +++- debian/control | 6 +- debian/gir1.2-dbusmenu-glib-0.4.install | 2 +- debian/gir1.2-dbusmenu-gtk-0.4.install | 2 +- debian/gir1.2-dbusmenu-gtk3-0.4.install | 2 +- debian/libdbusmenu-glib-dev.install | 12 +-- debian/libdbusmenu-glib-doc.install | 2 +- debian/libdbusmenu-glib4.install | 2 +- debian/libdbusmenu-glib4.symbols | 63 +------------ debian/libdbusmenu-gtk-dev.install | 12 +-- debian/libdbusmenu-gtk-doc.install | 2 +- debian/libdbusmenu-gtk3-3.symbols | 141 ------------------------------ debian/libdbusmenu-gtk3-4.install | 2 +- debian/libdbusmenu-gtk3-4.symbols | 25 ++++++ debian/libdbusmenu-gtk3-dev.install | 12 +-- debian/libdbusmenu-gtk4.install | 2 +- debian/libdbusmenu-gtk4.symbols | 118 +------------------------ debian/libdbusmenu-jsonloader-dev.install | 8 +- debian/libdbusmenu-jsonloader4.install | 2 +- debian/libdbusmenu-jsonloader4.symbols | 3 + debian/libdbusmenu-tools.install | 6 +- debian/rules | 45 +++------- 22 files changed, 99 insertions(+), 389 deletions(-) delete mode 100644 debian/libdbusmenu-gtk3-3.symbols create mode 100644 debian/libdbusmenu-gtk3-4.symbols create mode 100644 debian/libdbusmenu-jsonloader4.symbols (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index fb49c3a..27cf7ab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -libdbusmenu (0.4.90-0ubuntu1~ppa1) oneiric; urgency=low +libdbusmenu (0.4.90-0ubuntu1) oneiric; urgency=low + [ Ted Gould ] * debian/control, debian/*: Renaming packages for library version bump from 3 to 4. * New upstream release. @@ -10,7 +11,21 @@ libdbusmenu (0.4.90-0ubuntu1~ppa1) oneiric; urgency=low * Removing the SerializableMenuitem object * debian/rules: Making GTK2 the special build - -- Ted Gould Mon, 20 Jun 2011 17:00:12 -0500 + [ Ken VanDine ] + * +debian/libdbusmenu-jsonloader4.symbols + * debian/*.symbols + - Fixed sonames and removed all the duplicate symbols + * debian/*.install, debian/rules + - Use cdbs to do the dual builds for gtk2/gtk3 + * debian/control + - Updated standards version to 3.9.2 + - Set version on the json-glib build depends to >= 0.13.4 + - Make gir1.2-dbusmenu-glib-0.4 break gir1.2-unity-3.0 and + gir1.2-indicate-0.5 built against older versions of dbusmenu to + prevent breakage in python apps that use gir loading multiple versions + of dbusmenu-glib + + -- Ken VanDine Fri, 24 Jun 2011 14:55:59 -0400 libdbusmenu (0.4.4-0ubuntu1~ppa1) natty; urgency=low diff --git a/debian/control b/debian/control index da0842d..85a8715 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Build-Depends: debhelper (>= 5.0), gtk-doc-tools, libtool, intltool, - libjson-glib-dev, + libjson-glib-dev (>= 0.13.4), gobject-introspection, libgirepository1.0-dev (>= 0.9.3), gir1.2-glib-2.0, @@ -24,7 +24,7 @@ Build-Depends: debhelper (>= 5.0), libx11-dev (>= 1.3), dh-autoreconf, valac-0.12 -Standards-Version: 3.9.1 +Standards-Version: 3.9.2 Homepage: https://launchpad.net/dbusmenu Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/dbusmenu/ubuntu Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/dbusmenu/ubuntu @@ -108,6 +108,8 @@ Architecture: any Depends: ${misc:Depends}, libdbusmenu-glib4 (= ${binary:Version}), ${gir:Depends} +Breaks: gir1.2-unity-3.0 (<< 3.8.4-0ubuntu2), + gir1.2-indicate-0.5 (<< 0.5.0-0ubuntu4) Description: typelib file for libdbusmenu-glib4 libdbusmenu passes a menu structure across DBus so that a program can create a menu simply without worrying about how it is displayed on the diff --git a/debian/gir1.2-dbusmenu-glib-0.4.install b/debian/gir1.2-dbusmenu-glib-0.4.install index 20751be..a9808fc 100644 --- a/debian/gir1.2-dbusmenu-glib-0.4.install +++ b/debian/gir1.2-dbusmenu-glib-0.4.install @@ -1 +1 @@ -debian/tmp/usr/lib/girepository-1.0/Dbusmenu-0.4.typelib +debian/tmp/gtk3/usr/lib/girepository-1.0/Dbusmenu-0.4.typelib /usr/lib/girepository-1.0/ diff --git a/debian/gir1.2-dbusmenu-gtk-0.4.install b/debian/gir1.2-dbusmenu-gtk-0.4.install index 16bad97..3493751 100644 --- a/debian/gir1.2-dbusmenu-gtk-0.4.install +++ b/debian/gir1.2-dbusmenu-gtk-0.4.install @@ -1 +1 @@ -debian/tmp/usr/lib/girepository-1.0/DbusmenuGtk-0.4.typelib +debian/tmp/gtk2/usr/lib/girepository-1.0/DbusmenuGtk-0.4.typelib /usr/lib/girepository-1.0/ diff --git a/debian/gir1.2-dbusmenu-gtk3-0.4.install b/debian/gir1.2-dbusmenu-gtk3-0.4.install index abf6fab..64a74b6 100644 --- a/debian/gir1.2-dbusmenu-gtk3-0.4.install +++ b/debian/gir1.2-dbusmenu-gtk3-0.4.install @@ -1 +1 @@ -debian/tmp/usr/lib/girepository-1.0/DbusmenuGtk3-0.4.typelib +debian/tmp/gtk3/usr/lib/girepository-1.0/DbusmenuGtk3-0.4.typelib /usr/lib/girepository-1.0/ diff --git a/debian/libdbusmenu-glib-dev.install b/debian/libdbusmenu-glib-dev.install index f8e0345..197e9de 100644 --- a/debian/libdbusmenu-glib-dev.install +++ b/debian/libdbusmenu-glib-dev.install @@ -1,6 +1,6 @@ -debian/tmp/usr/include/libdbusmenu-0.4/libdbusmenu-glib/* -debian/tmp/usr/lib/pkgconfig/dbusmenu-glib-0.4.pc -debian/tmp/usr/lib/libdbusmenu-glib.a -debian/tmp/usr/lib/libdbusmenu-glib.so -debian/tmp/usr/share/gir-1.0/Dbusmenu-0.4.gir -debian/tmp/usr/share/vala/vapi/Dbusmenu-0.4.vapi +debian/tmp/gtk3/usr/include/libdbusmenu-0.4/libdbusmenu-glib /usr/include/libdbusmenu-0.4/ +debian/tmp/gtk3/usr/lib/pkgconfig/dbusmenu-glib-0.4.pc /usr/lib/pkgconfig/ +debian/tmp/gtk3/usr/lib/libdbusmenu-glib.a /usr/lib/ +debian/tmp/gtk3/usr/lib/libdbusmenu-glib.so /usr/lib/ +debian/tmp/gtk3/usr/share/gir-1.0/Dbusmenu-0.4.gir /usr/share/gir-1.0/ +debian/tmp/gtk3/usr/share/vala/vapi/Dbusmenu-0.4.vapi /usr/share/vala/vapi/ diff --git a/debian/libdbusmenu-glib-doc.install b/debian/libdbusmenu-glib-doc.install index 2fde7f6..ec8274e 100644 --- a/debian/libdbusmenu-glib-doc.install +++ b/debian/libdbusmenu-glib-doc.install @@ -1 +1 @@ -debian/tmp//usr/share/gtk-doc/html/libdbusmenu-glib/* +debian/tmp/gtk3/usr/share/gtk-doc/html/libdbusmenu-glib /usr/share/gtk-doc/html/ diff --git a/debian/libdbusmenu-glib4.install b/debian/libdbusmenu-glib4.install index acdbacf..a98765c 100644 --- a/debian/libdbusmenu-glib4.install +++ b/debian/libdbusmenu-glib4.install @@ -1 +1 @@ -debian/tmp/usr/lib/libdbusmenu-glib.so.* +debian/tmp/gtk3/usr/lib/libdbusmenu-glib.so.* /usr/lib/ diff --git a/debian/libdbusmenu-glib4.symbols b/debian/libdbusmenu-glib4.symbols index 5cac25d..0e0dcb4 100644 --- a/debian/libdbusmenu-glib4.symbols +++ b/debian/libdbusmenu-glib4.symbols @@ -1,4 +1,4 @@ -libdbusmenu-glib.so.3 libdbusmenu-glib3 #MINVER# +libdbusmenu-glib.so.4 libdbusmenu-glib4 #MINVER# dbus_menu_clean_xml@Base 0.4.2 dbusmenu_client_add_type_handler@Base 0.4.2 dbusmenu_client_add_type_handler_full@Base 0.4.2 @@ -78,64 +78,3 @@ libdbusmenu-glib.so.3 libdbusmenu-glib3 #MINVER# dbusmenu_text_direction_get_type@Base 0.4.2 dbusmenu_text_direction_get_value_from_nick@Base 0.4.2 session_bus_cb@Base 0.4.2 -libdbusmenu-gtk.so.3 libdbusmenu-glib3 #MINVER# - dbusmenu_gtk_parse_get_cached_item@Base 0.4.2 - dbusmenu_gtk_parse_menu_structure@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_build_menuitem@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_get_type@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_register_to_client@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_set_menuitem@Base 0.4.2 - dbusmenu_gtkclient_get_accel_group@Base 0.4.2 - dbusmenu_gtkclient_get_type@Base 0.4.2 - dbusmenu_gtkclient_menuitem_get@Base 0.4.2 - dbusmenu_gtkclient_menuitem_get_submenu@Base 0.4.2 - dbusmenu_gtkclient_new@Base 0.4.2 - dbusmenu_gtkclient_newitem_base@Base 0.4.2 - dbusmenu_gtkclient_set_accel_group@Base 0.4.2 - dbusmenu_gtkmenu_get_client@Base 0.4.2 - dbusmenu_gtkmenu_get_type@Base 0.4.2 - dbusmenu_gtkmenu_new@Base 0.4.2 - dbusmenu_menuitem_property_get_image@Base 0.4.2 - dbusmenu_menuitem_property_get_shortcut@Base 0.4.2 - dbusmenu_menuitem_property_set_image@Base 0.4.2 - dbusmenu_menuitem_property_set_shortcut@Base 0.4.2 - dbusmenu_menuitem_property_set_shortcut_menuitem@Base 0.4.2 - dbusmenu_menuitem_property_set_shortcut_string@Base 0.4.2 - genericmenuitem_get_image@Base 0.4.2 - genericmenuitem_get_type@Base 0.4.2 - genericmenuitem_set_check_type@Base 0.4.2 - genericmenuitem_set_image@Base 0.4.2 - genericmenuitem_set_state@Base 0.4.2 - theme_dir_db@Base 0.4.2 -libdbusmenu-gtk3.so.3 libdbusmenu-glib3 #MINVER# - dbusmenu_gtk_parse_get_cached_item@Base 0.4.2 - dbusmenu_gtk_parse_menu_structure@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_build_menuitem@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_get_type@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_register_to_client@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_set_menuitem@Base 0.4.2 - dbusmenu_gtkclient_get_accel_group@Base 0.4.2 - dbusmenu_gtkclient_get_type@Base 0.4.2 - dbusmenu_gtkclient_menuitem_get@Base 0.4.2 - dbusmenu_gtkclient_menuitem_get_submenu@Base 0.4.2 - dbusmenu_gtkclient_new@Base 0.4.2 - dbusmenu_gtkclient_newitem_base@Base 0.4.2 - dbusmenu_gtkclient_set_accel_group@Base 0.4.2 - dbusmenu_gtkmenu_get_client@Base 0.4.2 - dbusmenu_gtkmenu_get_type@Base 0.4.2 - dbusmenu_gtkmenu_new@Base 0.4.2 - dbusmenu_menuitem_property_get_image@Base 0.4.2 - dbusmenu_menuitem_property_get_shortcut@Base 0.4.2 - dbusmenu_menuitem_property_set_image@Base 0.4.2 - dbusmenu_menuitem_property_set_shortcut@Base 0.4.2 - dbusmenu_menuitem_property_set_shortcut_menuitem@Base 0.4.2 - dbusmenu_menuitem_property_set_shortcut_string@Base 0.4.2 - genericmenuitem_get_image@Base 0.4.2 - genericmenuitem_get_type@Base 0.4.2 - genericmenuitem_set_check_type@Base 0.4.2 - genericmenuitem_set_image@Base 0.4.2 - genericmenuitem_set_state@Base 0.4.2 - theme_dir_db@Base 0.4.2 -libdbusmenu-jsonloader.so.3 libdbusmenu-glib3 #MINVER# - dbusmenu_json_build_from_file@Base 0.4.2 - dbusmenu_json_build_from_node@Base 0.4.2 diff --git a/debian/libdbusmenu-gtk-dev.install b/debian/libdbusmenu-gtk-dev.install index 0ce2419..2e5dc02 100644 --- a/debian/libdbusmenu-gtk-dev.install +++ b/debian/libdbusmenu-gtk-dev.install @@ -1,6 +1,6 @@ -debian/tmp/usr/include/libdbusmenu-0.4/libdbusmenu-gtk/* -debian/tmp/usr/lib/pkgconfig/dbusmenu-gtk-0.4.pc -debian/tmp/usr/lib/libdbusmenu-gtk.a -debian/tmp/usr/lib/libdbusmenu-gtk.so -debian/tmp/usr/share/gir-1.0/DbusmenuGtk-0.4.gir -debian/tmp/usr/share/vala/vapi/DbusmenuGtk-0.4.vapi +debian/tmp/gtk2/usr/include/libdbusmenu-0.4/libdbusmenu-gtk /usr/include/libdbusmenu-0.4/ +debian/tmp/gtk2/usr/lib/pkgconfig/dbusmenu-gtk-0.4.pc /usr/lib/pkgconfig/ +debian/tmp/gtk2/usr/lib/libdbusmenu-gtk.a /usr/lib/ +debian/tmp/gtk2/usr/lib/libdbusmenu-gtk.so /usr/lib/ +debian/tmp/gtk2/usr/share/gir-1.0/DbusmenuGtk-0.4.gir /usr/share/gir-1.0/ +debian/tmp/gtk2/usr/share/vala/vapi/DbusmenuGtk-0.4.vapi /usr/share/vala/vapi/ diff --git a/debian/libdbusmenu-gtk-doc.install b/debian/libdbusmenu-gtk-doc.install index e349aaa..b7dae35 100644 --- a/debian/libdbusmenu-gtk-doc.install +++ b/debian/libdbusmenu-gtk-doc.install @@ -1 +1 @@ -debian/tmp//usr/share/gtk-doc/html/libdbusmenu-gtk/* +debian/tmp/gtk2/usr/share/gtk-doc/html/libdbusmenu-gtk /usr/share/gtk-doc/html/ diff --git a/debian/libdbusmenu-gtk3-3.symbols b/debian/libdbusmenu-gtk3-3.symbols deleted file mode 100644 index 3e44390..0000000 --- a/debian/libdbusmenu-gtk3-3.symbols +++ /dev/null @@ -1,141 +0,0 @@ -libdbusmenu-glib.so.3 libdbusmenu-gtk3-3 #MINVER# - dbus_menu_clean_xml@Base 0.4.2 - dbusmenu_client_add_type_handler@Base 0.4.2 - dbusmenu_client_add_type_handler_full@Base 0.4.2 - dbusmenu_client_get_icon_paths@Base 0.4.2 - dbusmenu_client_get_root@Base 0.4.2 - dbusmenu_client_get_status@Base 0.4.2 - dbusmenu_client_get_text_direction@Base 0.4.2 - dbusmenu_client_get_type@Base 0.4.2 - dbusmenu_client_menuitem_get_type@Base 0.4.2 - dbusmenu_client_menuitem_new@Base 0.4.2 - dbusmenu_client_new@Base 0.4.2 - dbusmenu_client_send_about_to_show@Base 0.4.2 - dbusmenu_client_send_event@Base 0.4.2 - dbusmenu_defaults_default_get@Base 0.4.2 - dbusmenu_defaults_default_get_type@Base 0.4.2 - dbusmenu_defaults_default_set@Base 0.4.2 - dbusmenu_defaults_get_type@Base 0.4.2 - dbusmenu_defaults_ref_default@Base 0.4.2 - dbusmenu_menuitem_build_variant@Base 0.4.2 - dbusmenu_menuitem_child_add_position@Base 0.4.2 - dbusmenu_menuitem_child_append@Base 0.4.2 - dbusmenu_menuitem_child_delete@Base 0.4.2 - dbusmenu_menuitem_child_find@Base 0.4.2 - dbusmenu_menuitem_child_prepend@Base 0.4.2 - dbusmenu_menuitem_child_reorder@Base 0.4.2 - dbusmenu_menuitem_exposed@Base 0.4.2 - dbusmenu_menuitem_find_id@Base 0.4.2 - dbusmenu_menuitem_foreach@Base 0.4.2 - dbusmenu_menuitem_get_children@Base 0.4.2 - dbusmenu_menuitem_get_id@Base 0.4.2 - dbusmenu_menuitem_get_parent@Base 0.4.2 - dbusmenu_menuitem_get_position@Base 0.4.2 - dbusmenu_menuitem_get_position_realized@Base 0.4.2 - dbusmenu_menuitem_get_root@Base 0.4.2 - dbusmenu_menuitem_get_type@Base 0.4.2 - dbusmenu_menuitem_handle_event@Base 0.4.2 - dbusmenu_menuitem_new@Base 0.4.2 - dbusmenu_menuitem_new_with_id@Base 0.4.2 - dbusmenu_menuitem_properties_copy@Base 0.4.2 - dbusmenu_menuitem_properties_list@Base 0.4.2 - dbusmenu_menuitem_properties_variant@Base 0.4.2 - dbusmenu_menuitem_property_exist@Base 0.4.2 - dbusmenu_menuitem_property_get@Base 0.4.2 - dbusmenu_menuitem_property_get_bool@Base 0.4.2 - dbusmenu_menuitem_property_get_int@Base 0.4.2 - dbusmenu_menuitem_property_get_variant@Base 0.4.2 - dbusmenu_menuitem_property_is_default@Base 0.4.2 - dbusmenu_menuitem_property_remove@Base 0.4.2 - dbusmenu_menuitem_property_set@Base 0.4.2 - dbusmenu_menuitem_property_set_bool@Base 0.4.2 - dbusmenu_menuitem_property_set_int@Base 0.4.2 - dbusmenu_menuitem_property_set_variant@Base 0.4.2 - dbusmenu_menuitem_proxy_get_type@Base 0.4.2 - dbusmenu_menuitem_proxy_get_wrapped@Base 0.4.2 - dbusmenu_menuitem_proxy_new@Base 0.4.2 - dbusmenu_menuitem_realized@Base 0.4.2 - dbusmenu_menuitem_send_about_to_show@Base 0.4.2 - dbusmenu_menuitem_set_parent@Base 0.4.2 - dbusmenu_menuitem_set_realized@Base 0.4.2 - dbusmenu_menuitem_set_root@Base 0.4.2 - dbusmenu_menuitem_show_to_user@Base 0.4.2 - dbusmenu_menuitem_take_children@Base 0.4.2 - dbusmenu_menuitem_unparent@Base 0.4.2 - dbusmenu_server_get_icon_paths@Base 0.4.2 - dbusmenu_server_get_status@Base 0.4.2 - dbusmenu_server_get_text_direction@Base 0.4.2 - dbusmenu_server_get_type@Base 0.4.2 - dbusmenu_server_new@Base 0.4.2 - dbusmenu_server_set_icon_paths@Base 0.4.2 - dbusmenu_server_set_root@Base 0.4.2 - dbusmenu_server_set_status@Base 0.4.2 - dbusmenu_server_set_text_direction@Base 0.4.2 - dbusmenu_status_get_nick@Base 0.4.2 - dbusmenu_status_get_type@Base 0.4.2 - dbusmenu_status_get_value_from_nick@Base 0.4.2 - dbusmenu_text_direction_get_nick@Base 0.4.2 - dbusmenu_text_direction_get_type@Base 0.4.2 - dbusmenu_text_direction_get_value_from_nick@Base 0.4.2 - session_bus_cb@Base 0.4.2 -libdbusmenu-gtk.so.3 libdbusmenu-gtk3-3 #MINVER# - dbusmenu_gtk_parse_get_cached_item@Base 0.4.2 - dbusmenu_gtk_parse_menu_structure@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_build_menuitem@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_get_type@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_register_to_client@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_set_menuitem@Base 0.4.2 - dbusmenu_gtkclient_get_accel_group@Base 0.4.2 - dbusmenu_gtkclient_get_type@Base 0.4.2 - dbusmenu_gtkclient_menuitem_get@Base 0.4.2 - dbusmenu_gtkclient_menuitem_get_submenu@Base 0.4.2 - dbusmenu_gtkclient_new@Base 0.4.2 - dbusmenu_gtkclient_newitem_base@Base 0.4.2 - dbusmenu_gtkclient_set_accel_group@Base 0.4.2 - dbusmenu_gtkmenu_get_client@Base 0.4.2 - dbusmenu_gtkmenu_get_type@Base 0.4.2 - dbusmenu_gtkmenu_new@Base 0.4.2 - dbusmenu_menuitem_property_get_image@Base 0.4.2 - dbusmenu_menuitem_property_get_shortcut@Base 0.4.2 - dbusmenu_menuitem_property_set_image@Base 0.4.2 - dbusmenu_menuitem_property_set_shortcut@Base 0.4.2 - dbusmenu_menuitem_property_set_shortcut_menuitem@Base 0.4.2 - dbusmenu_menuitem_property_set_shortcut_string@Base 0.4.2 - genericmenuitem_get_image@Base 0.4.2 - genericmenuitem_get_type@Base 0.4.2 - genericmenuitem_set_check_type@Base 0.4.2 - genericmenuitem_set_image@Base 0.4.2 - genericmenuitem_set_state@Base 0.4.2 - theme_dir_db@Base 0.4.2 -libdbusmenu-gtk3.so.3 libdbusmenu-gtk3-3 #MINVER# - dbusmenu_gtk_parse_get_cached_item@Base 0.4.2 - dbusmenu_gtk_parse_menu_structure@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_build_menuitem@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_get_type@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_register_to_client@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_set_menuitem@Base 0.4.2 - dbusmenu_gtkclient_get_accel_group@Base 0.4.2 - dbusmenu_gtkclient_get_type@Base 0.4.2 - dbusmenu_gtkclient_menuitem_get@Base 0.4.2 - dbusmenu_gtkclient_menuitem_get_submenu@Base 0.4.2 - dbusmenu_gtkclient_new@Base 0.4.2 - dbusmenu_gtkclient_newitem_base@Base 0.4.2 - dbusmenu_gtkclient_set_accel_group@Base 0.4.2 - dbusmenu_gtkmenu_get_client@Base 0.4.2 - dbusmenu_gtkmenu_get_type@Base 0.4.2 - dbusmenu_gtkmenu_new@Base 0.4.2 - dbusmenu_menuitem_property_get_image@Base 0.4.2 - dbusmenu_menuitem_property_get_shortcut@Base 0.4.2 - dbusmenu_menuitem_property_set_image@Base 0.4.2 - dbusmenu_menuitem_property_set_shortcut@Base 0.4.2 - dbusmenu_menuitem_property_set_shortcut_menuitem@Base 0.4.2 - dbusmenu_menuitem_property_set_shortcut_string@Base 0.4.2 - genericmenuitem_get_image@Base 0.4.2 - genericmenuitem_get_type@Base 0.4.2 - genericmenuitem_set_check_type@Base 0.4.2 - genericmenuitem_set_image@Base 0.4.2 - genericmenuitem_set_state@Base 0.4.2 - theme_dir_db@Base 0.4.2 -libdbusmenu-jsonloader.so.3 libdbusmenu-gtk3-3 #MINVER# - dbusmenu_json_build_from_file@Base 0.4.2 - dbusmenu_json_build_from_node@Base 0.4.2 diff --git a/debian/libdbusmenu-gtk3-4.install b/debian/libdbusmenu-gtk3-4.install index af2e9a3..2bf1f59 100644 --- a/debian/libdbusmenu-gtk3-4.install +++ b/debian/libdbusmenu-gtk3-4.install @@ -1 +1 @@ -debian/tmp/usr/lib/libdbusmenu-gtk3.so.* +debian/tmp/gtk3/usr/lib/libdbusmenu-gtk3.so.* /usr/lib/ diff --git a/debian/libdbusmenu-gtk3-4.symbols b/debian/libdbusmenu-gtk3-4.symbols new file mode 100644 index 0000000..1988a84 --- /dev/null +++ b/debian/libdbusmenu-gtk3-4.symbols @@ -0,0 +1,25 @@ +libdbusmenu-gtk3.so.4 libdbusmenu-gtk3-4 #MINVER# + dbusmenu_gtk_parse_get_cached_item@Base 0.4.2 + dbusmenu_gtk_parse_menu_structure@Base 0.4.2 + dbusmenu_gtkclient_get_accel_group@Base 0.4.2 + dbusmenu_gtkclient_get_type@Base 0.4.2 + dbusmenu_gtkclient_menuitem_get@Base 0.4.2 + dbusmenu_gtkclient_menuitem_get_submenu@Base 0.4.2 + dbusmenu_gtkclient_new@Base 0.4.2 + dbusmenu_gtkclient_newitem_base@Base 0.4.2 + dbusmenu_gtkclient_set_accel_group@Base 0.4.2 + dbusmenu_gtkmenu_get_client@Base 0.4.2 + dbusmenu_gtkmenu_get_type@Base 0.4.2 + dbusmenu_gtkmenu_new@Base 0.4.2 + dbusmenu_menuitem_property_get_image@Base 0.4.2 + dbusmenu_menuitem_property_get_shortcut@Base 0.4.2 + dbusmenu_menuitem_property_set_image@Base 0.4.2 + dbusmenu_menuitem_property_set_shortcut@Base 0.4.2 + dbusmenu_menuitem_property_set_shortcut_menuitem@Base 0.4.2 + dbusmenu_menuitem_property_set_shortcut_string@Base 0.4.2 + genericmenuitem_get_image@Base 0.4.2 + genericmenuitem_get_type@Base 0.4.2 + genericmenuitem_set_check_type@Base 0.4.2 + genericmenuitem_set_image@Base 0.4.2 + genericmenuitem_set_state@Base 0.4.2 + theme_dir_db@Base 0.4.2 diff --git a/debian/libdbusmenu-gtk3-dev.install b/debian/libdbusmenu-gtk3-dev.install index dcd24a3..6d3fa0b 100644 --- a/debian/libdbusmenu-gtk3-dev.install +++ b/debian/libdbusmenu-gtk3-dev.install @@ -1,6 +1,6 @@ -debian/tmp/usr/include/libdbusmenu-0.4/libdbusmenu-gtk3/* -debian/tmp/usr/lib/pkgconfig/dbusmenu-gtk3-0.4.pc -debian/tmp/usr/lib/libdbusmenu-gtk3.a -debian/tmp/usr/lib/libdbusmenu-gtk3.so -debian/tmp/usr/share/gir-1.0/DbusmenuGtk3-0.4.gir -debian/tmp/usr/share/vala/vapi/DbusmenuGtk3-0.4.vapi +debian/tmp/gtk3/usr/include/libdbusmenu-0.4/libdbusmenu-gtk3 /usr/include/libdbusmenu-0.4/ +debian/tmp/gtk3/usr/lib/pkgconfig/dbusmenu-gtk3-0.4.pc /usr/lib/pkgconfig/ +debian/tmp/gtk3/usr/lib/libdbusmenu-gtk3.a /usr/lib/ +debian/tmp/gtk3/usr/lib/libdbusmenu-gtk3.so /usr/lib/ +debian/tmp/gtk3/usr/share/gir-1.0/DbusmenuGtk3-0.4.gir /usr/share/gir-1.0/ +debian/tmp/gtk3/usr/share/vala/vapi/DbusmenuGtk3-0.4.vapi /usr/share/gir-1.0/ diff --git a/debian/libdbusmenu-gtk4.install b/debian/libdbusmenu-gtk4.install index d677935..2605240 100644 --- a/debian/libdbusmenu-gtk4.install +++ b/debian/libdbusmenu-gtk4.install @@ -1 +1 @@ -debian/tmp/usr/lib/libdbusmenu-gtk.so.* +debian/tmp/gtk2/usr/lib/libdbusmenu-gtk.so.* /usr/lib/ diff --git a/debian/libdbusmenu-gtk4.symbols b/debian/libdbusmenu-gtk4.symbols index fd2d6aa..a2bc347 100644 --- a/debian/libdbusmenu-gtk4.symbols +++ b/debian/libdbusmenu-gtk4.symbols @@ -1,90 +1,6 @@ -libdbusmenu-glib.so.3 libdbusmenu-gtk3 #MINVER# - dbus_menu_clean_xml@Base 0.4.2 - dbusmenu_client_add_type_handler@Base 0.4.2 - dbusmenu_client_add_type_handler_full@Base 0.4.2 - dbusmenu_client_get_icon_paths@Base 0.4.2 - dbusmenu_client_get_root@Base 0.4.2 - dbusmenu_client_get_status@Base 0.4.2 - dbusmenu_client_get_text_direction@Base 0.4.2 - dbusmenu_client_get_type@Base 0.4.2 - dbusmenu_client_menuitem_get_type@Base 0.4.2 - dbusmenu_client_menuitem_new@Base 0.4.2 - dbusmenu_client_new@Base 0.4.2 - dbusmenu_client_send_about_to_show@Base 0.4.2 - dbusmenu_client_send_event@Base 0.4.2 - dbusmenu_defaults_default_get@Base 0.4.2 - dbusmenu_defaults_default_get_type@Base 0.4.2 - dbusmenu_defaults_default_set@Base 0.4.2 - dbusmenu_defaults_get_type@Base 0.4.2 - dbusmenu_defaults_ref_default@Base 0.4.2 - dbusmenu_menuitem_build_variant@Base 0.4.2 - dbusmenu_menuitem_child_add_position@Base 0.4.2 - dbusmenu_menuitem_child_append@Base 0.4.2 - dbusmenu_menuitem_child_delete@Base 0.4.2 - dbusmenu_menuitem_child_find@Base 0.4.2 - dbusmenu_menuitem_child_prepend@Base 0.4.2 - dbusmenu_menuitem_child_reorder@Base 0.4.2 - dbusmenu_menuitem_exposed@Base 0.4.2 - dbusmenu_menuitem_find_id@Base 0.4.2 - dbusmenu_menuitem_foreach@Base 0.4.2 - dbusmenu_menuitem_get_children@Base 0.4.2 - dbusmenu_menuitem_get_id@Base 0.4.2 - dbusmenu_menuitem_get_parent@Base 0.4.2 - dbusmenu_menuitem_get_position@Base 0.4.2 - dbusmenu_menuitem_get_position_realized@Base 0.4.2 - dbusmenu_menuitem_get_root@Base 0.4.2 - dbusmenu_menuitem_get_type@Base 0.4.2 - dbusmenu_menuitem_handle_event@Base 0.4.2 - dbusmenu_menuitem_new@Base 0.4.2 - dbusmenu_menuitem_new_with_id@Base 0.4.2 - dbusmenu_menuitem_properties_copy@Base 0.4.2 - dbusmenu_menuitem_properties_list@Base 0.4.2 - dbusmenu_menuitem_properties_variant@Base 0.4.2 - dbusmenu_menuitem_property_exist@Base 0.4.2 - dbusmenu_menuitem_property_get@Base 0.4.2 - dbusmenu_menuitem_property_get_bool@Base 0.4.2 - dbusmenu_menuitem_property_get_int@Base 0.4.2 - dbusmenu_menuitem_property_get_variant@Base 0.4.2 - dbusmenu_menuitem_property_is_default@Base 0.4.2 - dbusmenu_menuitem_property_remove@Base 0.4.2 - dbusmenu_menuitem_property_set@Base 0.4.2 - dbusmenu_menuitem_property_set_bool@Base 0.4.2 - dbusmenu_menuitem_property_set_int@Base 0.4.2 - dbusmenu_menuitem_property_set_variant@Base 0.4.2 - dbusmenu_menuitem_proxy_get_type@Base 0.4.2 - dbusmenu_menuitem_proxy_get_wrapped@Base 0.4.2 - dbusmenu_menuitem_proxy_new@Base 0.4.2 - dbusmenu_menuitem_realized@Base 0.4.2 - dbusmenu_menuitem_send_about_to_show@Base 0.4.2 - dbusmenu_menuitem_set_parent@Base 0.4.2 - dbusmenu_menuitem_set_realized@Base 0.4.2 - dbusmenu_menuitem_set_root@Base 0.4.2 - dbusmenu_menuitem_show_to_user@Base 0.4.2 - dbusmenu_menuitem_take_children@Base 0.4.2 - dbusmenu_menuitem_unparent@Base 0.4.2 - dbusmenu_server_get_icon_paths@Base 0.4.2 - dbusmenu_server_get_status@Base 0.4.2 - dbusmenu_server_get_text_direction@Base 0.4.2 - dbusmenu_server_get_type@Base 0.4.2 - dbusmenu_server_new@Base 0.4.2 - dbusmenu_server_set_icon_paths@Base 0.4.2 - dbusmenu_server_set_root@Base 0.4.2 - dbusmenu_server_set_status@Base 0.4.2 - dbusmenu_server_set_text_direction@Base 0.4.2 - dbusmenu_status_get_nick@Base 0.4.2 - dbusmenu_status_get_type@Base 0.4.2 - dbusmenu_status_get_value_from_nick@Base 0.4.2 - dbusmenu_text_direction_get_nick@Base 0.4.2 - dbusmenu_text_direction_get_type@Base 0.4.2 - dbusmenu_text_direction_get_value_from_nick@Base 0.4.2 - session_bus_cb@Base 0.4.2 -libdbusmenu-gtk.so.3 libdbusmenu-gtk3 #MINVER# +libdbusmenu-gtk.so.4 libdbusmenu-gtk4 #MINVER# dbusmenu_gtk_parse_get_cached_item@Base 0.4.2 dbusmenu_gtk_parse_menu_structure@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_build_menuitem@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_get_type@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_register_to_client@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_set_menuitem@Base 0.4.2 dbusmenu_gtkclient_get_accel_group@Base 0.4.2 dbusmenu_gtkclient_get_type@Base 0.4.2 dbusmenu_gtkclient_menuitem_get@Base 0.4.2 @@ -107,35 +23,3 @@ libdbusmenu-gtk.so.3 libdbusmenu-gtk3 #MINVER# genericmenuitem_set_image@Base 0.4.2 genericmenuitem_set_state@Base 0.4.2 theme_dir_db@Base 0.4.2 -libdbusmenu-gtk3.so.3 libdbusmenu-gtk3 #MINVER# - dbusmenu_gtk_parse_get_cached_item@Base 0.4.2 - dbusmenu_gtk_parse_menu_structure@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_build_menuitem@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_get_type@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_register_to_client@Base 0.4.2 - dbusmenu_gtk_serializable_menu_item_set_menuitem@Base 0.4.2 - dbusmenu_gtkclient_get_accel_group@Base 0.4.2 - dbusmenu_gtkclient_get_type@Base 0.4.2 - dbusmenu_gtkclient_menuitem_get@Base 0.4.2 - dbusmenu_gtkclient_menuitem_get_submenu@Base 0.4.2 - dbusmenu_gtkclient_new@Base 0.4.2 - dbusmenu_gtkclient_newitem_base@Base 0.4.2 - dbusmenu_gtkclient_set_accel_group@Base 0.4.2 - dbusmenu_gtkmenu_get_client@Base 0.4.2 - dbusmenu_gtkmenu_get_type@Base 0.4.2 - dbusmenu_gtkmenu_new@Base 0.4.2 - dbusmenu_menuitem_property_get_image@Base 0.4.2 - dbusmenu_menuitem_property_get_shortcut@Base 0.4.2 - dbusmenu_menuitem_property_set_image@Base 0.4.2 - dbusmenu_menuitem_property_set_shortcut@Base 0.4.2 - dbusmenu_menuitem_property_set_shortcut_menuitem@Base 0.4.2 - dbusmenu_menuitem_property_set_shortcut_string@Base 0.4.2 - genericmenuitem_get_image@Base 0.4.2 - genericmenuitem_get_type@Base 0.4.2 - genericmenuitem_set_check_type@Base 0.4.2 - genericmenuitem_set_image@Base 0.4.2 - genericmenuitem_set_state@Base 0.4.2 - theme_dir_db@Base 0.4.2 -libdbusmenu-jsonloader.so.3 libdbusmenu-gtk3 #MINVER# - dbusmenu_json_build_from_file@Base 0.4.2 - dbusmenu_json_build_from_node@Base 0.4.2 diff --git a/debian/libdbusmenu-jsonloader-dev.install b/debian/libdbusmenu-jsonloader-dev.install index 9594064..95902cd 100644 --- a/debian/libdbusmenu-jsonloader-dev.install +++ b/debian/libdbusmenu-jsonloader-dev.install @@ -1,4 +1,4 @@ -debian/tmp/usr/include/libdbusmenu-0.4/libdbusmenu-jsonloader/* -debian/tmp/usr/lib/pkgconfig/dbusmenu-jsonloader-0.4.pc -debian/tmp/usr/lib/libdbusmenu-jsonloader.a -debian/tmp/usr/lib/libdbusmenu-jsonloader.so +debian/tmp/gtk3/usr/include/libdbusmenu-0.4/libdbusmenu-jsonloader /usr/include/libdbusmenu-0.4/ +debian/tmp/gtk3/usr/lib/pkgconfig/dbusmenu-jsonloader-0.4.pc /usr/lib/pkgconfig/ +debian/tmp/gtk3/usr/lib/libdbusmenu-jsonloader.a /usr/lib/ +debian/tmp/gtk3/usr/lib/libdbusmenu-jsonloader.so /usr/lib/ diff --git a/debian/libdbusmenu-jsonloader4.install b/debian/libdbusmenu-jsonloader4.install index bff47f5..74f887b 100644 --- a/debian/libdbusmenu-jsonloader4.install +++ b/debian/libdbusmenu-jsonloader4.install @@ -1 +1 @@ -debian/tmp/usr/lib/libdbusmenu-jsonloader.so.* +debian/tmp/gtk3/usr/lib/libdbusmenu-jsonloader.so.* /usr/lib/ diff --git a/debian/libdbusmenu-jsonloader4.symbols b/debian/libdbusmenu-jsonloader4.symbols new file mode 100644 index 0000000..38a6868 --- /dev/null +++ b/debian/libdbusmenu-jsonloader4.symbols @@ -0,0 +1,3 @@ +libdbusmenu-jsonloader.so.4 libdbusmenu-jsonloader4 #MINVER# + dbusmenu_json_build_from_file@Base 0.4.2 + dbusmenu_json_build_from_node@Base 0.4.2 diff --git a/debian/libdbusmenu-tools.install b/debian/libdbusmenu-tools.install index 4bdf013..1019dd8 100644 --- a/debian/libdbusmenu-tools.install +++ b/debian/libdbusmenu-tools.install @@ -1,3 +1,3 @@ -debian/tmp/usr/lib/libdbusmenu/dbusmenu-* -debian/tmp/usr/share/libdbusmenu/* /usr/share/libdbusmenu-tools/ -debian/tmp/usr/share/doc/libdbusmenu/README.dbusmenu-bench /usr/share/doc/libdbusmenu-tools/ +debian/tmp/gtk3/usr/lib/libdbusmenu/dbusmenu-* /usr/lib/libdbusmenu/ +debian/tmp/gtk3/usr/share/libdbusmenu/* /usr/share/libdbusmenu-tools/ +debian/tmp/gtk3/usr/share/doc/libdbusmenu/README.dbusmenu-bench /usr/share/doc/libdbusmenu-tools/ diff --git a/debian/rules b/debian/rules index 2243a71..d53875d 100755 --- a/debian/rules +++ b/debian/rules @@ -1,42 +1,25 @@ #!/usr/bin/make -f +DEB_BUILDDIR = build +DEB_MAKE_FLAVORS = gtk2 gtk3 + include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk include /usr/share/cdbs/1/rules/autoreconf.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk -DEB_SRCDIR = . -DEB_BUILDDIR = $(DEB_SRCDIR)/build +DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/tmp/@FLAVOR@ +DEB_DESTDIR = $(CURDIR)/debian/tmp/$(cdbs_make_curflavor)/ + +DEB_CONFIGURE_FLAGS_gtk2 = --with-gtk=2 +DEB_CONFIGURE_FLAGS_gtk3 = --with-gtk=3 DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc --enable-introspection + LDFLAGS += -Wl,-z,defs -Wl,--as-needed -configure/libdbusmenu-gtk4:: stamp-configure-gtk2 -stamp-configure-gtk2: - : # configure for GTK+ 2.0 - set -e; \ - rm -rf build-gtk2; \ - mkdir build-gtk2; \ - cd build-gtk2; \ - $(DEB_CONFIGURE_SCRIPT_ENV) ../configure --with-gtk=2 \ - $(filter-out --srcdir=%, $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_EXTRA_FLAGS)) \ - --enable-gtk-doc=no; \ - cd ..; - touch stamp-configure-gtk2 - -build/libdbusmenu-gtk4:: stamp-build-gtk2 -stamp-build-gtk2: stamp-configure-gtk2 - : # build for GTK+ 2.0 - $(MAKE) -C build-gtk2; - touch stamp-build-gtk2 - -common-install-prehook-arch:: stamp-build-gtk2 - : # install for GTK+ 2.0 - $(MAKE) -C build-gtk2 DESTDIR=$(CURDIR)/debian/tmp install - -binary-predeb/gir%:: - dh_girepository -p$(cdbs_curpkg) - -clean:: - rm -f stamp-*-gtk2 - rm -rf build-gtk2 +debian/stamp-autotools/gtk2: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk2) +debian/stamp-autotools/gtk3: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk3) + +common-install-arch:: + find debian/tmp -name \*.la -delete -- cgit v1.2.3 From 5c18b9297487c1c6098efbec2aae6ccca8c6a2d6 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Fri, 24 Jun 2011 16:17:22 -0400 Subject: releasing version 0.4.90-0ubuntu2 --- debian/changelog | 8 ++++++++ debian/control | 4 +++- 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 27cf7ab..79bdc1a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +libdbusmenu (0.4.90-0ubuntu2) oneiric; urgency=low + + * debian/control + - Also a a breaks to libdbusmenu-glib4 for gir1.2-unity-3.0 and + gir1.2-indicate-0.5 to make sure the library gets held back too. + + -- Ken VanDine Fri, 24 Jun 2011 16:05:56 -0400 + libdbusmenu (0.4.90-0ubuntu1) oneiric; urgency=low [ Ted Gould ] diff --git a/debian/control b/debian/control index 85a8715..8ea0aca 100644 --- a/debian/control +++ b/debian/control @@ -36,7 +36,9 @@ Depends: ${shlibs:Depends}, ${misc:Depends} Breaks: indicator-messages (<< 0.3.0), indicator-session (<< 0.2.0), - libdbusmenu-glib0 + libdbusmenu-glib0, + gir1.2-unity-3.0 (<< 3.8.4-0ubuntu2), + gir1.2-indicate-0.5 (<< 0.5.0-0ubuntu4) Description: library for passing menus over DBus libdbusmenu passes a menu structure across DBus so that a program can create a menu simply without worrying about how it is displayed on the -- cgit v1.2.3 From b9a57897d1b62553d16ae44fef08801bfb053360 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Tue, 20 Sep 2011 09:41:41 -0700 Subject: releasing version 0.4.94-0ubuntu1 --- debian/changelog | 9 +++++++-- debian/control | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 8e51968..52b1419 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,16 @@ -libdbusmenu (0.4.94-0ubuntu1~ppa1) oneiric; urgency=low +libdbusmenu (0.4.94-0ubuntu1) oneiric; urgency=low + [ Ted Gould ] * New upstream release. ∘ Protect functions from NULL submenus (LP: #803667) ∘ Build fixes (LP: #552526, LP: #552530, LP: #552538, LP: #709761, LP: #713690, LP: #643871, LP: #713685) - -- Ted Gould Tue, 20 Sep 2011 00:08:19 -0500 + [ Ken VanDine ] + * debian/control + - build dep on valac-0.14 + + -- Ken VanDine Tue, 20 Sep 2011 09:16:41 -0700 libdbusmenu (0.4.93-0ubuntu1) oneiric; urgency=low diff --git a/debian/control b/debian/control index 8ea0aca..2555cd1 100644 --- a/debian/control +++ b/debian/control @@ -23,7 +23,7 @@ Build-Depends: debhelper (>= 5.0), gir1.2-gtk-3.0, libx11-dev (>= 1.3), dh-autoreconf, - valac-0.12 + valac-0.14 Standards-Version: 3.9.2 Homepage: https://launchpad.net/dbusmenu Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/dbusmenu/ubuntu -- cgit v1.2.3 From 74aaf2261edeb98ac895636ee11ef8a7f4ed23e6 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Fri, 28 Oct 2011 09:25:56 -0400 Subject: releasing version 0.5.0-1ubuntu1 --- debian/changelog | 52 +++++++++++++++++++++++++++++++ debian/compat | 1 + debian/control | 25 +++++++++++---- debian/gir1.2-dbusmenu-glib-0.4.install | 2 +- debian/gir1.2-dbusmenu-gtk-0.4.install | 2 +- debian/gir1.2-dbusmenu-gtk3-0.4.install | 2 +- debian/libdbusmenu-glib-dev.install | 12 +++---- debian/libdbusmenu-glib-doc.install | 2 +- debian/libdbusmenu-glib4.install | 2 +- debian/libdbusmenu-gtk-dev.install | 12 +++---- debian/libdbusmenu-gtk-doc.install | 2 +- debian/libdbusmenu-gtk3-4.install | 2 +- debian/libdbusmenu-gtk3-dev.install | 12 +++---- debian/libdbusmenu-gtk4.install | 2 +- debian/libdbusmenu-jsonloader-dev.install | 8 ++--- debian/libdbusmenu-jsonloader4.install | 2 +- debian/libdbusmenu-tools.install | 6 ++-- debian/rules | 20 ++++++++++-- 18 files changed, 124 insertions(+), 42 deletions(-) create mode 100644 debian/compat (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index b270830..8c48a32 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,19 @@ +libdbusmenu (0.5.0-1ubuntu1) precise; urgency=low + + * Multiarch conversion (partial, gobject instrospection not touched) + (LP: #859512) + + -- Riku Voipio Mon, 26 Sep 2011 12:13:07 +0300 + +libdbusmenu (0.5.0-1) experimental; urgency=low + + * Merge from Ubuntu. + + Re-enable GTK3 packages. + * Re-order includes in debian/rules to prevent lintian's + E: libdbusmenu source: temporary-debhelper-file + + -- Evgeni Golov Sat, 15 Oct 2011 09:29:54 +0200 + libdbusmenu (0.5.0-0ubuntu3) oneiric; urgency=low * libdbusmenu-gtk/client.c: @@ -131,6 +147,15 @@ libdbusmenu (0.4.4-0ubuntu1~ppa1) natty; urgency=low -- Ted Gould Mon, 25 Apr 2011 15:19:25 -0500 +libdbusmenu (0.4.3-1) unstable; urgency=low + + * Merge new upstream release from Ubuntu. + * Do not build-depend on gir-repository-dev, libgtk2.0-dev + has Gtk-2.0.gir since 2.24.4-1 (bump B-D accordingly). + * Standards-Version: 3.9.2 + + -- Evgeni Golov Wed, 27 Apr 2011 14:00:04 +0200 + libdbusmenu (0.4.3-0ubuntu3) natty; urgency=low * Backport bug fixes from trunk: @@ -171,6 +196,12 @@ libdbusmenu (0.4.3-0ubuntu1) natty; urgency=low -- Ted Gould Thu, 14 Apr 2011 16:49:13 -0500 +libdbusmenu (0.4.2-1) unstable; urgency=low + + * Merge new upstream release from Ubuntu. + + -- Evgeni Golov Mon, 11 Apr 2011 12:43:49 +0200 + libdbusmenu (0.4.2-0ubuntu3) natty; urgency=low * Merged fix, guard against an activation that does not actually have @@ -208,6 +239,27 @@ libdbusmenu (0.4.1-0ubuntu1) natty; urgency=low -- Ted Gould Thu, 31 Mar 2011 13:56:54 -0500 +libdbusmenu (0.4.0-2) unstable; urgency=low + + * Build-depend on gir1.2-atk-1.0, it's not pulled in by gir1.2-gtk-2.0 + on ia64, mipsel and sparc64, causing FTBFS there. + + -- Evgeni Golov Wed, 30 Mar 2011 10:16:59 +0200 + +libdbusmenu (0.4.0-1) unstable; urgency=low + + * Merge new upstream release from Ubuntu. + This builds with gir-1.2 and thus closes: #614490. + Also builds fine with --as-needed, closes: #615741. + * Disable GTK3 packages for now. + * Fix DEB_DH_MAKESHLIBS_ARGS_* for the latest SONAME bump. + * Also fix cdbs targets for it. + * Use valac-0.10, valac-0.12 is only in experimental. + * Add gir-repository-dev back to Build-Depends, + it still has Gtk-2.0.gir on Debian. + + -- Evgeni Golov Fri, 25 Mar 2011 15:55:16 +0100 + libdbusmenu (0.4.0-0ubuntu2) natty; urgency=low * Cherry picked fix for potential memory issues to fix unity-panel-service diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..45a4fb7 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +8 diff --git a/debian/control b/debian/control index 2555cd1..a7ff43d 100644 --- a/debian/control +++ b/debian/control @@ -1,13 +1,13 @@ Source: libdbusmenu Section: gnome Priority: optional -Maintainer: Ubuntu Core Developers +Maintainer: Ubuntu Developers XSBC-Original-Maintainer: The Ayatana Packagers Uploaders: Evgeni Golov -Build-Depends: debhelper (>= 5.0), - cdbs (>= 0.4.41), +Build-Depends: debhelper (>= 8.1.3), + cdbs (>= 0.4.93), quilt, - libgtk2.0-dev (>= 2.23.2-0ubuntu2), + libgtk2.0-dev (>= 2.24.4-1~), libgtk-3-dev (>= 2.99.2-1ubuntu2), libgdk-pixbuf2.0-dev (>= 2.22.1-0ubuntu4), libdbus-glib-1-dev, @@ -26,8 +26,8 @@ Build-Depends: debhelper (>= 5.0), valac-0.14 Standards-Version: 3.9.2 Homepage: https://launchpad.net/dbusmenu -Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/dbusmenu/ubuntu -Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/dbusmenu/ubuntu +Vcs-Bzr: http://bzr.debian.org/bzr/pkg-ayatana/libdbusmenu/debian +Vcs-Browser: http://bzr.debian.org/loggerhead/pkg-ayatana/libdbusmenu/debian Package: libdbusmenu-glib4 Section: libs @@ -39,6 +39,8 @@ Breaks: indicator-messages (<< 0.3.0), libdbusmenu-glib0, gir1.2-unity-3.0 (<< 3.8.4-0ubuntu2), gir1.2-indicate-0.5 (<< 0.5.0-0ubuntu4) +Pre-Depends: ${misc:Pre-Depends} +Multi-Arch: same Description: library for passing menus over DBus libdbusmenu passes a menu structure across DBus so that a program can create a menu simply without worrying about how it is displayed on the @@ -54,6 +56,7 @@ Depends: ${shlibs:Depends}, libdbusmenu-glib4 (= ${binary:Version}), libdbus-glib-1-dev (>= 0.76), libgtk2.0-dev (>= 2.12.0) +Multi-Arch: same Description: library for passing menus over DBus - development files libdbusmenu passes a menu structure across DBus so that a program can create a menu simply without worrying about how it is displayed on the @@ -66,6 +69,8 @@ Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Pre-Depends: ${misc:Pre-Depends} +Multi-Arch: same Description: library for passing menus over DBus - GTK+ version libdbusmenu passes a menu structure across DBus so that a program can create a menu simply without worrying about how it is displayed on the @@ -82,6 +87,7 @@ Depends: ${shlibs:Depends}, libdbus-glib-1-dev (>= 0.76), libgtk2.0-dev (>= 2.12.0), libdbusmenu-glib-dev +Multi-Arch: same Description: library for passing menus over DBus - GTK+ version developement files libdbusmenu passes a menu structure across DBus so that a program can create a menu simply without worrying about how it is displayed on the @@ -96,6 +102,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, python, libdbusmenu-glib4 (= ${binary:Version}) +Multi-Arch: foreign Description: tools useful during development with libdbusmenu libdbusmenu passes a menu structure across DBus so that a program can create a menu simply without worrying about how it is displayed on the @@ -161,6 +168,8 @@ Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Pre-Depends: ${misc:Pre-Depends} +Multi-Arch: same Description: library for passing menus over DBus - Test lib libdbusmenu passes a menu structure across DBus so that a program can create a menu simply without worrying about how it is displayed on the @@ -178,6 +187,7 @@ Depends: ${shlibs:Depends}, libdbus-glib-1-dev (>= 0.76), libdbusmenu-glib-dev (= ${binary:Version}), libjson-glib-dev +Multi-Arch: same Description: library for passing menus over DBus - Test lib development files libdbusmenu passes a menu structure across DBus so that a program can create a menu simply without worrying about how it is displayed on the @@ -191,6 +201,8 @@ Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Pre-Depends: ${misc:Pre-Depends} +Multi-Arch: same Description: library for passing menus over DBus - GTK+ version libdbusmenu passes a menu structure across DBus so that a program can create a menu simply without worrying about how it is displayed on the @@ -207,6 +219,7 @@ Depends: ${shlibs:Depends}, libdbus-glib-1-dev (>= 0.76), libgtk-3-dev (>= 2.91.4-0ubuntu1), libdbusmenu-glib-dev +Multi-Arch: same Description: library for passing menus over DBus - GTK+ version developement files libdbusmenu passes a menu structure across DBus so that a program can create a menu simply without worrying about how it is displayed on the diff --git a/debian/gir1.2-dbusmenu-glib-0.4.install b/debian/gir1.2-dbusmenu-glib-0.4.install index a9808fc..da62142 100644 --- a/debian/gir1.2-dbusmenu-glib-0.4.install +++ b/debian/gir1.2-dbusmenu-glib-0.4.install @@ -1 +1 @@ -debian/tmp/gtk3/usr/lib/girepository-1.0/Dbusmenu-0.4.typelib /usr/lib/girepository-1.0/ +usr/lib/*/girepository-1.0/Dbusmenu-0.4.typelib /usr/lib/girepository-1.0/ diff --git a/debian/gir1.2-dbusmenu-gtk-0.4.install b/debian/gir1.2-dbusmenu-gtk-0.4.install index 3493751..1a62fd5 100644 --- a/debian/gir1.2-dbusmenu-gtk-0.4.install +++ b/debian/gir1.2-dbusmenu-gtk-0.4.install @@ -1 +1 @@ -debian/tmp/gtk2/usr/lib/girepository-1.0/DbusmenuGtk-0.4.typelib /usr/lib/girepository-1.0/ +usr/lib/*/girepository-1.0/DbusmenuGtk-0.4.typelib /usr/lib/girepository-1.0/ diff --git a/debian/gir1.2-dbusmenu-gtk3-0.4.install b/debian/gir1.2-dbusmenu-gtk3-0.4.install index 64a74b6..4c56230 100644 --- a/debian/gir1.2-dbusmenu-gtk3-0.4.install +++ b/debian/gir1.2-dbusmenu-gtk3-0.4.install @@ -1 +1 @@ -debian/tmp/gtk3/usr/lib/girepository-1.0/DbusmenuGtk3-0.4.typelib /usr/lib/girepository-1.0/ +usr/lib/*/girepository-1.0/DbusmenuGtk3-0.4.typelib /usr/lib/girepository-1.0/ diff --git a/debian/libdbusmenu-glib-dev.install b/debian/libdbusmenu-glib-dev.install index 197e9de..fc7079c 100644 --- a/debian/libdbusmenu-glib-dev.install +++ b/debian/libdbusmenu-glib-dev.install @@ -1,6 +1,6 @@ -debian/tmp/gtk3/usr/include/libdbusmenu-0.4/libdbusmenu-glib /usr/include/libdbusmenu-0.4/ -debian/tmp/gtk3/usr/lib/pkgconfig/dbusmenu-glib-0.4.pc /usr/lib/pkgconfig/ -debian/tmp/gtk3/usr/lib/libdbusmenu-glib.a /usr/lib/ -debian/tmp/gtk3/usr/lib/libdbusmenu-glib.so /usr/lib/ -debian/tmp/gtk3/usr/share/gir-1.0/Dbusmenu-0.4.gir /usr/share/gir-1.0/ -debian/tmp/gtk3/usr/share/vala/vapi/Dbusmenu-0.4.vapi /usr/share/vala/vapi/ +usr/include/libdbusmenu-0.4/libdbusmenu-glib /usr/include/libdbusmenu-0.4/ +usr/lib/*/pkgconfig/dbusmenu-glib-0.4.pc +usr/lib/*/libdbusmenu-glib.a +usr/lib/*/libdbusmenu-glib.so +usr/share/gir-1.0/Dbusmenu-0.4.gir /usr/share/gir-1.0/ +usr/share/vala/vapi/Dbusmenu-0.4.vapi /usr/share/vala/vapi/ diff --git a/debian/libdbusmenu-glib-doc.install b/debian/libdbusmenu-glib-doc.install index ec8274e..5d99d73 100644 --- a/debian/libdbusmenu-glib-doc.install +++ b/debian/libdbusmenu-glib-doc.install @@ -1 +1 @@ -debian/tmp/gtk3/usr/share/gtk-doc/html/libdbusmenu-glib /usr/share/gtk-doc/html/ +usr/share/gtk-doc/html/libdbusmenu-glib /usr/share/gtk-doc/html/ diff --git a/debian/libdbusmenu-glib4.install b/debian/libdbusmenu-glib4.install index a98765c..4c05f07 100644 --- a/debian/libdbusmenu-glib4.install +++ b/debian/libdbusmenu-glib4.install @@ -1 +1 @@ -debian/tmp/gtk3/usr/lib/libdbusmenu-glib.so.* /usr/lib/ +usr/lib/*/libdbusmenu-glib.so.* diff --git a/debian/libdbusmenu-gtk-dev.install b/debian/libdbusmenu-gtk-dev.install index 2e5dc02..ab8e8a9 100644 --- a/debian/libdbusmenu-gtk-dev.install +++ b/debian/libdbusmenu-gtk-dev.install @@ -1,6 +1,6 @@ -debian/tmp/gtk2/usr/include/libdbusmenu-0.4/libdbusmenu-gtk /usr/include/libdbusmenu-0.4/ -debian/tmp/gtk2/usr/lib/pkgconfig/dbusmenu-gtk-0.4.pc /usr/lib/pkgconfig/ -debian/tmp/gtk2/usr/lib/libdbusmenu-gtk.a /usr/lib/ -debian/tmp/gtk2/usr/lib/libdbusmenu-gtk.so /usr/lib/ -debian/tmp/gtk2/usr/share/gir-1.0/DbusmenuGtk-0.4.gir /usr/share/gir-1.0/ -debian/tmp/gtk2/usr/share/vala/vapi/DbusmenuGtk-0.4.vapi /usr/share/vala/vapi/ +usr/include/libdbusmenu-0.4/libdbusmenu-gtk /usr/include/libdbusmenu-0.4/ +usr/lib/*/pkgconfig/dbusmenu-gtk-0.4.pc +usr/lib/*/libdbusmenu-gtk.a +usr/lib/*/libdbusmenu-gtk.so +usr/share/gir-1.0/DbusmenuGtk-0.4.gir /usr/share/gir-1.0/ +usr/share/vala/vapi/DbusmenuGtk-0.4.vapi /usr/share/vala/vapi/ diff --git a/debian/libdbusmenu-gtk-doc.install b/debian/libdbusmenu-gtk-doc.install index b7dae35..664f00c 100644 --- a/debian/libdbusmenu-gtk-doc.install +++ b/debian/libdbusmenu-gtk-doc.install @@ -1 +1 @@ -debian/tmp/gtk2/usr/share/gtk-doc/html/libdbusmenu-gtk /usr/share/gtk-doc/html/ +usr/share/gtk-doc/html/libdbusmenu-gtk /usr/share/gtk-doc/html/ diff --git a/debian/libdbusmenu-gtk3-4.install b/debian/libdbusmenu-gtk3-4.install index 2bf1f59..a425da7 100644 --- a/debian/libdbusmenu-gtk3-4.install +++ b/debian/libdbusmenu-gtk3-4.install @@ -1 +1 @@ -debian/tmp/gtk3/usr/lib/libdbusmenu-gtk3.so.* /usr/lib/ +usr/lib/*/libdbusmenu-gtk3.so.* diff --git a/debian/libdbusmenu-gtk3-dev.install b/debian/libdbusmenu-gtk3-dev.install index 6d3fa0b..56f8fba 100644 --- a/debian/libdbusmenu-gtk3-dev.install +++ b/debian/libdbusmenu-gtk3-dev.install @@ -1,6 +1,6 @@ -debian/tmp/gtk3/usr/include/libdbusmenu-0.4/libdbusmenu-gtk3 /usr/include/libdbusmenu-0.4/ -debian/tmp/gtk3/usr/lib/pkgconfig/dbusmenu-gtk3-0.4.pc /usr/lib/pkgconfig/ -debian/tmp/gtk3/usr/lib/libdbusmenu-gtk3.a /usr/lib/ -debian/tmp/gtk3/usr/lib/libdbusmenu-gtk3.so /usr/lib/ -debian/tmp/gtk3/usr/share/gir-1.0/DbusmenuGtk3-0.4.gir /usr/share/gir-1.0/ -debian/tmp/gtk3/usr/share/vala/vapi/DbusmenuGtk3-0.4.vapi /usr/share/gir-1.0/ +usr/include/libdbusmenu-0.4/libdbusmenu-gtk3 /usr/include/libdbusmenu-0.4/ +usr/lib/*/pkgconfig/dbusmenu-gtk3-0.4.pc +usr/lib/*/libdbusmenu-gtk3.a +usr/lib/*/libdbusmenu-gtk3.so +usr/share/gir-1.0/DbusmenuGtk3-0.4.gir /usr/share/gir-1.0/ +usr/share/vala/vapi/DbusmenuGtk3-0.4.vapi /usr/share/gir-1.0/ diff --git a/debian/libdbusmenu-gtk4.install b/debian/libdbusmenu-gtk4.install index 2605240..546d698 100644 --- a/debian/libdbusmenu-gtk4.install +++ b/debian/libdbusmenu-gtk4.install @@ -1 +1 @@ -debian/tmp/gtk2/usr/lib/libdbusmenu-gtk.so.* /usr/lib/ +usr/lib/*/libdbusmenu-gtk.so.* diff --git a/debian/libdbusmenu-jsonloader-dev.install b/debian/libdbusmenu-jsonloader-dev.install index 95902cd..ebbb5ea 100644 --- a/debian/libdbusmenu-jsonloader-dev.install +++ b/debian/libdbusmenu-jsonloader-dev.install @@ -1,4 +1,4 @@ -debian/tmp/gtk3/usr/include/libdbusmenu-0.4/libdbusmenu-jsonloader /usr/include/libdbusmenu-0.4/ -debian/tmp/gtk3/usr/lib/pkgconfig/dbusmenu-jsonloader-0.4.pc /usr/lib/pkgconfig/ -debian/tmp/gtk3/usr/lib/libdbusmenu-jsonloader.a /usr/lib/ -debian/tmp/gtk3/usr/lib/libdbusmenu-jsonloader.so /usr/lib/ +usr/include/libdbusmenu-0.4/libdbusmenu-jsonloader /usr/include/libdbusmenu-0.4/ +usr/lib/*/pkgconfig/dbusmenu-jsonloader-0.4.pc +usr/lib/*/libdbusmenu-jsonloader.a +usr/lib/*/libdbusmenu-jsonloader.so diff --git a/debian/libdbusmenu-jsonloader4.install b/debian/libdbusmenu-jsonloader4.install index 74f887b..67976fd 100644 --- a/debian/libdbusmenu-jsonloader4.install +++ b/debian/libdbusmenu-jsonloader4.install @@ -1 +1 @@ -debian/tmp/gtk3/usr/lib/libdbusmenu-jsonloader.so.* /usr/lib/ +usr/lib/*/libdbusmenu-jsonloader.so.* diff --git a/debian/libdbusmenu-tools.install b/debian/libdbusmenu-tools.install index 1019dd8..1a79739 100644 --- a/debian/libdbusmenu-tools.install +++ b/debian/libdbusmenu-tools.install @@ -1,3 +1,3 @@ -debian/tmp/gtk3/usr/lib/libdbusmenu/dbusmenu-* /usr/lib/libdbusmenu/ -debian/tmp/gtk3/usr/share/libdbusmenu/* /usr/share/libdbusmenu-tools/ -debian/tmp/gtk3/usr/share/doc/libdbusmenu/README.dbusmenu-bench /usr/share/doc/libdbusmenu-tools/ +usr/lib/libdbusmenu/dbusmenu-* /usr/lib/libdbusmenu/ +usr/share/libdbusmenu/* /usr/share/libdbusmenu-tools/ +usr/share/doc/libdbusmenu/README.dbusmenu-bench /usr/share/doc/libdbusmenu-tools/ diff --git a/debian/rules b/debian/rules index 07f6d3a..8eeb376 100755 --- a/debian/rules +++ b/debian/rules @@ -3,18 +3,34 @@ DEB_BUILDDIR = build DEB_MAKE_FLAVORS = gtk2 gtk3 -include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk include /usr/share/cdbs/1/rules/autoreconf.mk include /usr/share/cdbs/1/rules/patchsys-quilt.mk +include /usr/share/cdbs/1/rules/debhelper.mk DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/tmp/@FLAVOR@ DEB_DESTDIR = $(CURDIR)/debian/tmp/$(cdbs_make_curflavor)/ +DEB_DH_INSTALL_ARGS_libdbusmenu-gtk4 += --sourcedir=debian/tmp/gtk2 +DEB_DH_INSTALL_ARGS_libdbusmenu-gtk-dev += --sourcedir=debian/tmp/gtk2 +DEB_DH_INSTALL_ARGS_libdbusmenu-gtk-doc += --sourcedir=debian/tmp/gtk2 +DEB_DH_INSTALL_ARGS_gir1.2-dbusmenu-gtk-0.4 += --sourcedir=debian/tmp/gtk2 + +DEB_DH_INSTALL_ARGS_gir1.2-dbusmenu-glib-0.4 += --sourcedir=debian/tmp/gtk3 +DEB_DH_INSTALL_ARGS_gir1.2-dbusmenu-gtk3-0.4 += --sourcedir=debian/tmp/gtk3 +DEB_DH_INSTALL_ARGS_libdbusmenu-glib4 += --sourcedir=debian/tmp/gtk3 +DEB_DH_INSTALL_ARGS_libdbusmenu-glib-dev += --sourcedir=debian/tmp/gtk3 +DEB_DH_INSTALL_ARGS_libdbusmenu-glib-doc += --sourcedir=debian/tmp/gtk3 +DEB_DH_INSTALL_ARGS_libdbusmenu-gtk3-4 += --sourcedir=debian/tmp/gtk3 +DEB_DH_INSTALL_ARGS_libdbusmenu-gtk3-dev += --sourcedir=debian/tmp/gtk3 +DEB_DH_INSTALL_ARGS_libdbusmenu-jsonloader4 += --sourcedir=debian/tmp/gtk3 +DEB_DH_INSTALL_ARGS_libdbusmenu-jsonloader-dev += --sourcedir=debian/tmp/gtk3 +DEB_DH_INSTALL_ARGS_libdbusmenu-tools += --sourcedir=debian/tmp/gtk3 + DEB_CONFIGURE_FLAGS_gtk2 = --with-gtk=2 DEB_CONFIGURE_FLAGS_gtk3 = --with-gtk=3 -DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc --enable-introspection +DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc --enable-introspection --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) DEB_DH_SHLIBDEPS_ARGS_libdbusmenu-gtk4 = -- -xlibgtk2.0-0 DEB_DH_SHLIBDEPS_ARGS_libdbusmenu-gtk3-4 = -- -xlibgtk-3-0 -- cgit v1.2.3 From 933e39cc70a28ca07b195064a1cd40bd4a755375 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Tue, 31 Jan 2012 10:58:15 -0500 Subject: * debian/control - build depend on libatk1.0-dev * debian/*-dev.install - fixed paths for installed headers * debian/libdbusmenu-glib4.symbols - added new symbols --- debian/changelog | 13 +++++++++++-- debian/control | 1 + debian/libdbusmenu-glib-dev.install | 6 +++--- debian/libdbusmenu-glib4.symbols | 2 ++ debian/libdbusmenu-gtk-dev.install | 6 +++--- debian/libdbusmenu-gtk3-dev.install | 6 +++--- debian/libdbusmenu-jsonloader-dev.install | 2 +- 7 files changed, 24 insertions(+), 12 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 0732a6d..4df92b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -libdbusmenu (0.5.90-0ubuntu1~ppa1) UNRELEASED; urgency=low +libdbusmenu (0.5.90-0ubuntu1) UNRELEASED; urgency=low + [ Ted Gould ] * New upstream release. * Add property for accessible descriptions * Use insert/remove signals on GTK3 build @@ -8,7 +9,15 @@ libdbusmenu (0.5.90-0ubuntu1~ppa1) UNRELEASED; urgency=low * Don't get objects from boolean values (LP: #870742) * Fix depreactions on GTK3 (LP: #917115) - -- Ted Gould Mon, 30 Jan 2012 23:21:31 -0600 + [ Ken VanDine ] + * debian/control + - build depend on libatk1.0-dev + * debian/*-dev.install + - fixed paths for installed headers + * debian/libdbusmenu-glib4.symbols + - added new symbols + + -- Ken VanDine Tue, 31 Jan 2012 10:07:36 -0500 libdbusmenu (0.5.1-0ubuntu2) precise; urgency=low diff --git a/debian/control b/debian/control index a7ff43d..ba4e3a1 100644 --- a/debian/control +++ b/debian/control @@ -11,6 +11,7 @@ Build-Depends: debhelper (>= 8.1.3), libgtk-3-dev (>= 2.99.2-1ubuntu2), libgdk-pixbuf2.0-dev (>= 2.22.1-0ubuntu4), libdbus-glib-1-dev, + libatk1.0-dev, gnome-doc-utils, gtk-doc-tools, libtool, diff --git a/debian/libdbusmenu-glib-dev.install b/debian/libdbusmenu-glib-dev.install index fc7079c..bc5b5b1 100644 --- a/debian/libdbusmenu-glib-dev.install +++ b/debian/libdbusmenu-glib-dev.install @@ -1,6 +1,6 @@ -usr/include/libdbusmenu-0.4/libdbusmenu-glib /usr/include/libdbusmenu-0.4/ +usr/include/libdbusmenu-glib-0.4/libdbusmenu-glib usr/lib/*/pkgconfig/dbusmenu-glib-0.4.pc usr/lib/*/libdbusmenu-glib.a usr/lib/*/libdbusmenu-glib.so -usr/share/gir-1.0/Dbusmenu-0.4.gir /usr/share/gir-1.0/ -usr/share/vala/vapi/Dbusmenu-0.4.vapi /usr/share/vala/vapi/ +usr/share/gir-1.0/Dbusmenu-0.4.gir +usr/share/vala/vapi/Dbusmenu-0.4.vapi diff --git a/debian/libdbusmenu-glib4.symbols b/debian/libdbusmenu-glib4.symbols index 0e0dcb4..a9ffaff 100644 --- a/debian/libdbusmenu-glib4.symbols +++ b/debian/libdbusmenu-glib4.symbols @@ -43,12 +43,14 @@ libdbusmenu-glib.so.4 libdbusmenu-glib4 #MINVER# dbusmenu_menuitem_property_exist@Base 0.4.2 dbusmenu_menuitem_property_get@Base 0.4.2 dbusmenu_menuitem_property_get_bool@Base 0.4.2 + dbusmenu_menuitem_property_get_byte_array@Base 0.5.90 dbusmenu_menuitem_property_get_int@Base 0.4.2 dbusmenu_menuitem_property_get_variant@Base 0.4.2 dbusmenu_menuitem_property_is_default@Base 0.4.2 dbusmenu_menuitem_property_remove@Base 0.4.2 dbusmenu_menuitem_property_set@Base 0.4.2 dbusmenu_menuitem_property_set_bool@Base 0.4.2 + dbusmenu_menuitem_property_set_byte_array@Base 0.5.90 dbusmenu_menuitem_property_set_int@Base 0.4.2 dbusmenu_menuitem_property_set_variant@Base 0.4.2 dbusmenu_menuitem_proxy_get_type@Base 0.4.2 diff --git a/debian/libdbusmenu-gtk-dev.install b/debian/libdbusmenu-gtk-dev.install index ab8e8a9..a17a99f 100644 --- a/debian/libdbusmenu-gtk-dev.install +++ b/debian/libdbusmenu-gtk-dev.install @@ -1,6 +1,6 @@ -usr/include/libdbusmenu-0.4/libdbusmenu-gtk /usr/include/libdbusmenu-0.4/ +usr/include/libdbusmenu-gtk-0.4/libdbusmenu-gtk usr/lib/*/pkgconfig/dbusmenu-gtk-0.4.pc usr/lib/*/libdbusmenu-gtk.a usr/lib/*/libdbusmenu-gtk.so -usr/share/gir-1.0/DbusmenuGtk-0.4.gir /usr/share/gir-1.0/ -usr/share/vala/vapi/DbusmenuGtk-0.4.vapi /usr/share/vala/vapi/ +usr/share/gir-1.0/DbusmenuGtk-0.4.gir +usr/share/vala/vapi/DbusmenuGtk-0.4.vapi diff --git a/debian/libdbusmenu-gtk3-dev.install b/debian/libdbusmenu-gtk3-dev.install index 56f8fba..782f5c8 100644 --- a/debian/libdbusmenu-gtk3-dev.install +++ b/debian/libdbusmenu-gtk3-dev.install @@ -1,6 +1,6 @@ -usr/include/libdbusmenu-0.4/libdbusmenu-gtk3 /usr/include/libdbusmenu-0.4/ +usr/include/libdbusmenu-gtk3-0.4/libdbusmenu-gtk usr/lib/*/pkgconfig/dbusmenu-gtk3-0.4.pc usr/lib/*/libdbusmenu-gtk3.a usr/lib/*/libdbusmenu-gtk3.so -usr/share/gir-1.0/DbusmenuGtk3-0.4.gir /usr/share/gir-1.0/ -usr/share/vala/vapi/DbusmenuGtk3-0.4.vapi /usr/share/gir-1.0/ +usr/share/gir-1.0/DbusmenuGtk3-0.4.gir +usr/share/vala/vapi/DbusmenuGtk3-0.4.vapi diff --git a/debian/libdbusmenu-jsonloader-dev.install b/debian/libdbusmenu-jsonloader-dev.install index ebbb5ea..1554085 100644 --- a/debian/libdbusmenu-jsonloader-dev.install +++ b/debian/libdbusmenu-jsonloader-dev.install @@ -1,4 +1,4 @@ -usr/include/libdbusmenu-0.4/libdbusmenu-jsonloader /usr/include/libdbusmenu-0.4/ +usr/include/libdbusmenu-glib-0.4/libdbusmenu-jsonloader usr/lib/*/pkgconfig/dbusmenu-jsonloader-0.4.pc usr/lib/*/libdbusmenu-jsonloader.a usr/lib/*/libdbusmenu-jsonloader.so -- cgit v1.2.3 From 3c72518d5dca5c9f330d730d870504e67943d42b Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Wed, 15 Feb 2012 21:59:50 +0100 Subject: debian/control: restore gtk2 gir depends until that source is updated --- debian/changelog | 6 ++++++ debian/control | 1 + 2 files changed, 7 insertions(+) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 8b6635e..133853a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libdbusmenu (0.5.91-0ubuntu2) UNRELEASED; urgency=low + + * debian/control: restore gtk2 gir depends until that source is updated + + -- Sebastien Bacher Wed, 15 Feb 2012 21:59:26 +0100 + libdbusmenu (0.5.91-0ubuntu1) precise; urgency=low * debian/control: diff --git a/debian/control b/debian/control index d10d7dd..a14bc40 100644 --- a/debian/control +++ b/debian/control @@ -18,6 +18,7 @@ Build-Depends: debhelper (>= 8.1.3), intltool, libjson-glib-dev (>= 0.13.4), gobject-introspection, + gir1.2-gtk-2.0, libgirepository1.0-dev (>= 0.9.3), libx11-dev (>= 1.3), dh-autoreconf, -- cgit v1.2.3 From 24c6a1293c2333ea523740bba8cc02a6d941bfad Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 29 Mar 2012 16:35:34 -0400 Subject: releasing version 0.5.96-0ubuntu1 --- debian/changelog | 12 +++++++++--- debian/control | 1 + 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'debian/control') diff --git a/debian/changelog b/debian/changelog index 68279f0..45bb33f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,18 @@ -libdbusmenu (0.5.96-0ubuntu1~ppa1) precise; urgency=low +libdbusmenu (0.5.96-0ubuntu1) precise; urgency=low + [ Charles Kerr ] * New upstream release. * Faster menuitem lookups (LP: #801699) - * To reduce dbus traffic, only send event replies when the caller requests them + * To reduce dbus traffic, only send event replies when the caller + requests them * Added support for callgrind-based benchmarks * Minor code cleanup - -- Charles Kerr Thu, 29 Mar 2012 11:38:40 -0700 + [ Ken VanDine ] + * debian/control + - added build depends on valgrind + + -- Ken VanDine Thu, 29 Mar 2012 16:35:00 -0400 libdbusmenu (0.5.95-0ubuntu1) precise; urgency=low diff --git a/debian/control b/debian/control index a14bc40..49438f9 100644 --- a/debian/control +++ b/debian/control @@ -22,6 +22,7 @@ Build-Depends: debhelper (>= 8.1.3), libgirepository1.0-dev (>= 0.9.3), libx11-dev (>= 1.3), dh-autoreconf, + valgrind, valac-0.16 Standards-Version: 3.9.2 Homepage: https://launchpad.net/dbusmenu -- cgit v1.2.3