[Python-modules-commits] r9195 - in packages/pyscard/trunk/debian (6 files)

[rousseau at users.alioth.debian.org]

    Date: Tuesday, July 28, 2009 @ 20:42:39
  Author: rousseau
Revision: 9195

* New upstream release
* debian/patches/*: all patches included upstream

Modified:
  packages/pyscard/trunk/debian/changelog
  packages/pyscard/trunk/debian/control
  packages/pyscard/trunk/debian/patches/series
  packages/pyscard/trunk/debian/rules
Deleted:
  packages/pyscard/trunk/debian/patches/01_setup.py
  packages/pyscard/trunk/debian/patches/02_winscarddll.c

Modified: packages/pyscard/trunk/debian/changelog
===================================================================
--- packages/pyscard/trunk/debian/changelog	2009-07-28 18:56:19 UTC (rev 9194)
+++ packages/pyscard/trunk/debian/changelog	2009-07-28 20:42:39 UTC (rev 9195)
@@ -1,3 +1,10 @@
+pyscard (1.6.8-1) unstable; urgency=low
+
+  * New upstream release
+  * debian/patches/*: all patches included upstream
+
+ -- Ludovic Rousseau <rousseau at debian.org>  Tue, 28 Jul 2009 22:39:00 +0200
+
 pyscard (1.6.7-6) unstable; urgency=low
 
   * trunk/debian/patches/02_winscarddll.c: use libpcsclite.so.1 instead of

Modified: packages/pyscard/trunk/debian/control
===================================================================
--- packages/pyscard/trunk/debian/control	2009-07-28 18:56:19 UTC (rev 9194)
+++ packages/pyscard/trunk/debian/control	2009-07-28 20:42:39 UTC (rev 9195)
@@ -2,7 +2,7 @@
 Priority: optional
 Maintainer: Ludovic Rousseau <rousseau at debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 5.0.38), python-support (>= 0.5.3), python-all-dev (>= 2.3.5-11), libpcsclite-dev, swig, quilt
+Build-Depends: debhelper (>= 5.0.38), python-support (>= 0.5.3), python-all-dev (>= 2.3.5-11), libpcsclite-dev, swig
 Standards-Version: 3.7.3
 Section: python
 XS-Python-Version: all

Deleted: packages/pyscard/trunk/debian/patches/01_setup.py
===================================================================
--- packages/pyscard/trunk/debian/patches/01_setup.py	2009-07-28 18:56:19 UTC (rev 9194)
+++ packages/pyscard/trunk/debian/patches/01_setup.py	2009-07-28 20:42:39 UTC (rev 9195)
@@ -1,39 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -41,15 +41,6 @@
-     platform_extra_compile_args=[]
-     platform_extra_link_args=[]
- 
--elif get_platform() in ('linux-i586', 'linux-i686', 'linux-x86_64'):
--    platform__cc_defines=[('PCSCLITE', '1')]
--    platform_swig_opts=['-DPCSCLITE']
--    platform_sources=[]
--    platform_libraries=['pcsclite']
--    platform_include_dirs=['/usr/include/PCSC']
--    platform_extra_compile_args=[]#['-ggdb', '-O0']
--    platform_extra_link_args=[]#['-ggdb']
--
- #
- # Mac OS X Tiger has python 2.3 preinstalled
- # get_platform() returns a string similar to 'darwin-8.11.1-i386' with python 2.3
-@@ -76,7 +67,13 @@
-     platform_extra_compile_args=['-v','-framework', 'PCSC', '-arch', 'i386', '-arch', 'ppc', '-ggdb', '-O0']
-     platform_extra_link_args=['-arch', 'i386', '-arch', 'ppc','-ggdb', '-framework', 'PCSC' ]
- else:
--    sys.exit("unsupported platform: " + get_platform() )
-+    platform__cc_defines=[('PCSCLITE', '1')]
-+    platform_swig_opts=['-DPCSCLITE']
-+    platform_sources=[]
-+    platform_libraries=['pcsclite']
-+    platform_include_dirs=['/usr/include/PCSC']
-+    platform_extra_compile_args=[]#['-ggdb', '-O0']
-+    platform_extra_link_args=[]#['-ggdb']
- 
- 
- class _pyscardBuildExt(build_ext):
-@@ -217,5 +214,3 @@
-             dir_util.mkpath( os.path.join( targetdir, newdir ) ) 
-             file_util.copy_file( file, os.path.join( targetdir, file ) )
- 
--
--

Deleted: packages/pyscard/trunk/debian/patches/02_winscarddll.c
===================================================================
--- packages/pyscard/trunk/debian/patches/02_winscarddll.c	2009-07-28 18:56:19 UTC (rev 9194)
+++ packages/pyscard/trunk/debian/patches/02_winscarddll.c	2009-07-28 20:42:39 UTC (rev 9195)
@@ -1,11 +0,0 @@
---- a/smartcard/scard/winscarddll.c
-+++ b/smartcard/scard/winscarddll.c
-@@ -536,7 +536,7 @@
-         #ifdef __APPLE__
-             lib = "/System/Library/Frameworks/PCSC.framework/PCSC";
-         #else
--            lib = "libpcsclite.so";
-+            lib = "libpcsclite.so.1";
-         #endif
- 
-         if( bFirstCall )

Modified: packages/pyscard/trunk/debian/patches/series
===================================================================
--- packages/pyscard/trunk/debian/patches/series	2009-07-28 18:56:19 UTC (rev 9194)
+++ packages/pyscard/trunk/debian/patches/series	2009-07-28 20:42:39 UTC (rev 9195)
@@ -1,2 +0,0 @@
-02_winscarddll.c
-01_setup.py

Modified: packages/pyscard/trunk/debian/rules
===================================================================
--- packages/pyscard/trunk/debian/rules	2009-07-28 18:56:19 UTC (rev 9194)
+++ packages/pyscard/trunk/debian/rules	2009-07-28 20:42:39 UTC (rev 9195)
@@ -20,8 +20,6 @@
 PYDEF=$(shell pyversions -d)
 PYVERS=$(shell pyversions -r)
 
-include /usr/share/quilt/quilt.make
-
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
@@ -31,7 +29,7 @@
 
 
 build: build-stamp
-build-stamp: patch configure-stamp 
+build-stamp: configure-stamp 
 	dh_testdir
 
 	# Add here commands to compile the package.
@@ -43,18 +41,16 @@
 
 	touch build-stamp
 
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
 
 	# Add here commands to clean up after the build process.
-	QUILT_PATCHES=$(QUILT_PATCH_DIR) quilt push 01_setup.py
 	for python in $(PYVERS); do \
 		python=$$(echo $$python | sed "s/$(PYDEF)/python/"); \
 		$$python setup.py clean; \
 	done
-	QUILT_PATCHES=$(QUILT_PATCH_DIR) quilt pop -a
 	rm -rf .pc
 	rm -rf build