* Standards-Version: 3.7.3 -> 3.8.1

- add support of noopt and parallel options in DEB_BUILD_OPTIONS
 - resynch pcscd.init with /etc/init.d/skeleton

debian/changelog

@@ -3,8 +3,11 @@ pcsc-lite (1.5.2-2) unstable; urgency=low
   * debian/rules: use symbolic links instead of copy to update config.sub and
     config.guess as suggested in /usr/share/doc/autotools-dev/README.Debian.gz
     Tries to limit difference with the Ubuntu package
+  * Standards-Version: 3.7.3 -> 3.8.1
+   - add support of noopt and parallel options in DEB_BUILD_OPTIONS
+   - resynch pcscd.init with /etc/init.d/skeleton
 
- -- Ludovic Rousseau <rousseau@debian.org>  Sun, 29 Mar 2009 16:21:57 +0200
+ -- Ludovic Rousseau <rousseau@debian.org>  Sun, 29 Mar 2009 17:04:44 +0200
 
 pcsc-lite (1.5.2-1) unstable; urgency=low
 

debian/control

@@ -3,7 +3,7 @@ Section: misc
 Priority: extra
 Maintainer: Ludovic Rousseau <rousseau@debian.org>
 Build-Depends: debhelper (>= 6.0.7~), flex, autotools-dev, libhal-dev
-Standards-Version: 3.7.3
+Standards-Version: 3.8.1
 Vcs-Svn: svn://svn.debian.org/svn/collab-maint/deb-maint/pcsc-lite/trunk
 Vcs-Browser: http://svn.debian.org/viewsvn/collab-maint/deb-maint/pcsc-lite/trunk/
 Homepage: http://pcsclite.alioth.debian.org/

debian/pcscd.init

@@ -1,29 +1,29 @@
 #! /bin/sh
-#
-# /etc/init.d/pcscd
-# Start/Stop/Restart PCSC Lite resource manager daemon
-#
-# Carlos Prados Bocos <cprados@debian.org>
-# modifications by Ludovic Rousseau <rousseau@debian.org>
-
 ### BEGIN INIT INFO
 # Provides: pcscd
-# Required-Start: $local_fs $remote_fs $syslog
-# Required-Stop: $local_fs $remote_fs $syslog
-# Should-Start: udev hal
-# Should-Stop: udev hal
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
+# Required-Start:    $local_fs $remote_fs $syslog
+# Required-Stop:     $local_fs $remote_fs $syslog
+# Should-Start:      udev hal
+# Should-Stop:       udev hal
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
 # Short-Description: Daemon to access a smart card using PC/SC
-# Description: The PC/SC daemon is used to dynamically allocate/deallocate
-#	 reader drivers at runtime and manage connections to the readers.
+# Description:       The PC/SC daemon is used to dynamically
+#                    allocate/deallocate reader drivers at runtime and manage
+#                    connections to the readers.
 ### END INIT INFO
 
+# Authors: 
+#   Carlos Prados Bocos <cprados@debian.org>
+#   Ludovic Rousseau <rousseau@debian.org>
+
+# Do NOT "set -e"
+
+# PATH should only include /usr/* if it runs after the mountnfs.sh script
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC="PCSC Lite resource manager"
 NAME=pcscd
 DAEMON=/usr/sbin/$NAME
-
 PIDFILE=/var/run/pcscd/$NAME.pid
 SCRIPTNAME=/etc/init.d/$NAME
 
@@ -31,20 +31,19 @@ SCRIPTNAME=/etc/init.d/$NAME
 # /etc/default/pcscd and add a line 
 # DAEMON_ARGS="--your-option"
 
-# Gracefully exit if the package has been removed (but not purged).
+# Exit if the package is not installed
 [ -x "$DAEMON" ] || exit 0
 
+# Read configuration variable file if it is present
+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
+
 # Load the VERBOSE setting and other rcS variables
 . /lib/init/vars.sh
 
 # Define LSB log_* functions.
+# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
 . /lib/lsb/init-functions
 
-# Include pcscd defaults if available
-if [ -f /etc/default/pcscd ] ; then
-	. /etc/default/pcscd
-fi
-
 # get LANG variable (code from /etc/init.d/keymap.sh)
 ENV_FILE="none"
 [ -r /etc/environment ] && ENV_FILE="/etc/environment"

debian/rules

@@ -16,13 +16,24 @@ else
 endif
 
 # see http://www.debian.org/doc/debian-policy/ch-files.html
-CFLAGS += -Wall -D_REENTRANT
+CFLAGS = -Wall -g -D_REENTRANT
 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
+
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+	MAKEFLAGS += -j$(NUMJOBS)
+endif
+
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	INSTALL_PROGRAM += -s
 endif