[Pkg-cli-libs-commits] [SCM] poppler-sharp branch, master, updated. debian/0.0.1-1-1-g00611d5

[Chow Loong Jin]

The following commit has been merged in the master branch:
commit 00611d53f1afa33f198bf77488d27d4437052c5b
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Tue Jun 22 12:57:46 2010 +0800

    GPL-2+ => GPL-2
    
    * debian/copyright:
      + Amend to GPL-2, rather than GPL-2+, since poppler is licensed under
        GPL-2, so derived works such as poppler-sharp cannot be licensed
        under GPL-2+

diff --git a/debian/changelog b/debian/changelog
index 1906a2a..01298b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+poppler-sharp (0.0.1-2) UNRELEASED; urgency=low
+
+  * debian/copyright:
+    + Amend to GPL-2, rather than GPL-2+, since poppler is licensed under
+      GPL-2, so derived works such as poppler-sharp cannot be licensed
+      under GPL-2+
+
+ -- Chow Loong Jin <hyperair at ubuntu.com>  Tue, 22 Jun 2010 12:57:24 +0800
+
 poppler-sharp (0.0.1-1) unstable; urgency=low
 
   * Initial release (Closes: #585517)
diff --git a/debian/copyright b/debian/copyright
index 05a9d38..057d8ff 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,11 +5,10 @@ Source: http://github.com/jacintos/poppler-sharp/downloads
 
 Files: *
 Copyright: Jacinto Shy, Jr. <jacinto.m.shy at gmail.com>
-License: GPL-2+
+License: GPL-2
  This program is free software; 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 2 of the License, or
- (at your option) any later version.
+ the Free Software Foundation; either version 2 of the License.
  .
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of

-- 
poppler-sharp