debian/changelog | 8 +++++++
debian/control | 4 +--
debian/copyright | 52 ++++++++-----------------------------------------
debian/copyright.head | 3 ++
debian/rules | 9 ++++++++
debian/watch.fslsfonts | 2 -
debian/watch.fstobdf | 2 -
debian/watch.showfont | 2 -
debian/watch.xfsinfo | 2 -
9 files changed, 35 insertions(+), 49 deletions(-)
New commits:
commit beb9be7302e98ef6c4f8b6f1eb7f6e9bd0522eec
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Aug 21 18:07:09 2016 +0200
Generate debian/copyright from upstream COPYING files, and update
xorg.freedesktop.org URLs in packaging to https.
diff --git a/debian/changelog b/debian/changelog
index 20f419a..027fc77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
x11-xfs-utils (7.7+3) UNRELEASED; urgency=medium
* Update Vcs-* control fields to use https.
+ * Generate debian/copyright from upstream COPYING files, and update
+ xorg.freedesktop.org URLs in packaging to https.
-- Julien Cristau <jcris...@debian.org> Sun, 21 Aug 2016 18:02:04 +0200
diff --git a/debian/copyright b/debian/copyright
index 04e796e..55110b3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,38 +1,7 @@
The contents of this package were downloaded from
-http://xorg.freedesktop.org/releases/individual/app/
+https://xorg.freedesktop.org/releases/individual/app/
It contains the fslsfonts, fstobdf, showfont and xfsinfo applications.
-Copyright 1987, 1990, 1991, 1993, 1998 The Open Group
-Copyright (c) 2001-2003 by Juliusz Chroboczek
-Copyright (c) 2002 by Tomohiro KUBOTA
-Copyright (c) 1993 Quarterdeck Office Systems
-Copyright 2002-2004 by Roland Mainz <roland.ma...@nrubsig.org>
-Copyright 1990 Network Computing Devices;
-Copyright 1987 by Digital Equipment Corporation
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-
fslsfonts:
Copyright 1990, 1993, 1994, 1998 The Open Group
@@ -76,7 +45,6 @@ fslsfonts:
ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
THIS SOFTWARE.
-
fstobdf:
Copyright 1990, 1991, 1998 The Open Group
@@ -102,7 +70,7 @@ fstobdf:
Copyright 1990, 1991 Network Computing Devices;
- Portions Copyright 1987 by Digital Equipment Corporation
+ Portions Copyright 1987 by Digital Equipment Corporation
Permission to use, copy, modify, distribute, and sell this software and
its documentation for any purpose is hereby granted without fee, provided
@@ -147,8 +115,9 @@ fstobdf:
XFree86 Project.
+
Copyright 2005 Red Hat, Inc.
-
+
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
the above copyright notice appear in all copies and that both that
@@ -167,7 +136,6 @@ fstobdf:
TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THIS SOFTWARE.
-
showfont:
Copyright (c) 1987 X Consortium
@@ -196,6 +164,7 @@ showfont:
from the X Consortium.
+
Copyright 1990 Network Computing Devices;
Portions Copyright 1987 by Digital Equipment Corporation
@@ -218,7 +187,7 @@ showfont:
Copyright 2005 Red Hat, Inc.
-
+
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
the above copyright notice appear in all copies and that both that
@@ -228,7 +197,7 @@ showfont:
specific, written prior permission. Red Hat makes no
representations about the suitability of this software for any purpose. It
is provided "as is" without express or implied warranty.
-
+
RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
@@ -237,7 +206,6 @@ showfont:
TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THIS SOFTWARE.
-
xfsinfo:
Portions Copyright 1987, 1993, 1998 The Open Group
@@ -263,7 +231,6 @@ xfsinfo:
other dealings in this Software without prior written authorization
from The Open Group.
-
Copyright 1990, 1991 Network Computing Devices;
Portions Copyright 1987 by Digital Equipment Corporation
@@ -287,9 +254,8 @@ xfsinfo:
OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
Copyright 2005 Red Hat, Inc.
-
+
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
the above copyright notice appear in all copies and that both that
@@ -299,7 +265,7 @@ xfsinfo:
specific, written prior permission. Red Hat makes no
representations about the suitability of this software for any purpose. It
is provided "as is" without express or implied warranty.
-
+
RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
diff --git a/debian/copyright.head b/debian/copyright.head
new file mode 100644
index 0000000..60f1ef7
--- /dev/null
+++ b/debian/copyright.head
@@ -0,0 +1,3 @@
+The contents of this package were downloaded from
+https://xorg.freedesktop.org/releases/individual/app/
+It contains the fslsfonts, fstobdf, showfont and xfsinfo applications.
diff --git a/debian/rules b/debian/rules
index e612d8b..f82640d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -57,3 +57,12 @@ get-tarballs: $(addprefix get-tarball-, $(SUBDIRS))
.PHONY: get-tarball-%
get-tarball-%:
uscan --no-conf --destdir . --download --no-symlink --package $*
--upstream-version $(shell awk -F = '/^PACKAGE_VERSION=/ { print $$2 }' <
$*/configure ) --watchfile debian/watch.$* || test $$? = 1
+
+.PHONY: update-copyright
+update-copyright: $(addsuffix /COPYING, $(SUBDIRS)) debian/copyright.head
+ cp debian/copyright.head debian/copyright
+ for subdir in $(SUBDIRS); do \
+ echo >> debian/copyright && \
+ echo $$subdir: >> debian/copyright && \
+ sed -e 's/^./ &/' < $$subdir/COPYING >> debian/copyright \
+ || exit; done
diff --git a/debian/watch.fslsfonts b/debian/watch.fslsfonts
index 6320862..4b7d718 100644
--- a/debian/watch.fslsfonts
+++ b/debian/watch.fslsfonts
@@ -1,4 +1,4 @@
#git=git://anongit.freedesktop.org/xorg/app/fslsfonts
version=3
opts="pgpsigurlmangle=s/$/.sig/" \
-http://xorg.freedesktop.org/releases/individual/app/ fslsfonts-(.*)\.tar\.gz
+https://xorg.freedesktop.org/releases/individual/app/ fslsfonts-(.*)\.tar\.gz
diff --git a/debian/watch.fstobdf b/debian/watch.fstobdf
index 3df70e8..2ba9fbe 100644
--- a/debian/watch.fstobdf
+++ b/debian/watch.fstobdf
@@ -1,4 +1,4 @@
#git=git://anongit.freedesktop.org/xorg/app/fstobdf
version=3
opts="pgpsigurlmangle=s/$/.sig/" \
-http://xorg.freedesktop.org/releases/individual/app/ fstobdf-(.*)\.tar\.gz
+https://xorg.freedesktop.org/releases/individual/app/ fstobdf-(.*)\.tar\.gz
diff --git a/debian/watch.showfont b/debian/watch.showfont
index 89a2d28..fb809d2 100644
--- a/debian/watch.showfont
+++ b/debian/watch.showfont
@@ -1,4 +1,4 @@
#git=git://anongit.freedesktop.org/xorg/app/showfont
version=3
opts="pgpsigurlmangle=s/$/.sig/" \
-http://xorg.freedesktop.org/releases/individual/app/ showfont-(.*)\.tar\.gz
+https://xorg.freedesktop.org/releases/individual/app/ showfont-(.*)\.tar\.gz
diff --git a/debian/watch.xfsinfo b/debian/watch.xfsinfo
index 6556f8f..aa9ee7b 100644
--- a/debian/watch.xfsinfo
+++ b/debian/watch.xfsinfo
@@ -1,4 +1,4 @@
#git=git://anongit.freedesktop.org/xorg/app/xfsinfo
version=3
opts="pgpsigurlmangle=s/$/.sig/" \
-http://xorg.freedesktop.org/releases/individual/app/ xfsinfo-(.*)\.tar\.gz
+https://xorg.freedesktop.org/releases/individual/app/ xfsinfo-(.*)\.tar\.gz
commit ae65094bef1bdfa80c35cafae543021c855830c2
Author: Julien Cristau <jcris...@debian.org>
Date: Sun Aug 21 18:02:15 2016 +0200
Update Vcs-* control fields to use https.
diff --git a/debian/changelog b/debian/changelog
index 19bcf09..20f419a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x11-xfs-utils (7.7+3) UNRELEASED; urgency=medium
+
+ * Update Vcs-* control fields to use https.
+
+ -- Julien Cristau <jcris...@debian.org> Sun, 21 Aug 2016 18:02:04 +0200
+
x11-xfs-utils (7.7+2) unstable; urgency=medium
* Let uscan verify tarball signatures.
diff --git a/debian/control b/debian/control
index bee5bf9..4c9abf0 100644
--- a/debian/control
+++ b/debian/control
@@ -10,8 +10,8 @@ Build-Depends:
libfs-dev (>= 2:1.0.0),
x11proto-core-dev (>= 7.0.25),
Standards-Version: 3.9.1
-Vcs-Git: git://git.debian.org/git/pkg-xorg/app/x11-xfs-utils
-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/x11-xfs-utils.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/app/x11-xfs-utils.git
+Vcs-Browser: https://anonscm.debian.org/git/pkg-xorg/app/x11-xfs-utils.git
Package: x11-xfs-utils
Architecture: any
