[SCM] Git repository for devscripts branch, master, updated. v2.12.0-21-gcbc235e

[Benjamin Drung]

The following commit has been merged in the master branch:
commit cbc235e612c681cd15860eeb45b02d02d7edb430
Author: Benjamin Drung <bdrung at debian.org>
Date:   Thu Aug 2 23:59:21 2012 +0200

    Add changelog entry and test case for previous commit.

diff --git a/debian/changelog b/debian/changelog
index ca67d65..67c321a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ devscripts (2.12.2) UNRELEASED; urgency=low
 
   [ Ville Skyttä ]
   * Spelling fixes.
+  * licensecheck: Trim trailing comma from some GPL notices' versions.
 
   [ David Prévot ]
   * licensecheck.1: Consistency fix.
diff --git a/test/licensecheck/gpl-2-comma.sh b/test/licensecheck/gpl-2-comma.sh
new file mode 100644
index 0000000..c1dd41a
--- /dev/null
+++ b/test/licensecheck/gpl-2-comma.sh
@@ -0,0 +1,5 @@
+# Copyright (C) 2012 Devscripts developers
+#
+# This program is free software. you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2, as
+# published by the Free Software Foundation.
diff --git a/test/test_licensecheck b/test/test_licensecheck
index a8814d1..fd7ce3f 100755
--- a/test/test_licensecheck
+++ b/test/test_licensecheck
@@ -40,6 +40,7 @@ testLGPL() {
 
 testGPL() {
     license "gpl-2" "GPL (v2)"
+    license "gpl-2-comma.sh" "GPL (v2)"
 }
 
 testDual() {

-- 
Git repository for devscripts