[Pkg-cracklib-commits] r110 - in cracklib2/branches/lenny-backports/debian: . patches
Jan Dittberner
jandd at alioth.debian.org
Wed Nov 18 22:34:08 UTC 2009
Author: jandd
Date: 2009-11-18 22:34:08 +0000 (Wed, 18 Nov 2009)
New Revision: 110
Added:
cracklib2/branches/lenny-backports/debian/patches/01-use-src-path-for-python.patch
Removed:
cracklib2/branches/lenny-backports/debian/patches/01-cracklib-format-optim.patch
cracklib2/branches/lenny-backports/debian/patches/02-ccwarnings.patch
cracklib2/branches/lenny-backports/debian/patches/04-enable-gettext.patch
Modified:
cracklib2/branches/lenny-backports/debian/changelog
cracklib2/branches/lenny-backports/debian/control
cracklib2/branches/lenny-backports/debian/copyright
cracklib2/branches/lenny-backports/debian/libcrack2.install
cracklib2/branches/lenny-backports/debian/libcrack2.links
cracklib2/branches/lenny-backports/debian/libcrack2.symbols
cracklib2/branches/lenny-backports/debian/patches/03-packer-dont-print-skipping-line.patch
cracklib2/branches/lenny-backports/debian/patches/series
cracklib2/branches/lenny-backports/debian/rules
Log:
prepare backports upload
Modified: cracklib2/branches/lenny-backports/debian/changelog
===================================================================
--- cracklib2/branches/lenny-backports/debian/changelog 2009-11-18 21:53:55 UTC (rev 109)
+++ cracklib2/branches/lenny-backports/debian/changelog 2009-11-18 22:34:08 UTC (rev 110)
@@ -1,8 +1,31 @@
-cracklib2 (2.8.13-13) UNRELEASED; urgency=low
+cracklib2 (2.8.14-1~bpo50+1) lenny-backports; urgency=low
* debian/changelog: use "Closes" instead of wrong "fixes" for 2.8.13-12
+ * debian/control:
+ - update Standards-Version to 3.8.3 (no changes needed)
+ - add ${misc:Depends}
+ * debian/rules:
+ - install NEWS as upstream changelog
+ - remove /usr/share/python/python.mk import not existing in Lenny
+ - add macro py_sitename_sh to allow backporting
+ * New upstream release
+ - integrate Debian patches
+ - added and updated translations
+ - improved Python binding
+ * remove patches debian/patches/01-cracklib-format-optim.patch,
+ debian/patches/02-ccwarnings.patch and
+ debian/patches/04-enable-gettext.patch that have been applied
+ upstream, update debian/patches/series accordingly
+ * debian/patches/03-packer-dont-print-skipping-line.patch annotated with
+ DEP-3 tags
+ * add debian/patches/01-use-src-path-for-python.patch to allow building
+ Python extension outside the source folder
+ * debian/copyright: update upstream copyright
+ * debian/libcrack2.install, debian/libcrack2.links: update library
+ version to 2.8.1
+ * debian/libcrack2.symbols: add GetDefaultCracklibDict
- -- Jan Dittberner <jandd at debian.org> Sat, 01 Aug 2009 22:56:07 +0200
+ -- Jan Dittberner <jandd at debian.org> Wed, 18 Nov 2009 23:24:18 +0100
cracklib2 (2.8.13-12) unstable; urgency=low
Modified: cracklib2/branches/lenny-backports/debian/control
===================================================================
--- cracklib2/branches/lenny-backports/debian/control 2009-11-18 21:53:55 UTC (rev 109)
+++ cracklib2/branches/lenny-backports/debian/control 2009-11-18 22:34:08 UTC (rev 110)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Jan Dittberner <jandd at debian.org>
Uploaders: Martin Pitt <mpitt at debian.org>
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
Build-Depends: debhelper (>= 7), python-central (>= 0.6.7),
python-all-dev, python-all, chrpath, xmlto, quilt(>= 0.4), automake
(>= 1.10), autoconf (>=2.61), libtool
@@ -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
@@ -58,7 +59,7 @@
Architecture: any
Depends: ${python:Depends}, ${shlibs:Depends}, libcrack2
(>=${binary:Version}), python (>= 2.4), cracklib-runtime
- (>=${binary:Version})
+ (>=${binary:Version}), ${misc:Depends}
Provides: ${python:Provides}, python-crack
Conflicts: python-crack (<< 2.8.12-1)
XB-Python-Version: ${python:Versions}
Modified: cracklib2/branches/lenny-backports/debian/copyright
===================================================================
--- cracklib2/branches/lenny-backports/debian/copyright 2009-11-18 21:53:55 UTC (rev 109)
+++ cracklib2/branches/lenny-backports/debian/copyright 2009-11-18 22:34:08 UTC (rev 110)
@@ -7,7 +7,8 @@
It was downloaded from http://sourceforge.net/projects/cracklib
Copyright (c) 1993 Alec Muffett <alecm at crypto.dircon.co.uk>,
-Copyright (c) 2005-2008 Nathan Neulinger <nneul at umr.edu>
+Copyright (c) 2005-2009 Nathan Neulinger <nneul at umr.edu>,
+Copyright (c) 2008-2009 Jan Dittberner <jan at dittberner.info>
Modifications: Added cronjob, configuration file, and man pages.
Modified: cracklib2/branches/lenny-backports/debian/libcrack2.install
===================================================================
--- cracklib2/branches/lenny-backports/debian/libcrack2.install 2009-11-18 21:53:55 UTC (rev 109)
+++ cracklib2/branches/lenny-backports/debian/libcrack2.install 2009-11-18 22:34:08 UTC (rev 110)
@@ -1,4 +1,4 @@
-debian/tmp/usr/lib/libcrack.so.2.8.0 usr/lib
+debian/tmp/usr/lib/libcrack.so.2.8.1 usr/lib
debian/tmp/usr/share/cracklib/cracklib-small usr/share/cracklib
debian/tmp/usr/share/cracklib/cracklib.magic usr/share/cracklib
debian/tmp/usr/share/locale/* usr/share/locale
Modified: cracklib2/branches/lenny-backports/debian/libcrack2.links
===================================================================
--- cracklib2/branches/lenny-backports/debian/libcrack2.links 2009-11-18 21:53:55 UTC (rev 109)
+++ cracklib2/branches/lenny-backports/debian/libcrack2.links 2009-11-18 22:34:08 UTC (rev 110)
@@ -1 +1 @@
-/usr/lib/libcrack.so.2.8.0 /usr/lib/libcrack.so.2
+/usr/lib/libcrack.so.2.8.1 /usr/lib/libcrack.so.2
Modified: cracklib2/branches/lenny-backports/debian/libcrack2.symbols
===================================================================
--- cracklib2/branches/lenny-backports/debian/libcrack2.symbols 2009-11-18 21:53:55 UTC (rev 109)
+++ cracklib2/branches/lenny-backports/debian/libcrack2.symbols 2009-11-18 22:34:08 UTC (rev 110)
@@ -26,3 +26,4 @@
Suffix at Base 2.8.12
Trim at Base 2.8.12
Uppercase at Base 2.8.12
+ GetDefaultCracklibDict at Base 2.8.14
Deleted: cracklib2/branches/lenny-backports/debian/patches/01-cracklib-format-optim.patch
===================================================================
--- cracklib2/branches/lenny-backports/debian/patches/01-cracklib-format-optim.patch 2009-11-18 21:53:55 UTC (rev 109)
+++ cracklib2/branches/lenny-backports/debian/patches/01-cracklib-format-optim.patch 2009-11-18 22:34:08 UTC (rev 110)
@@ -1,15 +0,0 @@
-optimize normalization in cracklib-format
---- a/util/cracklib-format
-+++ b/util/cracklib-format
-@@ -4,9 +4,7 @@
- # into cracklib-packer
- #
- gzip -cdf "$@" |
-+ grep -v '^\(#\|$\)' |
- tr '[A-Z]' '[a-z]' |
- tr -cd '\012[a-z][0-9]' |
-- sort |
-- uniq |
-- grep -v '^#' |
-- grep -v '^$'
-+ sort -u
Copied: cracklib2/branches/lenny-backports/debian/patches/01-use-src-path-for-python.patch (from rev 107, cracklib2/trunk/debian/patches/01-use-src-path-for-python.patch)
===================================================================
--- cracklib2/branches/lenny-backports/debian/patches/01-use-src-path-for-python.patch (rev 0)
+++ cracklib2/branches/lenny-backports/debian/patches/01-use-src-path-for-python.patch 2009-11-18 22:34:08 UTC (rev 110)
@@ -0,0 +1,14 @@
+Author: Jan Dittberner <jandd at debian.org>
+Description: use source path when building in a directory outside the
+ source directory
+--- a/python/Makefile.am
++++ b/python/Makefile.am
+@@ -1,7 +1,7 @@
+ if BUILD_PYTHON
+ python_PYTHON = cracklib.py
+ pyexec_LTLIBRARIES = _cracklibmodule.la
+-AM_CFLAGS = -I$(top_builddir)/lib
++AM_CFLAGS = -I$(top_srcdir)/lib
+ _cracklibmodule_la_LDFLAGS = -module -avoid-version $(top_builddir)/lib/libcrack.la
+ DEFS += '-DDEFAULT_CRACKLIB_DICT="$(DEFAULT_CRACKLIB_DICT)"'
+ DEFS += '-DPYTHON_H="python at PYTHON_VERSION@/Python.h"'
Deleted: cracklib2/branches/lenny-backports/debian/patches/02-ccwarnings.patch
===================================================================
--- cracklib2/branches/lenny-backports/debian/patches/02-ccwarnings.patch 2009-11-18 21:53:55 UTC (rev 109)
+++ cracklib2/branches/lenny-backports/debian/patches/02-ccwarnings.patch 2009-11-18 22:34:08 UTC (rev 110)
@@ -1,74 +0,0 @@
-fixes for cc warnings
---- a/lib/packlib.c
-+++ b/lib/packlib.c
-@@ -15,7 +15,7 @@
- #endif
- #include "packer.h"
-
--static char vers_id[] = "packlib.c : v2.3p2 Alec Muffett 18 May 1993";
-+static const char vers_id[] = "packlib.c : v2.3p2 Alec Muffett 18 May 1993";
-
- #define DEBUG 0
-
---- a/lib/rules.c
-+++ b/lib/rules.c
-@@ -4,7 +4,7 @@
- * or its effect upon hardware or computer systems.
- */
-
--static char vers_id[] = "rules.c : v5.0p3 Alec Muffett 20 May 1993";
-+static const char vers_id[] = "rules.c : v5.0p3 Alec Muffett 20 May 1993";
-
- #include "config.h"
- #include <string.h>
-@@ -24,7 +24,7 @@
- int val;
- char *a, *b, *c, *d, *e, *f, *g;
- {
-- fprintf(stderr, a, b, c, d, e, f);
-+ fprintf(stderr, a, b, c, d, e, f, g);
- }
- #else
- static void
-@@ -480,7 +480,7 @@
- Debug(1, "Mangle: '>' weird argument in '%s'\n", control);
- return ((char *) 0);
- }
-- if (strlen(area) <= limit)
-+ if ( (int) strlen(area) <= limit)
- {
- return ((char *) 0);
- }
-@@ -499,7 +499,7 @@
- Debug(1, "Mangle: '<' weird argument in '%s'\n", control);
- return ((char *) 0);
- }
-- if (strlen(area) >= limit)
-+ if ( (int) strlen(area) >= limit)
- {
- return ((char *) 0);
- }
---- a/lib/stringlib.c
-+++ b/lib/stringlib.c
-@@ -11,7 +11,7 @@
- #endif
- #include "packer.h"
-
--static char vers_id[] = "stringlib.c : v2.3p2 Alec Muffett 18 May 1993";
-+static const char vers_id[] = "stringlib.c : v2.3p2 Alec Muffett 18 May 1993";
-
- char
- Chop(string)
---- a/util/packer.c
-+++ b/util/packer.c
-@@ -17,8 +17,8 @@
- int argc;
- char *argv[];
- {
-- uint32_t readed;
-- uint32_t wrote;
-+ unsigned long readed;
-+ unsigned long wrote;
- PWDICT *pwp;
- char buffer[STRINGSIZE];
- char *file;
Modified: cracklib2/branches/lenny-backports/debian/patches/03-packer-dont-print-skipping-line.patch
===================================================================
--- cracklib2/branches/lenny-backports/debian/patches/03-packer-dont-print-skipping-line.patch 2009-11-18 21:53:55 UTC (rev 109)
+++ cracklib2/branches/lenny-backports/debian/patches/03-packer-dont-print-skipping-line.patch 2009-11-18 22:34:08 UTC (rev 110)
@@ -1,4 +1,7 @@
-remove unnecessary output of skipped lines
+Author: Martin Pitt <mpitt at debian.org>
+Subject: remove unnecessary output of skipped lines
+Bug-Debian: http://bugs.debian.org/304583
+Last-Update: 2009-11-18
--- a/util/packer.c
+++ b/util/packer.c
@@ -57,7 +57,6 @@
Deleted: cracklib2/branches/lenny-backports/debian/patches/04-enable-gettext.patch
===================================================================
--- cracklib2/branches/lenny-backports/debian/patches/04-enable-gettext.patch 2009-11-18 21:53:55 UTC (rev 109)
+++ cracklib2/branches/lenny-backports/debian/patches/04-enable-gettext.patch 2009-11-18 22:34:08 UTC (rev 110)
@@ -1,12 +0,0 @@
-enable gettext support--- a/util/check.c
-+++ b/util/check.c
-@@ -20,6 +20,9 @@
- const char *why;
- int i;
-
-+ setlocale(LC_ALL, "");
-+ textdomain(PACKAGE);
-+
- while (fgets(buf, sizeof(buf), stdin) != NULL) {
- while (((i = strlen(buf)) > 0) && (i > 0)) {
- if (strchr("\r\n", buf[i - 1]) != NULL) {
Modified: cracklib2/branches/lenny-backports/debian/patches/series
===================================================================
--- cracklib2/branches/lenny-backports/debian/patches/series 2009-11-18 21:53:55 UTC (rev 109)
+++ cracklib2/branches/lenny-backports/debian/patches/series 2009-11-18 22:34:08 UTC (rev 110)
@@ -1,4 +1,2 @@
-01-cracklib-format-optim.patch
-02-ccwarnings.patch
03-packer-dont-print-skipping-line.patch
-04-enable-gettext.patch
+01-use-src-path-for-python.patch
Modified: cracklib2/branches/lenny-backports/debian/rules
===================================================================
--- cracklib2/branches/lenny-backports/debian/rules 2009-11-18 21:53:55 UTC (rev 109)
+++ cracklib2/branches/lenny-backports/debian/rules 2009-11-18 22:34:08 UTC (rev 110)
@@ -1,8 +1,8 @@
#!/usr/bin/make -f
-include /usr/share/python/python.mk
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+py_sitename_sh = $$(basename $$(_py_=$(strip $(1)); python$${_py_\#python*} -c 'from distutils import sysconfig; print(sysconfig.get_python_lib())'))
include /usr/share/quilt/quilt.make
# This has to be exported to make some magic below work.
@@ -83,7 +83,7 @@
binary-common:
dh_testdir
dh_testroot
- dh_installchangelogs
+ dh_installchangelogs NEWS
dh_installdocs
dh_installexamples
dh_installman
@@ -120,7 +120,7 @@
binary-python%:
dh_testdir
dh_testroot
- dh_installchangelogs
+ dh_installchangelogs NEWS
dh_installdocs
dh_strip
dh_link
More information about the Pkg-cracklib-commits
mailing list