From 2740c7221e5cc93cbb821f35b606a6cbe805f83f Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Mon, 11 Jan 2010 16:11:40 +0100 Subject: * debian/rules: - updated shlibs version --- debian/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 7f7f405..0611a62 100755 --- a/debian/rules +++ b/debian/rules @@ -6,6 +6,6 @@ include /usr/share/cdbs/1/class/gnome.mk DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper LDFLAGS += -Wl,-z,defs -Wl,--as-needed -DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk0 += -V 'libdbusmenu-gtk0 (>= 0.1.2)' - +DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk0 += -V 'libdbusmenu-gtk0 (>= 0.2)' +DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-glib0 += -V 'libdbusmenu-glib0 (>= 0.2)' -- cgit v1.2.3 From 3a8693e2b3bdaaac979eadca296cb44257e6f882 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 18 Feb 2010 10:57:45 -0600 Subject: debian/rules: Updating shlibs --- debian/changelog | 1 + debian/rules | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index 3b4a7fe..456bc85 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ libdbusmenu (0.2.5-0ubuntu1~ppa1) UNRELEASED; urgency=low * Upstream release 0.2.5 * Adding in menuitem proxy object. * Adding ID to default item. + * debian/rules: Updating shlibs -- Ted Gould Thu, 18 Feb 2010 10:54:24 -0600 diff --git a/debian/rules b/debian/rules index cc20837..07187d4 100755 --- a/debian/rules +++ b/debian/rules @@ -6,6 +6,6 @@ include /usr/share/cdbs/1/class/gnome.mk DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper LDFLAGS += -Wl,-z,defs -Wl,--as-needed -DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk1 += -V 'libdbusmenu-gtk1 (>= 0.2.2)' -DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-glib1 += -V 'libdbusmenu-glib1 (>= 0.2.2)' +DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk1 += -V 'libdbusmenu-gtk1 (>= 0.2.5)' +DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-glib1 += -V 'libdbusmenu-glib1 (>= 0.2.5)' -- cgit v1.2.3 From 61ad4d5c68a37c07a9046640cfdf6f92e787c48c Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Mon, 7 Jun 2010 17:34:11 +0200 Subject: releasing version 0.3.1-0ubuntu1 --- debian/changelog | 2 +- debian/rules | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index 52d4e9b..0a5e059 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libdbusmenu (0.3.1-0ubuntu1) UNRELEASED; urgency=low +libdbusmenu (0.3.1-0ubuntu1) maverick; urgency=low * New upstream release. * Fix annotations for GIR scanner diff --git a/debian/rules b/debian/rules index c23bde6..4b97c18 100755 --- a/debian/rules +++ b/debian/rules @@ -6,6 +6,6 @@ include /usr/share/cdbs/1/class/gnome.mk DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper LDFLAGS += -Wl,-z,defs -Wl,--as-needed -DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk1 += -V 'libdbusmenu-gtk1 (>= 0.2.5)' +DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk1 += -V 'libdbusmenu-gtk1 (>= 0.3.1)' DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-glib1 += -V 'libdbusmenu-glib1 (>= 0.2.8)' -- cgit v1.2.3 From cffbc900aed2cdf265dbde3fc94cd329890836ee Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 24 Jun 2010 09:30:46 -0500 Subject: debian/rules: Updating shlibs to 0.3.3 for shortcut API additions --- debian/changelog | 3 ++- debian/rules | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index e92735f..406ca2f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,8 +8,9 @@ libdbusmenu (0.3.3-0ubuntu1~ppa1) UNRELEASED; urgency=low * Merging in Debian branch * debian/control: Switching branch on this branch to be the dbusmenu-team. + * debian/rules: Updating shlibs to 0.3.3 for shortcut API additions - -- Ted Gould Thu, 24 Jun 2010 09:21:02 -0500 + -- Ted Gould Thu, 24 Jun 2010 09:30:21 -0500 libdbusmenu (0.3.2-1) unstable; urgency=low diff --git a/debian/rules b/debian/rules index 4f08dbf..e274757 100755 --- a/debian/rules +++ b/debian/rules @@ -6,6 +6,6 @@ include /usr/share/cdbs/1/class/gnome.mk DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc LDFLAGS += -Wl,-z,defs -Wl,--as-needed -DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk1 += -V 'libdbusmenu-gtk1 (>= 0.3.1)' -DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-glib1 += -V 'libdbusmenu-glib1 (>= 0.2.8)' +DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk1 += -V 'libdbusmenu-gtk1 (>= 0.3.3)' +DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-glib1 += -V 'libdbusmenu-glib1 (>= 0.3.3)' -- cgit v1.2.3 From d62037551cb0b27c1d4ed7ce7bb7865bd22d8fc7 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sat, 7 Aug 2010 16:13:41 -0500 Subject: debian/rules: Enabling running check at build time --- debian/changelog | 6 ++++++ debian/rules | 1 + 2 files changed, 7 insertions(+) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index ff1a6d2..d30dda9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libdbusmenu (0.3.9-0ubuntu1~ppa2~check1) UNRELEASED; urgency=low + + * debian/rules: Enabling running check at build time + + -- Ted Gould Sat, 07 Aug 2010 16:13:06 -0500 + libdbusmenu (0.3.9-0ubuntu1~ppa1) lucid; urgency=low * New upstream release. diff --git a/debian/rules b/debian/rules index e274757..c015803 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_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 e8704dfe47c14af9c395449ad78fb3d8abd1b416 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 19 Aug 2010 16:18:01 -0400 Subject: releasing version 0.3.11-0ubuntu1 --- debian/changelog | 2 +- debian/rules | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index bb13160..65d8354 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libdbusmenu (0.3.11-0ubuntu1) UNRELEASED; urgency=low +libdbusmenu (0.3.11-0ubuntu1) maverick; urgency=low * New upstream release. * Fix to handle whitespace in layout XML better diff --git a/debian/rules b/debian/rules index c015803..e274757 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 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/rules') 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 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/rules') 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/rules') 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 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/rules') 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 720066a82b4dd8d3b1793f85528d4d031381afaa Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Wed, 13 Apr 2011 16:49:24 -0400 Subject: * debian/rules - Fixed package names for makeshlibs (LP: #760102) --- debian/changelog | 7 +++++++ debian/rules | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index 5e668f7..2f38b21 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libdbusmenu (0.4.2-0ubuntu4) UNRELEASED; urgency=low + + * debian/rules + - Fixed package names for makeshlibs (LP: #760102) + + -- Ken VanDine Wed, 13 Apr 2011 16:48:13 -0400 + libdbusmenu (0.4.2-0ubuntu3) natty; urgency=low * Merged fix, guard against an activation that does not actually have diff --git a/debian/rules b/debian/rules index 10140ea..8b346e9 100755 --- a/debian/rules +++ b/debian/rules @@ -11,9 +11,9 @@ 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-gtk2 += -V 'libdbusmenu-gtk2 (>= 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)' +DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk3 += -V 'libdbusmenu-gtk3 (>= 0.3.90)' +DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk3-3 += -V 'libdbusmenu-gtk3-3 (>= 0.3.90)' +DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-glib3 += -V 'libdbusmenu-glib3 (>= 0.3.90)' configure/libdbusmenu-gtk3-2:: stamp-configure-gtk3 stamp-configure-gtk3: -- cgit v1.2.3 From 189ec71e2bcd15cb22f7161d42b2a4cc12321d0d Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 14 Apr 2011 08:56:58 -0400 Subject: Fixed package names for makeshlibs and build targets (LP: #760102) --- debian/changelog | 4 ++-- debian/rules | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index 2f38b21..401e6aa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ libdbusmenu (0.4.2-0ubuntu4) UNRELEASED; urgency=low * debian/rules - - Fixed package names for makeshlibs (LP: #760102) + - Fixed package names for makeshlibs and build targets (LP: #760102) - -- Ken VanDine Wed, 13 Apr 2011 16:48:13 -0400 + -- Ken VanDine Thu, 14 Apr 2011 08:56:29 -0400 libdbusmenu (0.4.2-0ubuntu3) natty; urgency=low diff --git a/debian/rules b/debian/rules index 8b346e9..73068fb 100755 --- a/debian/rules +++ b/debian/rules @@ -15,7 +15,7 @@ DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk3 += -V 'libdbusmenu-gtk3 (>= 0.3.90)' DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk3-3 += -V 'libdbusmenu-gtk3-3 (>= 0.3.90)' DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-glib3 += -V 'libdbusmenu-glib3 (>= 0.3.90)' -configure/libdbusmenu-gtk3-2:: stamp-configure-gtk3 +configure/libdbusmenu-gtk3-3:: stamp-configure-gtk3 stamp-configure-gtk3: : # configure for GTK+ 3.0 set -e; \ @@ -28,7 +28,7 @@ stamp-configure-gtk3: cd ..; touch stamp-configure-gtk3 -build/libdbusmenu-gtk3-2:: stamp-build-gtk3 +build/libdbusmenu-gtk3-3:: stamp-build-gtk3 stamp-build-gtk3: stamp-configure-gtk3 : # build for GTK+ 3.0 $(MAKE) -C build-gtk3; -- cgit v1.2.3 From f25ac35c8a5ddba42bd987accbeb209829236dc2 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 14 Apr 2011 09:30:12 -0400 Subject: - Fixed package names in build targets (LP: #760102) - Dropped makeshlibs in favor of symbols files * +debian/libdbusmenu-glib3.symbols * +debian/libdbusmenu-gtk3-3.symbols * +debian/libdbusmenu-gtk3.symbols --- debian/changelog | 8 ++- debian/libdbusmenu-glib3.symbols | 141 ++++++++++++++++++++++++++++++++++++++ debian/libdbusmenu-gtk3-3.symbols | 141 ++++++++++++++++++++++++++++++++++++++ debian/libdbusmenu-gtk3.symbols | 141 ++++++++++++++++++++++++++++++++++++++ debian/rules | 4 -- 5 files changed, 429 insertions(+), 6 deletions(-) create mode 100644 debian/libdbusmenu-glib3.symbols create mode 100644 debian/libdbusmenu-gtk3-3.symbols create mode 100644 debian/libdbusmenu-gtk3.symbols (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index 401e6aa..75bb02f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,13 @@ libdbusmenu (0.4.2-0ubuntu4) UNRELEASED; urgency=low * debian/rules - - Fixed package names for makeshlibs and build targets (LP: #760102) + - Fixed package names in build targets (LP: #760102) + - Dropped makeshlibs in favor of symbols files + * +debian/libdbusmenu-glib3.symbols + * +debian/libdbusmenu-gtk3-3.symbols + * +debian/libdbusmenu-gtk3.symbols - -- Ken VanDine Thu, 14 Apr 2011 08:56:29 -0400 + -- Ken VanDine Thu, 14 Apr 2011 09:27:03 -0400 libdbusmenu (0.4.2-0ubuntu3) natty; urgency=low diff --git a/debian/libdbusmenu-glib3.symbols b/debian/libdbusmenu-glib3.symbols new file mode 100644 index 0000000..5cac25d --- /dev/null +++ b/debian/libdbusmenu-glib3.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.symbols b/debian/libdbusmenu-gtk3-3.symbols new file mode 100644 index 0000000..3e44390 --- /dev/null +++ b/debian/libdbusmenu-gtk3-3.symbols @@ -0,0 +1,141 @@ +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.symbols b/debian/libdbusmenu-gtk3.symbols new file mode 100644 index 0000000..fd2d6aa --- /dev/null +++ b/debian/libdbusmenu-gtk3.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/rules b/debian/rules index 73068fb..dd4f69c 100755 --- a/debian/rules +++ b/debian/rules @@ -11,10 +11,6 @@ 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-gtk3 += -V 'libdbusmenu-gtk3 (>= 0.3.90)' -DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk3-3 += -V 'libdbusmenu-gtk3-3 (>= 0.3.90)' -DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-glib3 += -V 'libdbusmenu-glib3 (>= 0.3.90)' - configure/libdbusmenu-gtk3-3:: stamp-configure-gtk3 stamp-configure-gtk3: : # configure for GTK+ 3.0 -- cgit v1.2.3 From fef7512c7afa24a79fce499353aaf6700096caaa Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 20 Jun 2011 16:49:16 -0500 Subject: debian/rules: Making GTK2 the special build --- debian/changelog | 3 ++- debian/rules | 36 ++++++++++++++++++------------------ 2 files changed, 20 insertions(+), 19 deletions(-) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index af5746b..3d1aa7e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,8 +8,9 @@ libdbusmenu (0.4.90-0ubuntu1~ppa1) UNRELEASED; urgency=low * Memory leaks for GVariant usage (LP: #784890) * Making GTK 3 default build * Removing the SerializableMenuitem object + * debian/rules: Making GTK2 the special build - -- Ted Gould Mon, 20 Jun 2011 16:38:53 -0500 + -- Ted Gould Mon, 20 Jun 2011 16:49:03 -0500 libdbusmenu (0.4.4-0ubuntu1~ppa1) natty; urgency=low diff --git a/debian/rules b/debian/rules index dd4f69c..2243a71 100755 --- a/debian/rules +++ b/debian/rules @@ -11,32 +11,32 @@ DEB_BUILDDIR = $(DEB_SRCDIR)/build DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc --enable-introspection LDFLAGS += -Wl,-z,defs -Wl,--as-needed -configure/libdbusmenu-gtk3-3:: stamp-configure-gtk3 -stamp-configure-gtk3: - : # configure for GTK+ 3.0 +configure/libdbusmenu-gtk4:: stamp-configure-gtk2 +stamp-configure-gtk2: + : # configure for GTK+ 2.0 set -e; \ - rm -rf build-gtk3; \ - mkdir build-gtk3; \ - cd build-gtk3; \ - $(DEB_CONFIGURE_SCRIPT_ENV) ../configure --with-gtk=3 \ + 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-gtk3 + touch stamp-configure-gtk2 -build/libdbusmenu-gtk3-3:: stamp-build-gtk3 -stamp-build-gtk3: stamp-configure-gtk3 - : # build for GTK+ 3.0 - $(MAKE) -C build-gtk3; - touch stamp-build-gtk3 +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-gtk3 - : # install for GTK+ 3.0 - $(MAKE) -C build-gtk3 DESTDIR=$(CURDIR)/debian/tmp install +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-*-gtk3 - rm -rf build-gtk3 + rm -f stamp-*-gtk2 + rm -rf build-gtk2 -- 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/rules') 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 07ff9d838965d81d3f32151e96146d45912217fe Mon Sep 17 00:00:00 2001 From: Didier Roche Date: Mon, 25 Jul 2011 18:04:06 +0200 Subject: * debian/rules: - avoid making indicator-appmenu* depends on gtk2/3 by dpkg-shlibdeps. The library doesn't hurt if gtk isn't installed and that enable pre-installlation of the indicator stack without requiring the full gtk stack being there without any gtk app installed. --- debian/changelog | 10 ++++++++++ debian/rules | 3 +++ 2 files changed, 13 insertions(+) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index bfa403e..e49e0ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +libdbusmenu (0.4.90-0ubuntu4) UNRELEASED; urgency=low + + * debian/rules: + - avoid making indicator-appmenu* depends on gtk2/3 by dpkg-shlibdeps. + The library doesn't hurt if gtk isn't installed and that enable + pre-installlation of the indicator stack without requiring the full gtk + stack being there without any gtk app installed. + + -- Didier Roche Mon, 25 Jul 2011 18:03:50 +0200 + libdbusmenu (0.4.90-0ubuntu3) oneiric; urgency=low * debian/patches/lp799878.patch diff --git a/debian/rules b/debian/rules index d53875d..07f6d3a 100755 --- a/debian/rules +++ b/debian/rules @@ -16,6 +16,9 @@ DEB_CONFIGURE_FLAGS_gtk3 = --with-gtk=3 DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc --enable-introspection +DEB_DH_SHLIBDEPS_ARGS_libdbusmenu-gtk4 = -- -xlibgtk2.0-0 +DEB_DH_SHLIBDEPS_ARGS_libdbusmenu-gtk3-4 = -- -xlibgtk-3-0 + LDFLAGS += -Wl,-z,defs -Wl,--as-needed debian/stamp-autotools/gtk2: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk2) -- 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/rules') 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 3c7a02690c63f3931cee3aadf4c46683483a3f86 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Wed, 21 Nov 2012 14:12:25 -0500 Subject: * debian/rules: - Convert to dh9; some variables where kept but renamed to brevity. - Override dh_autoreconf to make sure it calls autogen.sh, and doesn't run configure. --- debian/changelog | 4 ++++ debian/rules | 73 ++++++++++++++++++++++++++++++++------------------------ 2 files changed, 46 insertions(+), 31 deletions(-) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index 3f5f5af..0908a12 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,10 @@ libdbusmenu (12.10.3-0ubuntu1) UNRELEASED; urgency=low - Update style to match other indicator stack packages. - Drop Build-Depends on cdbs. - Bump debhelper Build-Depends to (>= 9). + * debian/rules: + - Convert to dh9; some variables where kept but renamed to brevity. + - Override dh_autoreconf to make sure it calls autogen.sh, and doesn't run + configure. -- Mathieu Trudel-Lapierre Wed, 21 Nov 2012 13:17:02 -0500 diff --git a/debian/rules b/debian/rules index 8eeb376..7ea788e 100755 --- a/debian/rules +++ b/debian/rules @@ -1,44 +1,55 @@ #!/usr/bin/make -f -DEB_BUILDDIR = build -DEB_MAKE_FLAVORS = gtk2 gtk3 +FLAVORS = gtk2 gtk3 -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 +CONFIGURE_FLAGS_gtk2 = --with-gtk=2 +CONFIGURE_FLAGS_gtk3 = --with-gtk=3 -DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/tmp/@FLAVOR@ -DEB_DESTDIR = $(CURDIR)/debian/tmp/$(cdbs_make_curflavor)/ +CONFIGURE_COMMON_FLAGS += --disable-scrollkeeper --enable-gtk-doc --enable-introspection --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) -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 +INSTALL_COMMON_FLAGS = --fail-missing -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 +LDFLAGS += -Wl,-z,defs -Wl,--as-needed -DEB_CONFIGURE_FLAGS_gtk2 = --with-gtk=2 -DEB_CONFIGURE_FLAGS_gtk3 = --with-gtk=3 +%: + dh $@ --with autoreconf -DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc --enable-introspection --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) +override_dh_autoreconf: + NOCONFIGURE=1 dh_autoreconf ./autogen.sh -DEB_DH_SHLIBDEPS_ARGS_libdbusmenu-gtk4 = -- -xlibgtk2.0-0 -DEB_DH_SHLIBDEPS_ARGS_libdbusmenu-gtk3-4 = -- -xlibgtk-3-0 +override_dh_auto_configure: $(FLAVORS:%=doconfigure-%) -LDFLAGS += -Wl,-z,defs -Wl,--as-needed +doconfigure-%: + DH_VERBOSE=1 dh_auto_configure --builddirectory=builddir/$* -- $(CONFIGURE_FLAGS_$*) $(CONFIGURE_COMMON_FLAGS) + +override_dh_auto_build: $(FLAVORS:%=dobuild-%) -debian/stamp-autotools/gtk2: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk2) -debian/stamp-autotools/gtk3: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk3) +dobuild-%: + dh_auto_build --builddirectory=builddir/$* -common-install-arch:: +override_dh_auto_install: $(FLAVORS:%=doinstall-%) + +doinstall-%: + dh_auto_install --builddirectory=builddir/$* --destdir=debian/tmp/$* + +override_dh_install: find debian/tmp -name \*.la -delete + dh_install $(INSTALL_COMMON_FLAGS) -plibdbusmenu-gtk4 --sourcedir=debian/tmp/gtk2 + dh_install $(INSTALL_COMMON_FLAGS) -plibdbusmenu-gtk-dev --sourcedir=debian/tmp/gtk2 + dh_install $(INSTALL_COMMON_FLAGS) -plibdbusmenu-gtk-doc --sourcedir=debian/tmp/gtk2 + dh_install $(INSTALL_COMMON_FLAGS) -pgir1.2-dbusmenu-gtk-0.4 --sourcedir=debian/tmp/gtk2 + dh_install $(INSTALL_COMMON_FLAGS) -pgir1.2-dbusmenu-glib-0.4 --sourcedir=debian/tmp/gtk3 + dh_install $(INSTALL_COMMON_FLAGS) -pgir1.2-dbusmenu-gtk3-0.4 --sourcedir=debian/tmp/gtk3 + dh_install $(INSTALL_COMMON_FLAGS) -plibdbusmenu-glib4 --sourcedir=debian/tmp/gtk3 + dh_install $(INSTALL_COMMON_FLAGS) -plibdbusmenu-glib-dev --sourcedir=debian/tmp/gtk3 + dh_install $(INSTALL_COMMON_FLAGS) -plibdbusmenu-glib-doc --sourcedir=debian/tmp/gtk3 + dh_install $(INSTALL_COMMON_FLAGS) -plibdbusmenu-gtk3-4 --sourcedir=debian/tmp/gtk3 + dh_install $(INSTALL_COMMON_FLAGS) -plibdbusmenu-gtk3-dev --sourcedir=debian/tmp/gtk3 + dh_install $(INSTALL_COMMON_FLAGS) -plibdbusmenu-jsonloader4 --sourcedir=debian/tmp/gtk3 + dh_install $(INSTALL_COMMON_FLAGS) -plibdbusmenu-jsonloader-dev --sourcedir=debian/tmp/gtk3 + dh_install $(INSTALL_COMMON_FLAGS) -plibdbusmenu-tools --sourcedir=debian/tmp/gtk3 + +override_dh_shlibdeps: + dh_shlibdeps -plibdbusmenu-gtk4 -- -xlibgtk2.0-0 + dh_shlibdeps -plibdbusmenu-gtk3-4 -- -xlibgtk-3-0 + -- cgit v1.2.3 From 197688438c54ff42088745e16457432bb0f907ce Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Thu, 22 Nov 2012 18:25:10 -0500 Subject: Clean up unnecessary files we don't want to install, so that dh_install can complete. --- debian/changelog | 2 ++ debian/rules | 4 ++++ 2 files changed, 6 insertions(+) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index 2743496..73403da 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ libdbusmenu (12.10.3-0ubuntu1) UNRELEASED; urgency=low - Convert to dh9; some variables where kept but renamed to brevity. - Override dh_autoreconf to make sure it calls autogen.sh, and doesn't run configure. + - Clean up unnecessary files we don't want to install, so that dh_install + can complete. * debian/compat: bump to compat level 9. * debian/libdbusmenu-gtk-doc.install: add the glib-server-nomenu.c example. diff --git a/debian/rules b/debian/rules index 7ea788e..b6ab921 100755 --- a/debian/rules +++ b/debian/rules @@ -34,6 +34,10 @@ doinstall-%: override_dh_install: find debian/tmp -name \*.la -delete + # Remove gtk2 copies of dbusmenu-tools (we use the gtk3 build) + rm -f debian/tmp/gtk2/usr/lib/x86_64-linux-gnu/dbusmenu-testapp + rm -f debian/tmp/gtk2/usr/lib/x86_64-linux-gnu/dbusmenu-dumper + rm -f debian/tmp/gtk2/usr/lib/x86_64-linux-gnu/dbusmenu-bench dh_install $(INSTALL_COMMON_FLAGS) -plibdbusmenu-gtk4 --sourcedir=debian/tmp/gtk2 dh_install $(INSTALL_COMMON_FLAGS) -plibdbusmenu-gtk-dev --sourcedir=debian/tmp/gtk2 dh_install $(INSTALL_COMMON_FLAGS) -plibdbusmenu-gtk-doc --sourcedir=debian/tmp/gtk2 -- cgit v1.2.3 From 9217f452b5dd349092185436c76b3c77465c2627 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Fri, 23 Nov 2012 16:19:42 -0500 Subject: Override dh_auto_test to make sure they can be run for both the gtk2 and gtk3 flavors. --- debian/changelog | 2 ++ debian/rules | 6 ++++++ 2 files changed, 8 insertions(+) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index 0b5fef5..085d6e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,8 @@ libdbusmenu (12.10.3-0ubuntu1) UNRELEASED; urgency=low configure. - Clean up unnecessary files we don't want to install, so that dh_install can complete. + - Override dh_auto_test to make sure they can be run for both the gtk2 and + gtk3 flavors. * debian/compat: bump to compat level 9. * debian/libdbusmenu-gtk-doc.install: add the glib-server-nomenu.c example. * debian/libdbusmenu-tools.install: install dbusmenu-* binaries from the diff --git a/debian/rules b/debian/rules index b6ab921..d428b3e 100755 --- a/debian/rules +++ b/debian/rules @@ -32,6 +32,12 @@ override_dh_auto_install: $(FLAVORS:%=doinstall-%) doinstall-%: dh_auto_install --builddirectory=builddir/$* --destdir=debian/tmp/$* +override_dh_auto_test: $(FLAVORS:%=dotest-%) + +dotest-%: + # Tests temporarily disabled; test-gtk-label fails. See http://pad.lv/1082516 + #dh_auto_test --builddirectory=builddir/$* + override_dh_install: find debian/tmp -name \*.la -delete # Remove gtk2 copies of dbusmenu-tools (we use the gtk3 build) -- cgit v1.2.3 From b83fb86b4826bac58154fbb76ccf9d1495a8fffb Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Mon, 26 Nov 2012 20:59:22 -0500 Subject: Re-enable tests. --- debian/rules | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index d428b3e..f64efa6 100755 --- a/debian/rules +++ b/debian/rules @@ -35,8 +35,7 @@ doinstall-%: override_dh_auto_test: $(FLAVORS:%=dotest-%) dotest-%: - # Tests temporarily disabled; test-gtk-label fails. See http://pad.lv/1082516 - #dh_auto_test --builddirectory=builddir/$* + dh_auto_test --builddirectory=builddir/$* override_dh_install: find debian/tmp -name \*.la -delete -- cgit v1.2.3 From 4855bd8639c7666817f8b5162b5cd6408b61af62 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Tue, 4 Dec 2012 19:13:40 -0500 Subject: - Add xvfb to Build-Depends. - Run dh_auto_test through xvfb-run. --- debian/changelog | 2 ++ debian/control | 1 + debian/rules | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index dc472b8..cfa0ceb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ libdbusmenu (12.10.3-0ubuntu1) UNRELEASED; urgency=low - Update Vcs-Bzr, Vcs-Browser and add a notice to uploaders. - Remove outdated Breaks:. - Add dbus-test-runner to Build-Depends. + - Add xvfb to Build-Depends. * debian/rules: - Convert to dh9; some variables where kept but renamed to brevity. - Override dh_autoreconf to make sure it calls autogen.sh, and doesn't run @@ -16,6 +17,7 @@ libdbusmenu (12.10.3-0ubuntu1) UNRELEASED; urgency=low can complete. - Override dh_auto_test to make sure they can be run for both the gtk2 and gtk3 flavors. + - Run dh_auto_test through xvfb-run. * debian/compat: bump to compat level 9. * debian/libdbusmenu-gtk-doc.install: add the glib-server-nomenu.c example. * debian/libdbusmenu-tools.install: install dbusmenu-* binaries from the diff --git a/debian/control b/debian/control index c383ec3..74461c7 100644 --- a/debian/control +++ b/debian/control @@ -13,6 +13,7 @@ Build-Depends: debhelper (>= 9), gtk-doc-tools, valgrind, dbus-test-runner, + xvfb, libgtk2.0-dev (>= 2.24.4-1~), libgtk-3-dev (>= 2.99.2-1ubuntu2), libgdk-pixbuf2.0-dev (>= 2.22.1-0ubuntu4), diff --git a/debian/rules b/debian/rules index f64efa6..f838d26 100755 --- a/debian/rules +++ b/debian/rules @@ -35,7 +35,7 @@ doinstall-%: override_dh_auto_test: $(FLAVORS:%=dotest-%) dotest-%: - dh_auto_test --builddirectory=builddir/$* + xvfb-run dh_auto_test --builddirectory=builddir/$* override_dh_install: find debian/tmp -name \*.la -delete -- cgit v1.2.3