Synchronized with patch 111 from Manojs tree

[debian/debian-policy.git] / debian / copyright

diff --git a/debian/copyright b/debian/copyright
index 207e3093bac415afcb12a1143f91f7e75eafe437..741d48341cf3a57b9caee4016326fd038f0509cf 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,12 +1,16 @@
+This is the Debian package of Debian Policy Manual, the Filesystem
+Hierarchy Standard, the Linux Filesystem Standard and related
+documents. It was originally assembled by Christian Schwarz and is now
+maintained by the Debian Policy Group
+<debian-policy@lists.debian.org>.
 
-This is the Debian package of Debian Policy Manual, the Linux
-Filesystem Standard and related documents. It was assembled by
-Christian Schwarz <schwarz@debian.org>.
+The FHS and FSSTND documents were downloaded from
+http://www.pathname.com/fhs/.
 
 ------------------------------------------------------------------------------
 Copyright of the Debian Policy Manual:
 
-Copyright ©1996 Ian Jackson.
+Copyright (C) 1996 Ian Jackson.
 
 This manual is free software; you may redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
@@ -25,6 +29,37 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 MA 02111-1307, USA.
 
 ------------------------------------------------------------------------------
+
+Copyright of the Filesystem Hierarchy Standard (FHS)
+
+Copyright (C) 1994-2000 Daniel Quinlan
+
+Permission is granted to make and distribute verbatim copies of this
+standard provided the copyright and this permission notice are preserved
+on all copies.
+
+[troff source includes the following paragraph:
+Permission is granted to process this file through a typesetter (such as
+troff) and print the results, provided the printed document carries a
+permission notice identical to this one except for the removal of this
+paragraph (this paragraph not being relevant to the printed document).]
+
+Permission is granted to copy and distribute modified versions of this
+standard under the conditions for verbatim copying, provided also that
+the title page is labeled as modified including a reference to the
+original standard, provided that information on retrieving the original
+standard is included, and provided that the entire resulting derived
+work is distributed under the terms of a permission notice identical to
+this one.
+
+Permission is granted to copy and distribute translations of this
+standard into another language, under the above conditions for modified
+versions, except that this permission notice may be stated in a
+translation approved by the copyright holder.
+
+
+------------------------------------------------------------------------------
+
 Copyright of the Linux Filesystem Standard (FSSTND).