[Pkg-samba-maint] r1551 - branches/samba/experimental/debian

[bubulle at alioth.debian.org]

Author: bubulle
Date: 2007-11-13 04:44:59 +0000 (Tue, 13 Nov 2007)
New Revision: 1551

Modified:
   branches/samba/experimental/debian/changelog
   branches/samba/experimental/debian/control
   branches/samba/experimental/debian/control.in
   branches/samba/experimental/debian/rules
Log:
Revert the DNS update changes (done in trunk)


Modified: branches/samba/experimental/debian/changelog
===================================================================
--- branches/samba/experimental/debian/changelog	2007-11-13 04:43:17 UTC (rev 1550)
+++ branches/samba/experimental/debian/changelog	2007-11-13 04:44:59 UTC (rev 1551)
@@ -1,11 +1,3 @@
-samba (3.2.0~pre1-2) UNRELEASED; urgency=low
-
-  * Compile with DNS update support. Thanks to Matthias Gug for
-    reporting and contributions from Launchpad's #156686
-    Closes: #449422
-
- -- Christian Perrier <bubulle at debian.org>  Sun, 11 Nov 2007 09:51:05 +0000
-
 samba (3.2.0~pre1-1) experimental; urgency=low
 
   * New upstream (pre-)release

Modified: branches/samba/experimental/debian/control
===================================================================
--- branches/samba/experimental/debian/control	2007-11-13 04:43:17 UTC (rev 1550)
+++ branches/samba/experimental/debian/control	2007-11-13 04:44:59 UTC (rev 1551)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Samba Maintainers <pkg-samba-maint at lists.alioth.debian.org>
 Uploaders: Eloy A. Paris <peloy at debian.org>, Steve Langasek <vorlon at debian.org>, Christian Perrier <bubulle at debian.org>, Noèl Köthe <noel at debian.org>, Adam Conrad <adconrad at 0c3.net>, Peter Eisentraut <petere at debian.org>
-Build-Depends: debhelper (>= 5.0.37.2), libpam0g-dev, libreadline5-dev, libcupsys2-dev (>=1.1.20final+cvs20040330-4), libacl1-dev (>= 2.2.11-1) [alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc], libkrb5-dev, libldap2-dev, po-debconf, binutils (>= 2.14.90.0.7), type-handling (>= 0.2.1), libpopt-dev, dpkg-dev (>= 1.13.9), quilt (>= 0.40), uuid-dev
+Build-Depends: debhelper (>= 5.0.37.2), libpam0g-dev, libreadline5-dev, libcupsys2-dev (>=1.1.20final+cvs20040330-4), libacl1-dev (>= 2.2.11-1) [alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc], libkrb5-dev, libldap2-dev, po-debconf, binutils (>= 2.14.90.0.7), type-handling (>= 0.2.1), libpopt-dev, dpkg-dev (>= 1.13.9), quilt (>= 0.40)
 Build-Conflicts: libfam-dev
 Standards-Version: 3.7.2
 

Modified: branches/samba/experimental/debian/control.in
===================================================================
--- branches/samba/experimental/debian/control.in	2007-11-13 04:43:17 UTC (rev 1550)
+++ branches/samba/experimental/debian/control.in	2007-11-13 04:44:59 UTC (rev 1551)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Samba Maintainers <pkg-samba-maint at lists.alioth.debian.org>
 Uploaders: Eloy A. Paris <peloy at debian.org>, Steve Langasek <vorlon at debian.org>, Christian Perrier <bubulle at debian.org>, Noèl Köthe <noel at debian.org>, Adam Conrad <adconrad at 0c3.net>, Peter Eisentraut <petere at debian.org>
-Build-Depends: debhelper (>= 5.0.37.2), libpam0g-dev, libreadline5-dev, libcupsys2-dev (>=1.1.20final+cvs20040330-4), libacl1-dev (>= 2.2.11-1) [@libacl@], libkrb5-dev, libldap2-dev, po-debconf, binutils (>= 2.14.90.0.7), type-handling (>= 0.2.1), libpopt-dev, dpkg-dev (>= 1.13.9), quilt (>= 0.40), uuid-dev
+Build-Depends: debhelper (>= 5.0.37.2), libpam0g-dev, libreadline5-dev, libcupsys2-dev (>=1.1.20final+cvs20040330-4), libacl1-dev (>= 2.2.11-1) [@libacl@], libkrb5-dev, libldap2-dev, po-debconf, binutils (>= 2.14.90.0.7), type-handling (>= 0.2.1), libpopt-dev, dpkg-dev (>= 1.13.9), quilt (>= 0.40)
 Build-Conflicts: libfam-dev
 Standards-Version: 3.7.2
 

Modified: branches/samba/experimental/debian/rules
===================================================================
--- branches/samba/experimental/debian/rules	2007-11-13 04:43:17 UTC (rev 1550)
+++ branches/samba/experimental/debian/rules	2007-11-13 04:44:59 UTC (rev 1551)
@@ -51,8 +51,7 @@
 		--with-shared-modules=idmap_rid,idmap_ad \
 		--with-automount \
 		--with-ldap \
-		--with-ads \
-		--with-dnsupdate
+		--with-ads
 
 ifeq ($(DEB_HOST_ARCH_OS),linux)
   conf_args += \