[Pkg-samba-maint] r2933 - branches/samba/backports.org/etch/debian

[bubulle at alioth.debian.org]

Author: bubulle
Date: 2009-07-03 03:45:24 +0000 (Fri, 03 Jul 2009)
New Revision: 2933

Modified:
   branches/samba/backports.org/etch/debian/changelog
   branches/samba/backports.org/etch/debian/control
Log:
Prepare backport


Modified: branches/samba/backports.org/etch/debian/changelog
===================================================================
--- branches/samba/backports.org/etch/debian/changelog	2009-07-02 20:43:47 UTC (rev 2932)
+++ branches/samba/backports.org/etch/debian/changelog	2009-07-03 03:45:24 UTC (rev 2933)
@@ -1,3 +1,9 @@
+samba (2:3.3.6-1~bpo40+1) UNRELEASED; urgency=low
+
+  * Etch backport
+
+ -- Christian Perrier <bubulle at debian.org>  Thu, 02 Jul 2009 22:50:23 +0200
+
 samba (2:3.3.6-1) unstable; urgency=high
 
   * New upstream release. Security release.
@@ -193,7 +199,6 @@
 
  -- Christian Perrier <bubulle at debian.org>  Sat, 14 Feb 2009 13:38:14 +0100
 
->>>>>>> .fusion-droit.r2788
 samba (2:3.2.5-4) unstable; urgency=low
 
   * Fix segfault whan accessign some NAS devices running old versions of Samba

Modified: branches/samba/backports.org/etch/debian/control
===================================================================
--- branches/samba/backports.org/etch/debian/control	2009-07-02 20:43:47 UTC (rev 2932)
+++ branches/samba/backports.org/etch/debian/control	2009-07-03 03:45:24 UTC (rev 2933)
@@ -3,15 +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>
-Build-Depends: debhelper, libpam0g-dev, libreadline5-dev, libcups2-dev | libcupsys2-dev, libacl1-dev [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, libpopt-dev, quilt, uuid-dev, libkeyutils-dev [alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc]
-Build-Depends: debhelper (>=6.0.0), libpam0g-dev, libreadline5-dev,
-	libcups2-dev | libcupsys2-dev,
-	libacl1-dev [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, libpopt-dev, quilt, uuid-dev,
-	libtalloc-dev (>= 1.2.0~git20080616),
-	libcap2-dev [alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],
-	libkeyutils-dev [alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],
-	ctdb (>= 1.0.73) [alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc]
+Build-Depends: debhelper (>=6.0.0), libpam0g-dev, libreadline5-dev, libcups2-dev | libcupsys2-dev, libacl1-dev [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, libpopt-dev, quilt, uuid-dev, libkeyutils-dev [alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc]
 Build-Conflicts: libfam-dev
 Standards-Version: 3.8.2
 Homepage: http://www.samba.org