summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-12-14 14:52:54 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-12-14 14:52:54 +0100
commitfea23651bcdc2ef13d7eb18f283f2cd285df9f98 (patch)
tree3e40e1f3ac876559295169a8b20b39fc6ee17547 /debian
parentd54066e296261089c45863f5751e5ec49f4a801e (diff)
Refresh patches; Change my email address
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog11
-rw-r--r--debian/control2
-rw-r--r--debian/copyright4
-rw-r--r--debian/files1
-rw-r--r--debian/patches/0600-manpage-spelling.patch26
-rw-r--r--debian/patches/series2
6 files changed, 28 insertions, 18 deletions
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 <debian@jff.email> 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 <debian@jff-webhosting.net>
+Maintainer: Jörg Frings-Fürst <debian@jff.email>
Uploaders: Laszlo Boszormenyi (GCS) <gcs@debian.org>
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 <moshez@debian.org>
2003-2008 Mark Brown <broonie@debian.org>
2008-2014 Luca Falavigna <dktrkranz@ubuntu.com>
- 2014-2017 Jörg Frings-Fürst <debian@jff-webhosting.net>
+ 2014-2017 Jörg Frings-Fürst <debian@jff.email>
License: GPL-3.0+
Files: debian/patches/*
Copyright: 2010-2014 Luca Falavigna <dktrkranz@ubuntu.com>
- 2014-2017 Jörg Frings-Fürst <debian@jff-webhosting.net>
+ 2014-2017 Jörg Frings-Fürst <debian@jff.email>
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<dir>
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