[SCM] tango branch, master, updated. debian/7.2.6+dfsg-12-4-g4db26c1

Picca Frédéric-Emma?==?UTF-8?Q?nuel picca at debian.org
Sun Feb 19 16:37:31 UTC 2012


The following commit has been merged in the master branch:
commit f4914b98e16d25af74d2405c8e79665f72291241
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Sun Feb 19 15:11:04 2012 +0100

    repare for backport on stable without bpo

diff --git a/debian/control b/debian/control
index a5db9a8..592265d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,11 @@ Section: science
 Priority: extra
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Picca Frédéric-Emmanuel <picca at debian.org>
-Build-Depends: debhelper (>= 8), po-debconf, dh-autoreconf, libcos4-dev (>= 4.1.3), libmysqlclient-dev
+Build-Depends: debhelper (>= 8),
+	       dh-autoreconf,
+	       libcos4-dev (>= 4.1.3),
+	       libmysqlclient-dev
+	       po-debconf
 Build-Depends-Indep: doxygen
 Standards-Version: 3.9.2
 Homepage: http://www.tango-controls.org
diff --git a/debian/rules b/debian/rules
index 1955785..304dd68 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,10 @@ BUILDROOT=build
 PACKAGE := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
 VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)+.*/\1/p')
 
-dpkg_buildflags = DEB_LDFLAGS_MAINT_STRIP="-Wl,-Bsymbolic-functions" dpkg-buildflags
+CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
+CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
+LDFLAGS:=$(shell DEB_LDFLAGS_MAINT_STRIP="-Wl,-Bsymbolic-functions" dpkg-buildflags --get LDFLAGS)
 
 get-orig-source:
 	uscan --verbose --force-download --download-current-version
@@ -15,7 +18,7 @@ get-orig-source:
 	ln -fs $(PACKAGE)-$(VERSION)+dfsg.tar.gz ../$(PACKAGE)_$(VERSION)+dfsg.orig.tar.gz
 
 override_dh_auto_configure:
-	dh_auto_configure -- $(shell $(dpkg_buildflags) --export=configure) --with-omni=/usr --disable-dbcreate --disable-java --with-doxygen --disable-jpegmmx
+	dh_auto_configure -- --with-omni=/usr --disable-dbcreate --disable-java --with-doxygen --disable-jpegmmx
 
 override_dh_auto_install:
 	dh_auto_install --destdir="$(CURDIR)/debian/tmp/"

-- 
TANGO distributed control system.



More information about the debian-science-commits mailing list