[SCM] Git repository for devscripts branch, master, updated. v2.11.7-4-ge269155

[James McCoy]

The following commit has been merged in the master branch:
commit e269155ab8650df671ab89ada852973166b415bc
Author: James McCoy <jamessan at debian.org>
Date:   Tue May 15 20:08:04 2012 -0400

    Also note DEBCHANGE_MAINTTRAILER change in NEWS entry for 2.11.7.
    
    Closes: #672973
    Signed-off-by: James McCoy <jamessan at debian.org>

diff --git a/debian/NEWS b/debian/NEWS
index 144b4b5..a2bf585 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -5,6 +5,10 @@ devscripts (2.11.7) unstable; urgency=low
   behavior, DEBCHANGE_RELEASE_HEURISTIC=log can be added to the configuration
   file.
 
+  Enabling the changelog heuristic also enables DEBCHANGE_MAINTTRAILER.  This
+  can be disabled by adding DEBCHANGE_MAINTTRAILER=no to the configuration
+  file.
+
  -- James McCoy <jamessan at debian.org>  Sun, 29 Apr 2012 18:38:46 -0400
 
 devscripts (2.11.2) unstable; urgency=low
diff --git a/debian/changelog b/debian/changelog
index 294768d..bef5745 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ devscripts (2.11.8) UNRELEASED; urgency=low
   [ James McCoy ]
   * dd-list:
     + Recognize -h argument, as documented.
+  * Also note DEBCHANGE_MAINTTRAILER change in NEWS entry for 2.11.7.
+    (Closes: #672973)
 
  -- David Prévot <taffit at debian.org>  Sun, 06 May 2012 23:26:05 -0400
 

-- 
Git repository for devscripts