[SCM] Git repository for devscripts branch, master, updated. v2.12.4-169-g4d71afa

Benjamin Drung bdrung at debian.org
Tue Feb 19 16:24:25 UTC 2013


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

    Add changelog entry and test case for previous commit.

diff --git a/debian/changelog b/debian/changelog
index e14b33d..ae0638e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+devscripts (2.13.1) UNRELEASED; urgency=low
+
+  [ Laurent Rineau ]
+  * Fix the detection of (L|A)GPL. (Closes: #700938)
+
+ -- Benjamin Drung <bdrung at debian.org>  Tue, 19 Feb 2013 17:22:32 +0100
+
 devscripts (2.13.0) experimental; urgency=low
 
   [ Christoph Berg ]
diff --git a/test/licensecheck/gpl-variation.c b/test/licensecheck/lgpl-3+.h
similarity index 55%
copy from test/licensecheck/gpl-variation.c
copy to test/licensecheck/lgpl-3+.h
index c0b82d6..4ab70af 100644
--- a/test/licensecheck/gpl-variation.c
+++ b/test/licensecheck/lgpl-3+.h
@@ -1,13 +1,13 @@
 // 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,
+// The files in this directory are part of the Devscripts Library.
+// You can redistribute them and/or  modify them under the terms of the
+// GNU Lesser General Public License as published by the Free Software Foundation;
 // either version 3 of the License, or (at your option) any later version.
 //
 // Licensees holding a valid commercial license may use this file in
 // accordance with the commercial license agreement provided with the software.
 //
-// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+// These files are provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/test/test_licensecheck b/test/test_licensecheck
index c965413..8e1a709 100755
--- a/test/test_licensecheck
+++ b/test/test_licensecheck
@@ -47,6 +47,7 @@ testLGPL() {
     license "lgpl-2.1.c" "LGPL (v2.1)"
     license "lgpl-2.1.h" "LGPL (v2.1)"
     license "lgpl-2.s" "LGPL (v2)"
+    license "lgpl-3+.h" "LGPL (v3 or later)"
     license "lgpl-variation.c" "LGPL (v3 or later)"
 }
 

-- 
Git repository for devscripts



More information about the devscripts-devel mailing list