[SCM] Git repository for devscripts branch, master, updated. v2.11.7-66-ga1d2539

[James McCoy]

The following commit has been merged in the master branch:
commit 1c646d3347104b3e83b321d38759f63533f0e5fc
Author: James McCoy <jamessan at debian.org>
Date:   Sat Jun 16 11:07:20 2012 -0400

    debchange: Add more documentation about the effects of the changelog heuristic
    
    Closes: #673974
    Signed-off-by: James McCoy <jamessan at debian.org>

diff --git a/debian/changelog b/debian/changelog
index a100c6a..3996c10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,10 @@ devscripts (2.11.9) UNRELEASED; urgency=low
   [ Bernhard R. Link ]
   * debchange: fix NMU detection to not NMU QA packages (Closes: #676881)
 
+  [ James McCoy ]
+  * debchange: Add more documentation about the effects of changelog
+    heuristic.  (Closes: #673974)
+
  -- David Prévot <taffit at debian.org>  Thu, 31 May 2012 12:12:02 -0400
 
 devscripts (2.11.8) unstable; urgency=low
diff --git a/scripts/debchange.1 b/scripts/debchange.1
index f7e27f5..ef0be38 100644
--- a/scripts/debchange.1
+++ b/scripts/debchange.1
@@ -155,12 +155,20 @@ this will also change the suffix from buildX to ubuntu1.  Use
 a new section at the beginning of the changelog with appropriate
 headers and footers.  Also, if this is a new version of a native
 Debian package, the directory name is changed to reflect this.
+If \fBDEBCHANGE_RELEASE_HEURISTIC\fR is \fIchangelog\fR (default) and the
+current release is \fIUNRELEASED\fR, this will only change the version of the
+current changelog stanza.  Otherwise, this will create a new changelog stanza
+with the new version.
 .TP
 \fB\-\-newversion \fIversion\fR, \fB\-v \fIversion\fR
 This specifies the version number (including the Debian release part)
 explicitly and behaves as the \fB\-\-increment\fR option in other
 respects.  It will also change the directory name if the upstream
 version number has changed.
+If \fBDEBCHANGE_RELEASE_HEURISTIC\fR is \fIchangelog\fR (default) and the
+current release is \fIUNRELEASED\fR, this will only change the version of the
+current changelog stanza.  Otherwise, this will create a new changelog stanza
+with the new version.
 .TP
 .BR \-\-edit ", " \-e
 Edit the changelog in an editor.
diff --git a/scripts/debchange.pl b/scripts/debchange.pl
index 9e7b933..2c6205e 100755
--- a/scripts/debchange.pl
+++ b/scripts/debchange.pl
@@ -230,8 +230,8 @@ Options:
          Display version information
   At most one of -a, -i, -e, -r, -v, -d, -n, --bin-nmu, -q, --qa, -R, -s,
   --team, --bpo, -l (or their long equivalents) may be used.
-  With no options, one of -i or -a is chosen by looking for a .upload
-  file in the parent directory and checking its contents.
+  With no options, one of -i or -a is chosen by looking at the release
+  specified in the changelog.
 
 Default settings modified by devscripts configuration files:
 $modified_conf_msg

-- 
Git repository for devscripts