[Pkg-cracklib-commits] r100 - in cracklib2/trunk/debian: . source
Jan Dittberner
jandd at alioth.debian.org
Sat Nov 7 15:31:40 UTC 2009
Author: jandd
Date: 2009-11-07 15:31:40 +0000 (Sat, 07 Nov 2009)
New Revision: 100
Added:
cracklib2/trunk/debian/python-cracklib.preinst
cracklib2/trunk/debian/source/
cracklib2/trunk/debian/source/format
Modified:
cracklib2/trunk/debian/changelog
cracklib2/trunk/debian/control
cracklib2/trunk/debian/rules
Log:
switch to debhelper 7, source format 3.0 (quilt) and python-support
Modified: cracklib2/trunk/debian/changelog
===================================================================
--- cracklib2/trunk/debian/changelog 2009-08-02 08:14:48 UTC (rev 99)
+++ cracklib2/trunk/debian/changelog 2009-11-07 15:31:40 UTC (rev 100)
@@ -1,8 +1,19 @@
cracklib2 (2.8.13-13) UNRELEASED; urgency=low
+ * NOT RELEASED YET
* debian/changelog: use "Closes" instead of wrong "fixes" for 2.8.13-12
+ * switch to python-support
+ * add debian/python-cracklib.preinst to call pycentral on first update
+ * debian/control:
+ - update Standards-Version to 3.8.3 (no changes needed)
+ - add ${misc:Depends}
+ - update debhelper dependency
+ - replace Build-Depends python-central with python-support
+ * debian/rules:
+ - switch to dh7
+ * add debian/source/format to switch to 3.0 (quilt) source format
- -- Jan Dittberner <jandd at debian.org> Sat, 01 Aug 2009 22:56:07 +0200
+ -- Jan Dittberner <jandd at debian.org> Sat, 07 Nov 2009 16:08:38 +0100
cracklib2 (2.8.13-12) unstable; urgency=low
Modified: cracklib2/trunk/debian/control
===================================================================
--- cracklib2/trunk/debian/control 2009-08-02 08:14:48 UTC (rev 99)
+++ cracklib2/trunk/debian/control 2009-11-07 15:31:40 UTC (rev 100)
@@ -3,8 +3,8 @@
Priority: optional
Maintainer: Jan Dittberner <jandd at debian.org>
Uploaders: Martin Pitt <mpitt at debian.org>
-Standards-Version: 3.8.2
-Build-Depends: debhelper (>= 7), python-central (>= 0.6.7),
+Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 7.0.50), python-support (>= 1.0.2),
python-all-dev, python-all, chrpath, xmlto, quilt(>= 0.4), automake
(>= 1.10), autoconf (>=2.61), libtool
Homepage: http://sourceforge.net/projects/cracklib
@@ -14,7 +14,7 @@
Package: libcrack2
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: cracklib-runtime
Conflicts: cracklib2.6, cracklib2 (<< 2.8.12-1)
Provides: cracklib2
@@ -30,7 +30,7 @@
Section: libdevel
Priority: extra
Architecture: any
-Depends: libcrack2 (=${binary:Version})
+Depends: libcrack2 (=${binary:Version}), ${misc:Depends}
Recommends: cracklib-runtime
Provides: cracklib-dev, cracklib2-dev
Conflicts: cracklib-dev, cracklib2-dev (<< 2.8.12-1)
@@ -46,7 +46,8 @@
Package: cracklib-runtime
Section: admin
Architecture: any
-Depends: ${shlibs:Depends}, libcrack2 (>=${binary:Version}), file
+Depends: ${shlibs:Depends}, libcrack2 (>=${binary:Version}), file,
+ ${misc:Depends}
Recommends: wordlist
Description: runtime support for password checker library cracklib2
Run-time support programs which use the shared library in libcrack2
@@ -56,8 +57,8 @@
Package: python-cracklib
Section: python
Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, libcrack2
- (>=${binary:Version}), python (>= 2.4), cracklib-runtime
+Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends},
+ libcrack2 (>=${binary:Version}), cracklib-runtime
(>=${binary:Version})
Provides: ${python:Provides}, python-crack
Conflicts: python-crack (<< 2.8.12-1)
@@ -74,7 +75,7 @@
Section: python
Priority: extra
Architecture: all
-Depends: python-cracklib
+Depends: python-cracklib, ${misc:Depends}
Description: transitional package from python-crack to python-cracklib
There has been a package python-crack in previous Debian
versions. This package provides an upgrade path to python-cracklib
Added: cracklib2/trunk/debian/python-cracklib.preinst
===================================================================
--- cracklib2/trunk/debian/python-cracklib.preinst (rev 0)
+++ cracklib2/trunk/debian/python-cracklib.preinst 2009-11-07 15:31:40 UTC (rev 100)
@@ -0,0 +1,11 @@
+#!/bin/sh
+# TODO: remove this file after releasing Squeeze
+set -e
+if [ "$1" = upgrade ]
+then
+ if dpkg --compare-versions "$2" lt 2.8.13-13; then
+ pycentral pkgremove python-cracklib
+ fi
+fi
+
+#DEBHELPER#
Modified: cracklib2/trunk/debian/rules
===================================================================
--- cracklib2/trunk/debian/rules 2009-08-02 08:14:48 UTC (rev 99)
+++ cracklib2/trunk/debian/rules 2009-11-07 15:31:40 UTC (rev 100)
@@ -4,17 +4,12 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/quilt/quilt.make
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
-
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)
-configure-stamp: patch
- dh_testdir
+override_dh_auto_configure:
./autogen.sh
mkdir -p debian/tmpbuild
cd debian/tmpbuild; \
@@ -25,23 +20,17 @@
../../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
- touch configure-stamp
-build: build-stamp
-
-build-stamp: configure-stamp
+override_dh_auto_build:
$(MAKE) -C debian/tmpbuild
for i in $(PYVERS); 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
- touch build-stamp
-clean: unpatch
- dh_testdir
- dh_testroot
- rm -rf build-stamp configure-stamp debian/tmpbuild
+override_dh_auto_clean:
+ rm -rf debian/tmpbuild
for i in $(PYVERS); do \
rm -rf debian/build$$i; \
done
@@ -49,7 +38,6 @@
rm -rf debian/doc
if [ -f Makefile ]; then $(MAKE) clean; fi
if [ -f Makefile ]; then $(MAKE) distclean; fi
- dh_clean
# remove files created or modified by autogen.sh
rm -f config.guess config.sub Makefile.in aclocal.m4 configure \
dicts/Makefile.in doc/Makefile.in lib/Makefile.in m4/Makefile.in \
@@ -57,12 +45,7 @@
m4/ltoptions.m4 m4/ltversion.m4 m4/libtool.m4 m4/ltsugar.m4 \
m4/lt~obsolete.m4
-install: DH_OPTIONS=
-install: build
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
+override_dh_auto_install:
$(MAKE) -C debian/tmpbuild DESTDIR=`pwd`/debian/tmp install
for i in $(PYVERS); do \
$(MAKE) -C debian/build$$i/python install DESTDIR=`pwd`/debian/tmp; \
@@ -72,67 +55,11 @@
chrpath -d debian/tmp/usr/sbin/cracklib-check \
debian/tmp/usr/sbin/cracklib-packer \
debian/tmp/usr/sbin/cracklib-unpacker
- touch debian/python-cracklib.install
for i in $(PYVERS); do \
echo "debian/tmp/usr/lib/python$$i/$(call py_sitename_sh, $$i)/_cracklibmodule.so usr/lib/python$$i/$(call py_sitename_sh, $$i)" >> debian/python-cracklib.install; \
echo "debian/tmp/usr/lib/python$$i/$(call py_sitename_sh, $$i)/cracklib.py usr/lib/python$$i/$(call py_sitename_sh, $$i)" >> debian/python-cracklib.install; \
echo "debian/crack.py usr/lib/python$$i/$(call py_sitename_sh, $$i)" >> debian/python-cracklib.install; \
done
- dh_install
-binary-common:
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs
- dh_installexamples
- dh_installman
- dh_installcron
- dh_installlogcheck
- dh_strip
- dh_link
- dh_compress
- dh_fixperms
- dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary-indep: build install
- dh_testdir -ppython-crack
- dh_testroot -ppython-crack
- dh_installchangelogs -ppython-crack
- dh_installdocs -ppython-crack
- dh_compress -ppython-crack
- dh_installdeb -ppython-crack
- dh_gencontrol -ppython-crack
- dh_md5sums -ppython-crack
- dh_builddeb -ppython-crack
-
-binary-arch: build install
- $(MAKE) -f debian/rules binary-common DH_OPTIONS=-plibcrack2
- $(MAKE) -f debian/rules binary-common DH_OPTIONS=-plibcrack2-dev
- $(MAKE) -f debian/rules binary-common DH_OPTIONS=-pcracklib-runtime
- $(MAKE) -f debian/rules binary-python-cracklib DH_OPTIONS=-ppython-cracklib
-
-binary-python%:
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs
- dh_strip
- dh_link
- dh_compress
- dh_fixperms
- dh_pycentral
- dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary-common binary install
+%:
+ dh --with-quilt $@
\ No newline at end of file
Added: cracklib2/trunk/debian/source/format
===================================================================
--- cracklib2/trunk/debian/source/format (rev 0)
+++ cracklib2/trunk/debian/source/format 2009-11-07 15:31:40 UTC (rev 100)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the Pkg-cracklib-commits
mailing list