aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog21
-rw-r--r--debian/control64
-rw-r--r--debian/gir1.0-dbusmenu-gtk3-0.2.install1
-rw-r--r--debian/libdbusmenu-gtk3-2.install1
-rw-r--r--debian/libdbusmenu-gtk3-dev.install5
-rw-r--r--debian/libdbusmenu-jsonloader2.install (renamed from debian/libdbusmenu-jsonloader1.install)0
-rwxr-xr-xdebian/rules41
7 files changed, 116 insertions, 17 deletions
diff --git a/debian/changelog b/debian/changelog
index 3fc5e60..5b24f81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,22 @@
-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
+ - Removed build depends for gir-repository-dev (LP: #677382)
+ - Use gir:Depends
+ * docs/libdbusmenu-gtk/reference/Makefile.am, libdbusmenu-glib/Makefile.am,
+ libdbusmenu-gtk/Makefile.am
+ - Fixes needed for building with-gtk=3
+
+ [ Ted Gould ]
* New upstream release.
* Breaking ABI and getting reserved back
* Adding build support for GTK2/3 builds
@@ -9,7 +26,7 @@ libdbusmenu (0.3.90-0ubuntu1~ppa1) maverick; urgency=low
debian/libdbusmenu-gtk2.install: Switching package names to
match .so bump.
- -- Ted Gould <ted@ubuntu.com> Thu, 11 Nov 2010 11:34:00 -0600
+ -- Ken VanDine <ken.vandine@canonical.com> 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 b162015..bef3fd0 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,9 @@ 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),
+ libgdk-pixbuf2.0-dev (>= 2.22.1-0ubuntu4),
libdbus-glib-1-dev,
gnome-doc-utils,
gtk-doc-tools,
@@ -15,15 +17,13 @@ Build-Depends: debhelper (>= 5.0),
libxml2-dev,
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
+ dh-autoreconf,
+ valac-0.12
Standards-Version: 3.9.1
Homepage: https://launchpad.net/dbusmenu
Vcs-Bzr: https://code.launchpad.net/~dbusmenu-team/dbusmenu/ubuntu
@@ -107,7 +107,7 @@ Section: libs
Architecture: any
Depends: ${misc:Depends},
libdbusmenu-glib2 (= ${binary:Version}),
- gir1.0-glib-2.0
+ ${gir:Depends}
Description: typelib file for libdbusmenu-glib2
libdbusmenu passes a menu structure across DBus so that a program can
create a menu simply without worrying about how it is displayed on the
@@ -121,8 +121,7 @@ Section: libs
Architecture: any
Depends: ${misc:Depends},
libdbusmenu-gtk2 (= ${binary:Version}),
- gir1.0-dbusmenu-glib-0.2 (= ${binary:Version}),
- gir1.0-gtk-2.0
+ ${gir:Depends}
Description: typelib file for libdbusmenu-gtk2
libdbusmenu passes a menu structure across DBus so that a program can
create a menu simply without worrying about how it is displayed on the
@@ -153,7 +152,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,3 +180,46 @@ Description: library for passing menus over DBus - Test lib development files
.
This package contains files that are needed to build test suites in
applications or libraries using dbusmenu.
+
+Package: libdbusmenu-gtk3-2
+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-2 (= ${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-2 (= ${binary:Version}),
+ ${gir:Depends}
+Description: typelib file for libdbusmenu-gtk2
+ libdbusmenu passes a menu structure across DBus so that a program can
+ create a menu simply without worrying about how it is displayed on the
+ 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-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-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-jsonloader1.install b/debian/libdbusmenu-jsonloader2.install
index bff47f5..bff47f5 100644
--- a/debian/libdbusmenu-jsonloader1.install
+++ b/debian/libdbusmenu-jsonloader2.install
diff --git a/debian/rules b/debian/rules
index 1578fbf..cd1d01f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,11 +2,44 @@
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_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-2 += -V 'libdbusmenu-gtk3-2 (>= 0.3.90)'
+DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-glib2 += -V 'libdbusmenu-glib2 (>= 0.3.90)'
+
+configure/libdbusmenu-gtk3-2:: 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-2:: stamp-build-gtk3
+stamp-build-gtk3: stamp-configure-gtk3
+ : # build for GTK+ 3.0
+ $(MAKE) -C build-gtk3;
+ touch stamp-build-gtk3
+
+common-install-prehook-arch:: stamp-build-gtk3
+ : # install for GTK+ 3.0
+ $(MAKE) -C build-gtk3 DESTDIR=$(CURDIR)/debian/tmp install
+
+binary-predeb/gir%::
+ dh_girepository -p$(cdbs_curpkg)
+clean::
+ rm -f stamp-*-gtk3
+ rm -rf build-gtk3
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-19 03:05:23 +0000