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

diff --git a/debian/changelog b/debian/changelog
index 75324ab4761cf01afcb5d1bedc302374cf6e5837..a8ebb38d949878067d92ebc14425491821decde5 100644 (file)
--- 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 309c750945a4e14cdc96db7c4f784b8886e20fbe..8977e198da480848344ea5595ac11859f4290124 100755 (executable)
--- 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 b238a14460e37230c2971ee2f7afd764356e775a..760fea7a067fbaf20954863efe7e09c060db3630 100644 (file)
--- a/policy.sgml
+++ b/policy.sgml
@@ -3485,15 +3485,15 @@ Package: libc6
                      Otherwise (i.e., the package was completely purged):
                      <example compact="compact">
 <var>new-preinst</var> install
-                     </example>
-                     Error unwind actions, respectively:
-                     <example compact="compact">
+                 </item>
+                </enumlist>
+              </example>
+                Error unwind actions, respectively:
+                <example compact="compact">
 <var>new-postrm</var> abort-upgrade <var>old-version</var>
 <var>new-postrm</var> abort-install <var>old-version</var>
 <var>new-postrm</var> abort-install
-                     </example>
-                 </item>
-               </enumlist>
+                </example>
            </item>
 
            <item>