Package: libuser
Severity: wishlist
Tags: patch
Hi,
The dpatch patch management system has been deprecated for some time. The
Lintian currently flags use of dpatch packages as an error. The new 3.0
packaging format is an improved version which, among other things, contains
patch management built-in. For more information, see:
http://wiki.debian.org/Projects/DebSrc3.0
I had some free time; see attached patch to migrate to new package
format. Note that all files in debian/patches/* are canocalized to
*.patch.
Let me know if there is anything that needs adjusting or if it is ok
to upload this version in a NMU in case you are working on other
issues needing attention.
Thanks,
Jari
>From f339c8828c6290e5bf0db38156f81005ba179a56 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Fri, 27 Apr 2012 22:29:15 +0300
Subject: [PATCH] format-3.0
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Signed-off-by: Jari Aalto <jari.aa...@cante.net>
---
debian/changelog | 12 ++++++++++++
debian/compat | 2 +-
debian/control | 16 ++++++++--------
debian/copyright | 6 ++++--
debian/patches/00list | 2 --
.../patches/{01manpage.dpatch => 10-manpage.patch} | 8 ++------
....dpatch => 20-libuser-0.56.18-default-pw.patch} | 8 ++------
debian/patches/series | 2 ++
debian/rules | 20 +++++++-------------
debian/source/format | 1 +
10 files changed, 39 insertions(+), 38 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{01manpage.dpatch => 10-manpage.patch} (77%)
rename debian/patches/{02libuser-0.56.18-default-pw.dpatch => 20-libuser-0.56.18-default-pw.patch} (97%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 19dc4cf..90d0537 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+libuser (1:0.56.9.dfsg.1-1.3) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
+ * Update to Standards-Version to 3.9.3 and debhelper to 9.
+ * Add required build-arch and build-indep targets.
+ * Fix copyright-refers-to-symlink-license (Lintian).
+ * Fix copyright-without-copyright-notice (Lintian).
+ * Fix wrong-section-according-to-package-name (Lintian).
+
+ -- Jari Aalto <jari.aa...@cante.net> Fri, 27 Apr 2012 22:06:00 +0300
+
libuser (1:0.56.9.dfsg.1-1.2) unstable; urgency=low
* Non-maintainer upload.
diff --git a/debian/compat b/debian/compat
index b8626c4..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+9
diff --git a/debian/control b/debian/control
index a3442fa..0b726fb 100644
--- a/debian/control
+++ b/debian/control
@@ -2,15 +2,15 @@ Source: libuser
Section: admin
Priority: optional
Maintainer: Ghe Rivero <g...@debian.org>
-Build-Depends: debhelper (>= 4.0.0), python-all-dev, pkg-config,
+Build-Depends: debhelper (>= 9), python-all-dev, pkg-config,
libglib2.0-dev, linuxdoc-tools, groff, libpam0g-dev, libpopt-dev,
- dpatch, autotools-dev, python-support (>= 0.4), chrpath
-Standards-Version: 3.7.3
+ autotools-dev, python-support (>= 0.4), chrpath
+Standards-Version: 3.9.3
Homepage: https://fedorahosted.org/libuser/
Package: libuser
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: user and group account administration library
The libuser library implements a standardized interface for manipulating
and administering user and group accounts. The library uses pluggable
@@ -21,7 +21,7 @@ Description: user and group account administration library
Package: libuser1-dev
Architecture: any
-Depends: ${shlibs:Depends}, libuser1 (= ${binary:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, libuser1 (= ${binary:Version})
Section: libdevel
Description: user and group account administration library (development files)
The libuser library implements a standardized interface for manipulating
@@ -30,7 +30,7 @@ Description: user and group account administration library (development files)
Package: libuser1
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Section: libs
Description: user and group account administration library (shared libraries)
The libuser library implements a standardized interface for manipulating
@@ -38,12 +38,12 @@ Description: user and group account administration library (shared libraries)
back-ends to interface to its data sources.
Package: python-libuser
+Section: python
Architecture: any
-Depends: ${shlibs:Depends}, ${python:Depends}
+Depends: ${misc: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)
-Section: admin
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 --git a/debian/copyright b/debian/copyright
index debd56d..73ec86f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,7 +3,9 @@ Thu, 31 Mar 2005 09:56:46 +0200.
It was downloaded from https://fedorahosted.org/libuser/wiki/LibuserDownloads
-Copyright & Upstream Author: Nalin Dahyabhai <na...@redhat.com>
+Upstream Author:
+
+ Copyright (C) 2005 Nalin Dahyabhai <na...@redhat.com>
License: LGPL
- /usr/share/common-licenses/LGPL
+ /usr/share/common-licenses/LGPL-2
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index c0a1f6d..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-01manpage
-02libuser-0.56.18-default-pw.dpatch
diff --git a/debian/patches/01manpage.dpatch b/debian/patches/10-manpage.patch
similarity index 77%
rename from debian/patches/01manpage.dpatch
rename to debian/patches/10-manpage.patch
index 2673d52..1a3d48a 100644
--- a/debian/patches/01manpage.dpatch
+++ b/debian/patches/10-manpage.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01manpage.dpatch by Ghe Rivero <g...@upsa.es>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Ghe Rivero <g...@upsa.es>
+Subject: No description.
-@DPATCH@
diff -urNad --exclude=CVS --exclude=.svn ./apps/lnewusers.1 /tmp/dpep-work.UgPLTp/libuser-0.53.8.dfsg.1/apps/lnewusers.1
--- ./apps/lnewusers.1 2005-01-17 02:13:38.000000000 +0100
+++ /tmp/dpep-work.UgPLTp/libuser-0.53.8.dfsg.1/apps/lnewusers.1 2005-08-06 11:08:21.196167784 +0200
diff --git a/debian/patches/02libuser-0.56.18-default-pw.dpatch b/debian/patches/20-libuser-0.56.18-default-pw.patch
similarity index 97%
rename from debian/patches/02libuser-0.56.18-default-pw.dpatch
rename to debian/patches/20-libuser-0.56.18-default-pw.patch
index 52825d0..67b16c9 100644
--- a/debian/patches/02libuser-0.56.18-default-pw.dpatch
+++ b/debian/patches/20-libuser-0.56.18-default-pw.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02libuser-0.56.18-default-pw.dpatch by Miloslav Trmac <m...@redhat.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Correctly mark the LDAP default password value as encrypted (CVE-2011-0002)
+From: Miloslav Trmac <m...@redhat.com>
+Subject: Correctly mark the LDAP default password value as encrypted (CVE-2011-0002)
-@DPATCH@
--- a/Makefile.am 2008-04-10 07:14:41.000000000 +1000
+++ b/Makefile.am 2011-02-08 12:21:36.000000000 +1100
@@ -16,7 +16,7 @@ PYTHON_CPPFLAGS = -I/usr/include/python$
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..5723a0c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+10-manpage.patch
+20-libuser-0.56.18-default-pw.patch
diff --git a/debian/rules b/debian/rules
index 2c4bee6..5b84dc9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,14 +9,12 @@
# Uncomment this to turn on verbose mode.
export DH_VERBOSE=1
-#include /usr/share/dpatch/dpatch.make
# 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)
-include /usr/share/dpatch/dpatch.make
CFLAGS = -Wall -g
@@ -26,27 +24,20 @@ else
CFLAGS += -O2
endif
-clean: unpatch
+clean:
dh_testdir
dh_testroot
[ ! -f Makefile ] || $(MAKE) distclean
-rm -f config.sub config.guess
dh_clean
-install-python%: patch-stamp
+install-python%:
dh_testdir
dh_testroot
dh_installdirs
[ ! -f Makefile ] || $(MAKE) distclean
-
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
-
+ cp -vf /usr/share/misc/config.sub /usr/share/misc/config.guess .
# configure for pythonX.Y
CFLAGS="$(CFLAGS)" PYTHON=python$* ./configure \
--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
@@ -95,6 +86,9 @@ install: $(patsubst %,install-%,$(shell pyversions -s))
sed -i "/dependency_libs/ s/'.*'/''/" `find . -name '*.la'`
+build-arch: binary-arch
+build-indep: binary-indep
+
# Build architecture-independent files here.
binary-indep: install
# We have nothing to do by default.
@@ -121,4 +115,4 @@ binary-arch: install
dh_builddeb
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install patch unpatch
+.PHONY: build clean binary-indep binary-arch binary install
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
--
1.7.10
