[Pkg-cracklib-commits] [SCM] Git repository for pkg-cracklib branch, experimental, updated. debian/2.8.16-2-19-gb343783

[Jan Dittberner]

The following commit has been merged in the experimental branch:
commit c8380d1699105bcb72b679c0ba5d54a6287333a5
Author: Jan Dittberner <jandd at debian.org>
Date:   Mon Jan 24 17:58:54 2011 +0100

    New binary package python3-cracklib, dh_python2
    
    * New binary package python3-cracklib
      - debian/control: add python3-cracklib stanza, add
        python3-all-dev, python3-setuptools and python3-all to
        Build-Depends
      - debian/rules: add rules to build the Python3 binary package
    * Switch to dh_python2 instead of python-support
      - debian/control: remove python-support from Build-Depends
      - debian/rules: add --with python2 to dh invocation

diff --git a/debian/changelog b/debian/changelog
index 8daf501..e10aacd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+cracklib2 (2.8.18-2) experimental; urgency=low
+
+  * New binary package python3-cracklib
+    - debian/control: add python3-cracklib stanza, add
+      python3-all-dev, python3-setuptools and python3-all to
+      Build-Depends
+    - debian/rules: add rules to build the Python3 binary package
+  * Switch to dh_python2 instead of python-support
+    - debian/control: remove python-support from Build-Depends
+    - debian/rules: add --with python2 to dh invocation
+
+ -- Jan Dittberner <jandd at debian.org>  Mon, 24 Jan 2011 17:55:33 +0100
+
 cracklib2 (2.8.18-1) experimental; urgency=low
 
   * New upstream version.
diff --git a/debian/control b/debian/control
index 4c77d1d..6f4a2b4 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,8 @@ Uploaders: Martin Pitt <mpitt at debian.org>
 Standards-Version: 3.9.1
 Build-Depends: debhelper (>= 7.0.50), python-support (>= 1.0.2),
  python-all-dev, python-all, chrpath, xmlto, automake (>= 1.10),
- autoconf (>=2.61), libtool, python-setuptools
+ autoconf (>=2.61), libtool, python-setuptools, python3-all-dev,
+ python3-all, python3-setuptools
 Homepage: http://sourceforge.net/projects/cracklib
 XS-Python-Version: all
 Vcs-Git: git://git.debian.org/pkg-cracklib/pkg-cracklib.git
@@ -64,3 +65,19 @@ Description: Python bindings for password checker library cracklib2
  .
  You should install this package if you want to use or develop Python
  applications that want to interface with cracklib2.
+
+Package: python3-cracklib
+Section: python
+Architecture: any
+Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends},
+ libcrack2 (>=${binary:Version}), cracklib-runtime
+ (>=${binary:Version})
+Provides: ${python3:Provides}
+XB-Python3-Version: ${python3:Versions}
+Description: Python3 bindings for password checker library cracklib2
+ This package provides Python3 bindings for cracklib. It contains a
+ pythonic interface to cracklib's functions and some Python
+ convenience functions.
+ .
+ You should install this package if you want to use or develop Python3
+ applications that want to interface with cracklib2.
diff --git a/debian/rules b/debian/rules
index 2e3e055..1b6b81b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,16 +8,17 @@ DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 PYVERS := $(shell pyversions -vs)
+PY3VERS := $(shell py3versions -vs)
 
 override_dh_auto_configure:
 	./autogen.sh
 	mkdir -p debian/tmpbuild
 	cd debian/tmpbuild; \
 	../../configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --disable-rpath --without-python --with-default-dict=/var/cache/cracklib/cracklib_dict
-	for i in $(PYVERS); do \
+	for i in $(PYVERS) $(PY3VERS); do \
 		mkdir -p debian/build$$i; \
 		cd debian/build$$i; \
-		../../configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --disable-rpath  --with-default-dict=/var/cache/cracklib/cracklib_dict PYTHON_PREFIX=/usr/lib/python$$i PYTHON=/usr/bin/python$$i; \
+		../../configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --disable-rpath --with-default-dict=/var/cache/cracklib/cracklib_dict PYTHON_PREFIX=/usr/lib/python$$i PYTHON=/usr/bin/python$$i; \
 		cd ../..; \
 	done
 
@@ -26,15 +27,19 @@ override_dh_auto_build:
 	for i in $(PYVERS); do \
 		${MAKE} -C debian/build$$i/python top_builddir=`pwd`/debian/tmpbuild; \
 	done
+	for i in $(PY3VERS); do \
+		${MAKE} -C debian/build$$i/python top_builddir=`pwd`/debian/tmpbuild; \
+	done
 	xmlto -o debian/doc xhtml-nochunks debian/libcrack2.xml
 	xmlto -o debian/doc xhtml-nochunks debian/cracklib-runtime.xml
 
 override_dh_auto_clean:
 	rm -rf debian/tmpbuild
-	for i in $(PYVERS); do \
+	for i in $(PYVERS) $(PY3VERS); do \
 		rm -rf debian/build$$i; \
 	done
 	rm -f debian/python-cracklib.install
+	rm -f debian/python3-cracklib.install
 	rm -rf debian/doc
 	if [ -f Makefile ]; then $(MAKE) clean; fi
 	if [ -f Makefile ]; then $(MAKE) distclean; fi
@@ -52,13 +57,18 @@ override_dh_auto_install:
 		rm -rf debian/tmp/usr/lib/python$$i/*.pyc; \
 		rm -rf debian/tmp/usr/lib/python$$i/*.pyo; \
 	done
+	for i in $(PY3VERS); do \
+		$(MAKE) -C debian/build$$i/python3 install DESTDIR=`pwd`/debian/tmp; \
+		rm -rf debian/tmp/usr/lib/python$$i/*.pyc; \
+		rm -rf debian/tmp/usr/lib/python$$i/*.pyo; \
+	done
 	chrpath -d debian/tmp/usr/sbin/cracklib-check \
 	 debian/tmp/usr/sbin/cracklib-packer \
 	 debian/tmp/usr/sbin/cracklib-unpacker
 	for i in $(PYVERS); do \
 		cd debian/build$$i/python; \
 		ln -s ../../../python/cracklib.py . ; \
-                ln -s ../../../_cracklibmodule.c . ; \
+		ln -s ../../../_cracklibmodule.c . ; \
 		python$$i setup.py egg_info install_egg_info --install-dir "../../tmp/usr/lib/python$$i/$(call py_sitename_sh, $$i)"; \
 		cd ../../..; \
 		find "debian/tmp/usr/lib/python$$i/$(call py_sitename_sh, $$i)" -type f | grep egg-info >> debian/python-cracklib.install; \
@@ -71,4 +81,4 @@ override_dh_installchangelogs:
 	dh_installchangelogs NEWS
 
 %:
-	dh $@
+	dh --with python2 $@

-- 
Git repository for pkg-cracklib