[Pkg-cracklib-commits] [pkg-cracklib] 02/03: Multiarch support by Iain Lane

Jan Dittberner jandd at alioth.debian.org
Mon Aug 12 08:33:11 UTC 2013 

This is an automated email from the git hooks/post-receive script.

jandd pushed a commit to branch master
in repository pkg-cracklib.

commit ca9365acd457a82b8187409da5ea916e52060e89
Author: Jan Dittberner <jandd at debian.org>
Date:   Mon Aug 12 10:21:02 2013 +0200

    Multiarch support by Iain Lane
    
    * Fix "Build for multiarch" (Closes: #679962)
      - add multiarch support contributed by Iain Lane
      - Use docbook2html instead of xmlto, for determinstic output.
      - Fix non-SGML characters in cracklib-runtime.xml
---
 debian/changelog            |   12 ++++++++----
 debian/control              |    8 ++++++--
 debian/cracklib-runtime.xml |    4 ++--
 debian/libcrack2-dev.links  |    1 -
 debian/rules                |   22 +++++++++++++++-------
 5 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 01fbdd6..bf9d1c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
 cracklib2 (2.9.0-1) UNRELEASED; urgency=low
 
-  * New upstream version.
-  * refresh debian/patches/libcrack2-error-safer-check-variant.patch
-  * add new FascistCheckUser to debian/libcrack2.symbols
-  * update library link in debian/libcrack2.links
+  * New upstream version
+    - refresh debian/patches/libcrack2-error-safer-check-variant.patch
+    - add new FascistCheckUser to debian/libcrack2.symbols
+    - update library link in debian/libcrack2.links
   * debian/control: use canonical VCS-* URLs
+  * Fix "Build for multiarch" (Closes: #679962)
+    - add multiarch support contributed by Iain Lane
+    - Use docbook2html instead of xmlto, for determinstic output.
+    - Fix non-SGML characters in cracklib-runtime.xml
 
  -- Jan Dittberner <jandd at debian.org>  Sun, 11 Aug 2013 16:24:48 +0200
 
diff --git a/debian/control b/debian/control
index 9d3ef0c..43d33e9 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,8 @@ Priority: optional
 Maintainer: Jan Dittberner <jandd at debian.org>
 Uploaders: Martin Pitt <mpitt at debian.org>
 Standards-Version: 3.9.4
-Build-Depends: debhelper (>= 7.0.50), python-all-dev (>= 2.6.6-3~),
- python3-all-dev (>= 3.1.3-2~), chrpath, xmlto, automake (>= 1.10),
+Build-Depends: debhelper (>= 9), python-all-dev (>= 2.6.6-3~),
+ python3-all-dev (>= 3.1.3-2~), chrpath, docbook-utils, automake (>= 1.10),
  autoconf (>=2.61), libtool, python-setuptools, python3-setuptools,
  dpkg-dev (>= 1.16.1~), autotools-dev
 Homepage: http://sourceforge.net/projects/cracklib
@@ -14,6 +14,8 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-cracklib/pkg-cracklib.git
 
 Package: libcrack2
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: cracklib-runtime
 Description: pro-active password checker library
@@ -40,6 +42,8 @@ Description: pro-active password checker library - development files
 Package: cracklib-runtime
 Section: admin
 Architecture: any
+Multi-Arch: foreign
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, libcrack2 (>=${binary:Version}), file,
  ${misc:Depends}
 Recommends: wamerican | wordlist
diff --git a/debian/cracklib-runtime.xml b/debian/cracklib-runtime.xml
index b65d1bc..a8cd5b7 100644
--- a/debian/cracklib-runtime.xml
+++ b/debian/cracklib-runtime.xml
@@ -75,7 +75,7 @@
         <title>cracklib-format</title>
         <para><application>cracklib-format</application> takes a list
         of text files each containing a list of words, one per line,
-        It lowercases all words, removes control charac‐ters, and
+        It lowercases all words, removes control characters, and
         sorts the lists. It outputs the cleaned up list to standard
         output.
         </para>
@@ -119,7 +119,7 @@
       <title><package>cracklib2</package>'s test utility
       <application>cracklib-check.</application></title>
       <para><application>cracklib-check</application> takes a list of
-      passwords from stdin and checks them via libcrack2’s <ulink
+      passwords from stdin and checks them via libcrack2's <ulink
       url="/cgi-bin/man/man2html/FascistCheck+3">FascistCheck</ulink>
       sub routine.</para>
       <para><application>cracklib-check</application> prints each
diff --git a/debian/libcrack2-dev.links b/debian/libcrack2-dev.links
index 2bde974..4b01ff6 100644
--- a/debian/libcrack2-dev.links
+++ b/debian/libcrack2-dev.links
@@ -1,2 +1 @@
-/usr/lib/libcrack.so.2 /usr/lib/libcrack.so
 /usr/share/man/man3/FascistCheck.3 /usr/share/man/man3/cracklib.3
diff --git a/debian/rules b/debian/rules
index f3abdd9..646d47d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,7 @@ include /usr/share/python/python.mk
 
 DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 PYVERS := $(shell pyversions -vs)
 PY3VERS := $(shell py3versions -vs)
@@ -19,6 +20,7 @@ override_dh_auto_configure:
 	$(CURDIR)/configure \
 		--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
 		--prefix=/usr --disable-rpath --without-python \
+		--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
 		--with-default-dict=/var/cache/cracklib/cracklib_dict \
 		CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)"
 	for i in $(PYVERS) $(PY3VERS); do \
@@ -27,6 +29,7 @@ override_dh_auto_configure:
 		$(CURDIR)/configure \
 			--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
 			--prefix=/usr --disable-rpath \
+			--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
 			--with-default-dict=/var/cache/cracklib/cracklib_dict \
 			PYTHON_PREFIX=$(call py_builddir_sh,$$i) \
 			PYTHON=/usr/bin/python$$i \
@@ -46,8 +49,8 @@ override_dh_auto_build:
 		      . ; \
 		CFLAGS="-I$(CURDIR)/lib $(CFLAGS)" LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)" python$$i setup.py build ; \
 	done
-	xmlto -o debian/doc xhtml-nochunks debian/libcrack2.xml
-	xmlto -o debian/doc xhtml-nochunks debian/cracklib-runtime.xml
+	docbook2html -o debian/doc --nochunks debian/libcrack2.xml
+	docbook2html -o debian/doc --nochunks debian/cracklib-runtime.xml
 
 override_dh_auto_test:
 	mkdir $(CURDIR)/debian/tmp
@@ -75,11 +78,11 @@ override_dh_auto_clean:
 override_dh_auto_install:
 	$(MAKE) -C $(CURDIR)/debian/buildtmp/base DESTDIR=$(CURDIR)/debian/libcrack2 install
 	# move files to libcrack2-dev
-	mkdir -p $(CURDIR)/debian/libcrack2-dev/usr/lib
+	mkdir -p $(CURDIR)/debian/libcrack2-dev/usr/lib/$(DEB_HOST_MULTIARCH)
 	mv $(CURDIR)/debian/libcrack2/usr/include \
 	   $(CURDIR)/debian/libcrack2-dev/usr
-	mv $(CURDIR)/debian/libcrack2/usr/lib/*.a \
-	   $(CURDIR)/debian/libcrack2-dev/usr/lib
+	mv $(CURDIR)/debian/libcrack2/usr/lib/$(DEB_HOST_MULTIARCH)/*.a \
+	   $(CURDIR)/debian/libcrack2-dev/usr/lib/$(DEB_HOST_MULTIARCH)
 	# move files to cracklib-runtime
 	mkdir -p $(CURDIR)/debian/cracklib-runtime/usr/share/dict
 	mv $(CURDIR)/debian/libcrack2/usr/sbin \
@@ -87,8 +90,8 @@ override_dh_auto_install:
 	mv $(CURDIR)/debian/libcrack2/usr/share/cracklib/cracklib-small \
 	   $(CURDIR)/debian/cracklib-runtime/usr/share/dict
 	# remove unused files
-	rm -f $(CURDIR)/debian/libcrack2/usr/lib/*.la \
-	      $(CURDIR)/debian/libcrack2/usr/lib/libcrack.so
+	rm -f $(CURDIR)/debian/libcrack2/usr/lib/$(DEB_HOST_MULTIARCH)/*.la \
+	      $(CURDIR)/debian/libcrack2/usr/lib/$(DEB_HOST_MULTIARCH)/libcrack.so
 	rm -rf $(CURDIR)/debian/libcrack2/usr/share/cracklib
 	chrpath -d \
 	  $(CURDIR)/debian/cracklib-runtime/usr/sbin/cracklib-check \
@@ -103,6 +106,11 @@ override_dh_auto_install:
 		python$$i setup.py install --install-layout=deb --root $(CURDIR)/debian/python3-cracklib; \
 	done
 
+override_dh_link:
+	dh_link -plibcrack2-dev usr/lib/$(DEB_HOST_MULTIARCH)/libcrack.so.2 \
+		usr/lib/$(DEB_HOST_MULTIARCH)/libcrack.so
+	dh_link
+
 override_dh_installchangelogs:
 	dh_installchangelogs NEWS
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cracklib/pkg-cracklib.git

More information about the Pkg-cracklib-commits mailing list