[Pkg-samba-maint] r3627 - in trunk/samba4: .bzr-builddeb debian

[jelmer at alioth.debian.org]

Author: jelmer
Date: 2010-10-17 19:58:24 +0000 (Sun, 17 Oct 2010)
New Revision: 3627

Modified:
   trunk/samba4/.bzr-builddeb/default.conf
   trunk/samba4/debian/changelog
Log:
Merge new upstream snapshot, fix bzr-builddeb configuration.

Modified: trunk/samba4/.bzr-builddeb/default.conf
===================================================================
--- trunk/samba4/.bzr-builddeb/default.conf	2010-10-17 19:58:13 UTC (rev 3626)
+++ trunk/samba4/.bzr-builddeb/default.conf	2010-10-17 19:58:24 UTC (rev 3627)
@@ -1,2 +1,3 @@
-[DEFAULT]
+[BUILDDEB]
+merge = True
 upstream_branch = git://git.samba.org/samba.git

Modified: trunk/samba4/debian/changelog
===================================================================
--- trunk/samba4/debian/changelog	2010-10-17 19:58:13 UTC (rev 3626)
+++ trunk/samba4/debian/changelog	2010-10-17 19:58:24 UTC (rev 3627)
@@ -1,4 +1,4 @@
-samba4 (4.0.0~alpha13+bzr12287.dfsg1-1) experimental; urgency=low
+samba4 (4.0.0~alpha13+bzr12290.dfsg1-1) experimental; urgency=low
 
   * New upstream snapshot.
    + Fixes provision to be able to find the data path again.