Guido Günther <[email protected]> writes: > Hi Tony, > On Tue, May 11, 2010 at 10:16:53PM -0700, tony mancill wrote: > >> tags 480953 + patch >> tags 482729 + pending >> tags 548485 + patch >> tags 548485 + pending >> thanks >> >> Dear maintainer, >> >> I've prepared an NMU for nss-updatedb (versioned as 10-1.1) and >> uploaded it to DELAYED/3. Please feel free to tell me if I >> should delay it longer. (Patch excluded due to the length of the >> patch; please contact me directly or use debdiff or interdiff >> to generate the patch.) > Thanks for the NMU. Hope you coordinated with Jari?
Yes, this has been taken cared of. > Please attach the patch to the BTS! Attached. Jari
config.guess | 244 ++++++++++++++++++++++--------------------------- config.sub | 102 ++++++++++++++++----- debian/changelog | 26 +++++ debian/compat | 2 +- debian/control | 6 +- debian/copyright | 9 +- debian/patches/series | 1 + debian/rules | 11 +-- debian/source/format | 1 + 9 files changed, 230 insertions(+), 172 deletions(-) diff --git a/config.guess b/config.guess index f32079a..c2246a4 100755 diff --git a/config.sub b/config.sub index 6759825..c2d1257 100755 diff --git a/debian/changelog b/debian/changelog index 9699e17..070d92e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,29 @@ +nss-updatedb (10-1.1) unstable; urgency=low + + [ Jari Aalto ] + * Non-maintainer upload. + - Move to packaging format "3.0 (quilt)" + (FTBFS minor; Closes: #482729). + * debian/compat + - Update to 7. + * debian/control + - (Build-Depends): remove quilt; obsolete. Update from + libdb4.6-dev to libdb-dev >= 4.7 (Closes: #548485). + - (Standards-Version): Update to 3.8.4 and debhelper 7.1. + * debian/copyright + - Point to GPL-2 and a minor layout update. + * debian/rules + - Delete obsolete quilt calls. + * debian/rules + - (install): Update dh_clean to dh_prep. + - (clean): Fix lintian debian-rules-ignores-make-clean-error + (Closes: #480953). Patch thanks to + Miguel Angel Ruiz Manzano <[email protected]> + * debian/source/format + - New file + + -- Jari Aalto <[email protected]> Fri, 07 May 2010 12:10:35 +0300 + nss-updatedb (10-1) unstable; urgency=low * drop return-zero-in-case-of-success.patch - applied upstream diff --git a/debian/compat b/debian/compat index b8626c4..7f8f011 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -4 +7 diff --git a/debian/control b/debian/control index 15e4d2e..1121e66 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,8 @@ Source: nss-updatedb Section: net Priority: extra Maintainer: Guido Guenther <[email protected]> -Build-Depends: debhelper (>= 4.0.0), quilt (>= 0.40), autotools-dev, libdb4.6-dev -Standards-Version: 3.7.3 +Build-Depends: debhelper (>= 7.1), autotools-dev, libdb-dev (>= 4.7) +Standards-Version: 3.8.4 Homepage: http://www.padl.com/OSS/nss_updatedb.html Package: nss-updatedb @@ -13,7 +13,7 @@ Recommends: libnss-db Description: Cache name service directories in DB format This package contains a script, nss_updatedb, which can be used to maintain local caches of user and group directories. - These can then be used by the DB Name Service Switch module + These can then be used by the DB Name Service Switch module (libnss-db) to provide name service when the system is offline. . These tools are designed to work with libpam-ldap and libnss-ldap. diff --git a/debian/copyright b/debian/copyright index 5a31dd2..00c55b4 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,5 +1,7 @@ -This package was debianized by Guido Guenther <[email protected]> on -Tue, 5 Apr 2005 12:27:07 +0200. +This package was debianized by: + + Guido Guenther <[email protected]> + on Tue, 5 Apr 2005 12:27:07 +0200. It was downloaded from http://www.padl.com/OSS/nss_updatedb.html @@ -28,5 +30,4 @@ License: Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. On Debian systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL'. - +Public License can be found in "/usr/share/common-licenses/GPL-2". diff --git a/debian/patches/series b/debian/patches/series index 01e2030..4edd5fb 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 01_debian-paths.diff +debian-changes-10-1.1 diff --git a/debian/rules b/debian/rules index 11e981d..c232c5a 100755 --- a/debian/rules +++ b/debian/rules @@ -14,9 +14,6 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -# for quilt -include /usr/share/quilt/quilt.make - CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) @@ -25,7 +22,7 @@ else CFLAGS += -O2 endif -config.status: patch configure +config.status: configure dh_testdir chmod 755 ./configure LDFLAGS="$(LDFLAGS)" CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info @@ -39,12 +36,12 @@ build-stamp: config.status $(MAKE) touch build-stamp -clean: unpatch +clean: dh_testdir dh_testroot rm -f build-stamp - -$(MAKE) distclean + [ ! -f Makefile ] || $(MAKE) distclean ifneq "$(wildcard /usr/share/misc/config.sub)" "" cp -f /usr/share/misc/config.sub config.sub endif @@ -58,7 +55,7 @@ endif install: build dh_testdir dh_testroot - dh_clean -k + dh_prep dh_installdirs $(MAKE) install DESTDIR=$(CURDIR)/debian/nss-updatedb 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)
