Clarify license.

Most Inkscape source code does not specify GPL version, so it is essentially
GPL v1+ under section 9. Authors of the few GPL v2 only files were contacted
and all agreed to relicense under GPL v2 or later. We also have a few files
copies from GIMP, which are GPL v3+, so the complete program is available
under GPL v3 or later.

(bzr r14873)

7 files changed, 10 insertions, 7 deletions

diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp
index decb14184..7d76fa043 100644
--- a/src/display/sp-canvas.cpp
+++ b/src/display/sp-canvas.cpp
@@ -1159,8 +1159,11 @@ void SPCanvas::handle_size_allocate(GtkWidget *widget, GtkAllocation *allocation
         allocation->width, allocation->height);
     if (canvas->_backing_store) {
         cairo_t *cr = cairo_create(new_backing_store);
-        cairo_set_source_surface(cr, canvas->_backing_store, 0, 0);
+        cairo_translate(cr, -canvas->_x0, -canvas->_y0);
         cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
+        cairo_set_source(cr, canvas->_background);
+        cairo_paint(cr);
+        cairo_set_source_surface(cr, canvas->_backing_store, canvas->_x0, canvas->_y0);
         cairo_paint(cr);
         cairo_destroy(cr);
         cairo_surface_destroy(canvas->_backing_store);
diff --git a/src/live_effects/lpe-jointype.cpp b/src/live_effects/lpe-jointype.cpp
index 2eef315dd..fe42932be 100644
--- a/src/live_effects/lpe-jointype.cpp
+++ b/src/live_effects/lpe-jointype.cpp
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2014 Authors
 *
-* Released under GNU GPL v2, read the file 'COPYING' for more information
+* Released under GNU GPL v2+, read the file 'COPYING' for more information
 */
 
 #include "live_effects/parameter/enum.h"
diff --git a/src/live_effects/lpe-jointype.h b/src/live_effects/lpe-jointype.h
index fddaeb619..ef7abdcc7 100644
--- a/src/live_effects/lpe-jointype.h
+++ b/src/live_effects/lpe-jointype.h
@@ -3,7 +3,7 @@
  *

  * Copyright (C) 2014 Authors

  *

- * Released under GNU GPL v2, read the file COPYING for more information

+ * Released under GNU GPL v2+, read the file COPYING for more information

  */

 

 #ifndef INKSCAPE_LPE_JOINTYPE_H

diff --git a/src/main-cmdlineact.cpp b/src/main-cmdlineact.cpp
index ade83dfda..496c16d5d 100644
--- a/src/main-cmdlineact.cpp
+++ b/src/main-cmdlineact.cpp
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 2007 Authors
  *
- * Released under GNU GPL v2, read the file 'COPYING' for more information
+ * Released under GNU GPL v2+, read the file 'COPYING' for more information
  */
 
 #include <ui/view/view.h>
diff --git a/src/main-cmdlineact.h b/src/main-cmdlineact.h
index c8ef64f10..b8ec4403b 100644
--- a/src/main-cmdlineact.h
+++ b/src/main-cmdlineact.h
@@ -12,7 +12,7 @@
  *
  * Copyright (C) 2007 Authors
  *
- * Released under GNU GPL v2.x, read the file 'COPYING' for more information
+ * Released under GNU GPL v2+, read the file 'COPYING' for more information
  */
 
 namespace Inkscape {
diff --git a/src/ui/dialog/object-properties.cpp b/src/ui/dialog/object-properties.cpp
index 75430ed44..be46129c4 100644
--- a/src/ui/dialog/object-properties.cpp
+++ b/src/ui/dialog/object-properties.cpp
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  * Copyright (C) 2012 Kris De Gussem <Kris.DeGussem@gmail.com>
- * c++ version based on former C-version (GPL v2) with authors:
+ * c++ version based on former C-version (GPL v2+) with authors:
  *   Lauris Kaplinski <lauris@kaplinski.com>
  *   bulia byak <buliabyak@users.sf.net>
  *   Johan Engelen <goejendaagh@zonnet.nl>
diff --git a/src/ui/dialog/object-properties.h b/src/ui/dialog/object-properties.h
index 093f273f6..dc28c0bad 100644
--- a/src/ui/dialog/object-properties.h
+++ b/src/ui/dialog/object-properties.h
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  * Copyright (C) 2012 Kris De Gussem <Kris.DeGussem@gmail.com>
- * c++version based on former C-version (GPL v2) with authors:
+ * c++version based on former C-version (GPL v2+) with authors:
  *   Lauris Kaplinski <lauris@kaplinski.com>
  *   bulia byak <buliabyak@users.sf.net>
  *   Johan Engelen <goejendaagh@zonnet.nl>