From 6444976013c07e4ada22294223ac386a6c35848e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 28 Sep 2017 11:23:54 +0200 Subject: New upstream release, refresh patches --- debian/changelog | 7 +++++++ debian/control | 1 + debian/patches/0110-remove_stale_files.patch | 4 ++-- debian/patches/0115-secure_script_scons.patch | 2 +- debian/patches/0120-fix-bibtex-call.patch | 4 ++-- debian/patches/0600-manpage-spelling.patch | 24 ++++++++++++------------ 6 files changed, 25 insertions(+), 17 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ca830c5..52d12e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +scons (3.0.0-1) UNRELEASED; urgency=medium + + * New upstream release. + - Refresh patches. + + -- Jörg Frings-Fürst Thu, 28 Sep 2017 10:22:56 +0200 + scons (2.5.1-1) unstable; urgency=medium * New upstream release. diff --git a/debian/control b/debian/control index fca11e7..878f29d 100644 --- a/debian/control +++ b/debian/control @@ -22,3 +22,4 @@ Description: replacement for make support. SCons rule sets are Python scripts so as well as the features it provides itself SCons allows you to use the full power of Python to control compilation. + diff --git a/debian/patches/0110-remove_stale_files.patch b/debian/patches/0110-remove_stale_files.patch index d4be6bf..0fd1a6a 100644 --- a/debian/patches/0110-remove_stale_files.patch +++ b/debian/patches/0110-remove_stale_files.patch @@ -7,8 +7,8 @@ Index: trunk/engine/SCons/Script/Main.py =================================================================== --- trunk.orig/engine/SCons/Script/Main.py +++ trunk/engine/SCons/Script/Main.py -@@ -1094,6 +1094,21 @@ def _main(parser): - print 'Found nothing to build' +@@ -1106,6 +1106,21 @@ def _main(parser): + print('Found nothing to build') exit_status = 2 + # Remove temporary files left by SCons diff --git a/debian/patches/0115-secure_script_scons.patch b/debian/patches/0115-secure_script_scons.patch index 7463f32..24d9cf6 100644 --- a/debian/patches/0115-secure_script_scons.patch +++ b/debian/patches/0115-secure_script_scons.patch @@ -8,7 +8,7 @@ Index: trunk/script/scons =================================================================== --- trunk.orig/script/scons +++ trunk/script/scons -@@ -75,8 +75,8 @@ if "SCONS_LIB_DIR" in os.environ: +@@ -77,8 +77,8 @@ if "SCONS_LIB_DIR" in os.environ: # - running from source takes priority (since 2.3.2), excluding SCONS_LIB_DIR settings script_path = os.path.abspath(os.path.dirname(__file__)) diff --git a/debian/patches/0120-fix-bibtex-call.patch b/debian/patches/0120-fix-bibtex-call.patch index ea82ca5..703ddaf 100644 --- a/debian/patches/0120-fix-bibtex-call.patch +++ b/debian/patches/0120-fix-bibtex-call.patch @@ -10,7 +10,7 @@ Index: trunk/engine/SCons/Tool/tex.py =================================================================== --- trunk.orig/engine/SCons/Tool/tex.py +++ trunk/engine/SCons/Tool/tex.py -@@ -346,6 +346,13 @@ def InternalLaTeXAuxAction(XXXLaTeXActio +@@ -347,6 +347,13 @@ def InternalLaTeXAuxAction(XXXLaTeXActio if result != 0: check_file_error_message(env['BIBTEX'], 'blg') must_rerun_latex = True @@ -24,7 +24,7 @@ Index: trunk/engine/SCons/Tool/tex.py # Now decide if biber will need to be run. # When the backend for biblatex is biber (by choice or default) the -@@ -369,6 +376,13 @@ def InternalLaTeXAuxAction(XXXLaTeXActio +@@ -370,6 +377,13 @@ def InternalLaTeXAuxAction(XXXLaTeXActio if result != 0: check_file_error_message(env['BIBER'], 'blg') must_rerun_latex = True diff --git a/debian/patches/0600-manpage-spelling.patch b/debian/patches/0600-manpage-spelling.patch index f66ea23..6543a2e 100644 --- a/debian/patches/0600-manpage-spelling.patch +++ b/debian/patches/0600-manpage-spelling.patch @@ -16,7 +16,7 @@ Index: trunk/scons.1 .RE .PP \-\-config=force -@@ -6350,7 +6350,7 @@ env\&.Substfile(\*(Aqfoo\&.in\*(Aq, SUBS +@@ -6376,7 +6376,7 @@ env\&.Substfile(\*(Aqfoo\&.in\*(Aq, SUBS good_foo = [(\*(Aq$foobar\*(Aq, \*(Aq$foobar\*(Aq), (\*(Aq$foo\*(Aq, \*(Aq$foo\*(Aq)] env\&.Substfile(\*(Aqfoo\&.in\*(Aq, SUBST_DICT = good_foo) @@ -25,7 +25,7 @@ Index: trunk/scons.1 bad_bar = {\*(Aq@bar@\*(Aq: \*(Aq@soap@\*(Aq, \*(Aq@soap@\*(Aq: \*(Aqlye\*(Aq} env\&.Substfile(\*(Aqbar\&.in\*(Aq, SUBST_DICT = bad_bar) -@@ -6582,7 +6582,7 @@ file\&. Note, that the updated +@@ -6608,7 +6608,7 @@ file\&. Note, that the updated POT and PO @@ -34,7 +34,7 @@ Index: trunk/scons.1 po/ directory contains LINGUAS -@@ -7122,7 +7122,7 @@ Example: +@@ -7148,7 +7148,7 @@ Example: AllowSubstExceptions() # Also allow a string containing a zero\-division expansion @@ -43,7 +43,7 @@ Index: trunk/scons.1 AllowSubstExceptions(IndexError, NameError, ZeroDivisionError) .fi .if n \{\ -@@ -9198,7 +9198,7 @@ Return([vars\&.\&.\&., stop=]) +@@ -9123,7 +9123,7 @@ Return([vars\&.\&.\&., stop=]) .RS 4 By default, this stops processing the current SConscript file and returns to the calling SConscript file the values of the variables named in the \fIvars\fR @@ -52,7 +52,7 @@ Index: trunk/scons.1 \fBReturn\fR\&. Any strings that contain white space .sp The optional -@@ -10118,7 +10118,7 @@ function to create a copy of your source +@@ -10023,7 +10023,7 @@ function to create a copy of your source \fIvariant_dir\fR is not found but exists under \fIsrc_dir\fR, the file or directory is copied to @@ -61,7 +61,7 @@ Index: trunk/scons.1 .sp \fBVariantDir\fR -@@ -11373,7 +11373,7 @@ is used to create PDF output from an XML +@@ -11290,7 +11290,7 @@ is used to create PDF output from an XML .PP DOCBOOK_FOPFLAGS .RS 4 @@ -70,7 +70,7 @@ Index: trunk/scons.1 fop or xep\&. -@@ -11400,7 +11400,7 @@ is used to resolve XIncludes for a given +@@ -11317,7 +11317,7 @@ is used to resolve XIncludes for a given .PP DOCBOOK_XMLLINTFLAGS .RS 4 @@ -79,7 +79,7 @@ Index: trunk/scons.1 xmllint\&. .RE .PP -@@ -11431,7 +11431,7 @@ is used to transform an XML file via a g +@@ -11348,7 +11348,7 @@ is used to transform an XML file via a g .PP DOCBOOK_XSLTPROCFLAGS .RS 4 @@ -88,7 +88,7 @@ Index: trunk/scons.1 xsltproc (or saxon, -@@ -11440,7 +11440,7 @@ xalan)\&. +@@ -11357,7 +11357,7 @@ xalan)\&. .PP DOCBOOK_XSLTPROCPARAMS .RS 4 @@ -97,7 +97,7 @@ Index: trunk/scons.1 saxon and saxon\-xslt, respectively\&. -@@ -14052,7 +14052,7 @@ A list of installed versions of the Metr +@@ -14008,7 +14008,7 @@ A list of installed versions of the Metr .PP NAME .RS 4 @@ -106,7 +106,7 @@ Index: trunk/scons.1 .RE .PP no_import_lib -@@ -16437,7 +16437,7 @@ builder\&. +@@ -16341,7 +16341,7 @@ builder\&. .PP _XGETTEXTFROMFLAGS .RS 4 @@ -115,7 +115,7 @@ Index: trunk/scons.1 \-D flags from the \fB$XGETTEXTPATH\fR -@@ -18375,7 +18375,7 @@ a = Action("build < ${SOURCE\&.file} > $ +@@ -18279,7 +18279,7 @@ a = Action("build < ${SOURCE\&.file} > $ The \fBAction\fR() global function also takes an \fBexitstatfunc\fR -- cgit v1.2.3 From 60eb82f11569e48e32b35db6d3ec87535ad782ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 28 Sep 2017 11:27:16 +0200 Subject: New README.source to explain the branching model used. --- debian/README.source | 18 ++++++++++++++++++ debian/changelog | 5 +++++ 2 files changed, 23 insertions(+) create mode 100644 debian/README.source (limited to 'debian') diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..e4f2b3d --- /dev/null +++ b/debian/README.source @@ -0,0 +1,18 @@ +Hello, + +now I use the branching model from Vincent Driessen[1]. + +I use the gitflow-avh[2]. with the Documentation[3]. +The Debian package can be found here[4]. + +Please upload unattended uploads use a branch feature/. + + +Many thanks. + + -- Jörg Frings-Fürst Fri, 02 Jun 2017 19:00:40 +0200 + +[1] http://nvie.com/posts/a-successful-git-branching-model/ +[2] https://github.com/petervanderdoes/gitflow-avh +[3] https://github.com/petervanderdoes/gitflow-avh/wiki +[4] https://tracker.debian.org/pkg/git-flow diff --git a/debian/changelog b/debian/changelog index 52d12e2..a522b11 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,11 @@ scons (3.0.0-1) UNRELEASED; urgency=medium * New upstream release. - Refresh patches. + + patches/0110-remove_stale_files.patch + + patches/0115-secure_script_scons.patch + + patches/0120-fix-bibtex-call.patch + + patches/0600-manpage-spelling.patch + * New README.source to explain the branching model used. -- Jörg Frings-Fürst Thu, 28 Sep 2017 10:22:56 +0200 -- cgit v1.2.3 From 4f8e3f08db7282f254bbe161655a0d062ecb15d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 28 Sep 2017 11:28:56 +0200 Subject: Declare compliance with Debian Policy 4.1.0 --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a522b11..83d3502 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ scons (3.0.0-1) UNRELEASED; urgency=medium + patches/0120-fix-bibtex-call.patch + patches/0600-manpage-spelling.patch * New README.source to explain the branching model used. + * Declare compliance with Debian Policy 4.1.0. (No changes needed). -- Jörg Frings-Fürst Thu, 28 Sep 2017 10:22:56 +0200 diff --git a/debian/control b/debian/control index 878f29d..ce9b1b2 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 10), dh-python, python (>= 2.7~) -Standards-Version: 3.9.8 +Standards-Version: 4.1.0 X-Python-Version: >= 2.7 Homepage: http://www.scons.org/ Vcs-Git: https://anonscm.debian.org/cgit/collab-maint/scons.git -- cgit v1.2.3 From b86e79e512e6dcadfa21a972e77e57f34f58c7eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 28 Sep 2017 11:38:53 +0200 Subject: Correct typo in man page --- debian/patches/0600-manpage-spelling.patch | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'debian') diff --git a/debian/patches/0600-manpage-spelling.patch b/debian/patches/0600-manpage-spelling.patch index 6543a2e..4afc829 100644 --- a/debian/patches/0600-manpage-spelling.patch +++ b/debian/patches/0600-manpage-spelling.patch @@ -16,6 +16,15 @@ Index: trunk/scons.1 .RE .PP \-\-config=force +@@ -1472,7 +1472,7 @@ The tool definition (i\&.e\&. my_tool()) + .PP + If no tool list is specified, then SCons will auto\-detect the installed tools using the PATH variable in the ENV construction variable and the platform name when the Environment is constructed\&. Changing the PATH variable after the Environment is constructed will not cause the tools to be redetected\&. + .PP +-One feature now present within Scons is the ability to have nested tools\&. Tools which can be located within a subdirectory in the toolpath\&. With a nested tool name the dot represents a directory seperator ++One feature now present within Scons is the ability to have nested tools\&. Tools which can be located within a subdirectory in the toolpath\&. With a nested tool name the dot represents a directory separator + .sp + .if n \{\ + .RS 4 @@ -6376,7 +6376,7 @@ env\&.Substfile(\*(Aqfoo\&.in\*(Aq, SUBS good_foo = [(\*(Aq$foobar\*(Aq, \*(Aq$foobar\*(Aq), (\*(Aq$foo\*(Aq, \*(Aq$foo\*(Aq)] env\&.Substfile(\*(Aqfoo\&.in\*(Aq, SUBST_DICT = good_foo) -- cgit v1.2.3 From bd6e1a190712d0d857cdc659a5824c5e08ea0f83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 28 Sep 2017 11:42:22 +0200 Subject: d/copyright: add year 2017 --- debian/changelog | 2 ++ debian/copyright | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 83d3502..e5a220f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ scons (3.0.0-1) UNRELEASED; urgency=medium + patches/0600-manpage-spelling.patch * New README.source to explain the branching model used. * Declare compliance with Debian Policy 4.1.0. (No changes needed). + * debian/copyright: + - Add year 2017 to *, debian and debian/patches. -- Jörg Frings-Fürst Thu, 28 Sep 2017 10:22:56 +0200 diff --git a/debian/copyright b/debian/copyright index 12c6fd4..b5a45f4 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,7 +4,7 @@ Upstream-Contact: Steven Knight Source: http://www.scons.org Files: * -Copyright: 2001-2016 The SCons Foundation +Copyright: 2001-2017 The SCons Foundation 1999-2006 Gregory P. Ward 2001-2003 Steven Knight 2001-2004 Twisted Matrix Laboratories @@ -17,12 +17,12 @@ Files: debian/* Copyright: 2002 Moshe Zadka 2003-2008 Mark Brown 2008-2014 Luca Falavigna - 2014-2016 Jörg Frings-Fürst + 2014-2017 Jörg Frings-Fürst License: GPL-3.0+ Files: debian/patches/* Copyright: 2010-2014 Luca Falavigna - 2014-2016 Jörg Frings-Fürst + 2014-2017 Jörg Frings-Fürst License: Expat License: Expat -- cgit v1.2.3 From 3bab2962eecc24c19366692e52ebca5eb835d117 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 1 Oct 2017 13:22:57 +0200 Subject: Rewrite patches (print syntax) --- debian/patches/0110-remove_stale_files.patch | 4 ++-- debian/patches/0120-fix-bibtex-call.patch | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/patches/0110-remove_stale_files.patch b/debian/patches/0110-remove_stale_files.patch index 0fd1a6a..b3a94d2 100644 --- a/debian/patches/0110-remove_stale_files.patch +++ b/debian/patches/0110-remove_stale_files.patch @@ -18,10 +18,10 @@ Index: trunk/engine/SCons/Script/Main.py + for path in ('.sconsign.dblite', '.sconf_temp'): + try: + if os.path.isfile(path): -+ print 'Removing autogenerated file %s' % path ++ print ('Removing autogenerated file %s' % (path)) + os.remove(path) + if os.path.isdir(path): -+ print 'Removing autogenerated directory %s' % path ++ print ('Removing autogenerated directory %s' % (path)) + shutil.rmtree(path) + except OSError: + pass diff --git a/debian/patches/0120-fix-bibtex-call.patch b/debian/patches/0120-fix-bibtex-call.patch index 703ddaf..0bdbee8 100644 --- a/debian/patches/0120-fix-bibtex-call.patch +++ b/debian/patches/0120-fix-bibtex-call.patch @@ -15,7 +15,7 @@ Index: trunk/engine/SCons/Tool/tex.py check_file_error_message(env['BIBTEX'], 'blg') must_rerun_latex = True + if Verbose: -+ print "Need to run bibtex on ",auxfilename ++ print ("Need to run bibtex on " + auxfilename) + bibfile = env.fs.File(SCons.Util.splitext(target_aux)[0]) + result = BibTeXAction(bibfile, bibfile, env) + if result != 0: @@ -29,7 +29,7 @@ Index: trunk/engine/SCons/Tool/tex.py check_file_error_message(env['BIBER'], 'blg') must_rerun_latex = True + if Verbose: -+ print "Need to run biber on ",bcffilename ++ print ("Need to run biber on " + bcffilename) + bibfile = env.fs.File(SCons.Util.splitext(target_bcf)[0]) + result = BiberAction(bibfile, bibfile, env) + if result != 0: -- cgit v1.2.3 From 13e92f02338ad8d28d58fcd7c9f46d0d5e970e54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 1 Oct 2017 13:32:38 +0200 Subject: d/changelog: Change release and date/time to publish --- debian/changelog | 4 ++-- debian/files | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 debian/files (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index e5a220f..8db961b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -scons (3.0.0-1) UNRELEASED; urgency=medium +scons (3.0.0-1) unstable; urgency=medium * New upstream release. - Refresh patches. @@ -11,7 +11,7 @@ scons (3.0.0-1) UNRELEASED; urgency=medium * debian/copyright: - Add year 2017 to *, debian and debian/patches. - -- Jörg Frings-Fürst Thu, 28 Sep 2017 10:22:56 +0200 + -- Jörg Frings-Fürst Sun, 01 Oct 2017 13:30:32 +0200 scons (2.5.1-1) unstable; urgency=medium diff --git a/debian/files b/debian/files new file mode 100644 index 0000000..55c5400 --- /dev/null +++ b/debian/files @@ -0,0 +1 @@ +scons_3.0.0-1_source.buildinfo devel optional -- cgit v1.2.3