diff options
author | Ken VanDine <ken.vandine@canonical.com> | 2010-11-24 14:07:15 -0500 |
---|---|---|
committer | Ken VanDine <ken.vandine@canonical.com> | 2010-11-24 14:07:15 -0500 |
commit | 0d98749cbe9f405e4579adf0c30d534c277c2686 (patch) | |
tree | f970fd79e9b237626aabdbc03c2454cdfc828143 /debian | |
parent | d5fcf6e23110f1ce1e753dc78da6b425dab0c713 (diff) | |
download | libdbusmenu-0d98749cbe9f405e4579adf0c30d534c277c2686.tar.gz libdbusmenu-0d98749cbe9f405e4579adf0c30d534c277c2686.tar.bz2 libdbusmenu-0d98749cbe9f405e4579adf0c30d534c277c2686.zip |
* 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
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 19 | ||||
-rw-r--r-- | debian/control | 10 | ||||
-rw-r--r-- | debian/libdbusmenu-gtk3-2.install (renamed from debian/libdbusmenu-gtk3.install) | 0 | ||||
-rw-r--r-- | debian/libdbusmenu-jsonloader2.install (renamed from debian/libdbusmenu-jsonloader1.install) | 0 | ||||
-rwxr-xr-x | debian/rules | 10 |
5 files changed, 28 insertions, 11 deletions
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 <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 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.install b/debian/libdbusmenu-gtk3-2.install index af2e9a3..af2e9a3 100644 --- a/debian/libdbusmenu-gtk3.install +++ b/debian/libdbusmenu-gtk3-2.install 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 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) |