From 957f2c55744c1b473180f03838c26de7e68df89b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 16 Nov 2015 07:09:25 +0100 Subject: Remove upstream applied patch --- debian/changelog | 7 ++ debian/patches/0001-user_guide.patch | 26 +++++ debian/patches/0100-license.patch | 206 ----------------------------------- debian/patches/0500-user_guide.patch | 26 ----- debian/patches/series | 3 +- 5 files changed, 34 insertions(+), 234 deletions(-) create mode 100644 debian/patches/0001-user_guide.patch delete mode 100644 debian/patches/0100-license.patch delete mode 100644 debian/patches/0500-user_guide.patch (limited to 'debian') 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 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/0001-user_guide.patch b/debian/patches/0001-user_guide.patch new file mode 100644 index 0000000..4d608d1 --- /dev/null +++ b/debian/patches/0001-user_guide.patch @@ -0,0 +1,26 @@ +Description: Build User Guide only +Author: Luca Falavigna +Forwarded: not-needed +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 ++++ trunk/doc/SConscript +@@ -308,12 +308,12 @@ else: + DOCTARGETS = 0 + DOCDEPENDS = 1 + DOCNODES = 2 +- docs = {'design' : (['chunked','pdf'], [], []), ++ docs = {#'design' : (['chunked','pdf'], [], []), + #'python10' : (['chunked','html','pdf'], [], []), +- 'reference' : (['chunked','html','pdf'], [], []), ++ #'reference' : (['chunked','html','pdf'], [], []), + #'developer' : (['chunked','html','pdf'], [], []), + 'user' : (['chunked','html','pdf','epub','text'], [], []), +- 'man' : (['man','epub','text'], [], []) ++ #'man' : (['man','epub','text'], [], []) + } + + # 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 -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 @@ - - - -+ rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" /> - - -+ rdf:about="http://creativecommons.org/licenses/by-sa/3.0/"> - -+ rdf:resource="http://creativecommons.org/ns#Reproduction" /> - -+ rdf:resource="http://creativecommons.org/ns#Distribution" /> - -+ rdf:resource="http://creativecommons.org/ns#Notice" /> - -- -+ rdf:resource="http://creativecommons.org/ns#Attribution" /> - -+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /> - -+ rdf:resource="http://creativecommons.org/ns#ShareAlike" /> - - - -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 @@ - - - -+ rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" /> - - -+ rdf:about="http://creativecommons.org/licenses/by-sa/3.0/"> - -+ rdf:resource="http://creativecommons.org/ns#Reproduction" /> - -+ rdf:resource="http://creativecommons.org/ns#Distribution" /> - -+ rdf:resource="http://creativecommons.org/ns#Notice" /> - -- -+ rdf:resource="http://creativecommons.org/ns#Attribution" /> - -+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /> - -+ rdf:resource="http://creativecommons.org/ns#ShareAlike" /> - - - -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 @@ - - - -+ rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" /> - - -+ rdf:about="http://creativecommons.org/licenses/by-sa/3.0/"> - -+ rdf:resource="http://creativecommons.org/ns#Reproduction" /> - -+ rdf:resource="http://creativecommons.org/ns#Distribution" /> - -+ rdf:resource="http://creativecommons.org/ns#Notice" /> - -- -+ rdf:resource="http://creativecommons.org/ns#Attribution" /> - -+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /> - -+ rdf:resource="http://creativecommons.org/ns#ShareAlike" /> - - - -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 @@ - - - -+ rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" /> - - -+ rdf:about="http://creativecommons.org/licenses/by-sa/3.0/"> - -+ rdf:resource="http://creativecommons.org/ns#Reproduction" /> - -+ rdf:resource="http://creativecommons.org/ns#Distribution" /> - -+ rdf:resource="http://creativecommons.org/ns#Notice" /> - -- -+ rdf:resource="http://creativecommons.org/ns#Attribution" /> - -+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /> - -+ rdf:resource="http://creativecommons.org/ns#ShareAlike" /> - - - diff --git a/debian/patches/0500-user_guide.patch b/debian/patches/0500-user_guide.patch deleted file mode 100644 index 4d608d1..0000000 --- a/debian/patches/0500-user_guide.patch +++ /dev/null @@ -1,26 +0,0 @@ -Description: Build User Guide only -Author: Luca Falavigna -Forwarded: not-needed -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 -+++ trunk/doc/SConscript -@@ -308,12 +308,12 @@ else: - DOCTARGETS = 0 - DOCDEPENDS = 1 - DOCNODES = 2 -- docs = {'design' : (['chunked','pdf'], [], []), -+ docs = {#'design' : (['chunked','pdf'], [], []), - #'python10' : (['chunked','html','pdf'], [], []), -- 'reference' : (['chunked','html','pdf'], [], []), -+ #'reference' : (['chunked','html','pdf'], [], []), - #'developer' : (['chunked','html','pdf'], [], []), - 'user' : (['chunked','html','pdf','epub','text'], [], []), -- 'man' : (['man','epub','text'], [], []) -+ #'man' : (['man','epub','text'], [], []) - } - - # 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 -- cgit v1.2.3