From 4640e44bbc60c9b6cc110aab95cd09f7ba2e118f Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Tue, 1 Jan 2008 23:24:50 +0000 Subject: [PATCH] FHS and FSSTND build and copyright cleanup Remove the remaining (mostly commented-out) build rules for FHS 2.1 and FSSTND. Remove the groff patch needed for building some versions of FHS 2.1 ourselves. Remove the (non-free) FSSTND license from debian/copyright since no FSSTND files are still part of Policy. FHS replaced it. Update the copyright years for FHS in debian/copyright. git-archimport-id: rra@debian.org--lenny/debian-policy--devel--3.7--patch-29 --- debian/changelog | 4 ++++ debian/copyright | 46 +++++----------------------------------------- debian/rules | 16 +--------------- mm1.32-patch | 46 ---------------------------------------------- 4 files changed, 10 insertions(+), 102 deletions(-) delete mode 100644 mm1.32-patch diff --git a/debian/changelog b/debian/changelog index 2217a62..404dd06 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,10 @@ debian-policy (3.7.4.0) unstable; urgency=low 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. -- diff --git a/debian/copyright b/debian/copyright index 545ed36..4b43882 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,10 +4,11 @@ documents. It was originally assembled by Christian Schwarz and is now maintained by the Debian Policy Group . -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. @@ -32,18 +33,14 @@ MA 02110-1301 USA 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 @@ -56,36 +53,3 @@ 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). - - -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. - --------------------------------------------------------------------------- diff --git a/debian/rules b/debian/rules index 04cf38e..1f5faba 100755 --- a/debian/rules +++ b/debian/rules @@ -50,15 +50,13 @@ DESC_FILES := debian-policy debian-menu-policy debian-perl-policy \ # 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 \ @@ -90,16 +88,6 @@ stamp-build: version.ent $(sanitycheck) $(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 @@ -136,7 +124,6 @@ stamp-policy: build $(sanitycheck) # 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 @@ -146,7 +133,6 @@ stamp-policy: build $(sanitycheck) # 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 \ diff --git a/mm1.32-patch b/mm1.32-patch deleted file mode 100644 index 54bc8de..0000000 --- a/mm1.32-patch +++ /dev/null @@ -1,46 +0,0 @@ -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] -- 2.39.5