summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillem Jover <guillem@debian.org>2006-10-25 03:02:07 +0000
committerGuillem Jover <guillem@hadrons.org>2010-06-10 23:21:21 +0200
commitd93fc319bd33477e3d8e458fe75fc00f9fcc5221 (patch)
tree9a20ee89a35f4ee7ecfa820f6dd08dbe5aa2368c
parent0d35d5d97dbcd605dcb463456618622194d327f4 (diff)
downloadinetutils-d93fc319bd33477e3d8e458fe75fc00f9fcc5221.tar.gz
Clarify the non-free doc stripping and repacking in debian/copyright
-rw-r--r--debian/changelog6
-rw-r--r--debian/copyright3
2 files changed, 6 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 7d49fbb..2834984 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,14 @@
inetutils (2:1.5.dfsg.1-1) UNRELEASED; urgency=low
* New upstream release.
- - Remove non-free RFC. (Closes: #393376)
- - Remove non-free GFDL documentation.
+ - Remove non-free RFC and GFDL documentation. Explain the situation
+ in debian/copyright. (Closes: #393376)
- debian/patches/00_build_dfsg.patch: New file. Disable the doc/ dir.
- debian/patches/00_no_link_extralibs.patch: Renamed to ...
- debian/patches/01_no_link_extralibs.patch: ... this. Partially merged
upstream.
- debian/patches/11_inetd_doc.patch: Remove. Merged upstream.
- * Do not Build-Depend on texinfo anymore, there's not info docs anymore.
+ * Do not Build-Depend on texinfo, there's no info docs anymore.
* Enable telnet authentication ShiShi support. (Closes: #300282)
* Disable syslogd forwarding by default, which was enabling inet
connections.
diff --git a/debian/copyright b/debian/copyright
index e7bbabe..f740506 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -13,6 +13,9 @@ The debian packages are maintained through Subversion on:
The source code is covered by the following copyrights:
+* The doc/ directory was removed from the original tarball, and the
+ tarball repacked as it contained GFDL'd material, and a non-free RFC.
+
* Most source files are copyrighted by:
The Regents of the University of California under the BSD license.