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/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian/rules') 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/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/rules') 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/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian/rules') 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/rules | 1 + 1 file changed, 1 insertion(+) (limited to 'debian/rules') 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/rules | 1 - 1 file changed, 1 deletion(-) (limited to 'debian/rules') 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/rules | 1 - 1 file changed, 1 deletion(-) (limited to 'debian/rules') 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/rules | 41 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 37 insertions(+), 4 deletions(-) (limited to 'debian/rules') 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/rules | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'debian/rules') 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) -- 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/rules | 1 + 1 file changed, 1 insertion(+) (limited to 'debian/rules') 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/rules | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'debian/rules') 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/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian/rules') 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/rules | 4 ---- 1 file changed, 4 deletions(-) (limited to 'debian/rules') 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/rules | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'debian/rules') 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/rules | 45 ++++++++++++++------------------------------- 1 file changed, 14 insertions(+), 31 deletions(-) (limited to 'debian/rules') 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/rules | 3 +++ 1 file changed, 3 insertions(+) (limited to 'debian/rules') 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/rules | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'debian/rules') 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/rules | 73 ++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 42 insertions(+), 31 deletions(-) (limited to 'debian/rules') 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/rules | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'debian/rules') 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/rules | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian/rules') 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/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/rules') 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