[SCM] Git repository for devscripts branch, master, updated. v2.12.4-171-g8910c5f

[Benjamin Drung]

The following commit has been merged in the master branch:
commit 8910c5f23bdf3f9fca07fec06ef81de22b0a7661
Author: Benjamin Drung <bdrung at debian.org>
Date:   Tue Feb 19 17:42:42 2013 +0100

    Add changelog entry and test case for previous commit.

diff --git a/debian/changelog b/debian/changelog
index ae0638e..f3648d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,9 @@
 devscripts (2.13.1) UNRELEASED; urgency=low
 
   [ Laurent Rineau ]
-  * Fix the detection of (L|A)GPL. (Closes: #700938)
+  * licensecheck:
+    - Fix the detection of (L|A)GPL. (Closes: #700938)
+    - Fix comments pattern detection. (Closes: #700944)
 
  -- Benjamin Drung <bdrung at debian.org>  Tue, 19 Feb 2013 17:22:32 +0100
 
diff --git a/test/licensecheck/gpl-variation.c b/test/licensecheck/comments-detection.h
similarity index 80%
copy from test/licensecheck/gpl-variation.c
copy to test/licensecheck/comments-detection.h
index c0b82d6..2d3abd5 100644
--- a/test/licensecheck/gpl-variation.c
+++ b/test/licensecheck/comments-detection.h
@@ -1,7 +1,6 @@
-// Copyright (c) 2013 Devscripts developers
+// Copyright (c) 2013 Devscripts developers.
 // All rights reserved.
 //
-// This file is part of Devscripts.
 // You can redistribute it and/or modify it under the terms of the GNU
 // General Public License as published by the Free Software Foundation,
 // either version 3 of the License, or (at your option) any later version.
@@ -11,3 +10,10 @@
 //
 // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+
+int main() {
+    int return_value = 42
+        / 2
+        / 3;
+    return return_value;
+}
diff --git a/test/test_licensecheck b/test/test_licensecheck
index 8e1a709..f6b4c4e 100755
--- a/test/test_licensecheck
+++ b/test/test_licensecheck
@@ -84,4 +84,8 @@ testFortranComments() {
     license "bsd.f" "BSD (2 clause)"
 }
 
+testCommentsDetection() {
+    license "comments-detection.h" "GPL (v3 or later)"
+}
+
 . shunit2

-- 
Git repository for devscripts