make dfsg ready

3 files changed, 211 insertions, 4 deletions

diff --git a/debian/patches/0100-license.patch b/debian/patches/0100-license.patch
new file mode 100644
index 0000000..c6e008a
--- /dev/null
+++ b/debian/patches/0100-license.patch
@@ -0,0 +1,206 @@
+Description: Change license from cc-by-nc-sa to cc-by-sa
+ Cherry-picked from upstream
+Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
+Origin: https://bitbucket.org/scons/scons/pull-request/238/fixed-license-of-svg-titlepage-files-2985/diff
+Bug: http://scons.tigris.org/issues/show_bug.cgi?id=2985
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=787356
+Forwarded: not-needed
+Last-Update: 2015-06-05
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/doc/design/titlepage/SConsBuildBricks_path.svg
+===================================================================
+--- trunk.orig/doc/design/titlepage/SConsBuildBricks_path.svg
++++ trunk/doc/design/titlepage/SConsBuildBricks_path.svg
+@@ -14,9 +14,9 @@
+    height="80.330002"
+    id="svg2"
+    sodipodi:version="0.32"
+-   inkscape:version="0.48.1 r9760"
++   inkscape:version="0.48.4 r9939"
+    version="1.0"
+-   sodipodi:docname="SConsBuildBricks.svg"
++   sodipodi:docname="SConsBuildBricks_path.svg"
+    inkscape:export-filename="Constructs-using-SCons.png"
+    inkscape:export-xdpi="100"
+    inkscape:export-ydpi="100">
+@@ -77,24 +77,22 @@
+           </cc:Agent>
+         </dc:contributor>
+         <cc:license
+-           rdf:resource="http://creativecommons.org/licenses/by-nc-sa/2.0/" />
++           rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
+       </cc:Work>
+       <cc:License
+-         rdf:about="http://creativecommons.org/licenses/by-nc-sa/2.5/">
++         rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
+         <cc:permits
+-           rdf:resource="http://web.resource.org/cc/Reproduction" />
++           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+         <cc:permits
+-           rdf:resource="http://web.resource.org/cc/Distribution" />
++           rdf:resource="http://creativecommons.org/ns#Distribution" />
+         <cc:requires
+-           rdf:resource="http://web.resource.org/cc/Notice" />
++           rdf:resource="http://creativecommons.org/ns#Notice" />
+         <cc:requires
+-           rdf:resource="http://web.resource.org/cc/Attribution" />
+-        <cc:prohibits
+-           rdf:resource="http://web.resource.org/cc/CommercialUse" />
++           rdf:resource="http://creativecommons.org/ns#Attribution" />
+         <cc:permits
+-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
++           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+         <cc:requires
+-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
++           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+       </cc:License>
+     </rdf:RDF>
+   </metadata>
+Index: trunk/doc/man/titlepage/SConsBuildBricks_path.svg
+===================================================================
+--- trunk.orig/doc/man/titlepage/SConsBuildBricks_path.svg
++++ trunk/doc/man/titlepage/SConsBuildBricks_path.svg
+@@ -14,9 +14,9 @@
+    height="80.330002"
+    id="svg2"
+    sodipodi:version="0.32"
+-   inkscape:version="0.48.1 r9760"
++   inkscape:version="0.48.4 r9939"
+    version="1.0"
+-   sodipodi:docname="SConsBuildBricks.svg"
++   sodipodi:docname="SConsBuildBricks_path.svg"
+    inkscape:export-filename="Constructs-using-SCons.png"
+    inkscape:export-xdpi="100"
+    inkscape:export-ydpi="100">
+@@ -77,24 +77,22 @@
+           </cc:Agent>
+         </dc:contributor>
+         <cc:license
+-           rdf:resource="http://creativecommons.org/licenses/by-nc-sa/2.0/" />
++           rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
+       </cc:Work>
+       <cc:License
+-         rdf:about="http://creativecommons.org/licenses/by-nc-sa/2.5/">
++         rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
+         <cc:permits
+-           rdf:resource="http://web.resource.org/cc/Reproduction" />
++           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+         <cc:permits
+-           rdf:resource="http://web.resource.org/cc/Distribution" />
++           rdf:resource="http://creativecommons.org/ns#Distribution" />
+         <cc:requires
+-           rdf:resource="http://web.resource.org/cc/Notice" />
++           rdf:resource="http://creativecommons.org/ns#Notice" />
+         <cc:requires
+-           rdf:resource="http://web.resource.org/cc/Attribution" />
+-        <cc:prohibits
+-           rdf:resource="http://web.resource.org/cc/CommercialUse" />
++           rdf:resource="http://creativecommons.org/ns#Attribution" />
+         <cc:permits
+-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
++           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+         <cc:requires
+-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
++           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+       </cc:License>
+     </rdf:RDF>
+   </metadata>
+Index: trunk/doc/reference/titlepage/SConsBuildBricks_path.svg
+===================================================================
+--- trunk.orig/doc/reference/titlepage/SConsBuildBricks_path.svg
++++ trunk/doc/reference/titlepage/SConsBuildBricks_path.svg
+@@ -14,9 +14,9 @@
+    height="80.330002"
+    id="svg2"
+    sodipodi:version="0.32"
+-   inkscape:version="0.48.1 r9760"
++   inkscape:version="0.48.4 r9939"
+    version="1.0"
+-   sodipodi:docname="SConsBuildBricks.svg"
++   sodipodi:docname="SConsBuildBricks_path.svg"
+    inkscape:export-filename="Constructs-using-SCons.png"
+    inkscape:export-xdpi="100"
+    inkscape:export-ydpi="100">
+@@ -77,24 +77,22 @@
+           </cc:Agent>
+         </dc:contributor>
+         <cc:license
+-           rdf:resource="http://creativecommons.org/licenses/by-nc-sa/2.0/" />
++           rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
+       </cc:Work>
+       <cc:License
+-         rdf:about="http://creativecommons.org/licenses/by-nc-sa/2.5/">
++         rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
+         <cc:permits
+-           rdf:resource="http://web.resource.org/cc/Reproduction" />
++           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+         <cc:permits
+-           rdf:resource="http://web.resource.org/cc/Distribution" />
++           rdf:resource="http://creativecommons.org/ns#Distribution" />
+         <cc:requires
+-           rdf:resource="http://web.resource.org/cc/Notice" />
++           rdf:resource="http://creativecommons.org/ns#Notice" />
+         <cc:requires
+-           rdf:resource="http://web.resource.org/cc/Attribution" />
+-        <cc:prohibits
+-           rdf:resource="http://web.resource.org/cc/CommercialUse" />
++           rdf:resource="http://creativecommons.org/ns#Attribution" />
+         <cc:permits
+-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
++           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+         <cc:requires
+-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
++           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+       </cc:License>
+     </rdf:RDF>
+   </metadata>
+Index: trunk/doc/user/titlepage/SConsBuildBricks_path.svg
+===================================================================
+--- trunk.orig/doc/user/titlepage/SConsBuildBricks_path.svg
++++ trunk/doc/user/titlepage/SConsBuildBricks_path.svg
+@@ -14,9 +14,9 @@
+    height="80.330002"
+    id="svg2"
+    sodipodi:version="0.32"
+-   inkscape:version="0.48.1 r9760"
++   inkscape:version="0.48.4 r9939"
+    version="1.0"
+-   sodipodi:docname="SConsBuildBricks.svg"
++   sodipodi:docname="SConsBuildBricks_path.svg"
+    inkscape:export-filename="Constructs-using-SCons.png"
+    inkscape:export-xdpi="100"
+    inkscape:export-ydpi="100">
+@@ -77,24 +77,22 @@
+           </cc:Agent>
+         </dc:contributor>
+         <cc:license
+-           rdf:resource="http://creativecommons.org/licenses/by-nc-sa/2.0/" />
++           rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
+       </cc:Work>
+       <cc:License
+-         rdf:about="http://creativecommons.org/licenses/by-nc-sa/2.5/">
++         rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
+         <cc:permits
+-           rdf:resource="http://web.resource.org/cc/Reproduction" />
++           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+         <cc:permits
+-           rdf:resource="http://web.resource.org/cc/Distribution" />
++           rdf:resource="http://creativecommons.org/ns#Distribution" />
+         <cc:requires
+-           rdf:resource="http://web.resource.org/cc/Notice" />
++           rdf:resource="http://creativecommons.org/ns#Notice" />
+         <cc:requires
+-           rdf:resource="http://web.resource.org/cc/Attribution" />
+-        <cc:prohibits
+-           rdf:resource="http://web.resource.org/cc/CommercialUse" />
++           rdf:resource="http://creativecommons.org/ns#Attribution" />
+         <cc:permits
+-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
++           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+         <cc:requires
+-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
++           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+       </cc:License>
+     </rdf:RDF>
+   </metadata>
diff --git a/debian/patches/user_guide.patch b/debian/patches/0500-user_guide.patch
index b6adcdd..deae5bf 100644
--- a/debian/patches/user_guide.patch
+++ b/debian/patches/0500-user_guide.patch
@@ -6,9 +6,9 @@ Last-Update: 2014-07-26
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 Index: trunk/doc/SConscript
 ===================================================================
---- trunk.orig/doc/SConscript	2014-07-05 15:44:22.000000000 +0200
-+++ trunk/doc/SConscript	2014-07-26 14:00:34.514151395 +0200
-@@ -266,12 +266,12 @@
+--- trunk.orig/doc/SConscript
++++ trunk/doc/SConscript
+@@ -267,12 +267,12 @@ else:
      DOCTARGETS = 0
      DOCDEPENDS = 1
      DOCNODES = 2
diff --git a/debian/patches/series b/debian/patches/series
index 8914f1d..ca893a6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
-user_guide.patch
+0100-license.patch
+0500-user_guide.patch