From eric at debian.org  Sun Mar 11 02:32:41 2012
From: eric at debian.org (Eric Dorland)
Date: Sun, 11 Mar 2012 02:32:41 +0000
Subject: [pkg-opensc-commit] [SCM] pam-p11 packaging branch, master,
	updated. 0cbb4cf2d54dc4f6e03cbc0ce81eaa46f00d8815
Message-ID: <E1S6YaP-0001nN-3h@vasks.debian.org>

The following commit has been merged in the master branch:
commit d32d23f839c4feb23ea6fc7ffd2eec16b5dc2f2d
Author: Eric Dorland <eric at debian.org>
Date:   Sat Mar 10 20:55:41 2012 -0500

    debian/compat, debian/control, debian/rules: Convert to debhelper 9 and drop cdbs.

diff --git a/debian/changelog b/debian/changelog
index fa2d564..12cf2a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+pam-p11 (0.1.5-2) unstable; urgency=low
+
+  * debian/compat, debian/control, debian/rules: Convert to debhelper 9
+    and drop cdbs.
+
+ --
+
 pam-p11 (0.1.5-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
index 9bc2634..c2334c1 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: pam-p11
 Section: admin
 Priority: optional
 Maintainer: Eric Dorland <eric at debian.org>
-Build-Depends: debhelper (>= 4.1), cdbs, libpam0g-dev, libp11-dev, libltdl-dev
+Build-Depends: debhelper (>= 9), libpam0g-dev, libp11-dev, libltdl-dev
 Standards-Version: 3.8.1
 Homepage: http://www.opensc-project.org/pam_p11/
 Vcs-Git: git://git.debian.org/git/pkg-opensc/pam-p11.git
diff --git a/debian/rules b/debian/rules
index 990c01a..a7b30e8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,10 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
+%:
+	dh $@
 
-DEB_INSTALL_CHANGELOGS_ALL := doc/ChangeLog
+override_dh_auto_configure:
+	dh_auto_configure -- --libdir=/lib
 
-DEB_CONFIGURE_EXTRA_FLAGS := --libdir=/lib
+override_dh_installchangelogs:
+	dh_installchangelogs doc/Changelog

-- 
pam-p11 packaging


From eric at debian.org  Sun Mar 11 02:32:41 2012
From: eric at debian.org (Eric Dorland)
Date: Sun, 11 Mar 2012 02:32:41 +0000
Subject: [pkg-opensc-commit] [SCM] pam-p11 packaging branch, master,
	updated. 0cbb4cf2d54dc4f6e03cbc0ce81eaa46f00d8815
Message-ID: <E1S6YaP-0001nY-9Q@vasks.debian.org>

The following commit has been merged in the master branch:
commit 56c73f404ae7ab1c5e4d200e105bae553decc519
Author: Eric Dorland <eric at debian.org>
Date:   Sat Mar 10 20:58:19 2012 -0500

    debian/control: Upgrade Standards-Version to 3.9.3.

diff --git a/debian/changelog b/debian/changelog
index 12cf2a1..71e1b26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ pam-p11 (0.1.5-2) unstable; urgency=low
 
   * debian/compat, debian/control, debian/rules: Convert to debhelper 9
     and drop cdbs.
+  * debian/control: Upgrade Standards-Version to 3.9.3.
 
  --
 
diff --git a/debian/control b/debian/control
index c2334c1..bc2ac94 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: admin
 Priority: optional
 Maintainer: Eric Dorland <eric at debian.org>
 Build-Depends: debhelper (>= 9), libpam0g-dev, libp11-dev, libltdl-dev
-Standards-Version: 3.8.1
+Standards-Version: 3.9.3
 Homepage: http://www.opensc-project.org/pam_p11/
 Vcs-Git: git://git.debian.org/git/pkg-opensc/pam-p11.git
 Vcs-Browser: http://git.debian.org/?p=pkg-opensc/pam-p11.git

-- 
pam-p11 packaging


From eric at debian.org  Sun Mar 11 02:32:41 2012
From: eric at debian.org (Eric Dorland)
Date: Sun, 11 Mar 2012 02:32:41 +0000
Subject: [pkg-opensc-commit] [SCM] pam-p11 packaging branch, master,
	updated. 0cbb4cf2d54dc4f6e03cbc0ce81eaa46f00d8815
Message-ID: <E1S6YaP-0001o1-Nf@vasks.debian.org>

The following commit has been merged in the master branch:
commit 0f9a7496ce3431fb41e96b5a985753991c7f0c4d
Author: Eric Dorland <eric at debian.org>
Date:   Sat Mar 10 21:10:51 2012 -0500

    debian/source/format: Convert to 3.0 quilt source package format.

diff --git a/debian/changelog b/debian/changelog
index 20561b1..6f61f41 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ pam-p11 (0.1.5-2) unstable; urgency=low
     and drop cdbs.
   * debian/control: Upgrade Standards-Version to 3.9.3.
   * debian/control, debian/rules: Multi-Arch enable package.
+  * debian/source/format: Convert to 3.0 quilt source package format.
 
  -- Eric Dorland <eric at debian.org>  Sat, 10 Mar 2012 21:05:34 -0500
 
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

-- 
pam-p11 packaging


From eric at debian.org  Sun Mar 11 02:32:41 2012
From: eric at debian.org (Eric Dorland)
Date: Sun, 11 Mar 2012 02:32:41 +0000
Subject: [pkg-opensc-commit] [SCM] pam-p11 packaging branch, master,
	updated. 0cbb4cf2d54dc4f6e03cbc0ce81eaa46f00d8815
Message-ID: <E1S6YaP-0001oD-Tj@vasks.debian.org>

The following commit has been merged in the master branch:
commit 0cbb4cf2d54dc4f6e03cbc0ce81eaa46f00d8815
Author: Eric Dorland <eric at debian.org>
Date:   Sat Mar 10 21:24:20 2012 -0500

    Fix typo of ChangeLog

diff --git a/debian/rules b/debian/rules
index 7610171..65ed60d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,4 +9,4 @@ override_dh_auto_configure:
 	dh_auto_configure -- --libdir=/lib/$(DEB_HOST_MULTIARCH)
 
 override_dh_installchangelogs:
-	dh_installchangelogs doc/Changelog
+	dh_installchangelogs doc/ChangeLog

-- 
pam-p11 packaging


From eric at debian.org  Sun Mar 11 02:32:41 2012
From: eric at debian.org (Eric Dorland)
Date: Sun, 11 Mar 2012 02:32:41 +0000
Subject: [pkg-opensc-commit] [SCM] pam-p11 packaging branch, master,
	updated. 0cbb4cf2d54dc4f6e03cbc0ce81eaa46f00d8815
Message-ID: <E1S6YaP-0001nm-Gr@vasks.debian.org>

The following commit has been merged in the master branch:
commit 063ca7120319c1128ba11666a81724d6f9b763be
Author: Eric Dorland <eric at debian.org>
Date:   Sat Mar 10 21:06:12 2012 -0500

    debian/control, debian/rules: Multi-Arch enable package.

diff --git a/debian/changelog b/debian/changelog
index 71e1b26..20561b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ pam-p11 (0.1.5-2) unstable; urgency=low
   * debian/compat, debian/control, debian/rules: Convert to debhelper 9
     and drop cdbs.
   * debian/control: Upgrade Standards-Version to 3.9.3.
+  * debian/control, debian/rules: Multi-Arch enable package.
 
- --
+ -- Eric Dorland <eric at debian.org>  Sat, 10 Mar 2012 21:05:34 -0500
 
 pam-p11 (0.1.5-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index bc2ac94..355d3c4 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,8 @@ Vcs-Browser: http://git.debian.org/?p=pkg-opensc/pam-p11.git
 
 Package: libpam-p11
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: libpam-opensc
 Replaces: libpam-opensc
diff --git a/debian/rules b/debian/rules
index a7b30e8..7610171 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,12 @@
 #!/usr/bin/make -f
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 %:
 	dh $@
 
 override_dh_auto_configure:
-	dh_auto_configure -- --libdir=/lib
+	dh_auto_configure -- --libdir=/lib/$(DEB_HOST_MULTIARCH)
 
 override_dh_installchangelogs:
 	dh_installchangelogs doc/Changelog

-- 
pam-p11 packaging


From eric at debian.org  Sun Mar 11 02:32:54 2012
From: eric at debian.org (Eric Dorland)
Date: Sun, 11 Mar 2012 02:32:54 +0000
Subject: [pkg-opensc-commit] [SCM] pam-p11 packaging tag, debian/0.1.5-2,
	created. 0cbb4cf2d54dc4f6e03cbc0ce81eaa46f00d8815
Message-ID: <E1S6Yac-0001qt-EO@vasks.debian.org>

The tag, debian/0.1.5-2 has been created
        at  0cbb4cf2d54dc4f6e03cbc0ce81eaa46f00d8815 (commit)

- Shortlog ------------------------------------------------------------
commit 0cbb4cf2d54dc4f6e03cbc0ce81eaa46f00d8815
Author: Eric Dorland <eric at debian.org>
Date:   Sat Mar 10 21:24:20 2012 -0500

    Fix typo of ChangeLog
-----------------------------------------------------------------------

-- 
pam-p11 packaging