From 704c0f4027e54e32716fcfc55b34b2f5ca45348f Mon Sep 17 00:00:00 2001 From: Ludovic Rousseau Date: Tue, 28 Jul 2009 21:31:13 +0000 Subject: [PATCH] debian/control: Standards-Version: 3.7.3 -> 3.8.2, add support of noopt, nostrip and parallel= in DEB_BUILD_OPTIONS --- debian/changelog | 4 +++- debian/control | 2 +- debian/rules | 23 ++++++++++++++++++++++- 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 42edd47..91e7c79 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,10 @@ ccid (1.3.11-1) unstable; urgency=low * debian/watch: new format * Fix "Please add Panasonic ZU-9PS" included upstream (Closes: #537317) + * debian/control: Standards-Version: 3.7.3 -> 3.8.2, add support of noopt, + nostrip and parallel= in DEB_BUILD_OPTIONS - -- Ludovic Rousseau Tue, 28 Jul 2009 21:20:43 +0000 + -- Ludovic Rousseau Tue, 28 Jul 2009 23:22:37 +0200 ccid (1.3.10-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 7a7312d..296e6e7 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: libs Priority: extra Maintainer: Ludovic Rousseau Build-Depends: debhelper (>= 5.0.45), libusb-dev (>= 0.1.6a-2.1), libpcsclite-dev (>= 1.3.3), flex, autotools-dev, pkg-config -Standards-Version: 3.7.3 +Standards-Version: 3.8.2 Vcs-Svn: svn://svn.debian.org/svn/collab-maint/deb-maint/ccid/trunk Vcs-Browser: http://svn.debian.org/viewsvn/collab-maint/deb-maint/ccid/trunk/ Homepage: http://pcsclite.alioth.debian.org/ccid.html diff --git a/debian/rules b/debian/rules index 948b036..fc5afc0 100755 --- a/debian/rules +++ b/debian/rules @@ -17,6 +17,26 @@ else confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) endif +CFLAGS = -Wall -g +INSTALL = install +INSTALL_FILE = $(INSTALL) -p -o root -g root -m 644 +INSTALL_PROGRAM = $(INSTALL) -p -o root -g root -m 755 +INSTALL_SCRIPT = $(INSTALL) -p -o root -g root -m 755 +INSTALL_DIR = $(INSTALL) -p -d -o root -g root -m 755 + +ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + MAKEFLAGS += -j$(NUMJOBS) +endif + configure: configure-stamp configure-stamp: dh_testdir @@ -24,7 +44,8 @@ configure-stamp: ./configure $(confflags) \ --prefix=/usr \ - --enable-twinserial + --enable-twinserial \ + CFLAGS="$(CFLAGS)" touch configure-stamp