Package: python-crack
Version: 0.5.1-2
Severity: wishlist
Tags: patch

Hi,

I wanted to get python-crack working with python 2.5.  While I was at it, 
I updated the source to use pysupport, clean up debian/rules a bit.

The addition of name/version to distutil.py prevents the creation of the
UNKNOWN egg file that was conflicting with another package (bug #476606).

Cheers,
Chris

diff -u python-crack-0.5.1/debian/rules python-crack-0.5.1/debian/rules
--- python-crack-0.5.1/debian/rules
+++ python-crack-0.5.1/debian/rules
@@ -3,65 +3,38 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
-
-# This is the debhelper compatibility version to use.
-export DH_COMPAT=5
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-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: configure
+configure-stamp:
        dh_testdir
-       for i in $(PYVERS); do \
-               mkdir -p debian/build$$i; \
-               cd debian/build$$i; \
-               ../../configure --host=$(DEB_HOST_GNU_TYPE) 
--build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr PYTHON=/usr/bin/python$$i; \
-               cd ../..; \
-       done
-       touch configure-stamp
+       dh_auto_configure
+       touch $@
 
-build: build-stamp
+build: build-stamp configure-stamp
 
-build-stamp: configure-stamp
-       dh_testdir
-       for i in $(PYVERS); do \
-               ${MAKE} -C debian/build$$i; \
-       done
-       touch build-stamp
+build-stamp: $(PYVERS:%=build-python%)
+       touch $@
+
+build-python%: configure-stamp
+       python$* distutil.py build
+       touch $@
 
-clean:
+clean: $(PYVERS:%=clean-python%)
        dh_testdir
        dh_testroot
-       rm -rf build-stamp configure-stamp debian/build*
-       for i in $(PYVERS); do \
-               rm -rf  debian/build$$i; \
-       done
+       dh_auto_clean
        dh_clean
+       rm -rf build build-stamp configure-stamp config.log config.status 
build-python* _crack.c
 
-install: DH_OPTIONS=
-install: build
-       dh_testdir
-       dh_testroot
-       dh_clean -k
-       dh_installdirs
-       for i in $(PYVERS); do \
-               ${MAKE} -C debian/build$$i install 
DESTDIR=`pwd`/debian/python-crack; \
-               rm -rf debian/python-crack/usr/lib/python$$i/*.pyc; \
-               rm -rf debian/python-crack/usr/lib/python$$i/*.pyo; \
-       done
+clean-python%:
+       python$* distutil.py clean
 
-# Build architecture-independent files here.
-binary-indep: DH_OPTIONS=-i
-binary-indep: build install
+install: build $(PYVERS:%=install-python%)
+       $(MAKE) -C doc install DESTDIR=$(CURDIR)/debian/python-crack
+
+install-python%:
+       python$* distutil.py install --root $(CURDIR)/debian/python-crack
 
-# Build architecture-dependent files here.
-binary-arch: DH_OPTIONS=-a
 binary-arch: build install
        dh_testdir
        dh_testroot
@@ -76,10 +49,10 @@
-       dh_pycentral
-       dh_python
+       dh_pysupport
        dh_installdeb
        dh_shlibdeps
        dh_gencontrol
        dh_md5sums
        dh_builddeb
 
+binary-indep: build install
+
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
diff -u python-crack-0.5.1/debian/changelog python-crack-0.5.1/debian/changelog
--- python-crack-0.5.1/debian/changelog
+++ python-crack-0.5.1/debian/changelog
@@ -1,3 +1,11 @@
+python-crack (0.5.1-2.1) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * Updated to use pysupport
+  * Build for python2.5
+
+ -- Chris AtLee <[EMAIL PROTECTED]>  Fri, 20 Jun 2008 17:24:45 -0400
+
 python-crack (0.5.1-2) unstable; urgency=low
 
   * Adopted the new Debian Python Policy. 
diff -u python-crack-0.5.1/debian/control python-crack-0.5.1/debian/control
--- python-crack-0.5.1/debian/control
+++ python-crack-0.5.1/debian/control
@@ -2,9 +2,8 @@
 Section: python
 Priority: extra
 Maintainer: Domenico Andreoli <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 5.0.37.2), cracklib2-dev, python, python-all-dev 
(>= 2.3.5-11), python-central (>= 0.4.17)
-Standards-Version: 3.7.2
-XS-Python-Version: all
+Build-Depends: debhelper (>= 5.0.37.2), cracklib2-dev, python, python-all-dev 
(>= 2.3.5-11), python-support (>= 0.6)
+Standards-Version: 3.8.0
 
 Package: python-crack
 Architecture: any
@@ -15,5 +14,4 @@
-XB-Python-Version: ${python:Versions}
+Homepage: http://www.nongnu.org/python-crack/
 Description: Python bindings for cracklib
  This module allows the use of cracklib services from within a Python script.
  .
- Homepage: http://www.nongnu.org/python-crack/
only in patch2:
unchanged:
--- python-crack-0.5.1.orig/distutil.py
+++ python-crack-0.5.1/distutil.py
@@ -1,6 +1,8 @@
 from distutils.core import setup, Extension
 
 setup(
+  name="crack",
+  version="0.5.1",
   ext_modules = [
     Extension("_crack", sources = [ "_crack.c" ], libraries = [ "crack" ])
   ]
only in patch2:
unchanged:
--- python-crack-0.5.1.orig/debian/compat
+++ python-crack-0.5.1/debian/compat
@@ -0,0 +1 @@
+7



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to