Hi, Attached is the diff for my libuser 1:0.54.6-2.1.dfsg.1-1.1 NMU.
-- ·O· Pierre Habouzit ··O [EMAIL PROTECTED] OOO http://www.madism.org
diff -u libuser-0.54.6-2.1.dfsg.1/debian/rules
libuser-0.54.6-2.1.dfsg.1/debian/rules
--- libuser-0.54.6-2.1.dfsg.1/debian/rules
+++ libuser-0.54.6-2.1.dfsg.1/debian/rules
@@ -26,8 +26,20 @@
CFLAGS += -O2
endif
-config.status: patch-stamp configure
+clean: unpatch
+ dh_testdir
+ dh_testroot
+ -$(MAKE) distclean
+ -rm -f config.sub config.guess
+ dh_clean
+
+install-python%: patch-stamp
dh_testdir
+ dh_testroot
+ dh_installdirs
+
+ -$(MAKE) distclean
+
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub config.sub
endif
@@ -35,52 +47,32 @@
cp -f /usr/share/misc/config.guess config.guess
endif
- # Add here commands to configure the package.
- CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE)
--build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man
--infodir=\$${prefix}/share/info --sysconfdir=/etc --with-python-version=2.3
--with-python-path=/usr/include/python2.3/
-
-
-build: build-stamp
-
-build-stamp: config.status
- dh_testdir
+ # configure for pythonX.Y
+ CFLAGS="$(CFLAGS)" PYTHON=python$* ./configure \
+ --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
+ --prefix=/usr --mandir=\$${prefix}/share/man \
+ --infodir=\$${prefix}/share/info --sysconfdir=/etc \
+ --with-python --disable-rpath
- # Add here commands to compile the package.
- $(MAKE)
- #docbook-to-man debian/libuser.sgml > libuser.1
+ # build for pythonX.Y
+ PYTHON=python$* $(MAKE)
- touch build-stamp
-
-clean: unpatch
- dh_testdir
- dh_testroot
- rm -f build-stamp
-
- # Add here commands to clean up after the build process.
- -$(MAKE) distclean
- -rm -f config.sub config.guess
-
- dh_clean
+ # install for pythonX.Y
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+ mkdir -p $(CURDIR)/debian/python-libuser/usr/lib/python$*/site-packages
+ cp $(CURDIR)/debian/tmp/usr/lib/python$*/site-packages/libusermodule.so
\
+
$(CURDIR)/debian/python-libuser/usr/lib/python$*/site-packages/libuser.so
-install: build
+install: $(patsubst %,install-%,$(shell pyversions -s))
dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- # Add here commands to install the package into debian/libuser.
- $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
- mv
$(CURDIR)/debian/tmp/usr/lib/python2.3/site-packages/libusermodule.so \
- $(CURDIR)/debian/tmp/usr/lib/python2.3/site-packages/libuser.so
install -Dm644 debian/shlibs.libuser1 debian/libuser1/DEBIAN/shlibs
-
-
# Build architecture-independent files here.
-binary-indep: build install
+binary-indep: install
# We have nothing to do by default.
# Build architecture-dependent files here.
-binary-arch: build install
+binary-arch: install
dh_testdir
dh_testroot
dh_installchangelogs ChangeLog
@@ -88,7 +80,7 @@
dh_installexamples
dh_install -s --sourcedir=debian/tmp --list-missing
dh_installman
- dh_python /usr/lib/python?.?/site-packages
+ dh_pysupport
dh_link
dh_strip
dh_compress
diff -u libuser-0.54.6-2.1.dfsg.1/debian/control
libuser-0.54.6-2.1.dfsg.1/debian/control
--- libuser-0.54.6-2.1.dfsg.1/debian/control
+++ libuser-0.54.6-2.1.dfsg.1/debian/control
@@ -2,8 +2,10 @@
Section: admin
Priority: optional
Maintainer: Ghe Rivero <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.0.0), python2.3-dev, pkg-config,
libglib2.0-dev, linuxdoc-tools, groff, libpam0g-dev, libpopt-dev, python,
dpatch
-Standards-Version: 3.6.2
+Build-Depends: debhelper (>= 4.0.0), python-all-dev, pkg-config,
+ libglib2.0-dev, linuxdoc-tools, groff, libpam0g-dev, libpopt-dev,
+ dpatch, python-support (>= 0.4)
+Standards-Version: 3.7.2
Package: libuser
Architecture: any
@@ -33,9 +35,12 @@
and administering user and group accounts. The library uses pluggable
back-ends to interface to its data sources.
-Package: python2.3-libuser
+Package: python-libuser
Architecture: any
-Depends: ${shlibs:Depends}, python2.3
+Depends: ${shlibs:Depends}, ${python:Depends}
+Provides: ${python:Provides}
+Replaces: python2.3-libuser (<< 1:0.54.6-2.1.dfsg.1-1.1)
+Conflicts: python2.3-libuser (<< 1:0.54.6-2.1.dfsg.1-1.1)
Description: user and group account administration library (development files)
The libuser library implements a standardized interface for manipulating
and administering user and group accounts. The library uses pluggable
diff -u libuser-0.54.6-2.1.dfsg.1/debian/changelog
libuser-0.54.6-2.1.dfsg.1/debian/changelog
--- libuser-0.54.6-2.1.dfsg.1/debian/changelog
+++ libuser-0.54.6-2.1.dfsg.1/debian/changelog
@@ -1,3 +1,13 @@
+libuser (1:0.54.6-2.1.dfsg.1-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Update package to the last python policy (Closes: 380854):
+ + build for all python versions.
+ + use python-support.
+ * Bump Standards-Verstion to 3.7.2.
+
+ -- Pierre Habouzit <[EMAIL PROTECTED]> Sun, 3 Sep 2006 21:58:15 +0200
+
libuser (1:0.54.6-2.1.dfsg.1-1) unstable; urgency=low
* New upstream release
reverted:
--- libuser-0.54.6-2.1.dfsg.1/debian/python2.3-libuser.install
+++ libuser-0.54.6-2.1.dfsg.1.orig/debian/python2.3-libuser.install
@@ -1,3 +0,0 @@
-usr/lib/python2.3/*.la
-usr/lib/python2.3/site-packages/libusermodule.la
-usr/lib/python2.3/site-packages/libuser.so
only in patch2:
unchanged:
--- libuser-0.54.6-2.1.dfsg.1.orig/debian/pyversions
+++ libuser-0.54.6-2.1.dfsg.1/debian/pyversions
@@ -0,0 +1 @@
+2.3-
signature.asc
Description: Digital signature
