Remove upstream applied patch

4 files changed, 8 insertions, 208 deletions

diff --git a/debian/changelog b/debian/changelog
index 6001641..e0eefcc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+scons-doc (2.4.1+repack-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+  * Remove upstream applied debain/patch/0100-license.patch.
+
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Mon, 16 Nov 2015 06:59:20 +0100
+
 scons-doc (2.4.0+repack-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/0500-user_guide.patch b/debian/patches/0001-user_guide.patch
index 4d608d1..4d608d1 100644
--- a/debian/patches/0500-user_guide.patch
+++ b/debian/patches/0001-user_guide.patch
diff --git a/debian/patches/0100-license.patch b/debian/patches/0100-license.patch
deleted file mode 100644
index c6e008a..0000000
--- a/debian/patches/0100-license.patch
+++ /dev/null
@@ -1,206 +0,0 @@
-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/series b/debian/patches/series
index ca893a6..e0c83fc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-0100-license.patch
-0500-user_guide.patch
+0001-user_guide.patch