tags 408248 patch
stop
Hi,
I've created a patch adding adduser to the depends and NMU'ed it to
DELAYED/0 according to
http://lists.debian.org/debian-devel-announce/2006/09/msg00020.html
The patch is attached, please note that this package uses yada and has a
very unusual packaging style.
Cheers,
Bastian
--
Bastian Venthur http://venthur.de
Debian Developer venthur at debian org
diff -ruN orig/ldapdns-2.06/debian/changelog ldapdns-2.06/debian/changelog
--- orig/ldapdns-2.06/debian/changelog 2007-02-01 10:49:37.000000000 +0100
+++ ldapdns-2.06/debian/changelog 2007-02-01 10:59:40.000000000 +0100
@@ -1,4 +1,12 @@
-ldapdns (2.06-3) unstable; urgency=high
+ldapdns (2.06-3.1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Added missing dep on adduser (Closes: #408248)
+ * Urgency high due RCness
+
+ -- Bastian Venthur <[EMAIL PROTECTED]> Thu, 1 Feb 2007 10:59:00 +0100
+
+ldapdns (2.06-3) unstable; urgency=high
* The upstream didn't fixed Bug#300574, so I've included the patch.
The fix is important because for some caching nameservers the ldapdns's
diff -ruN orig/ldapdns-2.06/debian/control ldapdns-2.06/debian/control
--- orig/ldapdns-2.06/debian/control 2007-02-01 10:49:37.000000000 +0100
+++ ldapdns-2.06/debian/control 2007-02-01 11:06:16.000000000 +0100
@@ -3,10 +3,11 @@
Section: net
Priority: optional
Standards-Version: 3.6.1
-Build-Depends: libldap2-dev, yada (>= 0.34)
+Build-Depends: libldap2-dev, yada (>= 0.52)
Package: ldapdns
Architecture: any
+Depends: adduser
Recommends: ldap-server
Suggests: dnsutils, ldap-utils
Description: DNS server that pulls data from an LDAP directory
diff -ruN orig/ldapdns-2.06/debian/packages ldapdns-2.06/debian/packages
--- orig/ldapdns-2.06/debian/packages 2007-02-01 10:49:37.000000000 +0100
+++ ldapdns-2.06/debian/packages 2007-02-01 11:05:53.000000000 +0100
@@ -53,6 +53,7 @@
Package: ldapdns
Architecture: any
Recommends: ldap-server
+Depends: adduser
Suggests: dnsutils, ldap-utils
Description: DNS server that pulls data from an LDAP directory
LDAPDNS is a ultra-fast, stable, multithreaded DNS server that pulls
diff -ruN orig/ldapdns-2.06/debian/rules ldapdns-2.06/debian/rules
--- orig/ldapdns-2.06/debian/rules 2007-02-01 10:49:37.000000000 +0100
+++ ldapdns-2.06/debian/rules 2007-02-01 11:06:15.000000000 +0100
@@ -1,18 +1,57 @@
#!/usr/bin/make -f
# Generated automatically from debian/packages
-# by yada v0.34, of Mon, 25 Apr 2005
+# by yada v0.52, of Fri, 8 Dec 2006
-DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_GNU_CPU := $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
-DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_HOST_GNU_SYSTEM := $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
-
-DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-DEB_BUILD_GNU_CPU := $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
-DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_BUILD_GNU_SYSTEM := $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
+DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH 2>/dev/null)
+DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null)
+DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU 2>/dev/null)
+DEB_HOST_GNU_CPU := $(shell dpkg-architecture -qDEB_HOST_GNU_CPU 2>/dev/null)
+DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE 2>/dev/null)
+DEB_HOST_GNU_SYSTEM := $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM 2>/dev/null)
+
+DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH 2>/dev/null)
+DEB_BUILD_ARCH_OS := $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS 2>/dev/null)
+DEB_BUILD_ARCH_CPU := $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null)
+DEB_BUILD_GNU_CPU := $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU 2>/dev/null)
+DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE 2>/dev/null)
+DEB_BUILD_GNU_SYSTEM := $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM 2>/dev/null)
+
+# Take account of old dpkg-architecture output.
+ifeq ($(DEB_HOST_ARCH_CPU),)
+ DEB_HOST_ARCH_CPU := $(DEB_HOST_GNU_CPU))
+ ifeq ($(DEB_HOST_ARCH_CPU),i486)
+ DEB_HOST_ARCH_OS := i386
+ else
+ ifeq ($(DEB_HOST_ARCH_CPU),x86_64)
+ DEB_HOST_ARCH_OS := amd64
+ endif
+ endif
+endif
+ifeq ($(DEB_HOST_ARCH_OS),)
+ DEB_HOST_ARCH_OS := $(subst -gnu,,$(DEB_HOST_GNU_SYSTEM))
+ ifeq ($(DEB_HOST_ARCH_OS),gnu)
+ DEB_HOST_ARCH_OS := hurd
+ endif
+endif
+ifeq ($(DEB_BUILD_ARCH_CPU),)
+ DEB_BUILD_ARCH_CPU := $(DEB_BUILD_GNU_CPU))
+ ifeq ($(DEB_BUILD_ARCH_CPU),i486)
+ DEB_BUILD_ARCH_OS := i386
+ else
+ ifeq ($(DEB_BUILD_ARCH_CPU),x86_64)
+ DEB_BUILD_ARCH_OS := amd64
+ endif
+ endif
+endif
+ifeq ($(DEB_BUILD_ARCH_OS),)
+ DEB_BUILD_ARCH_OS := $(subst -gnu,,$(DEB_BUILD_GNU_SYSTEM))
+ ifeq ($(DEB_BUILD_ARCH_OS),gnu)
+ DEB_BUILD_ARCH_OS := hurd
+ endif
+endif
-VERSION:=$(shell LC_ALL=C dpkg-parsechangelog | sed -ne 's/^Version: *\([^2]*\)/\1/p')
+LEFT_PARENTHESIS:=(
+VERSION:=$(shell head -n1 debian/changelog | sed -e "s/^[0-9a-zA-Z.-]* $(LEFT_PARENTHESIS)//" -e "s/[^0-9a-zA-Z.:+~-].*//")
SHELL=/bin/bash
@@ -55,9 +94,11 @@
debian/control: $(shell which yada) debian/packages-tmp
yada rebuild control
-templates: debian/templates
+templates: debian/templates debian/po/POTFILES.in
debian/templates: $(shell which yada) debian/packages-tmp
yada rebuild templates
+debian/po/POTFILES.in: $(shell which yada) debian/packages-tmp
+ yada rebuild templates
debian/build-stamp: debian/build-arch-stamp debian/build-indep-stamp
@[ -f $(shell which yada) -a -f debian/rules ]
@@ -105,7 +146,7 @@
@[ -f $(shell which yada) -a -f debian/rules ]
touch debian/build-arch-stamp
-debian/build-indep-stamp:
+debian/build-indep-stamp: debian/build-arch-stamp
@[ -f $(shell which yada) -a -f debian/rules ]
touch debian/build-indep-stamp
@@ -167,7 +208,7 @@
find debian/tmp-ldapdns -type f -print \
| sed -n 's/^debian\/tmp-ldapdns\(\/etc\/.*\)$$/\1/p' \
> debian/tmp-ldapdns/DEBIAN/conffiles
- if test ! -s debian/tmp-ldapdns/DEBIAN/conffiles; then rm -f debian/tmp-ldapdns/DEBIAN/conffiles; fi
+ test -s debian/tmp-ldapdns/DEBIAN/conffiles || rm -f debian/tmp-ldapdns/DEBIAN/conffiles
yada rebuild control
yada generate substvars ldapdns
umask 022 && dpkg-gencontrol -isp -pldapdns -Pdebian/tmp-ldapdns
