Bug#991359: unblock: liquidsoap/1.4.3-3

2021-07-23 Thread Kyle Robbertze
Control: tags -1 - moreinfo

Thanks, the new version has been uploaded to unstable and built.

Cheers
Kyle

-- 

⢀⣴⠾⠻⢶⣦⠀
⣾⠁⢠⠒⠀⣿⡁ Kyle Robbertze
⢿⡄⠘⠷⠚⠋⠀ Debian Developer
⠈⠳⣄ https://wiki.debian.org/KyleRobbertze



Bug#991359: unblock: liquidsoap/1.4.3-3

2021-07-21 Thread Kyle Robbertze
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock

Please unblock package liquidsoap

Liquidsoap is a scripting language for multimedia. It depends
on pervasive libraries to achieve much of the built-in
functions that user scripts can call. Currently these are installed in
the incorrect location, which cannot be found by liquidsoap (#991332).
The link is for the pervious version of the package and was accidentally
not updated when the latest upstream version was released. The new
changes attached correct the link and add autopkg tests to prevent a
regretion in future.

If this is not fixed user scripts that use any built-in functions would
be broken. This is almost all scripts, as even the get-started tutorial
script in the liquidsoap documentation uses 'mksafe' from those
functions [1]. There is a workaround that users can perform, but is not
very evident from the error message given by liquidsoap:

# mv /usr/share/liquidsoap/1.4.2 /usr/share/liquidsoap/1.4.3

Liquidsoap is a leaf package and this is a trvial change of an obvious
mistake.

[1] 
https://www.liquidsoap.info/doc-1.4.4/quick_start.html#that-source-is-fallible

[ Checklist ]
  [x] all changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in testing

unblock liquidsoap/1.4.3-3
diff -Nru liquidsoap-1.4.3/debian/changelog liquidsoap-1.4.3/debian/changelog
--- liquidsoap-1.4.3/debian/changelog   2021-07-21 16:18:07.0 +0200
+++ liquidsoap-1.4.3/debian/changelog   2020-12-22 09:17:12.0 +0200
@@ -1,9 +1,3 @@
-liquidsoap (1.4.3-3) unstable; urgency=medium
-
-  * Fix pervasive libraries symlink (Closes: 991332)
-
- -- Kyle Robbertze   Wed, 21 Jul 2021 16:18:07 +0200
-
 liquidsoap (1.4.3-2) unstable; urgency=medium
 
   * Set BYTE install correctly (Closes: #972272)
diff -Nru liquidsoap-1.4.3/debian/liquidsoap.links 
liquidsoap-1.4.3/debian/liquidsoap.links
--- liquidsoap-1.4.3/debian/liquidsoap.links2021-07-21 16:04:28.0 
+0200
+++ liquidsoap-1.4.3/debian/liquidsoap.links2020-05-22 12:16:51.0 
+0200
@@ -1 +1 @@
-usr/share/liquidsoap/libs usr/share/liquidsoap/1.4.3/libs
+usr/share/liquidsoap/libs usr/share/liquidsoap/1.4.2/libs
diff -Nru liquidsoap-1.4.3/debian/README.source 
liquidsoap-1.4.3/debian/README.source
--- liquidsoap-1.4.3/debian/README.source   2021-07-21 14:16:57.0 
+0200
+++ liquidsoap-1.4.3/debian/README.source   1970-01-01 02:00:00.0 
+0200
@@ -1,6 +0,0 @@
-Updating the upstream source
-
-
-When the upstream version changes, you will need to update
-debian/liquidsoap.links to link the pervasive scripts into the correct
-directory.
diff -Nru liquidsoap-1.4.3/debian/tests/control 
liquidsoap-1.4.3/debian/tests/control
--- liquidsoap-1.4.3/debian/tests/control   2021-07-21 15:40:31.0 
+0200
+++ liquidsoap-1.4.3/debian/tests/control   1970-01-01 02:00:00.0 
+0200
@@ -1 +0,0 @@
-Tests: pervasive-libraries
diff -Nru liquidsoap-1.4.3/debian/tests/pervasive-libraries 
liquidsoap-1.4.3/debian/tests/pervasive-libraries
--- liquidsoap-1.4.3/debian/tests/pervasive-libraries   2021-07-21 
16:06:10.0 +0200
+++ liquidsoap-1.4.3/debian/tests/pervasive-libraries   1970-01-01 
02:00:00.0 +0200
@@ -1,4 +0,0 @@
-#!/usr/bin/liquidsoap --check
-stream = playlist("")
-source = output.icecast(%mp3, host="localhost", port=8000, mount="listen.m3u", 
password="hackme")
-mksafe(source(mksafe(stream)))


Bug#977547: nmu: migrate-parsetree reverse dependencies

2020-12-16 Thread Kyle Robbertze
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: binnmu

Hello,

The following Ocaml packages need rebuilding due to the new version of
migrate-parsetree uploaded to unstable.

List generated from https://people.debian.org/~nomeata/binNMUs-ocaml.txt

nmu eliom_6.12.4-1  . armhf . sid . -m 
'migrate-parsetree changed from 4csu3 to 1abp1, ppx-tools-versioned changed 
from r6hc4 to d07i9'
nmu eliom_6.12.4-1  . mips64el mipsel armel . sid . -m 
'migrate-parsetree changed from 4oqg7 to y9ik5, ppx-tools-versioned changed 
from j28d9 to a8sg6'
nmu eliom_6.12.4-1  . arm64 . sid . -m 
'migrate-parsetree changed from 4te49 to vtsf2, ppx-tools-versioned changed 
from 1wex2 to l05p7'
nmu eliom_6.12.4-1  . i386  . sid . -m 
'migrate-parsetree changed from hu422 to rl9d2, ppx-tools-versioned changed 
from 9yhu1 to 1qvw3'
nmu eliom_6.12.4-1  . ppc64el   . sid . -m 
'migrate-parsetree changed from id828 to btpv9, ppx-tools-versioned changed 
from nu7y1 to z1h94'
nmu eliom_6.12.4-1  . amd64 . sid . -m 
'migrate-parsetree changed from nuom0 to n2039, ppx-tools-versioned changed 
from pn5t7 to brxi3'
nmu eliom_6.12.4-1  . s390x . sid . -m 
'migrate-parsetree changed from yvb04 to 9pt34, ppx-tools-versioned changed 
from wq601 to hrxm5'
nmu js-of-ocaml_3.8.0-1 . armhf . sid . -m 
'migrate-parsetree changed from 4csu3 to 1abp1'
nmu js-of-ocaml_3.8.0-1 . armhf . sid . -m 
'migrate-parsetree changed from 4csu3 to 1abp1, ppxlib changed from 8feq3 to 
ne9p3'
nmu js-of-ocaml_3.8.0-1 . mips64el mipsel armel . sid . -m 
'migrate-parsetree changed from 4oqg7 to y9ik5'
nmu js-of-ocaml_3.8.0-1 . mips64el mipsel armel . sid . -m 
'migrate-parsetree changed from 4oqg7 to y9ik5, ppxlib changed from ab5j9 to 
9a9z1'
nmu js-of-ocaml_3.8.0-1 . arm64 . sid . -m 
'migrate-parsetree changed from 4te49 to vtsf2'
nmu js-of-ocaml_3.8.0-1 . arm64 . sid . -m 
'migrate-parsetree changed from 4te49 to vtsf2, ppxlib changed from sshr3 to 
mdnj0'
nmu js-of-ocaml_3.8.0-1 . i386  . sid . -m 
'migrate-parsetree changed from hu422 to rl9d2'
nmu js-of-ocaml_3.8.0-1 . i386  . sid . -m 
'migrate-parsetree changed from hu422 to rl9d2, ppxlib changed from yw937 to 
wjeo5'
nmu js-of-ocaml_3.8.0-1 . ppc64el   . sid . -m 
'migrate-parsetree changed from id828 to btpv9'
nmu js-of-ocaml_3.8.0-1 . ppc64el   . sid . -m 
'migrate-parsetree changed from id828 to btpv9, ppxlib changed from gyp44 to 
ypxs5'
nmu js-of-ocaml_3.8.0-1 . amd64 . sid . -m 
'migrate-parsetree changed from nuom0 to n2039'
nmu js-of-ocaml_3.8.0-1 . amd64 . sid . -m 
'migrate-parsetree changed from nuom0 to n2039, ppxlib changed from jf0b6 to 
age97'
nmu js-of-ocaml_3.8.0-1 . s390x . sid . -m 
'migrate-parsetree changed from yvb04 to 9pt34'
nmu js-of-ocaml_3.8.0-1 . s390x . sid . -m 
'migrate-parsetree changed from yvb04 to 9pt34, ppxlib changed from 3v3b9 to 
2rql7'
nmu lwt_5.3.0-1 . armhf . sid . -m 
'migrate-parsetree changed from 4csu3 to 1abp1, ppx-tools-versioned changed 
from r6hc4 to d07i9'
nmu lwt_5.3.0-1 . mips64el mipsel armel . sid . -m 
'migrate-parsetree changed from 4oqg7 to y9ik5, ppx-tools-versioned changed 
from j28d9 to a8sg6'
nmu lwt_5.3.0-1 . arm64 . sid . -m 
'migrate-parsetree changed from 4te49 to vtsf2, ppx-tools-versioned changed 
from 1wex2 to l05p7'
nmu lwt_5.3.0-1 . i386  . sid . -m 
'migrate-parsetree changed from hu422 to rl9d2, ppx-tools-versioned changed 
from 9yhu1 to 1qvw3'
nmu lwt_5.3.0-1 . ppc64el   . sid . -m 
'migrate-parsetree changed from id828 to btpv9, ppx-tools-versioned changed 
from nu7y1 to z1h94'
nmu lwt_5.3.0-1 . amd64 . sid . -m 
'migrate-parsetree changed from nuom0 to n2039, ppx-tools-versioned changed 
from pn5t7 to brxi3'
nmu lwt_5.3.0-1 . s390x . sid . -m 
'migrate-parsetree changed from yvb04 to 9pt34, ppx-tools-versioned changed 
from wq601 to hrxm5'
nmu obus_1.2.3-1. armhf . sid . -m 
'migrate-parsetree changed from 4csu3 to 1abp1'
nmu obus_1.2.3-1. armhf . sid . -m 
'migrate-parsetree changed from 4csu3 to 1abp1, ppxlib changed from 8feq3 to 
ne9p3'
nmu obus_1.2.3-1. mips64el mipsel armel . sid . -m 
'migrate-parsetree changed from 4oqg7 to y9ik5'
nmu obus_1.2.3-1. mips64el mipsel armel . sid . -m 
'migrate-parsetree changed from 4oqg7

Bug#933127: nmu: zed_1.4-3

2019-07-26 Thread Kyle Robbertze
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: binnmu

Dear release team,

It seems in the last BinNMU of zed against camomile, amd64, arm64, armhf
and i386 architectures were not rebuilt. I have tested locally and zed
rebuild successfully on amd64.

nmu zed_1.4-3 . amd64 arm64 armhf i386 . unstable . -m "rebuild against 
camomile 0.8.5-1"

Thanks

-- System Information:
Debian Release: bullseye/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)
Foreign Architectures: arm64, i386

Kernel: Linux 4.19.0-5-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_ZA.UTF-8, LC_CTYPE=en_ZA.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_ZA:en (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled



Bug#932417: nmu: ocamlnet_4.1.2-3

2019-07-18 Thread Kyle Robbertze
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: binnmu

Please rebuild ocamlnet to use camlzip 1.08-1, uploaded to unstable
yesterday. Without this, ocamlnet fails to install as it depends on an
old build of camlzip.

nmu ocamlnet_4.1.2-3 . ANY . unstable . -m "rebuild against camlzip 1.08-1"

-- System Information:
Debian Release: bullseye/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)
Foreign Architectures: arm64, i386

Kernel: Linux 4.19.0-5-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_ZA.UTF-8, LC_CTYPE=en_ZA.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_ZA:en (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled



Bug#923684: nmu: galax_1.1-15

2019-05-12 Thread Kyle Robbertze
Hi Paul,

On 2019/05/09 20:43, Paul Gevers wrote:
> Control: tags -1 moreinfo
> 
> Hi Kyle,
> 
> Is this still relevant?

Seems that it is no longer relevant. The galax failure must be an issue
with galax and the rest are have now been built against the fixed
version of camomile.

> 
> On Sun, 03 Mar 2019 22:04:35 +0200 Kyle Robbertze 
> wrote:
>> There was a bug in how camomile < 1.0.1-3 was packaged that prevented
>> packages from building against it. This has been fixed, but requires
>> r-deps to be rebuilt using the fixed version.
>>
>> Thanks
>>
>> nmu galax_1.1-15 . ANY . unstable . -m "Rebuild against fixed camomile"
> 
> Without checking too carefully, I went ahead with this one today, but
> all builds failed very similar to the original problem:
> Checking for Camomile...ERROR: unable to find camomileLibrary.cmi in
> /usr/lib/ocaml/camomile

Ok I'll file a bug against galax then. It clearly does not support the
current version of camomile.

Thanks for all the work

Cheers
Kyle



Bug#923684: nmu: galax_1.1-15

2019-03-03 Thread Kyle Robbertze
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: binnmu

Hello,

There was a bug in how camomile < 1.0.1-3 was packaged that prevented
packages from building against it. This has been fixed, but requires
r-deps to be rebuilt using the fixed version.

Thanks

nmu galax_1.1-15 . ANY . unstable . -m "Rebuild against fixed camomile"
nmu ocaml-gettext_0.3.7-1 . ANY . unstable . -m "Rebuild against fixed camomile"
nmu lambda-term_1.10.1-2 . ANY . unstable . -m "Rebuild against fixed camomile"
nmu utop_1.19.3-2 . ANY . unstable . -m "Rebuild against fixed camomile"
nmu zed_1.4-3 . ANY . unstable . -m "Rebuild against fixed camomile"

-- System Information:
Debian Release: buster/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)
Foreign Architectures: arm64

Kernel: Linux 4.19.0-3-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_ZA.UTF-8, LC_CTYPE=en_ZA.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_ZA:en (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled



Bug#916650: stretch-pu: package liquidsoap/1.1.1-7.2

2019-02-09 Thread Kyle Robbertze
On 2019/02/09 16:08, Adam D. Barratt wrote:
> Control: tags -1 + moreinfo
> 
> On Sun, 2018-12-16 at 23:58 +0200, Kyle Robbertze wrote:
>> The current liquidsoap package in stable segfaults imediately on run.
>> Details are in bug #812591. The segfault is due to Ocaml version 4.02
>> which is present in stable. The fix upstream has been applied here
>> (sourced from Ubuntu where it has been working since 17.10). It is
>> part of the version currently in buster and unstable.
> 
> Apologies for not getting back to you sooner.

No worries, we all get busy :)
> 
> I have to admit that I'm a little concerned that it took quite so long
> for this bug to be fixed, given that it appears to have been reported
> well before the stretch freeze.

The package was abandoned for a long while, I have only just adopted it
and fixed it up.
> 
> If a package is incompatible with a newer version of Ocaml, is there no
> way of indicating this via e.g. dependency relationships, or the
> package somehow indicating which versions of Ocaml it is compatible
> with? This seems like the sort of thing that could also cause issues
> with partial upgrades between stable releases.

With this fix, it is compatible with newer Ocaml versions and the new
version in buster and unstable are too. As far as I can tell, there have
been no issues with newer versions outside of this. The common
convention seems to be to declare an un-versioned or minimum version
dependency on Ocaml and expect it to work with future versions.

Cheers
Kyle



signature.asc
Description: OpenPGP digital signature


Bug#916650: stretch-pu: package liquidsoap/1.1.1-7.2

2018-12-16 Thread Kyle Robbertze
Package: release.debian.org
Severity: normal
Tags: stretch
User: release.debian@packages.debian.org
Usertags: pu

The current liquidsoap package in stable segfaults imediately on run.
Details are in bug #812591. The segfault is due to Ocaml version 4.02
which is present in stable. The fix upstream has been applied here
(sourced from Ubuntu where it has been working since 17.10). It is part
of the version currently in buster and unstable.

I have tested it within a stable chroot (install and execution of simple
scripts).

Please accept the attached patch if possible. I have someone willing to
sponsor the upload.

-- System Information:
Debian Release: buster/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.18.0-3-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_ZA.UTF-8, LC_CTYPE=en_ZA.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_ZA:en (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru liquidsoap-1.1.1/debian/changelog liquidsoap-1.1.1/debian/changelog
--- liquidsoap-1.1.1/debian/changelog   2016-11-29 21:37:34.0 +
+++ liquidsoap-1.1.1/debian/changelog   2018-12-01 18:41:23.0 +
@@ -1,3 +1,9 @@
+liquidsoap (1.1.1-7.2+deb9u1) stretch; urgency=medium
+
+  * Fix compilation with Ocaml 4.02 (Closes: #812591)
+  * Added new uploader
+
+ -- Kyle Robbertze   Sat, 01 Dec 2018 20:41:23 +0200
+
 liquidsoap (1.1.1-7.2) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru liquidsoap-1.1.1/debian/control liquidsoap-1.1.1/debian/control
--- liquidsoap-1.1.1/debian/control 2016-11-29 21:35:41.0 +
+++ liquidsoap-1.1.1/debian/control 2018-12-01 18:38:23.0 +
@@ -3,6 +3,7 @@
 Priority: optional
 Maintainer: Debian OCaml Maintainers 
 Uploaders:
+ Kyle Robbertze ,
  Romain Beauxis ,
  Samuel Mimram 
 Build-Depends:
diff -Nru liquidsoap-1.1.1/debian/files liquidsoap-1.1.1/debian/files
--- liquidsoap-1.1.1/debian/files   2016-11-29 21:37:34.0 +
+++ liquidsoap-1.1.1/debian/files   1970-01-01 00:00:00.0 +
@@ -1 +0,0 @@
-liquidsoap_1.1.1-7.2_source.buildinfo sound optional
diff -Nru 
liquidsoap-1.1.1/debian/patches/bf0640779b2e7095e01755d3660c7e3f0865171d.patch 
liquidsoap-1.1.1/debian/patches/bf0640779b2e7095e01755d3660c7e3f0865171d.patch
--- 
liquidsoap-1.1.1/debian/patches/bf0640779b2e7095e01755d3660c7e3f0865171d.patch  
1970-01-01 00:00:00.0 +
+++ 
liquidsoap-1.1.1/debian/patches/bf0640779b2e7095e01755d3660c7e3f0865171d.patch  
2018-12-01 18:37:32.0 +
@@ -0,0 +1,456 @@
+From bf0640779b2e7095e01755d3660c7e3f0865171d Mon Sep 17 00:00:00 2001
+From: Romain Beauxis 
+Date: Thu, 14 May 2015 14:38:40 -0500
+Subject: [PATCH] More stuff to compile with 3.12.1 -> 4.03.0
+
+---
+ src/Makefile |  2 +-
+ src/decoder/decoder.ml   |  6 +--
+ src/decoder/image_decoder.ml |  2 +-
+ src/decoder/ogg_decoder.ml   |  2 +-
+ src/encoder/encoder.ml   |  2 +-
+ src/encoder/taglib_id3v2.ml  |  2 +-
+ src/lang/lang_builtins.ml|  8 ++--
+ src/lang/lang_encoders.ml| 86 
+ src/lang/lang_pp.ml  |  2 +-
+ src/lang/lang_types.ml   |  2 +-
+ src/operators/frei0r_op.ml   |  2 +-
+ src/operators/setvol.ml  |  2 +-
+ src/outputs/harbor_output.camlp4 |  2 +-
+ src/outputs/harbor_output.ml |  6 +--
+ src/outputs/icecast2.ml  |  2 +-
+ src/playlists/playlist_basic.ml  |  2 +-
+ src/protocols/mpd.ml |  2 +-
+ src/request.ml   |  2 +-
+ src/stream/frame.ml  |  2 +-
+ src/tools/harbor.camlp4  | 12 +++---
+ src/tools/harbor.ml  | 17 +---
+ src/tools/http.ml|  8 ++--
+ src/tools/plug.ml|  4 +-
+ src/tools/utils.ml   | 60 ++--
+ 24 files changed, 147 insertions(+), 90 deletions(-)
+
+Index: liquidsoap-1.1.1/src/Makefile
+===
+--- liquidsoap-1.1.1.orig/src/Makefile
 liquidsoap-1.1.1/src/Makefile
+@@ -173,7 +173,7 @@ $(call conditional_compilation,io,$(W_OS
+ $(call conditional_compilation,io,$(W_PULSEAUDIO),io/pulseaudio_io.ml)
+ $(call conditional_compilation,io,$(W_PORTAUDIO),io/portaudio_io.ml)
+ 
+-tools = tools/stdlib.ml tools/doc.ml tools/plug.ml tools/utils.ml \
++tools = tools/stdlib.ml tools/doc.ml tools/utils.ml tools/plug.ml \
+   $(if $(W_DYNLINK),tools/dyntools.ml) \
+   tools/rqueue.ml \
+   $(if $(W_LAME_DYN),tools/lame_dynlink.ml) \
+Index: liquidsoap-1.1.1/src/decoder/decoder.ml
+===
+--- liquidsoap-1.1.1.orig/src/decoder/decoder.ml
 liquidsoap-1.1.1/src/decoder/decoder.ml
+@@ -277,7 +277,7 @@ let get_image_file_decoder filename =
+   with
+   | Pe

Bug#855567: unblock: w3c-sgml-lib/1.3-2

2017-02-19 Thread Kyle Robbertze
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock

Please unblock package w3c-sgml-lib

This new version fixes #826216 and updates the maintainer to reflect the
orphaned state of the package.

Source diff is attached

unblock w3c-sgml-lib/1.3-2

-- System Information:
Debian Release: stretch
  APT prefers testing
  APT policy: (500, 'testing')
Architecture: amd64 (x86_64)

Kernel: Linux 4.9.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_ZA.UTF-8, LC_CTYPE=en_ZA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru w3c-sgml-lib-1.3/debian/changelog w3c-sgml-lib-1.3/debian/changelog
--- w3c-sgml-lib-1.3/debian/changelog   2013-03-16 18:11:53.0 +0200
+++ w3c-sgml-lib-1.3/debian/changelog   2017-02-04 09:15:24.0 +0200
@@ -1,3 +1,11 @@
+w3c-sgml-lib (1.3-2) unstable; urgency=medium
+
+  * QA Upload
+  * New Maintainer: Debian QA Group
+  * Fixed inconsistencies in the copyright file (Closes: #826216)
+
+ -- Kyle Robbertze   Sat, 4 Feb 2017 09:15:24 +0200
+
 w3c-sgml-lib (1.3-1) unstable; urgency=low
 
   * New upstream release (Closes: #665298)
diff -Nru w3c-sgml-lib-1.3/debian/control w3c-sgml-lib-1.3/debian/control
--- w3c-sgml-lib-1.3/debian/control 2013-03-16 17:43:37.0 +0200
+++ w3c-sgml-lib-1.3/debian/control 2017-02-04 09:15:24.0 +0200
@@ -1,7 +1,7 @@
 Source: w3c-sgml-lib
 Section: text
 Priority: optional
-Maintainer: Nicholas Bamber 
+Maintainer: Debian QA Group 
 Build-Depends: debhelper (>= 9.20120909), xml-core (>= 0.13+nmu2~),
  libreadonly-perl, libxml-libxml-perl, libautodie-perl
 Standards-Version: 3.9.4
diff -Nru w3c-sgml-lib-1.3/debian/copyright w3c-sgml-lib-1.3/debian/copyright
--- w3c-sgml-lib-1.3/debian/copyright   2012-10-03 10:41:57.0 +0200
+++ w3c-sgml-lib-1.3/debian/copyright   2017-02-04 09:13:21.0 +0200
@@ -4,35 +4,69 @@
 Upstream-Name: W3C SGML Library
 
 Files: *
-Copyright: 1994-2010, W3C(R) (MIT, ERCIM, KEIO)
+Copyright: 1994-2002, W3C(R) (MIT, ERCIM, KEIO)
 License: W3C-Software
+Comment: License Grant
+ Schemas (and DTDs) are frequently part of our specifications and
+ seemingly fall under the document copyright terms. However, as long as
+ you do not use the same formal namespace or public identifier to
+ identify that modified W3C schema/DTD (which might confuse
+ applications), you may treat the schema/DTD under the software terms.
+ This means that you are permitted to make a derivative or modified W3C
+ schema/DTD, but even under the software terms you are obligated to
+ include/retain the W3C copyright notice. We further appreciate a couple
+ sentences regarding who made the modifications, when, and what changes
+ were made in the original DTD -- a common software documentation practice.
+ .
+ From: 
http://web.archive.org/web/20010602194347/http://www.w3.org/Consortium/Legal/IPR-FAQ-2620.html#DTD
+
+Files: htdocs/sgml-lib/REC-xhtml1-20020801/xhtml1-*.dtd
+Copyright: 1994-2002, W3C(R) (MIT, ERCIM, KEIO)
+License: W3C-Software
+Comment: License Grant
+ However, if no specific license exists for such a DTD or schema, as
+ long as you do not use the same formal namespace or public identifier
+ to identify that modified W3C schema/DTD (which might confuse
+ applications), you often may treat the schema/DTD under the software
+ terms. This means that you are permitted to make a derivative or
+ modified W3C schema/DTD, but even under the software terms you are
+ obligated to include/retain the W3C copyright notice. We further
+ appreciate a couple sentences regarding who made the modifications,
+ when, and what changes were made in the original DTD - a common
+ software documentation practice.
+ .
+ From: 
http://web.archive.org/web/20020806141443/http://www.w3.org/Consortium/Legal/IPR-FAQ-2620.html#DTD
 
 Files: debian/*
 Copyright: 2010-2012, Nicholas Bamber 
 License: Artistic
 
 License: W3C-Software
- By obtaining, using and/or copying this work, you (the licensee) agree
- that you have read, understood, and will comply with the following
- terms and conditions.
+ This W3C work (including software, documents, or other related items)
+ is being provided by the copyright holders under the following 
+ license. By obtaining, using and/or copying this work, you (the 
+ licensee) agree that you have read, understood, and will comply with
+ the following terms and conditions:
  .
- Permission to copy, modify, and distribute this software and its
- documentation, with or without modification, for any purpose and
+ Permission to use, copy, modify, and distribute this software and its
+ documentation, with or without modification,  for any purpose and
  without fee or royalty is hereby granted, provided that you include the
  following on ALL copies of the software and documentation or portions
- thereof, including modifications:
+ thereof, including modifications, that you make:
* The f