attached
Cheers,
--
Steve McIntyre [email protected]
<http://www.linaro.org/> Linaro.org | Open source software for ARM SoCs
diff -u poldi-0.4.1/debian/rules poldi-0.4.1/debian/rules
--- poldi-0.4.1/debian/rules
+++ poldi-0.4.1/debian/rules
@@ -22,8 +22,9 @@
dh_testdir
CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE)
--build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man
--infodir=\$${prefix}/share/info --sysconfdir=/etc
--with-pam-module-directory=/lib/security
-
-build: build-stamp
+build-arch: build-stamp
+build-indep: build-stamp
+build: build-arch build-indep
build-stamp: config.status
dh_testdir
@@ -44,7 +45,7 @@
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
$(MAKE) install install-conf-skeleton
DESTDIR=$(CURDIR)/debian/libpam-poldi
@@ -73,6 +74,7 @@
dh_strip
dh_compress
dh_fixperms
+ rm -f $(CURDIR)/debian/libpam-poldi/usr/share/info/dir.gz
# dh_perl
# dh_python
# dh_makeshlibs
diff -u poldi-0.4.1/debian/control poldi-0.4.1/debian/control
--- poldi-0.4.1/debian/control
+++ poldi-0.4.1/debian/control
@@ -3,13 +3,13 @@
Priority: extra
Maintainer: Joachim Breitner <[email protected]>
Uploaders: Lionel Elie Mamane <[email protected]>
-Build-Depends: debhelper (>= 4.0.0), libgcrypt11-dev, libgpg-error-dev,
libusb-dev, libpam0g-dev, libksba-dev
-Standards-Version: 3.8.2
+Build-Depends: debhelper (>= 8.0.0), libgcrypt11-dev, libgpg-error-dev,
libusb-dev, libpam0g-dev, libksba-dev
+Standards-Version: 3.9.2
Homepage: http://www.g10code.com/p-poldi.html
Package: libpam-poldi
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, gpgsm
+Depends: ${shlibs:Depends}, ${misc:Depends}, gpgsm, dpkg (>= 1.15.4) |
install-info
Recommends: gnupg (>= 1.4.0)
Description: PAM module allowing authentication using a OpenPGP smartcard
This PAM module will allow you to login, screenlock and validate to
diff -u poldi-0.4.1/debian/compat poldi-0.4.1/debian/compat
--- poldi-0.4.1/debian/compat
+++ poldi-0.4.1/debian/compat
@@ -1 +1 @@
-4
+8
diff -u poldi-0.4.1/debian/changelog poldi-0.4.1/debian/changelog
--- poldi-0.4.1/debian/changelog
+++ poldi-0.4.1/debian/changelog
@@ -1,3 +1,18 @@
+poldi (0.4.1-2.1) unstable; urgency=low
+
+ * NMU
+ * Add -lgpg-error when linking tests, to fix FTBFS. Closes: #556068.
+ * Lintian-inspired cleanups:
+ + Update debhelper compat level from 4 to 8
+ + Add simple initial build-arch and build-indep rules
+ + Update Standards-Version
+ + Move from dh_clean -k to dh_prep
+ + Add versioned debhelper dep on version 8+
+ + Add depends on dpkg (>= 1.15.4) | install-info
+ + Remove .../info/dir.gz
+
+ -- Steve McIntyre <[email protected]> Tue, 03 Jan 2012 14:57:20 +0000
+
poldi (0.4.1-2) unstable; urgency=low
* Install a global scdaemon config file, scdaemon bails out if it does
only in patch2:
unchanged:
--- poldi-0.4.1.orig/tests/Makefile.in
+++ poldi-0.4.1/tests/Makefile.in
@@ -220,7 +220,7 @@
top_srcdir = @top_srcdir@
parse_test_SOURCES = parse-test.c
parse_test_CFLAGS = -Wall -I$(top_srcdir)/src/util -I$(top_srcdir)/src
-parse_test_LDADD = $(top_builddir)/src/util/libpoldi-util.a -lgcrypt
+parse_test_LDADD = $(top_builddir)/src/util/libpoldi-util.a -lgcrypt
-lgpg-error
pam_test_SOURCES = pam-test.c
pam_test_CFLAGS = -Wall
pam_test_LDADD = -lpam -lpam_misc
