From fea23651bcdc2ef13d7eb18f283f2cd285df9f98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 14 Dec 2017 14:52:54 +0100 Subject: Refresh patches; Change my email address --- debian/changelog | 11 +++++++++++ debian/control | 2 +- debian/copyright | 4 ++-- debian/files | 1 - debian/patches/0600-manpage-spelling.patch | 26 +++++++++++++------------- debian/patches/series | 2 +- 6 files changed, 28 insertions(+), 18 deletions(-) delete mode 100644 debian/files (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 97812a9..0590189 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +scons (3.0.1-1) UNRELEASED; urgency=medium + + * New upstream release: + - Refresh 0600-manpage-spelling.patch. + - Remove upstream applied 0125-printf_regression.patch. + * Change to my new email-address: + - debian/control, + - debian/copyright. + + -- Jörg Frings-Fürst Thu, 14 Dec 2017 14:38:03 +0100 + scons (3.0.0-2) unstable; urgency=high * New patch/0125-printf_regression.patch (Closes: #878327): diff --git a/debian/control b/debian/control index 4d74f55..8998644 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: scons Section: devel Priority: optional -Maintainer: Jörg Frings-Fürst +Maintainer: Jörg Frings-Fürst Uploaders: Laszlo Boszormenyi (GCS) Build-Depends: debhelper (>= 10), diff --git a/debian/copyright b/debian/copyright index b5a45f4..468939f 100644 --- a/debian/copyright +++ b/debian/copyright @@ -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-2017 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-2017 Jörg Frings-Fürst License: Expat License: Expat diff --git a/debian/files b/debian/files deleted file mode 100644 index 4cc8599..0000000 --- a/debian/files +++ /dev/null @@ -1 +0,0 @@ -scons_3.0.0-2_source.buildinfo devel optional diff --git a/debian/patches/0600-manpage-spelling.patch b/debian/patches/0600-manpage-spelling.patch index 4afc829..6d576ce 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 -@@ -1472,7 +1472,7 @@ The tool definition (i\&.e\&. my_tool()) +@@ -1545,7 +1545,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 -@@ -6376,7 +6376,7 @@ env\&.Substfile(\*(Aqfoo\&.in\*(Aq, SUBS +@@ -6449,7 +6449,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) -@@ -6608,7 +6608,7 @@ file\&. Note, that the updated +@@ -6681,7 +6681,7 @@ file\&. Note, that the updated POT and PO @@ -43,7 +43,7 @@ Index: trunk/scons.1 po/ directory contains LINGUAS -@@ -7148,7 +7148,7 @@ Example: +@@ -7221,7 +7221,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 \{\ -@@ -9123,7 +9123,7 @@ Return([vars\&.\&.\&., stop=]) +@@ -9196,7 +9196,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 -@@ -10023,7 +10023,7 @@ function to create a copy of your source +@@ -10096,7 +10096,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 -@@ -11290,7 +11290,7 @@ is used to create PDF output from an XML +@@ -11363,7 +11363,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\&. -@@ -11317,7 +11317,7 @@ is used to resolve XIncludes for a given +@@ -11390,7 +11390,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 -@@ -11348,7 +11348,7 @@ is used to transform an XML file via a g +@@ -11421,7 +11421,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, -@@ -11357,7 +11357,7 @@ xalan)\&. +@@ -11430,7 +11430,7 @@ xalan)\&. .PP DOCBOOK_XSLTPROCPARAMS .RS 4 @@ -106,7 +106,7 @@ Index: trunk/scons.1 saxon and saxon\-xslt, respectively\&. -@@ -14008,7 +14008,7 @@ A list of installed versions of the Metr +@@ -14081,7 +14081,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 -@@ -16341,7 +16341,7 @@ builder\&. +@@ -16414,7 +16414,7 @@ builder\&. .PP _XGETTEXTFROMFLAGS .RS 4 @@ -124,7 +124,7 @@ Index: trunk/scons.1 \-D flags from the \fB$XGETTEXTPATH\fR -@@ -18279,7 +18279,7 @@ a = Action("build < ${SOURCE\&.file} > $ +@@ -18354,7 +18354,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 f390c4b..d84f384 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,4 +4,4 @@ 0110-remove_stale_files.patch 0100-parallel_build.patch 0120-fix-bibtex-call.patch -0125-printf_regression.patch +#0125-printf_regression.patch -- cgit v1.2.3 From 342f70c8c5d69a1bdf07ba187b27ffce5bee2696 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 14 Dec 2017 14:55:20 +0100 Subject: Declare compliance with Debian Policy 4.1.2.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 0590189..85d552f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ scons (3.0.1-1) UNRELEASED; urgency=medium * Change to my new email-address: - debian/control, - debian/copyright. + * Declare compliance with Debian Policy 4.1.2.0 (No changes needed). -- Jörg Frings-Fürst Thu, 14 Dec 2017 14:38:03 +0100 diff --git a/debian/control b/debian/control index 8998644..cf711c2 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 10), dh-python, python (>= 2.7~) -Standards-Version: 4.1.1 +Standards-Version: 4.2.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 4836ba62ff2cbfe4e091751c4310db662125f3bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 14 Dec 2017 15:01:27 +0100 Subject: d/changelog: Remove trailing whitespace --- debian/changelog | 4 +++- debian/control | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 85d552f..77b8e06 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ scons (3.0.1-1) UNRELEASED; urgency=medium - debian/control, - debian/copyright. * Declare compliance with Debian Policy 4.1.2.0 (No changes needed). + * debian/changelog: + - Remove trailing whitespace. -- Jörg Frings-Fürst Thu, 14 Dec 2017 14:38:03 +0100 @@ -62,7 +64,7 @@ scons (2.5.0-1) unstable; urgency=medium * New upstream release. * Refresh patches. - * New debian/patches/0120-fix-bibtex-call.patch to create + * New debian/patches/0120-fix-bibtex-call.patch to create Bibtex bibliography always (Closes: #749716). * debian/watch: - bump version to 4 (no changes required). diff --git a/debian/control b/debian/control index cf711c2..8703627 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 10), dh-python, python (>= 2.7~) -Standards-Version: 4.2.1.0 +Standards-Version: 4.1.2.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 e18cb63b889697e54fe06be3eef8889b39f9fb4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 14 Dec 2017 15:48:56 +0100 Subject: d/changelog: Remove trailing whitespace --- debian/changelog | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 77b8e06..485bf95 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,7 +7,7 @@ scons (3.0.1-1) UNRELEASED; urgency=medium - debian/control, - debian/copyright. * Declare compliance with Debian Policy 4.1.2.0 (No changes needed). - * debian/changelog: + * debian/changelog: - Remove trailing whitespace. -- Jörg Frings-Fürst Thu, 14 Dec 2017 14:38:03 +0100 @@ -68,7 +68,7 @@ scons (2.5.0-1) unstable; urgency=medium Bibtex bibliography always (Closes: #749716). * debian/watch: - bump version to 4 (no changes required). - * debian/copyright: + * debian/copyright: - Add year 2016. * debian/control: - Bump Standards-Version to 3.9.7 (no changes required). @@ -588,7 +588,7 @@ scons (0.08-1) unstable; urgency=low scons (0.07-3) unstable; urgency=low * Removing /usr/doc links - * Python 2.1 -> Python 2.2 + * Python 2.1 -> Python 2.2 -- Moshe Zadka Tue, 27 Aug 2002 18:48:02 +0300 @@ -604,7 +604,7 @@ scons (0.07-1) unstable; urgency=low * New upstream version * Packaging properly, instead of as debian native - * Modifying copyright to include upstream location (Closes: #144491) + * Modifying copyright to include upstream location (Closes: #144491) * Fixing my e-mail address (Closes: #144490) * Thanks for looking after my packages, tbm ;-) @@ -612,7 +612,7 @@ scons (0.07-1) unstable; urgency=low scons (0.06-1) unstable; urgency=low - * New upstream version + * New upstream version -- Moshe Zadka Mon, 15 Apr 2002 19:22:09 +0300 -- cgit v1.2.3 From 379b7995fe7e7ecd5583d73d8c4e352cd487578c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 14 Dec 2017 16:00:35 +0100 Subject: d/changelog: change release, date, time --- 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 485bf95..0d0c874 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -scons (3.0.1-1) UNRELEASED; urgency=medium +scons (3.0.1-1) unstable; urgency=medium * New upstream release: - Refresh 0600-manpage-spelling.patch. @@ -10,7 +10,7 @@ scons (3.0.1-1) UNRELEASED; urgency=medium * debian/changelog: - Remove trailing whitespace. - -- Jörg Frings-Fürst Thu, 14 Dec 2017 14:38:03 +0100 + -- Jörg Frings-Fürst Thu, 14 Dec 2017 15:57:20 +0100 scons (3.0.0-2) unstable; urgency=high diff --git a/debian/files b/debian/files new file mode 100644 index 0000000..59a90df --- /dev/null +++ b/debian/files @@ -0,0 +1 @@ +scons_3.0.1-1_source.buildinfo devel optional -- cgit v1.2.3