[SCM] Git repository for devscripts branch, master, updated. v2.13.2-1-g10b3083

[James McCoy]

The following commit has been merged in the master branch:
commit 10b3083e7a2148fc8fb5b676cb4d0ead12294b98
Author: gregor herrmann <gregoa at debian.org>
Date:   Mon May 13 18:57:41 2013 +0200

    debcommit: include package names in (git) tags for -r
    
    On Sun, 31 Mar 2013 17:19:32 +0200, gregor herrmann wrote:
    
    > I've now put together a quick patch that does the same for debcommit:
    > add the source package name to commit messages and output messages
    > for release/tag.
    
    Updated for the newer debcommit in devscripts 2.13.2.
    
    Cheers,
    gregor
    
    --
     .''`.  Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06
     : :' : Debian GNU/Linux user, admin, and developer  -  http://www.debian.org/
     `. `'  Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe
       `-   NP: Chavela Vargas: Volver Volver
    
    Signed-off-by: James McCoy <jamessan at debian.org>

diff --git a/debian/changelog b/debian/changelog
index 745b1a7..cb85758 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+devscripts (2.13.3) UNRELEASED; urgency=low
+
+  [ gregor herrmann ]
+  * debcommit: Add the source package name to commit/tag messages.  (Closes:
+    #704236)
+
+ -- James McCoy <jamessan at debian.org>  Mon, 13 May 2013 22:43:59 -0400
+
 devscripts (2.13.2) unstable; urgency=low
 
   [ Julian Gilbey ]
diff --git a/scripts/debcommit.pl b/scripts/debcommit.pl
index 684928a..675d063 100755
--- a/scripts/debcommit.pl
+++ b/scripts/debcommit.pl
@@ -244,7 +244,7 @@ my $signtags=0;
 my $changelog;
 my $changelog_info=0;
 my $keyid;
-my ($version, $date, $maintainer);
+my ($package, $version, $date, $maintainer);
 my $onlydebian=0;
 
 # Now start by reading configuration files and then command line
@@ -359,9 +359,10 @@ if ($release || $changelog_info) {
 	if ($log->{Distribution} =~ /UNRELEASED/) {
 	    die "debcommit: $changelog says it's UNRELEASED\nTry running dch --release first\n";
 	}
+	$package = $log->{Source};
 	$version = $log->{Version};
 
-	$message="releasing version $version" if ! defined $message;
+	$message="releasing package $package version $version" if ! defined $message;
     }
     if ($changelog_info) {
 	$maintainer = $log->{Maintainer};
@@ -377,7 +378,7 @@ if ($edit) {
 
 if (not $confirm or confirm($message)) {
     commit($message);
-    tag($version) if $release;
+    tag($package, $version) if $release;
 }
 
 # End of code, only subs below
@@ -601,7 +602,7 @@ sub commit {
 }
 
 sub tag {
-    my $tag=shift;
+    my ($package, $tag) = @_;
 
     if ($prog eq 'svn' || $prog eq 'svk') {
 	my $svnpath=`svnpath`;
@@ -610,11 +611,11 @@ sub tag {
 	chomp $tagpath;
 
 	if (! action($prog, "copy", $svnpath, "$tagpath/$tag",
-		     "-m", "tagging version $tag")) {
+		     "-m", "tagging package $package version $tag")) {
 	    if (! action($prog, "mkdir", $tagpath,
 			 "-m", "create tag directory") ||
 		! action($prog, "copy", $svnpath, "$tagpath/$tag",
-			 "-m", "tagging version $tag")) {
+			 "-m", "tagging package $package version $tag")) {
 		die "debcommit: failed tagging with $tag\n";
 	    }
 	}
@@ -663,13 +664,13 @@ sub tag {
 	if ($signtags) {
 		if (defined $keyid) {
 			if (! action($prog, "tag", "-u", $keyid, "-m",
-			             "tagging version $tag", $tag)) {
+			             "tagging package $package version $tag", $tag)) {
 	        		die "debcommit: failed tagging with $tag\n";
 			}
 		}
 		else {
 			if (! action($prog, "tag", "-s", "-m",
-			             "tagging version $tag", $tag)) {
+			             "tagging package $package version $tag", $tag)) {
 	        		die "debcommit: failed tagging with $tag\n";
 			}
 		}
@@ -681,7 +682,7 @@ sub tag {
     elsif ($prog eq 'hg') {
 	$tag=~s/^[0-9]+://; # strip epoch
 	$tag="debian-$tag";
-    	if (! action($prog, "tag", "-m", "tagging version $tag", $tag)) {
+	if (! action($prog, "tag", "-m", "tagging package $package version $tag", $tag)) {
 	        die "debcommit: failed tagging with $tag\n";
     	}
     }

-- 
Git repository for devscripts