* New upstream release

* debian/rules: use dh (nearly) minimal rules * debian/control: remove reader list since it is no more up to date
2010-08-04 12:55:20 +00:00 · 2010-08-04 12:55:20 +00:00 · 5efebf87f2
parent b57425ab35
commit 5efebf87f2
3 changed files with 20 additions and 209 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,11 @@
+ccid (1.4.0-1) experimental; urgency=low
+
+  * New upstream release
+  * debian/rules: use dh (nearly) minimal rules
+  * debian/control: remove reader list since it is no more up to date
+
+ -- Ludovic Rousseau <rousseau@debian.org>  Wed, 04 Aug 2010 14:24:06 +0200
+
 ccid (1.3.13-1) experimental; urgency=low

  * New upstream release
--- a/debian/control
+++ b/debian/control
@ -2,7 +2,7 @@ Source: ccid
 Section: libs
 Priority: extra
 Maintainer: Ludovic Rousseau <rousseau@debian.org>
-Build-Depends: debhelper (>= 7), libusb-dev (>= 0.1.6a-2.1), libpcsclite-dev (>= 1.6.0), flex, autotools-dev, pkg-config
+Build-Depends: debhelper (>= 7.0.50~), libusb-dev (>= 0.1.6a-2.1), libpcsclite-dev (>= 1.6.2), flex, autotools-dev, pkg-config
 Standards-Version: 3.8.4
 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/
@ -22,86 +22,8 @@ Description: PC/SC driver for USB CCID smart card readers
 This package is needed to communicate with the CCID smartcard readers through
 the PC/SC Lite resource manager (pcscd).
 .
- Supported USB readers are (see homepage for more info): 
-  - ActivCard USB reader 3.0
-  - Advanced Card Systems ACR 38U-CCID
-  - Alcor Micro AU9520
-  - Athena ASE IIIe USB V2
-  - Athena ASE IIIe KB USB
-  - Axalto Reflex USB v3
-  - Blutronics Bludrive II CCID
-  - C3PO LTC31
-  - C3PO LTC32
-  - C3PO KBR36
-  - C3PO TLTC2USB
-  - Charismathics token
-  - Cherry XX33 keyboard
-  - Cherry XX44 keyboard
-  - Cherry SmartTerminal ST2XXX
-  - Cherry ST-1044U
-  - Dell keyboard SK-3106
-  - Dell smart card reader keyboard
-  - Eutron SIM Pocket Combo
-  - Eutron CryptoIdentity
-  - Eutron Smart Pocket
-  - Eutron Digipass 860
-  - Fujitsu Siemens Computers SmartCard USB 2A
-  - Fujitsu Siemens Computers SmartCard Keyboard USB 2A
-  - Gemplus GemPC 433 SL
-  - Gemplus GemPC Key
-  - Gemplus GemPC PinPad
-  - Gemplus GemPC Twin
-  - Gemplus GemCore POS Pro
-  - Gemplus GemCore SIM Pro
-  - Giesecke & Devrient StarSign Card Token 350
-  - Giesecke & Devrient StarSign Card Token 550
-  - HP USB Smart Card Keyboard
-  - HP USB Smartcard Reader
-  - id3 Semiconductors CL1356D
-  - id3 Semiconductors CL1356T
-  - Kobil KAAN Base
-  - Kobil KAAN Advanced
-  - Kobil KAAN SIM III
-  - Kobil mIDentity
-  - Lexar Smart Enterprise Guardian
-  - EMV CAP - SecOVID Reader III
-  - Lenovo Integrated Smart Card Reader
-  - O2Micro oz776
-  - OmniKey CardMan 1021
-  - OmniKey CardMan 3021
-  - OmniKey CardMan 3121
-  - OmniKey CardMan 3621
-  - OmniKey CardMan 3821
-  - OmniKey CardMan 3621
-  - OmniKey CardMan 4321
-  - OmniKey CardMan 5121
-  - OmniKey CardMan 5125
-  - OmniKey CardMan 5321
-  - OmniKey CardMan 6121
-  - Philips Semiconductors JCOP41V221" ICCD card
-  - Reiner-SCT cyberJack pinpad(a)
-  - RSA SecureID SID800
-  - SCM Micro SCR 331
-  - SCM Micro SCR 331-DI
-  - SCM Micro SCR 331-DI NTTCom
-  - SCM Micro SCR 3310
-  - SCM Micro SCR 3310 NTTCom
-  - SCM Micro SCR 3311
-  - SCM Micro SCR 3320
-  - SCM Micro SCR 333
-  - SCM SCR 3340 ExpressCard54
-  - SCM Micro SCR 335
-  - SCM Micro SCR 355
-  - SCM Micro SPR 532
-  - SCM Micro SDI 010
-  - SCM SCR 3340 ExpressCard54
-  - SmartEpad (v 2.0)
-  - Silitek SK-3105 keyboard
-  - SchlumbergerSema Cyberflex Access e-gate ICCD
-  - Verisign Secure Storage Token
-  - Verisign Secure Token
-  - Winbond Electronics W81E381 (for OEM only)
-  - Xiring Teo
+ For an exhaustive list of supported reader see
+ http://pcsclite.alioth.debian.org/section.html
 .
 This driver also supports the GemPC Twin connected to a serial port and
 the GemPC Card (PCMCIA, through the suggested pcmciautils package) and
--- a/debian/rules
+++ b/debian/rules
@ -1,138 +1,19 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.

-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+DESTDIR=debian/libccid

-DESTDIR=$(CURDIR)/debian/libccid/
+%:
+	dh $@

-export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+override_dh_auto_configure:
+	# add support of the GemPC Twin in serial mode
+	dh_auto_configure -- --enable-twinserial 

-# FOR AUTOCONF 2.52 AND NEWER ONLY
-ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
-	confflags += --build $(DEB_HOST_GNU_TYPE)
-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
-	# Add here commands to configure the package.
-
-	./configure $(confflags) \
-		--prefix=/usr \
-		--enable-twinserial \
-		CFLAGS="$(CFLAGS)"
-
-	touch configure-stamp
-
-
-build: build-stamp
-build-stamp: configure-stamp
-	dh_testdir
-
-	# Add here commands to compile the package.
-	$(MAKE)
-
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-
-	# Add here commands to clean up after the build process.
-	[ ! -f Makefile ] || $(MAKE) distclean
-
-	-test -r /usr/share/misc/config.sub && \
-		cp -f /usr/share/misc/config.sub config.sub
-	-test -r /usr/share/misc/config.guess && \
-		cp -f /usr/share/misc/config.guess config.guess
-
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-
-	# Add here commands to install the package into debian/tmp
-	DESTDIR=$(DESTDIR) $(MAKE) install
-
-	# install the ccidtwin
-	DESTDIR=$(DESTDIR) $(MAKE) -C src install_ccidtwin
+override_dh_auto_install:
+	dh_auto_install

+	# move the configuration file in /etc and create a symbolic link
 	mv $(DESTDIR)/usr/lib/pcsc/drivers/ifd-ccid.bundle/Contents/Info.plist $(DESTDIR)/etc/libccid_Info.plist
 	ln -s /etc/libccid_Info.plist $(DESTDIR)/usr/lib/pcsc/drivers/ifd-ccid.bundle/Contents/Info.plist

-	# reuse the upstream template
-	sed -e 's/^/#/' $(DESTDIR)/etc/reader.conf > $(DESTDIR)/etc/reader.conf.d/libccidtwin
-	rm $(DESTDIR)/etc/reader.conf
-
-	# install udev rule file
-	#cp src/pcscd_ccid.rules debian/libccid.udev
-
 	mv $(DESTDIR)/usr/share/doc/ccid $(DESTDIR)/usr/share/doc/libccid
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs
-#	dh_installexamples
-#	dh_install
-#	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
-#	dh_installman
-#	dh_installudev
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-#	dh_perl
-#	dh_python
-#	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure