After some thoughts, find another way to document the changes that were really made...

git-svn-id: svn://svn.debian.org/svn/pkg-samba/trunk/samba@4039 fc4039ab-9d04-0410-8cac-899223bdd6b0

diff --git a/debian/changelog b/debian/changelog
index d889dc9e87df8e35355af6e7db3b146354d58aed..d2e3a2521550075b9d98572fa16c6e9f8d0a5962 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+samba (2:3.6.3-3) UNRELEASED; urgency=low
+
+  * Two changes in the previous version should indeed read:
+    - samba.postinst: Avoid scary pdbedit warnings on first import.
+    - samba-common.postinst: Add more informative error message for the case
+      where smb.conf was manually deleted.
+    Closes: #664509
+  
+
+ -- Christian Perrier <bubulle@debian.org>  Sun, 18 Mar 2012 19:00:30 +0100
+
 samba (2:3.6.3-2) unstable; urgency=low
 
   [ Christian Perrier ]
@@ -7,8 +18,8 @@ samba (2:3.6.3-2) unstable; urgency=low
   * Lower priority of debconf question to medium after some pondering.
     After all, we have a sane default. Closes: #662801
   * Merge some Ubuntu patches:
-    - samba.postinst: Avoid scary pdbedit warnings on first import.
-    - samba-common.postinst: Add more informative error message for the case
+    - samba.config: Avoid scary pdbedit warnings on first import.
+    - samba.postinst: Add more informative error message for the case
       where smb.conf was manually deleted.
 
   [ Maarten Bezemer ]