From e627d1d01f36a1c4935978861db6e46b77167f1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 12 Oct 2018 20:06:47 +0200 Subject: Refresh d/p/0110-remove_stale_files.patch for python 3 compatibility --- debian/changelog | 7 +++++++ debian/files | 1 - debian/patches/0110-remove_stale_files.patch | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) delete mode 100644 debian/files (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 0d0c874..be64e6c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +scons (3.0.1-2) UNRELEASED; urgency=medium + + * Refresh debian/patches/0110-remove_stale_files.patch to + make fix python 3 compatibility (Closes: #893740). + + -- Jörg Frings-Fürst Fri, 12 Oct 2018 19:47:43 +0200 + scons (3.0.1-1) unstable; urgency=medium * New upstream release: diff --git a/debian/files b/debian/files deleted file mode 100644 index 59a90df..0000000 --- a/debian/files +++ /dev/null @@ -1 +0,0 @@ -scons_3.0.1-1_source.buildinfo devel optional diff --git a/debian/patches/0110-remove_stale_files.patch b/debian/patches/0110-remove_stale_files.patch index b3a94d2..298d47c 100644 --- a/debian/patches/0110-remove_stale_files.patch +++ b/debian/patches/0110-remove_stale_files.patch @@ -13,7 +13,7 @@ Index: trunk/engine/SCons/Script/Main.py + # Remove temporary files left by SCons + if options.clean: -+ if os.environ.has_key('DH_INTERNAL_OPTIONS'): ++ if 'DH_INTERNAL_OPTIONS' in os.environ: + import shutil + for path in ('.sconsign.dblite', '.sconf_temp'): + try: -- cgit v1.2.3 From be5e7d919ba5e4d228828bcd8f0313bb5b243081 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 12 Oct 2018 20:07:50 +0200 Subject: typo --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index be64e6c..8f9fddf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,8 @@ scons (3.0.1-2) UNRELEASED; urgency=medium - * Refresh debian/patches/0110-remove_stale_files.patch to - make fix python 3 compatibility (Closes: #893740). + * Refresh debian/patches/0110-remove_stale_files.patch for python 3 + compatibility (Closes: #893740). + Thanks to Bernd Zeimetz . -- Jörg Frings-Fürst Fri, 12 Oct 2018 19:47:43 +0200 -- cgit v1.2.3 From 3f7051cae2371516cfd44d25fef33216b7508095 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 12 Oct 2018 20:10:03 +0200 Subject: Migrate to debhelper 11 --- debian/changelog | 3 +++ debian/compat | 2 +- debian/control | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 8f9fddf..c7df472 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ scons (3.0.1-2) UNRELEASED; urgency=medium * Refresh debian/patches/0110-remove_stale_files.patch for python 3 compatibility (Closes: #893740). Thanks to Bernd Zeimetz . + * Migrate to debhelper 11: + - Change debian/compat to 11. + - Bump minimum debhelper version in debian/control to >= 11. -- Jörg Frings-Fürst Fri, 12 Oct 2018 19:47:43 +0200 diff --git a/debian/compat b/debian/compat index f599e28..b4de394 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -10 +11 diff --git a/debian/control b/debian/control index 8703627..b914de5 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Jörg Frings-Fürst Uploaders: Laszlo Boszormenyi (GCS) Build-Depends: - debhelper (>= 10), + debhelper (>= 11), dh-python, python (>= 2.7~) Standards-Version: 4.1.2.0 -- cgit v1.2.3 From e1c176198761e894da362cbdedd810e0938c0e3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 12 Oct 2018 20:11:18 +0200 Subject: Declare compliance with Debian Policy 4.2.1 --- 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 c7df472..18bbac5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ scons (3.0.1-2) UNRELEASED; urgency=medium * Migrate to debhelper 11: - Change debian/compat to 11. - Bump minimum debhelper version in debian/control to >= 11. + * Declare compliance with Debian Policy 4.2.1 (No changes needed). -- Jörg Frings-Fürst Fri, 12 Oct 2018 19:47:43 +0200 diff --git a/debian/control b/debian/control index b914de5..61060aa 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 11), dh-python, python (>= 2.7~) -Standards-Version: 4.1.2.0 +Standards-Version: 4.2.1 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 659f5379b685d75a6de6bc42e8f70bf9ff695342 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 12 Oct 2018 20:24:44 +0200 Subject: d/rules, d/control: Remove trailing whitespaces --- debian/changelog | 4 ++++ debian/control | 1 - debian/rules | 1 - 3 files changed, 4 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 18bbac5..a09076f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,10 @@ scons (3.0.1-2) UNRELEASED; urgency=medium - Change debian/compat to 11. - Bump minimum debhelper version in debian/control to >= 11. * Declare compliance with Debian Policy 4.2.1 (No changes needed). + * debian/control: + - Remove trailing whitespaces. + * debian/rules: + - Remove trailing whitespaces. -- Jörg Frings-Fürst Fri, 12 Oct 2018 19:47:43 +0200 diff --git a/debian/control b/debian/control index 61060aa..6c5d7ba 100644 --- a/debian/control +++ b/debian/control @@ -22,4 +22,3 @@ 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/rules b/debian/rules index 60e93ec..3df1e98 100755 --- a/debian/rules +++ b/debian/rules @@ -9,4 +9,3 @@ clean: override_dh_auto_install: dh_auto_install -- --no-version-script --standalone-lib --no-install-man - -- cgit v1.2.3 From 279d864b80870c0e7cb3e0a3dc37e338d15f4be8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 12 Oct 2018 21:18:07 +0200 Subject: d/rules, d/control: add python3 support --- debian/changelog | 2 ++ debian/control | 4 ++-- debian/rules | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a09076f..9d6e38c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,8 +9,10 @@ scons (3.0.1-2) UNRELEASED; urgency=medium * Declare compliance with Debian Policy 4.2.1 (No changes needed). * debian/control: - Remove trailing whitespaces. + - Add python3 support. * debian/rules: - Remove trailing whitespaces. + - Add python3 support. -- Jörg Frings-Fürst Fri, 12 Oct 2018 19:47:43 +0200 diff --git a/debian/control b/debian/control index 6c5d7ba..10eced4 100644 --- a/debian/control +++ b/debian/control @@ -6,9 +6,9 @@ Uploaders: Laszlo Boszormenyi (GCS) Build-Depends: debhelper (>= 11), dh-python, - python (>= 2.7~) + python-all, + python3-all Standards-Version: 4.2.1 -X-Python-Version: >= 2.7 Homepage: http://www.scons.org/ Vcs-Git: https://anonscm.debian.org/cgit/collab-maint/scons.git Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/scons.git diff --git a/debian/rules b/debian/rules index 3df1e98..9f5141f 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f %: - dh $@ --with python2 + dh $@ --with python2, python3 clean: rm -fr build -- cgit v1.2.3 From 66487b24e13ab807e9b581977f10dfcce7b20ed1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 12 Oct 2018 23:50:01 +0200 Subject: d/control: Change VCS-* to point to the new repository --- debian/changelog | 1 + debian/control | 4 ++-- debian/rules | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 9d6e38c..457f04c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ scons (3.0.1-2) UNRELEASED; urgency=medium * debian/control: - Remove trailing whitespaces. - Add python3 support. + - Change VCS-* to point to the new repository. * debian/rules: - Remove trailing whitespaces. - Add python3 support. diff --git a/debian/control b/debian/control index 10eced4..c2bf9b1 100644 --- a/debian/control +++ b/debian/control @@ -10,8 +10,8 @@ Build-Depends: python3-all Standards-Version: 4.2.1 Homepage: http://www.scons.org/ -Vcs-Git: https://anonscm.debian.org/cgit/collab-maint/scons.git -Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/scons.git +Vcs-Git: git://jff.email/opt/git/scons.git +Vcs-Browser: https://jff.email/cgit/scons.git Package: scons Architecture: all diff --git a/debian/rules b/debian/rules index 9f5141f..d375e94 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f %: - dh $@ --with python2, python3 + dh $@ --with python2,python3 clean: rm -fr build -- cgit v1.2.3 From 2fb368b8751637ffa010e5e4f79e2dda6adc6038 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 12 Jul 2019 17:46:22 +0200 Subject: Add Depends --- debian/control | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index c2bf9b1..462778b 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,10 @@ Vcs-Browser: https://jff.email/cgit/scons.git Package: scons Architecture: all -Depends: ${python:Depends}, ${misc:Depends} +Depends: + ${python:Depends}, + ${python3:Depends}, + ${misc:Depends} Description: replacement for make SCons is a make replacement providing a range of enhanced features such as automated dependency generation and built in compilation cache -- cgit v1.2.3 From c1083e1f5530a09b256975a3855ac2363d5ed6f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 12 Jul 2019 18:16:07 +0200 Subject: Refresh / remove patches --- debian/changelog | 8 ++++++-- debian/patches/0110-remove_stale_files.patch | 2 +- debian/patches/0120-fix-bibtex-call.patch | 4 ++-- debian/patches/0600-manpage-spelling.patch | 28 ++++++++++++++-------------- debian/patches/series | 4 ++-- 5 files changed, 25 insertions(+), 21 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 457f04c..a9456a1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,9 @@ -scons (3.0.1-2) UNRELEASED; urgency=medium +scons (3.0.5-1) UNRELEASED; urgency=medium + * New upstream release: + - Refresh patches.at + - Remove 0115-secure_script_scons.patch and + 0105-java_ignore_nonexistent_files.patch. * Refresh debian/patches/0110-remove_stale_files.patch for python 3 compatibility (Closes: #893740). Thanks to Bernd Zeimetz . @@ -15,7 +19,7 @@ scons (3.0.1-2) UNRELEASED; urgency=medium - Remove trailing whitespaces. - Add python3 support. - -- Jörg Frings-Fürst Fri, 12 Oct 2018 19:47:43 +0200 + -- Jörg Frings-Fürst Fri, 12 Jul 2019 17:54:18 +0200 scons (3.0.1-1) unstable; urgency=medium diff --git a/debian/patches/0110-remove_stale_files.patch b/debian/patches/0110-remove_stale_files.patch index 298d47c..9fbb186 100644 --- a/debian/patches/0110-remove_stale_files.patch +++ b/debian/patches/0110-remove_stale_files.patch @@ -7,7 +7,7 @@ Index: trunk/engine/SCons/Script/Main.py =================================================================== --- trunk.orig/engine/SCons/Script/Main.py +++ trunk/engine/SCons/Script/Main.py -@@ -1106,6 +1106,21 @@ def _main(parser): +@@ -1115,6 +1115,21 @@ def _main(parser): print('Found nothing to build') exit_status = 2 diff --git a/debian/patches/0120-fix-bibtex-call.patch b/debian/patches/0120-fix-bibtex-call.patch index 0bdbee8..98b2db6 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 -@@ -347,6 +347,13 @@ def InternalLaTeXAuxAction(XXXLaTeXActio +@@ -351,6 +351,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 -@@ -370,6 +377,13 @@ def InternalLaTeXAuxAction(XXXLaTeXActio +@@ -375,6 +382,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 6d576ce..0942458 100644 --- a/debian/patches/0600-manpage-spelling.patch +++ b/debian/patches/0600-manpage-spelling.patch @@ -7,7 +7,7 @@ Index: trunk/scons.1 =================================================================== --- trunk.orig/scons.1 +++ trunk/scons.1 -@@ -443,7 +443,7 @@ call should use or generate the results +@@ -447,7 +447,7 @@ call should use or generate the results .PP \-\-config=auto .RS 4 @@ -16,7 +16,7 @@ Index: trunk/scons.1 .RE .PP \-\-config=force -@@ -1545,7 +1545,7 @@ The tool definition (i\&.e\&. my_tool()) +@@ -1566,7 +1566,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 @@ -25,7 +25,7 @@ Index: trunk/scons.1 .sp .if n \{\ .RS 4 -@@ -6449,7 +6449,7 @@ env\&.Substfile(\*(Aqfoo\&.in\*(Aq, SUBS +@@ -6484,7 +6484,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) @@ -34,7 +34,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) -@@ -6681,7 +6681,7 @@ file\&. Note, that the updated +@@ -6716,7 +6716,7 @@ file\&. Note, that the updated POT and PO @@ -43,7 +43,7 @@ Index: trunk/scons.1 po/ directory contains LINGUAS -@@ -7221,7 +7221,7 @@ Example: +@@ -7256,7 +7256,7 @@ Example: AllowSubstExceptions() # Also allow a string containing a zero\-division expansion @@ -52,7 +52,7 @@ Index: trunk/scons.1 AllowSubstExceptions(IndexError, NameError, ZeroDivisionError) .fi .if n \{\ -@@ -9196,7 +9196,7 @@ Return([vars\&.\&.\&., stop=]) +@@ -9231,7 +9231,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 @@ -61,7 +61,7 @@ Index: trunk/scons.1 \fBReturn\fR\&. Any strings that contain white space .sp The optional -@@ -10096,7 +10096,7 @@ function to create a copy of your source +@@ -10139,7 +10139,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 @@ -70,7 +70,7 @@ Index: trunk/scons.1 .sp \fBVariantDir\fR -@@ -11363,7 +11363,7 @@ is used to create PDF output from an XML +@@ -11479,7 +11479,7 @@ is used to create PDF output from an XML .PP DOCBOOK_FOPFLAGS .RS 4 @@ -79,7 +79,7 @@ Index: trunk/scons.1 fop or xep\&. -@@ -11390,7 +11390,7 @@ is used to resolve XIncludes for a given +@@ -11506,7 +11506,7 @@ is used to resolve XIncludes for a given .PP DOCBOOK_XMLLINTFLAGS .RS 4 @@ -88,7 +88,7 @@ Index: trunk/scons.1 xmllint\&. .RE .PP -@@ -11421,7 +11421,7 @@ is used to transform an XML file via a g +@@ -11537,7 +11537,7 @@ is used to transform an XML file via a g .PP DOCBOOK_XSLTPROCFLAGS .RS 4 @@ -97,7 +97,7 @@ Index: trunk/scons.1 xsltproc (or saxon, -@@ -11430,7 +11430,7 @@ xalan)\&. +@@ -11546,7 +11546,7 @@ xalan)\&. .PP DOCBOOK_XSLTPROCPARAMS .RS 4 @@ -106,7 +106,7 @@ Index: trunk/scons.1 saxon and saxon\-xslt, respectively\&. -@@ -14081,7 +14081,7 @@ A list of installed versions of the Metr +@@ -14216,7 +14216,7 @@ A list of installed versions of the Metr .PP NAME .RS 4 @@ -115,7 +115,7 @@ Index: trunk/scons.1 .RE .PP no_import_lib -@@ -16414,7 +16414,7 @@ builder\&. +@@ -16584,7 +16584,7 @@ builder\&. .PP _XGETTEXTFROMFLAGS .RS 4 @@ -124,7 +124,7 @@ Index: trunk/scons.1 \-D flags from the \fB$XGETTEXTPATH\fR -@@ -18354,7 +18354,7 @@ a = Action("build < ${SOURCE\&.file} > $ +@@ -18526,7 +18526,7 @@ a = Action("build < ${SOURCE\&.file} > $ The \fBAction\fR() global function also takes an \fBexitstatfunc\fR diff --git a/debian/patches/series b/debian/patches/series index d84f384..20ca14e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,6 @@ 0600-manpage-spelling.patch -0115-secure_script_scons.patch -0105-java_ignore_nonexistent_files.patch +#0115-secure_script_scons.patch +#0105-java_ignore_nonexistent_files.patch 0110-remove_stale_files.patch 0100-parallel_build.patch 0120-fix-bibtex-call.patch -- cgit v1.2.3 From 2fa650932693967c84f40e9b69000fa622d0c219 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 12 Jul 2019 18:17:32 +0200 Subject: Migrate to debhelper 12 --- debian/changelog | 6 +++--- debian/compat | 2 +- debian/control | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a9456a1..7715eff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,9 +7,9 @@ scons (3.0.5-1) UNRELEASED; urgency=medium * Refresh debian/patches/0110-remove_stale_files.patch for python 3 compatibility (Closes: #893740). Thanks to Bernd Zeimetz . - * Migrate to debhelper 11: - - Change debian/compat to 11. - - Bump minimum debhelper version in debian/control to >= 11. + * Migrate to debhelper 12: + - Change debian/compat to 12. + - Bump minimum debhelper version in debian/control to >= 12. * Declare compliance with Debian Policy 4.2.1 (No changes needed). * debian/control: - Remove trailing whitespaces. diff --git a/debian/compat b/debian/compat index b4de394..48082f7 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -11 +12 diff --git a/debian/control b/debian/control index 462778b..b6d1434 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Jörg Frings-Fürst Uploaders: Laszlo Boszormenyi (GCS) Build-Depends: - debhelper (>= 11), + debhelper (>= 12), dh-python, python-all, python3-all -- cgit v1.2.3 From 0a1b85d1f4be822f6c494f6c426b1084a132e58d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 12 Jul 2019 18:18:15 +0200 Subject: Declare compliance with Debian Policy 4.4.0 --- debian/changelog | 2 +- debian/control | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 7715eff..14fd84c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,7 +10,7 @@ scons (3.0.5-1) UNRELEASED; urgency=medium * Migrate to debhelper 12: - Change debian/compat to 12. - Bump minimum debhelper version in debian/control to >= 12. - * Declare compliance with Debian Policy 4.2.1 (No changes needed). + * Declare compliance with Debian Policy 4.4.0 (No changes needed). * debian/control: - Remove trailing whitespaces. - Add python3 support. diff --git a/debian/control b/debian/control index b6d1434..f1d05f3 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Build-Depends: dh-python, python-all, python3-all -Standards-Version: 4.2.1 +Standards-Version: 4.4.0 Homepage: http://www.scons.org/ Vcs-Git: git://jff.email/opt/git/scons.git Vcs-Browser: https://jff.email/cgit/scons.git -- cgit v1.2.3 From bc95f6faea1c4cf8655d2b77397fb2850f5337cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 12 Jul 2019 18:36:53 +0200 Subject: Use pybuild as buildsystem --- debian/changelog | 3 ++- debian/rules | 12 ++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 14fd84c..920bca1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ scons (3.0.5-1) UNRELEASED; urgency=medium * New upstream release: - Refresh patches.at - - Remove 0115-secure_script_scons.patch and + - Remove 0115-secure_script_scons.patch and 0105-java_ignore_nonexistent_files.patch. + - Use pybuild as buildsystem. * Refresh debian/patches/0110-remove_stale_files.patch for python 3 compatibility (Closes: #893740). Thanks to Bernd Zeimetz . diff --git a/debian/rules b/debian/rules index d375e94..6171813 100755 --- a/debian/rules +++ b/debian/rules @@ -1,11 +1,11 @@ #!/usr/bin/make -f %: - dh $@ --with python2,python3 + dh $@ --with python2,python3 --buildsystem=pybuild -clean: - rm -fr build - dh $@ +#clean: +# rm -fr build +# dh $@ -override_dh_auto_install: - dh_auto_install -- --no-version-script --standalone-lib --no-install-man +#override_dh_auto_install: +# dh_auto_install -- --no-version-script --standalone-lib --no-install-man -- cgit v1.2.3 From b8f9f5298ba221af32f7106fe093903aedd76d43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 13 Jul 2019 09:26:41 +0200 Subject: some changes for pybuild --- debian/rules | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index 6171813..2e449d9 100755 --- a/debian/rules +++ b/debian/rules @@ -1,11 +1,6 @@ #!/usr/bin/make -f +export PYBUILD_INSTALL_ARGS=--no-version-script --standalone-lib --no-install-man + %: dh $@ --with python2,python3 --buildsystem=pybuild - -#clean: -# rm -fr build -# dh $@ - -#override_dh_auto_install: -# dh_auto_install -- --no-version-script --standalone-lib --no-install-man -- cgit v1.2.3 From 6f4176859c7871af6b1f21b2c0651da81993ac8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 13 Jul 2019 10:02:59 +0200 Subject: add --no-install-bat; add ; remove dh-python --- debian/control | 3 +-- debian/rules | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/control b/debian/control index f1d05f3..0c66ca1 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,6 @@ Maintainer: Jörg Frings-Fürst Uploaders: Laszlo Boszormenyi (GCS) Build-Depends: debhelper (>= 12), - dh-python, python-all, python3-all Standards-Version: 4.4.0 @@ -16,7 +15,7 @@ Vcs-Browser: https://jff.email/cgit/scons.git Package: scons Architecture: all Depends: - ${python:Depends}, + ${python2:Depends}, ${python3:Depends}, ${misc:Depends} Description: replacement for make diff --git a/debian/rules b/debian/rules index 2e449d9..a6576fe 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,6 @@ #!/usr/bin/make -f -export PYBUILD_INSTALL_ARGS=--no-version-script --standalone-lib --no-install-man +export PYBUILD_INSTALL_ARGS=--no-version-script --standalone-lib --no-install-man --no-install-bat %: dh $@ --with python2,python3 --buildsystem=pybuild -- cgit v1.2.3 From d3a8764d9b672bf65478d576b65b630d45bed796 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 13 Jul 2019 10:06:40 +0200 Subject: d/copyright: Add year 2019, Use secure URI --- debian/changelog | 3 +++ debian/copyright | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 920bca1..26a29a1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,9 @@ scons (3.0.5-1) UNRELEASED; urgency=medium * debian/rules: - Remove trailing whitespaces. - Add python3 support. + * debian/copyright: + - Add year 2019. + - Use secure URI. -- Jörg Frings-Fürst Fri, 12 Jul 2019 17:54:18 +0200 diff --git a/debian/copyright b/debian/copyright index 468939f..6d77f47 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,10 +1,10 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: scons Upstream-Contact: Steven Knight -Source: http://www.scons.org +Source: https://www.scons.org Files: * -Copyright: 2001-2017 The SCons Foundation +Copyright: 2001-2019 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-2017 Jörg Frings-Fürst + 2014-2019 Jörg Frings-Fürst License: GPL-3.0+ Files: debian/patches/* Copyright: 2010-2014 Luca Falavigna - 2014-2017 Jörg Frings-Fürst + 2014-2019 Jörg Frings-Fürst License: Expat License: Expat -- cgit v1.2.3 From b4371df49f76990e518fadb8b3c0352d5a5cfa50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 13 Jul 2019 10:08:31 +0200 Subject: d/control: Use secure URI for homepage --- 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 26a29a1..bfc54b5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,7 @@ scons (3.0.5-1) UNRELEASED; urgency=medium - Remove trailing whitespaces. - Add python3 support. - Change VCS-* to point to the new repository. + - Use secure URI for homepage. * debian/rules: - Remove trailing whitespaces. - Add python3 support. diff --git a/debian/control b/debian/control index 0c66ca1..095ae50 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Build-Depends: python-all, python3-all Standards-Version: 4.4.0 -Homepage: http://www.scons.org/ +Homepage: https://www.scons.org/ Vcs-Git: git://jff.email/opt/git/scons.git Vcs-Browser: https://jff.email/cgit/scons.git -- cgit v1.2.3 From bce851611f80881291b218657d201ee7b41011a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 13 Jul 2019 10:14:21 +0200 Subject: Sync with Salsa --- debian/changelog | 18 ++++++++++++++++++ debian/control | 2 ++ 2 files changed, 20 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index bfc54b5..f640e7c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,6 +26,24 @@ scons (3.0.5-1) UNRELEASED; urgency=medium -- Jörg Frings-Fürst Fri, 12 Jul 2019 17:54:18 +0200 +scons (3.0.1-2) unstable; urgency=medium + + [ Ondřej Nový ] + * d/control: Remove ancient X-Python-Version field + * d/copyright: Use https protocol in Format field + * d/control: Set Vcs-* to salsa.debian.org + * d/watch: Use https protocol + + [ Christian Ehrhardt ] + * d/p/0110-remove_stale_files.patch: update for python3 + compatibility (Closes: #893740) + + [ Laszlo Boszormenyi (GCS) ] + * Update debhelper level to 11 . + * Update Standards-Version to 4.2.1 . + + -- Laszlo Boszormenyi (GCS) Fri, 09 Nov 2018 18:35:29 +0000 + scons (3.0.1-1) unstable; urgency=medium * New upstream release: diff --git a/debian/control b/debian/control index 095ae50..c2d5bf8 100644 --- a/debian/control +++ b/debian/control @@ -9,6 +9,8 @@ Build-Depends: python3-all Standards-Version: 4.4.0 Homepage: https://www.scons.org/ +Vcs-Git: https://salsa.debian.org/debian/scons.git +Vcs-Browser: https://salsa.debian.org/debian/scons Vcs-Git: git://jff.email/opt/git/scons.git Vcs-Browser: https://jff.email/cgit/scons.git -- cgit v1.2.3 From 0aa26f1c87abad4b1e0dc25041a2277e61d6cab8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 13 Jul 2019 10:29:29 +0200 Subject: Add dh-python again --- debian/control | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/control b/debian/control index c2d5bf8..5c6305c 100644 --- a/debian/control +++ b/debian/control @@ -5,14 +5,13 @@ Maintainer: Jörg Frings-Fürst Uploaders: Laszlo Boszormenyi (GCS) Build-Depends: debhelper (>= 12), + dh-python, python-all, python3-all Standards-Version: 4.4.0 Homepage: https://www.scons.org/ Vcs-Git: https://salsa.debian.org/debian/scons.git Vcs-Browser: https://salsa.debian.org/debian/scons -Vcs-Git: git://jff.email/opt/git/scons.git -Vcs-Browser: https://jff.email/cgit/scons.git Package: scons Architecture: all -- cgit v1.2.3 From a340885007a394d44fd8f04c36d7536062b871ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 13 Jul 2019 10:38:36 +0200 Subject: Refresh patches --- 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 0942458..1b7e99d 100644 --- a/debian/patches/0600-manpage-spelling.patch +++ b/debian/patches/0600-manpage-spelling.patch @@ -34,6 +34,15 @@ 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) +@@ -6633,7 +6633,7 @@ files will be automatically created (i\& + \fB$LINGUAS_FILE\fR + and + \fB$POTDOMAIN\fR +-are taken into acount too\&. All other construction variables used by ++are taken into account too\&. All other construction variables used by + \fBPOTUpdate\fR, and + \fBPOUpdate\fR + work here too\&. @@ -6716,7 +6716,7 @@ file\&. Note, that the updated POT and -- cgit v1.2.3 From 9e35beff6976a673d0953aa6949045917a5091c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 13 Jul 2019 10:52:49 +0200 Subject: d/watch: sysnc with salsa --- debian/watch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/watch b/debian/watch index 916aabd..f61c313 100644 --- a/debian/watch +++ b/debian/watch @@ -2,4 +2,4 @@ # remove zip to get tar.gz # version=4 -http://sf.net/scons/scons-(\d\S*)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) +https://sf.net/scons/scons-(\d\S*)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) -- cgit v1.2.3 From 77340fd25f9cdc798fc2ea9d89ab3e3d16bf7882 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 13 Jul 2019 10:57:53 +0200 Subject: d/changelog: Change distribution, date and time; Remove double tags --- debian/changelog | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index f640e7c..4f67f4b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,11 @@ -scons (3.0.5-1) UNRELEASED; urgency=medium +scons (3.0.5-1) unstable; urgency=medium + [ Jörg Frings-Fürst ] * New upstream release: - Refresh patches.at - Remove 0115-secure_script_scons.patch and 0105-java_ignore_nonexistent_files.patch. - Use pybuild as buildsystem. - * Refresh debian/patches/0110-remove_stale_files.patch for python 3 - compatibility (Closes: #893740). - Thanks to Bernd Zeimetz . * Migrate to debhelper 12: - Change debian/compat to 12. - Bump minimum debhelper version in debian/control to >= 12. @@ -24,7 +22,7 @@ scons (3.0.5-1) UNRELEASED; urgency=medium - Add year 2019. - Use secure URI. - -- Jörg Frings-Fürst Fri, 12 Jul 2019 17:54:18 +0200 + -- Jörg Frings-Fürst Sat, 13 Jul 2019 10:54:17 +0200 scons (3.0.1-2) unstable; urgency=medium -- cgit v1.2.3 From 10171dd6571470b5cb1986d2a18a9737b37e4fb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 23 Jul 2019 13:35:49 +0200 Subject: New upstream release 3.1.0 --- debian/changelog | 2 +- debian/patches/0600-manpage-spelling.patch | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 4f67f4b..aecd027 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -scons (3.0.5-1) unstable; urgency=medium +scons (3.1.0-1) unstable; urgency=medium [ Jörg Frings-Fürst ] * New upstream release: diff --git a/debian/patches/0600-manpage-spelling.patch b/debian/patches/0600-manpage-spelling.patch index 1b7e99d..f0389ba 100644 --- a/debian/patches/0600-manpage-spelling.patch +++ b/debian/patches/0600-manpage-spelling.patch @@ -25,7 +25,7 @@ Index: trunk/scons.1 .sp .if n \{\ .RS 4 -@@ -6484,7 +6484,7 @@ env\&.Substfile(\*(Aqfoo\&.in\*(Aq, SUBS +@@ -6509,7 +6509,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) @@ -34,7 +34,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) -@@ -6633,7 +6633,7 @@ files will be automatically created (i\& +@@ -6658,7 +6658,7 @@ files will be automatically created (i\& \fB$LINGUAS_FILE\fR and \fB$POTDOMAIN\fR @@ -43,7 +43,7 @@ Index: trunk/scons.1 \fBPOTUpdate\fR, and \fBPOUpdate\fR work here too\&. -@@ -6716,7 +6716,7 @@ file\&. Note, that the updated +@@ -6741,7 +6741,7 @@ file\&. Note, that the updated POT and PO @@ -52,7 +52,7 @@ Index: trunk/scons.1 po/ directory contains LINGUAS -@@ -7256,7 +7256,7 @@ Example: +@@ -7281,7 +7281,7 @@ Example: AllowSubstExceptions() # Also allow a string containing a zero\-division expansion @@ -61,7 +61,7 @@ Index: trunk/scons.1 AllowSubstExceptions(IndexError, NameError, ZeroDivisionError) .fi .if n \{\ -@@ -9231,7 +9231,7 @@ Return([vars\&.\&.\&., stop=]) +@@ -9267,7 +9267,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 @@ -70,7 +70,7 @@ Index: trunk/scons.1 \fBReturn\fR\&. Any strings that contain white space .sp The optional -@@ -10139,7 +10139,7 @@ function to create a copy of your source +@@ -10175,7 +10175,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 @@ -79,7 +79,7 @@ Index: trunk/scons.1 .sp \fBVariantDir\fR -@@ -11479,7 +11479,7 @@ is used to create PDF output from an XML +@@ -11515,7 +11515,7 @@ is used to create PDF output from an XML .PP DOCBOOK_FOPFLAGS .RS 4 @@ -88,7 +88,7 @@ Index: trunk/scons.1 fop or xep\&. -@@ -11506,7 +11506,7 @@ is used to resolve XIncludes for a given +@@ -11542,7 +11542,7 @@ is used to resolve XIncludes for a given .PP DOCBOOK_XMLLINTFLAGS .RS 4 @@ -97,7 +97,7 @@ Index: trunk/scons.1 xmllint\&. .RE .PP -@@ -11537,7 +11537,7 @@ is used to transform an XML file via a g +@@ -11573,7 +11573,7 @@ is used to transform an XML file via a g .PP DOCBOOK_XSLTPROCFLAGS .RS 4 @@ -106,7 +106,7 @@ Index: trunk/scons.1 xsltproc (or saxon, -@@ -11546,7 +11546,7 @@ xalan)\&. +@@ -11582,7 +11582,7 @@ xalan)\&. .PP DOCBOOK_XSLTPROCPARAMS .RS 4 @@ -115,7 +115,7 @@ Index: trunk/scons.1 saxon and saxon\-xslt, respectively\&. -@@ -14216,7 +14216,7 @@ A list of installed versions of the Metr +@@ -14253,7 +14253,7 @@ A list of installed versions of the Metr .PP NAME .RS 4 @@ -124,7 +124,7 @@ Index: trunk/scons.1 .RE .PP no_import_lib -@@ -16584,7 +16584,7 @@ builder\&. +@@ -16627,7 +16627,7 @@ builder\&. .PP _XGETTEXTFROMFLAGS .RS 4 @@ -133,7 +133,7 @@ Index: trunk/scons.1 \-D flags from the \fB$XGETTEXTPATH\fR -@@ -18526,7 +18526,7 @@ a = Action("build < ${SOURCE\&.file} > $ +@@ -18569,7 +18569,7 @@ a = Action("build < ${SOURCE\&.file} > $ The \fBAction\fR() global function also takes an \fBexitstatfunc\fR -- cgit v1.2.3 From 43cacb94bedb48f949db55500b9d131baf971696 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 23 Jul 2019 16:36:49 +0200 Subject: d/changelog: change date and time; refresh d/patches/0600-manpage-spelling.patch --- debian/changelog | 3 +-- debian/patches/0600-manpage-spelling.patch | 20 +++++++++++++++++++- 2 files changed, 20 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index aecd027..a835cbb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,7 +13,6 @@ scons (3.1.0-1) unstable; urgency=medium * debian/control: - Remove trailing whitespaces. - Add python3 support. - - Change VCS-* to point to the new repository. - Use secure URI for homepage. * debian/rules: - Remove trailing whitespaces. @@ -22,7 +21,7 @@ scons (3.1.0-1) unstable; urgency=medium - Add year 2019. - Use secure URI. - -- Jörg Frings-Fürst Sat, 13 Jul 2019 10:54:17 +0200 + -- Jörg Frings-Fürst Tue, 23 Jul 2019 16:33:56 +0200 scons (3.0.1-2) unstable; urgency=medium diff --git a/debian/patches/0600-manpage-spelling.patch b/debian/patches/0600-manpage-spelling.patch index f0389ba..63f1a47 100644 --- a/debian/patches/0600-manpage-spelling.patch +++ b/debian/patches/0600-manpage-spelling.patch @@ -1,6 +1,6 @@ Description: Correct manpage spelling errors Author: Jörg Frings-Fürst -Last-Update: 2016-09-11 +Last-Update: 2019-07-23 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ Index: trunk/scons.1 @@ -124,6 +124,24 @@ Index: trunk/scons.1 .RE .PP no_import_lib +@@ -16051,7 +16051,7 @@ The suffix used for tar file names\&. + TEMPFILEARGJOIN + .RS 4 + The string (or character) to be used to join the arguments passed to TEMPFILE when command line exceeds the limit set by +-\fB$MAXLINELENGTH\fR\&. The default value is a space\&. However for MSVC, MSLINK the default is a line seperator characters as defined by os\&.linesep\&. Note this value is used literally and not expanded by the subst logic\&. ++\fB$MAXLINELENGTH\fR\&. The default value is a space\&. However for MSVC, MSLINK the default is a line separator characters as defined by os\&.linesep\&. Note this value is used literally and not expanded by the subst logic\&. + .RE + .PP + TEMPFILEPREFIX +@@ -16403,7 +16403,7 @@ file\&. + .PP + X_RPM_EXTRADEFS + .RS 4 +-A list used to supply extra defintions or flags to be added to the RPM ++A list used to supply extra definitions or flags to be added to the RPM + \&.spec + file\&. Each item is added as\-is with a carriage return appended\&. This is useful if some specific RPM feature not otherwise anticipated by SCons needs to be turned on or off\&. Note if this variable is omitted, SCons will by default supply the value + \*(Aq%global debug_package %{nil}\*(Aq @@ -16627,7 +16627,7 @@ builder\&. .PP _XGETTEXTFROMFLAGS -- cgit v1.2.3 From ab14b61a609791de18fa6d191ec2971ebe691986 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 25 Jul 2019 07:37:35 +0200 Subject: Remove pythone2 support --- debian/changelog | 4 +++- debian/control | 2 -- debian/rules | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a835cbb..6d3ffd0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,15 +13,17 @@ scons (3.1.0-1) unstable; urgency=medium * debian/control: - Remove trailing whitespaces. - Add python3 support. + - Remove python2 support. - Use secure URI for homepage. * debian/rules: - Remove trailing whitespaces. - Add python3 support. + - Remove python2 support. * debian/copyright: - Add year 2019. - Use secure URI. - -- Jörg Frings-Fürst Tue, 23 Jul 2019 16:33:56 +0200 + -- Jörg Frings-Fürst Thu, 25 Jul 2019 07:36:16 +0200 scons (3.0.1-2) unstable; urgency=medium diff --git a/debian/control b/debian/control index 5c6305c..280a6dd 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,6 @@ Uploaders: Laszlo Boszormenyi (GCS) Build-Depends: debhelper (>= 12), dh-python, - python-all, python3-all Standards-Version: 4.4.0 Homepage: https://www.scons.org/ @@ -16,7 +15,6 @@ Vcs-Browser: https://salsa.debian.org/debian/scons Package: scons Architecture: all Depends: - ${python2:Depends}, ${python3:Depends}, ${misc:Depends} Description: replacement for make diff --git a/debian/rules b/debian/rules index a6576fe..e759c42 100755 --- a/debian/rules +++ b/debian/rules @@ -3,4 +3,4 @@ export PYBUILD_INSTALL_ARGS=--no-version-script --standalone-lib --no-install-man --no-install-bat %: - dh $@ --with python2,python3 --buildsystem=pybuild + dh $@ --with python3 --buildsystem=pybuild -- cgit v1.2.3 From 81d95371129a9b7a5a6b79046972ab52b480aa86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 25 Jul 2019 07:45:27 +0200 Subject: Add version >= 3.5 to python3 --- debian/changelog | 4 ++-- debian/control | 2 +- debian/files | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 debian/files (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 6d3ffd0..c9a36cf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,7 +12,7 @@ scons (3.1.0-1) unstable; urgency=medium * Declare compliance with Debian Policy 4.4.0 (No changes needed). * debian/control: - Remove trailing whitespaces. - - Add python3 support. + - Add python3 (>= 3.5) support. - Remove python2 support. - Use secure URI for homepage. * debian/rules: @@ -23,7 +23,7 @@ scons (3.1.0-1) unstable; urgency=medium - Add year 2019. - Use secure URI. - -- Jörg Frings-Fürst Thu, 25 Jul 2019 07:36:16 +0200 + -- Jörg Frings-Fürst Thu, 25 Jul 2019 07:44:50 +0200 scons (3.0.1-2) unstable; urgency=medium diff --git a/debian/control b/debian/control index 280a6dd..8bcdffe 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Laszlo Boszormenyi (GCS) Build-Depends: debhelper (>= 12), dh-python, - python3-all + python3-all (>= 3.5) Standards-Version: 4.4.0 Homepage: https://www.scons.org/ Vcs-Git: https://salsa.debian.org/debian/scons.git diff --git a/debian/files b/debian/files new file mode 100644 index 0000000..b6685a8 --- /dev/null +++ b/debian/files @@ -0,0 +1 @@ +scons_3.1.0-1_source.buildinfo devel optional -- cgit v1.2.3 From 5dc21474e640669052b60f6cc3ee9a38a8e4d17b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 25 Jul 2019 07:46:25 +0200 Subject: remove d/files --- debian/files | 1 - 1 file changed, 1 deletion(-) delete mode 100644 debian/files (limited to 'debian') diff --git a/debian/files b/debian/files deleted file mode 100644 index b6685a8..0000000 --- a/debian/files +++ /dev/null @@ -1 +0,0 @@ -scons_3.1.0-1_source.buildinfo devel optional -- cgit v1.2.3 From a0a7e6a528813424826ab447a0a01e61ee47a546 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 6 Aug 2019 09:49:52 +0200 Subject: New debian/patches/0130-python3.patch --- debian/changelog | 4 +++- debian/patches/0130-python3.patch | 46 +++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 debian/patches/0130-python3.patch (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index c9a36cf..052bc3b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,8 +22,10 @@ scons (3.1.0-1) unstable; urgency=medium * debian/copyright: - Add year 2019. - Use secure URI. + * New debian/patches/0130-python3.patch: + - Switch shebang to python3. - -- Jörg Frings-Fürst Thu, 25 Jul 2019 07:44:50 +0200 + -- Jörg Frings-Fürst Tue, 06 Aug 2019 09:49:22 +0200 scons (3.0.1-2) unstable; urgency=medium diff --git a/debian/patches/0130-python3.patch b/debian/patches/0130-python3.patch new file mode 100644 index 0000000..9c13592 --- /dev/null +++ b/debian/patches/0130-python3.patch @@ -0,0 +1,46 @@ +Description: Use shebang python3 +Author: Jörg Fring-Fürst +Forwarded: not-needed +Last-Update: 2019-08-06 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/script/scons +=================================================================== +--- trunk.orig/script/scons ++++ trunk/script/scons +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#! /usr/bin/env python3 + # + # SCons - a Software Constructor + # +Index: trunk/script/scons-configure-cache +=================================================================== +--- trunk.orig/script/scons-configure-cache ++++ trunk/script/scons-configure-cache +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#! /usr/bin/env python3 + # + # SCons - a Software Constructor + # +Index: trunk/script/scons-time +=================================================================== +--- trunk.orig/script/scons-time ++++ trunk/script/scons-time +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # + # scons-time - run SCons timings and collect statistics + # +Index: trunk/script/sconsign +=================================================================== +--- trunk.orig/script/sconsign ++++ trunk/script/sconsign +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#! /usr/bin/env python3 + # + # SCons - a Software Constructor + # diff --git a/debian/patches/series b/debian/patches/series index 20ca14e..5325217 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,3 +5,4 @@ 0100-parallel_build.patch 0120-fix-bibtex-call.patch #0125-printf_regression.patch +0130-python3.patch -- cgit v1.2.3 From e5de8c685bad4b129a66a8d7fae451927d5c2ef6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 10 Aug 2019 08:46:17 +0200 Subject: New upstream release 3.1.1 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 052bc3b..ae90956 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -scons (3.1.0-1) unstable; urgency=medium +scons (3.1.1-1) unstable; urgency=medium [ Jörg Frings-Fürst ] * New upstream release: -- cgit v1.2.3 From f6c9bffb15e04ea412db4df22a3851448221b85a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 10 Aug 2019 09:06:20 +0200 Subject: d/changlog: change date / time --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ae90956..5a2658c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,7 +25,7 @@ scons (3.1.1-1) unstable; urgency=medium * New debian/patches/0130-python3.patch: - Switch shebang to python3. - -- Jörg Frings-Fürst Tue, 06 Aug 2019 09:49:22 +0200 + -- Jörg Frings-Fürst Sat, 10 Aug 2019 09:05:16 +0200 scons (3.0.1-2) unstable; urgency=medium -- cgit v1.2.3