aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog6
-rw-r--r--debian/control55
-rw-r--r--debian/gir1.0-dbusmenu-gtk3-0.2.install1
-rw-r--r--debian/libdbusmenu-gtk3-dev.install5
-rw-r--r--debian/libdbusmenu-gtk3.install1
-rwxr-xr-xdebian/rules41
6 files changed, 99 insertions, 10 deletions
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 <ken.vandine@canonical.com> 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 <pkg-ayatana-devel@lists.alioth.
Uploaders: Evgeni Golov <evgeni@debian.org>
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