Fix Apache2 license conflict with GPL with re-license from SOIX upstream

Fixed bugs:
  - https://launchpad.net/bugs/357043

(bzr r12370)

2 files changed, 3 insertions, 23 deletions

diff --git a/src/trace/siox.cpp b/src/trace/siox.cpp
index 1a1426b83..8c9130412 100644
--- a/src/trace/siox.cpp
+++ b/src/trace/siox.cpp
@@ -2,18 +2,8 @@
    Copyright 2005, 2006 by Gerald Friedland, Kristian Jantz and Lars Knipping
 
    Conversion to C++ for Inkscape by Bob Jamison
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+   
+   Released under GNU GPL, read the file 'COPYING' for more information
  */
 #include "siox.h"
 
diff --git a/src/trace/siox.h b/src/trace/siox.h
index 9a44ce1cf..fa18ac238 100644
--- a/src/trace/siox.h
+++ b/src/trace/siox.h
@@ -5,17 +5,7 @@
  *
  *  Conversion to C++ for Inkscape by Bob Jamison
  *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
+ *  Released under GNU GPL, read the file 'COPYING' for more information
  */
 
 /*