From 5213c971043358eeef6cc16b0c5853b962328b78 Mon Sep 17 00:00:00 2001 From: Manoj Srivastava Date: Thu, 16 Jun 2005 05:45:24 +0000 Subject: [PATCH] Move the error unwind eaxmple out the item in the postinst script Author: srivasta Date: 2005/02/04 23:44:52 Move the error unwind eaxmple out the item in the postinst script usage section. Delete generated files in the clean target (policy.{pdf,ps,tpt,txt} are generated files) git-archimport-id: srivasta@debian.org--etch/debian-policy--devel--3.0--patch-279 --- debian/changelog | 4 ++++ debian/rules | 4 +++- policy.sgml | 12 ++++++------ 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 75324ab..a8ebb38 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,10 @@ debian-policy (3.6.2.1) unstable; urgency=low * Bug fix: "debian-policy: please clarify section 12.7.", thanks to Adrian Bunk. Added a clarifying footnote that makes it clear that section 12.3 does not allow one to ignore section 12.7 (Closes: #276953). + * + * Bug fix: "debian-policy: should not ship generated files in source + archive, and should clean them from the tree", thanks to Branden + Robinson (Closes: #284967). -- diff --git a/debian/rules b/debian/rules index 309c750..8977e19 100755 --- a/debian/rules +++ b/debian/rules @@ -66,12 +66,14 @@ POLICY_FILES = $(SGML_FILES:=.sgml) $(SGML_FILES:=.txt.gz) \ debconf_spec/debconf_specification.txt.gz \ policy.ps.gz policy.pdf.gz +# policy.{pdf,ps,tpt,txt} are generated files FILES_TO_CLEAN = debian/files debian/buildinfo debian/substvars \ debian/postinst debian/prerm \ version.ent upgrading-checklist.txt \ $(SGML_FILES:=.txt.gz) $(SGML_FILES:=.html.tar.gz) \ policy.pdf.gz policy.ps.gz \ - debconf_specification.xml.tar.gz + debconf_specification.xml.tar.gz \ + policy.pdf policy.ps policy.txt policy. STAMPS_TO_CLEAN := stamp-policy stamp-build DIRS_TO_CLEAN := debian/tmp fhs $(SGML_FILES:=.html) diff --git a/policy.sgml b/policy.sgml index b238a14..760fea7 100644 --- a/policy.sgml +++ b/policy.sgml @@ -3485,15 +3485,15 @@ Package: libc6 Otherwise (i.e., the package was completely purged): new-preinst install - - Error unwind actions, respectively: - + + + + Error unwind actions, respectively: + new-postrm abort-upgrade old-version new-postrm abort-install old-version new-postrm abort-install - - - + -- 2.39.5