I made an NMU removing the W3C recommendations and "The Bare Bones Guide
to HTML" which is also non-free (licence does not allow modification).

The changes aside from the removals and autoconf changes are:

diff -Nru wml-2.0.11/COPYRIGHT.OTHER wml-2.0.11ds1/COPYRIGHT.OTHER
--- wml-2.0.11/COPYRIGHT.OTHER  2005-12-01 17:50:13.000000000 +0000
+++ wml-2.0.11ds1/COPYRIGHT.OTHER       2008-03-16 18:16:28.000000000 +0000
@@ -72,8 +72,4 @@
       Copyright (c) Kenneth Albanowski
       http://www.perl.com/CPAN/authors/id/KJALB/
 
-  The Bare Bones Guide to HTML, v4.0 [wml_docs/wml_barebone.txt]
-      Copyright (c) Kevin Werbach
-      http://werbach.com/barebones/
-
 
diff -Nru /tmp/z31amq81ik/wml-2.0.11/debian/changelog 
/tmp/WmNd6HWCVF/wml-2.0.11ds1/debian/changelog
--- wml-2.0.11/debian/changelog 2008-03-16 18:16:28.000000000 +0000
+++ wml-2.0.11ds1/debian/changelog      2008-03-16 18:16:28.000000000 +0000
@@ -1,3 +1,12 @@
+wml (2.0.11ds1-0.1) unstable; urgency=low
+
+  * Non-maintainer upload
+  * Removed non-free documentation (Closes: #464765)
+    - W3C recommendations (wml_docs/wml_std_*.txt)
+    - The Bare Bones Guide to HTML (wml_docs/wml_barebone.txt)
+
+ -- Ben Hutchings <[EMAIL PROTECTED]>  Sun, 16 Mar 2008 17:33:30 +0000
+
 wml (2.0.11-3.1) unstable; urgency=high
 
   * Non-maintainer upload by security team.
diff -Nru /tmp/z31amq81ik/wml-2.0.11/debian/copyright 
/tmp/WmNd6HWCVF/wml-2.0.11ds1/debian/copyright
--- wml-2.0.11/debian/copyright 2008-03-16 18:16:28.000000000 +0000
+++ wml-2.0.11ds1/debian/copyright      2008-03-16 18:16:28.000000000 +0000
@@ -6,6 +6,10 @@
 This package was debianized from
        http://www.engelschall.com/sw/wml/distrib/wml-2.0.8.tar.gz
 
+The files wml_docs/wml_std_*.txt and wml_docs/wml_barebone.txt have
+been removed because their licences do not meet the Debian Free
+Software Guidelines.
+
 Ralf Engelschall released WML under the terms and conditions of the GNU
 General Public License (GPL).  On Debian GNU/Linux systems, the complete
 text of the GNU General Public License may be found in
diff -Nru /tmp/z31amq81ik/wml-2.0.11/MANIFEST 
/tmp/WmNd6HWCVF/wml-2.0.11ds1/MANIFEST
--- wml-2.0.11/MANIFEST 2005-12-01 17:50:13.000000000 +0000
+++ wml-2.0.11ds1/MANIFEST      2008-03-16 18:16:28.000000000 +0000
@@ -410,19 +410,9 @@
 wml_contrib/wml.vim
 wml_contrib/wml1to2
 wml_docs/Makefile.in
-wml_docs/wml_barebone.txt
 wml_docs/wml_faq.pod
 wml_docs/wml_intro.pod
 wml_docs/wml_macros.pod
-wml_docs/wml_std_css1.txt
-wml_docs/wml_std_css2.txt
-wml_docs/wml_std_csspos.txt
-wml_docs/wml_std_html20.txt
-wml_docs/wml_std_html32.txt
-wml_docs/wml_std_html40.txt
-wml_docs/wml_std_html401.txt
-wml_docs/wml_std_wai10.txt
-wml_docs/wml_std_xhtml10.txt
 wml_docs/wml_tags.L.incl
 wml_docs/wml_tags.L.main
 wml_docs/wml_tags.pod.in
diff -Nru /tmp/z31amq81ik/wml-2.0.11/wml_contrib/tkwmd 
/tmp/WmNd6HWCVF/wml-2.0.11ds1/wml_contrib/tkwmd
--- wml-2.0.11/wml_contrib/tkwmd        2005-12-01 17:50:13.000000000 +0000
+++ wml-2.0.11ds1/wml_contrib/tkwmd     2008-03-16 18:16:28.000000000 +0000
@@ -77,10 +77,7 @@
 }
 
 add_doc_menu('Basics', 
-    qw(wml_intro wml_tutorial wml_faq wml_tags wml_barebone));
-add_doc_menu('References', 
-    qw(wml_std_html40 wml_std_html32 wml_std_html20 wml_std_css1
-       wml_std_css2 wml_std_csspos));
+    qw(wml_intro wml_tutorial wml_faq wml_tags));
 add_doc_menu('Frontends', qw(wml wmk wmd wmb wmu));
 add_doc_menu('Backends',
     qw(wml_p1_ipp wml_p2_mhc wml_p3_eperl wml_p4_gm4 wml_p5_divert
--- END ---

I noticed that tkwmd is installed under /usr/share/doc/wml, which is
possibly an error - but it's not a regression.

Ben.

-- 
Ben Hutchings
Life is like a sewer:
what you get out of it depends on what you put into it.

Attachment: signature.asc
Description: This is a digitally signed message part

Reply via email to