[pkg-opensc-commit] [SCM] OpenSC packaging branch, master, updated. 0bec47fb654add48c72ead93abfa75994d83e016

[Eric Dorland]

The following commit has been merged in the master branch:
commit 822728a0117d0c0d1b9e0036ae0415e53620c6dd
Author: Eric Dorland <eric at debian.org>
Date:   Mon Sep 7 18:53:51 2009 -0400

    Convert to dh instead of debhelper.
    
    * debian/compat: Use debhelper version 7.
    * debian/control: Drop build-deps on cdbs and build-depend on debhelper
      >= 7.0.50.
    * debian/rules: Convert to dh instead of debhelper.

diff --git a/debian/changelog b/debian/changelog
index 306ad1d..eacdadc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 opensc (0.11.9-2) unstable; urgency=low
 
   * debian/libopensc2.symbols: Add symbols file.
+  * debian/compat: Use debhelper version 7.
+  * debian/control: Drop build-deps on cdbs and build-depend on debhelper
+    >= 7.0.50.
+  * debian/rules: Convert to dh instead of debhelper.
 
- --
+ -- Eric Dorland <eric at debian.org>  Mon, 07 Sep 2009 19:00:53 -0400
 
 opensc (0.11.9-1) unstable; urgency=low
 
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index 394de9b..8ff3408 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: opensc
 Priority: extra
 Section: utils
 Maintainer: Eric Dorland <eric at debian.org>
-Build-Depends: cdbs, debhelper (>> 5), libltdl3-dev, libssl-dev (>= 0.9.7d-3), libpcsclite-dev (>= 1.2.9-beta1), libassuan-dev (>= 0.6.4-2), libopenct1-dev, libxt-dev, flex, pkg-config
+Build-Depends: debhelper (>= 7.0.50), libltdl3-dev, libssl-dev (>= 0.9.7d-3), libpcsclite-dev (>= 1.2.9-beta1), libassuan-dev (>= 0.6.4-2), libopenct1-dev, libxt-dev, flex, pkg-config
 Standards-Version: 3.8.3
 Homepage: http://www.opensc-project.org/
 Vcs-Git: git://git.debian.org/git/pkg-opensc/opensc.git
diff --git a/debian/rules b/debian/rules
index 0c1b645..3d41f58 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,16 +1,19 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
+%:
+	dh $@
 
-DEB_CONFIGURE_EXTRA_FLAGS = --enable-nsplugin --enable-pcsc --enable-openct
+override_dh_auto_configure:
+	dh_auto_configure -- --sysconfdir=/etc/opensc \
+		--enable-nsplugin \
+		--enable-pcsc \
+		--enable-openct
 
-DEB_INSTALL_DOCS_ALL := README NEWS
+override_dh_strip:
+	dh_strip --dbg-package=libopensc2-dbg
 
-DEB_SHLIBDEPS_INCLUDE := debian/tmp/usr/lib debian/tmp/usr/lib/pkcs11
+override_dh_installchangelogs:
+	dh_installchangelogs doc/nonpersistent/ChangeLog
 
-DEB_CONFIGURE_SYSCONFDIR := /etc/opensc
-
-DEB_INSTALL_CHANGELOGS_ALL := doc/nonpersistent/ChangeLog
-
-DEB_DH_STRIP_ARGS := --dbg-package=libopensc2-dbg
+override_dh_installdocs:
+	dh_installdocs -A README NEWS

-- 
OpenSC packaging