From a74264a996f89ed4bcd6cc3210c8c8ba51c3908d Mon Sep 17 00:00:00 2001 From: seb128 Date: Mon, 16 Mar 2009 23:23:33 +0100 Subject: updated shlibs version --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 1c64b91..27b72eb 100755 --- a/debian/rules +++ b/debian/rules @@ -5,4 +5,4 @@ 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_libindicate0 += -V 'libindicate0 (>= 0.1.2)' -- cgit v1.2.3 From 321d1da208cdff46bc14897dfcb73ded56815a12 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 17 Mar 2009 13:39:45 -0500 Subject: Removing all the gobject stuff from the debian build files --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 27b72eb..3025b6a 100755 --- a/debian/rules +++ b/debian/rules @@ -3,6 +3,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk -DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper +DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --disable-gobject-introspection LDFLAGS += -Wl,-z,defs -Wl,--as-needed DEB_DH_MAKESHLIBS_ARGS_libindicate0 += -V 'libindicate0 (>= 0.1.2)' -- cgit v1.2.3 From bff1218cd071d1c27e7fc6bc17c55251cbb6f956 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Wed, 5 Aug 2009 09:50:42 +0100 Subject: indicator-applet (0.2.0~bzr319-0ubuntu3) karmic; urgency=low * debian/rules - added --enable-gtk-doc to build the docs -- Ken VanDine Wed, 05 Aug 2009 09:50:17 +0100 --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 3025b6a..27ff7f1 100755 --- a/debian/rules +++ b/debian/rules @@ -3,6 +3,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk -DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --disable-gobject-introspection +DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --disable-gobject-introspection --enable-gtk-doc LDFLAGS += -Wl,-z,defs -Wl,--as-needed DEB_DH_MAKESHLIBS_ARGS_libindicate0 += -V 'libindicate0 (>= 0.1.2)' -- cgit v1.2.3 From a810a01a01d6600cc3a2dace659fcaf387b92f72 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 18 Aug 2009 13:45:00 -0500 Subject: * Merging in the seperation from indicator-applet * debian/* Removing all of the indicator-applet stuff --- debian/rules | 2 -- 1 file changed, 2 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 27ff7f1..744b984 100755 --- a/debian/rules +++ b/debian/rules @@ -3,6 +3,4 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk -DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --disable-gobject-introspection --enable-gtk-doc LDFLAGS += -Wl,-z,defs -Wl,--as-needed -DEB_DH_MAKESHLIBS_ARGS_libindicate0 += -V 'libindicate0 (>= 0.1.2)' -- cgit v1.2.3 From 259bcc9933de10b893dd9feeca3d18cde6bc5f1f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 11 Mar 2010 14:26:58 -0600 Subject: debian/rules: Updating shlibs number --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 5ee8f88..5e14c74 100755 --- a/debian/rules +++ b/debian/rules @@ -5,4 +5,4 @@ include /usr/share/cdbs/1/class/gnome.mk LDFLAGS += -Wl,-z,defs -Wl,--as-needed -DEB_DH_MAKESHLIBS_ARGS_libindicator0 += -V 'libindicator0 (>= 0.3.3)' +DEB_DH_MAKESHLIBS_ARGS_libindicator0 += -V 'libindicator0 (>= 0.3.5)' -- cgit v1.2.3 From 218c6a8d5f51f002e214f8ec74738e95b2efecdf Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 18 Mar 2010 10:59:10 -0500 Subject: debian/rules: Updating shlibs --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 5e14c74..151c78d 100755 --- a/debian/rules +++ b/debian/rules @@ -5,4 +5,4 @@ include /usr/share/cdbs/1/class/gnome.mk LDFLAGS += -Wl,-z,defs -Wl,--as-needed -DEB_DH_MAKESHLIBS_ARGS_libindicator0 += -V 'libindicator0 (>= 0.3.5)' +DEB_DH_MAKESHLIBS_ARGS_libindicator0 += -V 'libindicator0 (>= 0.3.6)' -- cgit v1.2.3 From 79f7355391b87f88f79330f4d7507ef72c15734c Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Fri, 13 Aug 2010 11:57:45 +0200 Subject: releasing version 0.3.11-0ubuntu2 --- debian/rules | 3 +++ 1 file changed, 3 insertions(+) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 151c78d..095f53b 100755 --- a/debian/rules +++ b/debian/rules @@ -2,7 +2,10 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk + LDFLAGS += -Wl,-z,defs -Wl,--as-needed DEB_DH_MAKESHLIBS_ARGS_libindicator0 += -V 'libindicator0 (>= 0.3.6)' + -- cgit v1.2.3 From a006528f328d99f16647616b006c8ae3172d3d3f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sun, 19 Sep 2010 14:42:21 -0500 Subject: * debian/rules: * Dropping the simple patch system * Changing the shlibs to libindicator1 --- debian/rules | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 095f53b..9099854 100755 --- a/debian/rules +++ b/debian/rules @@ -2,10 +2,9 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk LDFLAGS += -Wl,-z,defs -Wl,--as-needed -DEB_DH_MAKESHLIBS_ARGS_libindicator0 += -V 'libindicator0 (>= 0.3.6)' +DEB_DH_MAKESHLIBS_ARGS_libindicator0 += -V 'libindicator1 (>= 0.3.13)' -- cgit v1.2.3 From 98f804c2c5b4852c91796195dd3140d57f2afbc3 Mon Sep 17 00:00:00 2001 From: Didier Roche Date: Wed, 22 Sep 2010 10:05:24 +0200 Subject: redo removed adjustements --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 9099854..7ad558a 100755 --- a/debian/rules +++ b/debian/rules @@ -6,5 +6,5 @@ include /usr/share/cdbs/1/class/gnome.mk LDFLAGS += -Wl,-z,defs -Wl,--as-needed -DEB_DH_MAKESHLIBS_ARGS_libindicator0 += -V 'libindicator1 (>= 0.3.13)' +DEB_DH_MAKESHLIBS_ARGS_libindicator0 += -V 'libindicator1 (>= 0.3.14)' -- cgit v1.2.3 From 8915dd59667cd7aae74860ee063374b24734e03c Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Wed, 24 Nov 2010 18:39:14 -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 libindicator3-1, libindicator3-dev, libindicator3-tools binaries binaries * libindicator/Makefile.am and tools/Makefile.am - Fixes needed for building with-gtk=3 --- debian/rules | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 7ad558a..e4f4f04 100755 --- a/debian/rules +++ b/debian/rules @@ -2,9 +2,38 @@ 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 LDFLAGS += -Wl,-z,defs -Wl,--as-needed -DEB_DH_MAKESHLIBS_ARGS_libindicator0 += -V 'libindicator1 (>= 0.3.14)' +DEB_DH_MAKESHLIBS_ARGS_libindicator1 += -V 'libindicator1 (>= 0.3.15)' +DEB_DH_MAKESHLIBS_ARGS_libindicator3 += -V 'libindicator3-1 (>= 0.3.15)' +configure/libindicator3-1:: 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)); \ + cd ..; + touch stamp-configure-gtk3 + +build/libindicator3-1:: 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 + +clean:: + rm -f stamp-*-gtk3 + rm -rf build-gtk3 -- cgit v1.2.3 From 4a4ca1e84dab55c11301277ebc820dc3f9f7c9de Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 27 Jan 2011 15:29:13 -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 e4f4f04..de71b0a 100755 --- a/debian/rules +++ b/debian/rules @@ -9,8 +9,8 @@ DEB_BUILDDIR = $(DEB_SRCDIR)/build LDFLAGS += -Wl,-z,defs -Wl,--as-needed -DEB_DH_MAKESHLIBS_ARGS_libindicator1 += -V 'libindicator1 (>= 0.3.15)' -DEB_DH_MAKESHLIBS_ARGS_libindicator3 += -V 'libindicator3-1 (>= 0.3.15)' +DEB_DH_MAKESHLIBS_ARGS_libindicator1 += -V 'libindicator1 (>= 0.3.18)' +DEB_DH_MAKESHLIBS_ARGS_libindicator3 += -V 'libindicator3-1 (>= 0.3.18)' configure/libindicator3-1:: stamp-configure-gtk3 stamp-configure-gtk3: -- cgit v1.2.3 From f44a6bcf14243565e49f368b9db7423f49f871ce Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 7 Jul 2011 00:38:18 -0500 Subject: * debian/*install, control: Changing ABI version number bump in package names * debian/rules: Making GTK2 the special case as GTK3 is default now --- debian/rules | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 4c21f86..4581c33 100755 --- a/debian/rules +++ b/debian/rules @@ -9,31 +9,31 @@ DEB_BUILDDIR = $(DEB_SRCDIR)/build LDFLAGS += -Wl,-z,defs -Wl,--as-needed -DEB_DH_MAKESHLIBS_ARGS_libindicator3 += -V 'libindicator3 (>= 0.3.19)' -DEB_DH_MAKESHLIBS_ARGS_libindicator3_3 += -V 'libindicator3-3 (>= 0.3.19)' +DEB_DH_MAKESHLIBS_ARGS_libindicator4 += -V 'libindicator4 (>= 0.3.90)' +DEB_DH_MAKESHLIBS_ARGS_libindicator3_4 += -V 'libindicator3-4 (>= 0.3.90)' -configure/libindicator3-3:: stamp-configure-gtk3 -stamp-configure-gtk3: - : # configure for GTK+ 3.0 +configure/libindicator4:: 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)); \ cd ..; - touch stamp-configure-gtk3 + touch stamp-configure-gtk2 -build/libindicator3-3:: stamp-build-gtk3 -stamp-build-gtk3: stamp-configure-gtk3 - : # build for GTK+ 3.0 - $(MAKE) -C build-gtk3; - touch stamp-build-gtk3 +build/libindicator4:: 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 clean:: - rm -f stamp-*-gtk3 - rm -rf build-gtk3 + rm -f stamp-*-gtk2 + rm -rf build-gtk2 -- cgit v1.2.3 From c292980b2487057592929d5b9b9c4446013241c5 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 7 Jul 2011 10:55:25 -0400 Subject: * debian/rules - Simplify the dual builds with cdbs - Fixed package names to match soname * debian/*.install fixed paths to work with the dual builds change * tools/Makefile.in - Fixed path for xsessiondir * debian/control - Fixed package names to match soname --- debian/rules | 47 ++++++++++++++++------------------------------- 1 file changed, 16 insertions(+), 31 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 4581c33..17ed4cf 100755 --- a/debian/rules +++ b/debian/rules @@ -1,39 +1,24 @@ #!/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 -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 LDFLAGS += -Wl,-z,defs -Wl,--as-needed -DEB_DH_MAKESHLIBS_ARGS_libindicator4 += -V 'libindicator4 (>= 0.3.90)' -DEB_DH_MAKESHLIBS_ARGS_libindicator3_4 += -V 'libindicator3-4 (>= 0.3.90)' - -configure/libindicator4:: 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)); \ - cd ..; - touch stamp-configure-gtk2 - -build/libindicator4:: 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 - -clean:: - rm -f stamp-*-gtk2 - rm -rf build-gtk2 +DEB_DH_MAKESHLIBS_ARGS_libindicator6 += -V 'libindicator6 (>= 0.3.90)' +DEB_DH_MAKESHLIBS_ARGS_libindicator3_6 += -V 'libindicator3-6 (>= 0.3.90)' + +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 f1c0aaffe06a3a367f9eeda6e0a78a08c670ed35 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Tue, 22 Nov 2011 14:37:23 -0500 Subject: releasing version 0.4.1-1 --- debian/rules | 1 - 1 file changed, 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 66b1948..da650c3 100755 --- a/debian/rules +++ b/debian/rules @@ -23,4 +23,3 @@ debian/stamp-autotools/gtk3: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk3) common-install-arch:: find debian/tmp -name \*.la -delete cd po; intltool-update --pot --verbose - -- cgit v1.2.3 From 6659abf589204f0c826dd3637eaaac8c588f7a0e Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Tue, 24 Jan 2012 19:30:08 -0500 Subject: releasing version 0.4.90-0ubuntu1 --- debian/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index da650c3..f62d05a 100755 --- a/debian/rules +++ b/debian/rules @@ -14,8 +14,8 @@ DEB_CONFIGURE_FLAGS_gtk3 = --with-gtk=3 LDFLAGS += -Wl,-z,defs -Wl,--as-needed -DEB_DH_MAKESHLIBS_ARGS_libindicator6 += -V 'libindicator6 (>= 0.3.90)' -DEB_DH_MAKESHLIBS_ARGS_libindicator3_6 += -V 'libindicator3-6 (>= 0.3.90)' +DEB_DH_MAKESHLIBS_ARGS_libindicator7 += -V 'libindicator7 (>= 0.4.90)' +DEB_DH_MAKESHLIBS_ARGS_libindicator3_7 += -V 'libindicator3-7 (>= 0.4.90)' debian/stamp-autotools/gtk2: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk2) debian/stamp-autotools/gtk3: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk3) -- cgit v1.2.3 From 36b39c96eac1bcadaf506a52b6c583155559458b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 14 Feb 2012 14:23:06 -0600 Subject: debian/control, debian/rules: Adding in autoreconf support --- debian/rules | 1 + 1 file changed, 1 insertion(+) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index f62d05a..7e69bc0 100755 --- a/debian/rules +++ b/debian/rules @@ -5,6 +5,7 @@ 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 DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/tmp/@FLAVOR@ DEB_DESTDIR = $(CURDIR)/debian/tmp/$(cdbs_make_curflavor)/ -- cgit v1.2.3 From 7f1272a5681547e6a6cb083b699be4770c08ac96 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 14 Feb 2012 14:27:38 -0600 Subject: * debian/control, debian/rules: * Adding in autoreconf support * Adding a check rule and requiring new build deps --- debian/rules | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 7e69bc0..e74ddd1 100755 --- a/debian/rules +++ b/debian/rules @@ -13,6 +13,8 @@ DEB_DESTDIR = $(CURDIR)/debian/tmp/$(cdbs_make_curflavor)/ DEB_CONFIGURE_FLAGS_gtk2 = --with-gtk=2 DEB_CONFIGURE_FLAGS_gtk3 = --with-gtk=3 +DEB_MAKE_CHECK_TARGET := check + LDFLAGS += -Wl,-z,defs -Wl,--as-needed DEB_DH_MAKESHLIBS_ARGS_libindicator7 += -V 'libindicator7 (>= 0.4.90)' -- cgit v1.2.3 From 17133c0d617daea26c39f72c8ef527bd2cece5d0 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 14 Feb 2012 16:45:43 -0600 Subject: debian/rules: Adding messages --- debian/rules | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index e74ddd1..be53e6a 100755 --- a/debian/rules +++ b/debian/rules @@ -7,6 +7,8 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk include /usr/share/cdbs/1/rules/autoreconf.mk +export G_MESSAGES_DEBUG = all + DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/tmp/@FLAVOR@ DEB_DESTDIR = $(CURDIR)/debian/tmp/$(cdbs_make_curflavor)/ -- cgit v1.2.3 From 28d27ed11c41ca6859c533e6a084c631225c9912 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Thu, 29 Mar 2012 13:57:09 -0700 Subject: releasing version 0.4.94-0ubuntu1~ppa1 --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index be53e6a..7cf6832 100755 --- a/debian/rules +++ b/debian/rules @@ -15,7 +15,7 @@ DEB_DESTDIR = $(CURDIR)/debian/tmp/$(cdbs_make_curflavor)/ DEB_CONFIGURE_FLAGS_gtk2 = --with-gtk=2 DEB_CONFIGURE_FLAGS_gtk3 = --with-gtk=3 -DEB_MAKE_CHECK_TARGET := check +#DEB_MAKE_CHECK_TARGET := check LDFLAGS += -Wl,-z,defs -Wl,--as-needed -- cgit v1.2.3 From 3d69e24bb732c8fc2196a523b0b8c659eb3e8f59 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Wed, 21 Nov 2012 14:58:08 -0500 Subject: * debian/rules: - Convert to using the dh9 sequencer. --- debian/rules | 43 ++++++++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 17 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 7cf6832..8df3a90 100755 --- a/debian/rules +++ b/debian/rules @@ -1,30 +1,39 @@ #!/usr/bin/make -f -DEB_BUILDDIR = build -DEB_MAKE_FLAVORS = gtk2 gtk3 +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 +CONFIGURE_FLAGS_gtk2 = --with-gtk=2 +CONFIGURE_FLAGS_gtk3 = --with-gtk=3 + +LDFLAGS += -Wl,-z,defs -Wl,--as-needed export G_MESSAGES_DEBUG = all -DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/tmp/@FLAVOR@ -DEB_DESTDIR = $(CURDIR)/debian/tmp/$(cdbs_make_curflavor)/ +%: + dh $@ --with autoreconf -DEB_CONFIGURE_FLAGS_gtk2 = --with-gtk=2 -DEB_CONFIGURE_FLAGS_gtk3 = --with-gtk=3 +override_dh_auto_configure: $(FLAVORS:%=doconfigure-%) -#DEB_MAKE_CHECK_TARGET := check +doconfigure-%: + DH_VERBOSE=1 dh_auto_configure --builddirectory=builddir/$* -- $(CONFIGURE_FLAGS_$*) -LDFLAGS += -Wl,-z,defs -Wl,--as-needed +override_dh_auto_build: $(FLAVORS:%=dobuild-%) -DEB_DH_MAKESHLIBS_ARGS_libindicator7 += -V 'libindicator7 (>= 0.4.90)' -DEB_DH_MAKESHLIBS_ARGS_libindicator3_7 += -V 'libindicator3-7 (>= 0.4.90)' +dobuild-%: + dh_auto_build --builddirectory=builddir/$* -debian/stamp-autotools/gtk2: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk2) -debian/stamp-autotools/gtk3: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk3) +override_dh_auto_install: $(FLAVORS:%=doinstall-%) -common-install-arch:: +doinstall-%: + dh_auto_install --builddirectory=builddir/$* --destdir=debian/tmp/$* + +override_dh_install: find debian/tmp -name \*.la -delete - cd po; intltool-update --pot --verbose + find debian/tmp -name libdummy-indicator\* -delete + rm -f debian/tmp/gtk3/usr/share/libindicator/80indicator-debugging + dh_install --fail-missing + +override_dh_makeshlibs: + dh_makeshlibs -plibindicator7 -V 'libindicator7 (>= 0.4.90)' + dh_makeshlibs -plibindicator3-7 -V 'libindicator3-7 (>= 0.4.90)' + -- cgit v1.2.3 From 568063937e43660dfede1b289bea5c258aa69e9c Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Wed, 21 Nov 2012 14:59:47 -0500 Subject: Override dh_autoreconf to run autogen.sh and not call configure. --- debian/rules | 3 +++ 1 file changed, 3 insertions(+) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 8df3a90..35b1bb9 100755 --- a/debian/rules +++ b/debian/rules @@ -12,6 +12,9 @@ export G_MESSAGES_DEBUG = all %: dh $@ --with autoreconf +override_dh_autoreconf: + NOCONFIGURE=1 dh_autoreconf ./autogen.sh + override_dh_auto_configure: $(FLAVORS:%=doconfigure-%) doconfigure-%: -- cgit v1.2.3 From 5576bf0766de3a34922ebeb80e6268287b81a5b8 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Thu, 22 Nov 2012 12:13:37 -0500 Subject: - Use calls to dh_install per-package to use the right source directories. * debian/*.install: drop the debian/tmp/gtk* path elements and update for multiarch. --- debian/rules | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 35b1bb9..0ff1401 100755 --- a/debian/rules +++ b/debian/rules @@ -34,7 +34,12 @@ override_dh_install: find debian/tmp -name \*.la -delete find debian/tmp -name libdummy-indicator\* -delete rm -f debian/tmp/gtk3/usr/share/libindicator/80indicator-debugging - dh_install --fail-missing + dh_install -plibindicator7 --fail-missing --sourcedir=debian/tmp/gtk2 + dh_install -plibindicator-dev --fail-missing --sourcedir=debian/tmp/gtk2 + dh_install -plibindicator-tools --fail-missing --sourcedir=debian/tmp/gtk2 + dh_install -plibindicator3-7 --fail-missing --sourcedir=debian/tmp/gtk3 + dh_install -plibindicator3-dev --fail-missing --sourcedir=debian/tmp/gtk3 + dh_install -plibindicator3-tools --fail-missing --sourcedir=debian/tmp/gtk3 override_dh_makeshlibs: dh_makeshlibs -plibindicator7 -V 'libindicator7 (>= 0.4.90)' -- cgit v1.2.3 From f77d6ddd288985780c7fb0c27911ccf4c2df4983 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Thu, 22 Nov 2012 14:32:41 -0500 Subject: Add and export DPKG_GENSYMBOLS_CHECK_LEVEL. --- debian/rules | 1 + 1 file changed, 1 insertion(+) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 0ff1401..ec764bb 100755 --- a/debian/rules +++ b/debian/rules @@ -8,6 +8,7 @@ CONFIGURE_FLAGS_gtk3 = --with-gtk=3 LDFLAGS += -Wl,-z,defs -Wl,--as-needed export G_MESSAGES_DEBUG = all +export DPKG_GENSYMBOLS_CHECK_LEVEL = 4 %: dh $@ --with autoreconf -- cgit v1.2.3