to Josh Triplett (Closes: #455602).
* Bug fix: "Minor typos and wording suggestions", thanks to Michael
Tautschnig (Closes: #422552).
+ * Remove build system support for FHS 2.1 and FSSTND, mostly commented out.
+ * Remove the FSSTND license from debian/copyright; no FSSTND files are
+ currently part of policy.
+ * Update FHS copyright dates in debian/copyright.
--
maintained by the Debian Policy Group
<debian-policy@lists.debian.org>.
-The FHS and FSSTND documents were downloaded from
+The FHS documents were downloaded from
http://www.pathname.com/fhs/.
------------------------------------------------------------------------------
+
Copyright of the Debian Policy Manual:
Copyright (C) 1996 Ian Jackson.
Copyright of the Filesystem Hierarchy Standard (FHS)
-Copyright (C) 1994-2000 Daniel Quinlan
+Copyright © 1994-2004 Daniel Quinlan
+Copyright © 2001-2004 Paul 'Rusty' Russell
+Copyright © 2003-2004 Christopher Yeoh
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
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).
-
-
-Copyright (C) 1994, 1995 Daniel Quinlan
-
-Permission is granted to copy and distribute verbatim copies of this
-standard provided the copyright and this permission notice are
-preserved on all copies.
-
-Permission is granted for FSSTND contributors and participants to copy
-and distribute modified versions of this standard under the conditions
-for verbatim copying for purposes of filesystem standardization
-activities only, and subject to those restrictions listed below.
-
-The following restrictions apply to reproducing or transmitting the
-document in any form:
-
- o All copies or portions thereof must identify the document's title
- and section, and must be accompanied by this entire notice in a
- prominent location.
-
- o No portion of this document may be redistributed in any modified or
- abridged form without the prior approval of the FSSTND coordinator.
-
-Any entities seeking permission to distribute any material derived
-from this document (other than verbatim copies) must contact the
-FSSTND coordinator for the appropriate license.
-
---------------------------------------------------------------------------
# While we have two versions of the FHS installed in the source package,
# we need to modify this to handle it. This is the easiest way to do it.
# FHS_ARCHIVE := $(wildcard fhs*.tar.gz)
-# And with version 2.1, we have to build the text and dvi versions
-# ourselves :-(
FHS_ARCHIVE := fhs-2.3-source.tar.gz
FHS_HTML := fhs-2.3.html
FHS_FILES := fhs-2.3.ps.gz fhs-2.3.txt.gz fhs-2.3.pdf.gz
FHS_NEW_ARCHIVE :=
FHS_NEW_HTML :=
FHS_NEW_FILES :=
-# FSSTND_FILES := FSSTND-FAQ fsstnd-1.2.dvi.gz fsstnd-1.2.ps.gz fsstnd-1.2.txt.gz
+
POLICY_FILES = $(SGML_FILES:=.sgml) $(SGML_FILES:=.txt.gz) \
virtual-package-names-list.txt \
upgrading-checklist.txt libc6-migration.txt version.ent \
$(SGML_FILES:=.html.tar.gz) \
$(SGML_FILES:=.txt.gz) \
policy.ps.gz policy.pdf.gz
- # Need to use a patched tmac.m macro file if we're using a pre-1.16
- # groff; version 1.16 is apparently fixed
- if dpkg --compare-versions "$(shell dpkg -s groff | sed -n -e 's/Version: //p')" lt 1.16; then \
- cp /usr/share/groff/tmac/tmac.m fhs && \
- cd fhs && patch -p1 < ../mm1.32-patch; \
- fi
- # The extra '.' in the tmac path won't harm if unnecessary
- #GROFF_TMAC_PATH=. GROFF_NO_SGR=1 $(MAKE) -C fhs fhs.ps fhs.pdf fhs.txt
- #links -dump fhs-changes-2.1.html | perl -pe 's/[\r\0]//g' > \
- # fhs/fhs-changes-2.1.txt
links -dump upgrading-checklist.html | perl -pe 's/[\r\0]//g' > \
upgrading-checklist.txt
$(MAKE) -C debconf_spec all
# test -f stamp-build || $(MAKE) -f debian/rules build
rm -rf $(TMPTOP)
$(make_directory) $(TMPTOP)/DEBIAN
-# $(make_directory) $(DOCDIR)/fsstnd
$(make_directory) $(DOCDIR)/fhs
$(make_directory) $(LIBDIR)
# create a substvar to reference from debian/control so that
# itself...
echo "debian-policy:Version=$(version)" > debian/substvars
$(install_file) $(POLICY_FILES) $(DOCDIR)/
-# $(install_file) $(FSSTND_FILES) $(DOCDIR)/fsstnd/
$(install_file) debian/changelog $(DOCDIR)/
# Be more specific with file compression
gzip -f9 $(DOCDIR)/*.txt $(DOCDIR)/*.sgml \
+++ /dev/null
-Patch from Daniel Quinlan for mm-1.32 groff macros to make it work
-with FHS source
-
-diff -ur mm1.32/tmac.m tmac/tmac.m
---- mm1.32/tmac.m Thu Sep 2 22:37:52 1999
-+++ tmac/tmac.m Thu Jan 27 23:28:22 2000
-@@ -539,10 +539,12 @@
- .\" Break here to avoid problems with new linesetting of the previous line.
- .\" Hope this doesn't break anything else :-)
- .\" Don't break if arg_4 is a '1'.
-+.if \\n[D]>2 .tm PGFORM: \\$*
- .if ''\\$4' .br
-+.if \\n[D]>3 .tm PGFORM: IN l:\\n[.l] p:\\n[.p] o:\\n[.o]
- .ie !''\\$1' \{\
- . ll \\$1
--. nr @ll \n[.l]
-+. nr @ll \\n[.l]
- . nr @cur-ll \\n[@ll]
- . lt \\n[@ll]u
- .\}
-@@ -553,17 +555,23 @@
- .\"
- .ie !''\\$2' \{\
- . pl \\$2
--. nr @pl \n[.p]
-+. nr @pl \\n[.p]
- .\}
- .el .pl \\n[@pl]u
- .\"
- .ie !''\\$3' \{\
- . po \\$3
--. nr @po \n[.o]
-+. nr @po \\n[.o]
- .\}
- .el .po \\n[@po]u
-+.if \\n[D]>3 .tm PGFORM: OUT l:\\n[.l] p:\\n[.p] o:\\n[.o]
-+.if \\n[D]>2 .tm PGFORM: ll=\\n[@ll], pl=\\n[@pl], po=\\n[@po]
- 'in 0
- .pg@move-trap
-+.if \\n[D]>2 \{\
-+. tm Traps:
-+. ptr
-+.\}
- ..
- .\"-------------
- .\" .MOVE y [[x] linelength]
projects / debian / debian-policy.git / commitdiff