[poppler] 2 commits - poppler/GfxFont.cc poppler/GlobalParams.cc poppler/TextOutputDev.cc poppler/TextOutputDev.h poppler/UnicodeTypeTable.cc poppler/UnicodeTypeTable.h poppler/XpdfPluginAPI.cc

[Albert Astals Cid]

 poppler/GfxFont.cc          |    3 +++
 poppler/GlobalParams.cc     |    3 +++
 poppler/TextOutputDev.cc    |    3 +++
 poppler/TextOutputDev.h     |    3 +++
 poppler/UnicodeTypeTable.cc |    3 +++
 poppler/UnicodeTypeTable.h  |    3 +++
 poppler/XpdfPluginAPI.cc    |    3 +++
 7 files changed, 21 insertions(+)

New commits:
commit 214322f3c66a9aad4e2a46f6e305a3dacaa4f8b1
Author: Albert Astals Cid <aacid at kde.org>
Date:   Sun Jul 10 01:20:21 2011 +0100

    And 3 years later, Ed has answered :-)
    
    Now all our changes are GPLv2+

diff --git a/poppler/GfxFont.cc b/poppler/GfxFont.cc
index d80208d..114c797 100644
--- a/poppler/GfxFont.cc
+++ b/poppler/GfxFont.cc
@@ -10,6 +10,9 @@
 //
 // Modified under the Poppler project - http://poppler.freedesktop.org
 //
+// All changes made under the Poppler project to this file are licensed
+// under GPL version 2 or later
+//
 // Copyright (C) 2005, 2006, 2008-2010 Albert Astals Cid <aacid at kde.org>
 // Copyright (C) 2005, 2006 Kristian Høgsberg <krh at redhat.com>
 // Copyright (C) 2006 Takashi Iwai <tiwai at suse.de>
diff --git a/poppler/GlobalParams.cc b/poppler/GlobalParams.cc
index 1e0cdc4..3b4c001 100644
--- a/poppler/GlobalParams.cc
+++ b/poppler/GlobalParams.cc
@@ -10,6 +10,9 @@
 //
 // Modified under the Poppler project - http://poppler.freedesktop.org
 //
+// All changes made under the Poppler project to this file are licensed
+// under GPL version 2 or later
+//
 // Copyright (C) 2005 Martin Kretzschmar <martink at gnome.org>
 // Copyright (C) 2005, 2006 Kristian Høgsberg <krh at redhat.com>
 // Copyright (C) 2005, 2007-2010 Albert Astals Cid <aacid at kde.org>
diff --git a/poppler/TextOutputDev.cc b/poppler/TextOutputDev.cc
index 91b8c34..6c89510 100644
--- a/poppler/TextOutputDev.cc
+++ b/poppler/TextOutputDev.cc
@@ -10,6 +10,9 @@
 //
 // Modified under the Poppler project - http://poppler.freedesktop.org
 //
+// All changes made under the Poppler project to this file are licensed
+// under GPL version 2 or later
+//
 // Copyright (C) 2005-2007 Kristian Høgsberg <krh at redhat.com>
 // Copyright (C) 2005 Nickolay V. Shmyrev <nshmyrev at yandex.ru>
 // Copyright (C) 2006-2008, 2011 Carlos Garcia Campos <carlosgc at gnome.org>
diff --git a/poppler/TextOutputDev.h b/poppler/TextOutputDev.h
index b6b6952..d647340 100644
--- a/poppler/TextOutputDev.h
+++ b/poppler/TextOutputDev.h
@@ -10,6 +10,9 @@
 //
 // Modified under the Poppler project - http://poppler.freedesktop.org
 //
+// All changes made under the Poppler project to this file are licensed
+// under GPL version 2 or later
+//
 // Copyright (C) 2005-2007 Kristian Høgsberg <krh at redhat.com>
 // Copyright (C) 2006 Ed Catmur <ed at catmur.co.uk>
 // Copyright (C) 2007, 2008, 2011 Carlos Garcia Campos <carlosgc at gnome.org>
diff --git a/poppler/UnicodeTypeTable.cc b/poppler/UnicodeTypeTable.cc
index c0483a5..f18930f 100644
--- a/poppler/UnicodeTypeTable.cc
+++ b/poppler/UnicodeTypeTable.cc
@@ -10,6 +10,9 @@
 //
 // Modified under the Poppler project - http://poppler.freedesktop.org
 //
+// All changes made under the Poppler project to this file are licensed
+// under GPL version 2 or later
+//
 // Copyright (C) 2006, 2007 Ed Catmur <ed at catmur.co.uk>
 // Copyright (C) 2007 Jeff Muizelaar <jeff at infidigm.net>
 // Copyright (C) 2008 Albert Astals Cid <aacid at kde.org>
diff --git a/poppler/UnicodeTypeTable.h b/poppler/UnicodeTypeTable.h
index 939e916..19cd75d 100644
--- a/poppler/UnicodeTypeTable.h
+++ b/poppler/UnicodeTypeTable.h
@@ -10,6 +10,9 @@
 //
 // Modified under the Poppler project - http://poppler.freedesktop.org
 //
+// All changes made under the Poppler project to this file are licensed
+// under GPL version 2 or later
+//
 // Copyright (C) 2006 Ed Catmur <ed at catmur.co.uk>
 //
 // To see a description of the changes please see the Changelog file that
commit 37cc1344672f480d4062aafbd2f3245ca1392279
Author: Albert Astals Cid <aacid at kde.org>
Date:   Sun Jul 10 01:15:44 2011 +0100

    Fix header
    
    The file was modified in 2009 and README.contributors stating everything is GPLv2+ is from 2008

diff --git a/poppler/XpdfPluginAPI.cc b/poppler/XpdfPluginAPI.cc
index 94d2851..a4e0f0e 100644
--- a/poppler/XpdfPluginAPI.cc
+++ b/poppler/XpdfPluginAPI.cc
@@ -10,6 +10,9 @@
 //
 // Modified under the Poppler project - http://poppler.freedesktop.org
 //
+// All changes made under the Poppler project to this file are licensed
+// under GPL version 2 or later
+//
 // Copyright (C) 2009 Kovid Goyal <kovid at kovidgoyal.net>
 //
 // To see a description of the changes please see the Changelog file that