From 15ca6d2646e82d1c693fd27f6c63e1760e5063cc Mon Sep 17 00:00:00 2001 From: Manoj Srivastava Date: Thu, 16 Jun 2005 05:07:46 +0000 Subject: [PATCH] Renumbered version to 3.2.0.0 Author: jdg Date: 2000/06/20 15:31:32 Renumbered version to 3.2.0.0 Modified debian/rules to handle new FHS version (which has no pre-formatted text or dvi version), and handle tmac.m patch file from Daniel Quinlan git-archimport-id: srivasta@debian.org--etch/debian-policy--devel--3.0--patch-52 --- debian/changelog | 27 ++++++++++++++--------- debian/control | 5 +++-- debian/rules | 12 +++++++++-- mm1.32-patch | 46 ++++++++++++++++++++++++++++++++++++++++ upgrading-checklist.html | 10 ++++----- 5 files changed, 81 insertions(+), 19 deletions(-) create mode 100644 mm1.32-patch diff --git a/debian/changelog b/debian/changelog index 215843e..7850a84 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -debian-policy (4.0.0.0) unstable; urgency=low +debian-policy (3.2.0.0) unstable; urgency=low + * Fixed bugs in debian-policy package: * [ACCEPTED 10/26/99] changelog.html.gz sanitization. closes: Bug#40934 * [AMENDED 07/09/1999] policy on -g, a proposal closes: Bug#43787 * [ACCEPTED 02/01/2000] policy for usage of "xserver" @@ -17,25 +18,31 @@ debian-policy (4.0.0.0) unstable; urgency=low * [ACCEPTED 02/01/2000] applying the FHS to packages that use X closes: Bug#53762 * [ACCEPTED 02/01/2000] policy for X font packages closes: Bug#53763 + * Moved the documents into the Debian/ section, since that is where they + belong, really. closes: Bug#54777 + * Fixed the ftp location in the manuals. closes: Bug#56407 + * Fixed missing urlname entity in the sgml docs (where + was it defined before anyway?) closes: Bug#56692 + . + * Fixed bugs in packaging-manual package: + * We have had doc-base support for a while now. closes: Bug#15709 * packaging manual: Added additional clarification on dpkg behaviour. closes: Bug#17369 + * [PROPOSED]: clarification needed about diversions. + fixed usage for dpkg-divert closes: Bug#29522 * Fixed missing tag. closes: Bug#51091 * Documented that the library before the symlink hack (which dependend on file system specific kinks to work) is no longer required by newer versions of dpkg. closes: Bug#53405 * Fixed typo where dpkg-genchanges was used instead of dpkg-gencontrol. closes: Bug#58771 - * [PROPOSED]: clarification needed about diversions. - fixed usage for dpkg-divert closes: Bug#29522 - * We have had doc-base support for a while now. closes: Bug#15709 - * Moved the documents into the Debian/ section, since that is where they - belong, really. closes: Bug#54777 + . + * Other changes: * Added policy-process to document current procedures. - * Fixed missing urlname entity in the sgml docs (where - was it defined before anyway?) closes: Bug#56692 - * Fixed the ftp location in the manuals. closes: Bug#56407 + * Installed FHS version 2.1 + * Policy recommends packaging manual and vice versa - -- Manoj Srivastava Fri, 17 Mar 2000 20:29:39 -0600 + -- debian-policy (3.1.1.3) unstable; urgency=low diff --git a/debian/control b/debian/control index e99f7d4..2b9cef2 100644 --- a/debian/control +++ b/debian/control @@ -3,16 +3,16 @@ Section: doc Priority: optional Maintainer: Debian Policy List Standards-Version: ${debian-policy:Version} -Build-Depends-Indep: lynx, debiandoc-sgml, sp, liburi-perl, libpaperg, tetex-bin, tetex-extra, latex2html, libi18n-langtags-perl +Build-Depends-Indep: lynx, debiandoc-sgml, sp, liburi-perl, libpaperg, tetex-bin, tetex-extra, latex2html, libi18n-langtags-perl, groff, bsdmainutils, pstoedit Package: debian-policy Architecture: all +Recommends: packaging-manual Suggests: doc-base Conflicts: dpkg-dev (<< 1.4.0.9), doc-base (<< 0.6) Description: Debian Policy Manual and related documents This package contains: - Debian Policy Manual - - Linux Filesystem Structure (FSSTND) - Linux Filesystem Hierarchy Standard (FHS) - Authoritative list of virtual package names - Paper about libc6 migration @@ -20,6 +20,7 @@ Description: Debian Policy Manual and related documents Package: packaging-manual Architecture: all +Recommends: debian-policy Suggests: doc-base, dpkg (>= 1.4.0.23) Description: Debian Packaging Manual This package installs the Debian Packaging Manual. diff --git a/debian/rules b/debian/rules index fb5662b..7b00902 100755 --- a/debian/rules +++ b/debian/rules @@ -50,8 +50,10 @@ PLIBDIR := $(PTMPTOP)/usr/share/doc-base # 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 =$(shell ls -1 fhs*.tar.gz) -FHS_ARCHIVE =fhs-2.1-pre-03.tar.gz -FHS_FILES =fhs/fhs.dvi fhs/fhs.ps fhs/fhs.txt +# And with version 2.1, we have to build the text and dvi versions +# ourselves :-( +FHS_ARCHIVE =fhs-2.1-source.tar.gz +FHS_FILES =fhs/fhs.dvi fhs/fhs.ps fhs/fhs.txt fhs/fhs.pdf FSSTND_FILES =FSSTND-FAQ fsstnd-1.2.dvi.gz fsstnd-1.2.ps.gz fsstnd-1.2.txt.gz POLICY_FILES =policy.text.gz policy.sgml virtual-package-names-list.text \ upgrading-checklist.text libc6-migration.text \ @@ -81,6 +83,12 @@ stamp-build: gzip -9f $$file.text; \ done tar zfx $(FHS_ARCHIVE) + # Need to use a patched tmac.m macro file; can remove this + # bit once groff is fixed + cp /usr/share/groff/tmac/tmac.m fhs + cd fhs && patch -p1 < ../mm1.32-patch + GROFF_TMAC_PATH=. cd fhs && $(MAKE) all + lynx -dump fhs-changes-2.1.html > fhs/fhs-changes-2.1.text lynx -dump upgrading-checklist.html > upgrading-checklist.text touch stamp-build diff --git a/mm1.32-patch b/mm1.32-patch new file mode 100644 index 0000000..54bc8de --- /dev/null +++ b/mm1.32-patch @@ -0,0 +1,46 @@ +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] diff --git a/upgrading-checklist.html b/upgrading-checklist.html index bce6200..af7d6f1 100644 --- a/upgrading-checklist.html +++ b/upgrading-checklist.html @@ -6,10 +6,10 @@ Author : Manoj Srivastava ( srivasta@tiamat.datasync.com ) Created On : Thu Oct 29 20:54:48 1998 Created On Node : tiamat.datasync.com - Last Modified By : Manoj Srivastava - Last Modified On : Fri Mar 17 14:31:26 2000 - Last Machine Used: glaurung.green-gryphon.com - Update Count : 10 + Last Modified By : Julian Gilbey + Last Modified On : Mon Jun 19 20:06:50 2000 + Last Machine Used: polya.maths.qmw.ac.uk + Update Count : 11 Status : Unknown, Use with caution! HISTORY : Description : @@ -44,7 +44,7 @@ Manual.

The checklist

-4.0.0.0                    Mar 00
+3.2.0.0                    Jun 00
 
   Policy Manual:
      - By default executables should not be built with the debugging
-- 
2.39.5