proposed NMU of debian-policy (v2.4.1.3)
I have done the following non-content-related changes to Debian
Policy, based on the fact that it is not currently maintained. The
diff for this proposed NMU (from the last "official" version, 2.4.1.1)
is included below. Normally, I would just upload this. However,
since this *is* an very crucial piece of our internal infrastructure,
I've decided to ask here instead.
Again, no content changes in the policy at all, just typos, grammar
fixes, and packaging fixes.
Barring objections I shall upload this tomorrow evening.
Finally, if anyone wants to try it, you'll find it at
http://master.debian.org/~aph/
--
.....A. P. Harris...apharris@onShore.com...<URL:http://www.onShore.com/>
diff -Pur debian-policy-2.4.1.1/debian/changelog debian-policy-2.4.1.3/debian/changelog
--- debian-policy-2.4.1.1/debian/changelog Thu May 14 16:54:16 1998
+++ debian-policy-2.4.1.3/debian/changelog Sun Jul 26 18:06:24 1998
@@ -1,3 +1,32 @@
+debian-policy (2.4.1.3) unstable; urgency=low
+
+ * non-maintainer release
+ * policy.sgml: some awkward phrasings fixed (closes Bug#22006)
+ * policy.sgml: s/depreciated/deprecated (closes Bug#21831)
+ * debian/control: added conflict doc-base (<< 0.6), which I still am not
+ sure why we need this but hey (closes Bug#21554)
+ * policy.sgml: use new <url> tag where appropriate
+ * policy.sgml, debian/control: always dynamically self reference the
+ current version of policy, that is, do not hard code policy revision
+ or date anywhere
+ * debian/rules: use dpkg-gencontrol -isp
+ * bugs fixed in some unknown previous version (closes Bug#23177)
+
+ -- Adam P. Harris <aph@debian.org> Sun, 26 Jul 1998 18:06:08 -0400
+
+debian-policy (2.4.1.2) frozen unstable; urgency=low
+
+ * non-maintainer release
+ * rebuild package to fix truncated Chapter 3 (Bug#23408, not marked as
+ important but should be, since a gaping hole in policy is very
+ annoying.)
+ * bumped version of policy, within the document, to this version number,
+ but not the date, indicating nothing really changed since then
+ * no content changes
+ * debian/rules: clean is a little cleaner
+
+ -- Adam P. Harris <aph@debian.org> Tue, 16 Jun 1998 03:15:22 -0400
+
debian-policy (2.4.1.1) frozen unstable; urgency=low
* Orphaned package
@@ -427,5 +456,4 @@
Local variables:
mode: debian-changelog
-add-log-mailing-address: "schwarz@debian.org"
End:
diff -Pur debian-policy-2.4.1.1/debian/control debian-policy-2.4.1.3/debian/control
--- debian-policy-2.4.1.1/debian/control Thu May 14 16:53:36 1998
+++ debian-policy-2.4.1.3/debian/control Sun Jul 26 18:05:57 1998
@@ -2,12 +2,12 @@
Section: doc
Priority: extra
Maintainer: Debian QA <debian-qa@lists.debian.org>
-Standards-Version: 2.4.1.0
+Standards-Version: ${debian-policy:Version}
Package: debian-policy
Architecture: all
Suggests: doc-base
-Conflicts: dpkg-dev (<< 1.4.0.9)
+Conflicts: dpkg-dev (<< 1.4.0.9), doc-base (<< 0.6)
Description: Debian Policy Manual and related documents
This package contains:
- Debian Policy Manual
diff -Pur debian-policy-2.4.1.1/debian/rules debian-policy-2.4.1.3/debian/rules
--- debian-policy-2.4.1.1/debian/rules Tue Apr 14 06:03:10 1998
+++ debian-policy-2.4.1.3/debian/rules Sun Jul 26 18:28:29 1998
@@ -1,7 +1,14 @@
#!/usr/bin/make -f
+DEB_VERSION := $(shell LC_ALL=C dpkg-parsechangelog | grep ^Version: | sed 's/^Version: *//')
+DATE := $(shell date +"%Y-%m-%d")
+
build:
$(checkdir)
+ rm -f version.ent
+ echo "<!entity version \"$(DEB_VERSION)\">" >> version.ent
+ echo "<!entity date \"$(DATE)\">" >> version.ent
+ nsgmls -gues policy.sgml # check SGML syntax
debiandoc2html policy.sgml
debiandoc2text policy.sgml
lynx -dump upgrading-checklist.html > upgrading-checklist.text
@@ -11,15 +18,26 @@
clean:
$(checkdir)
-rm -f build
- -rm -rf policy.html policy.text* upgrading-checklist.text
+ -rm -rf policy.html policy.text* policy.lout*
+ -rm -rf lout.li
+ -rm -rf upgrading-checklist.text
-rm -f `find . -name "*~"`
-rm -rf debian/tmp debian/files* core debian/substvars
+ -rm -rf version.ent
binary-indep: checkroot build
$(checkdir)
-rm -rf debian/tmp
install -d debian/tmp
cd debian/tmp && install -d `cat ../dirs`
+
+ # create a substvar to reference from debian/control so that
+ # we don't hardcode the policy compliance of the policy
+ # package. I guess some might question this but I take it as
+ # a given that the debian-policy pkg must always comply with
+ # itself...
+ echo "debian-policy:Version=$(DEB_VERSION)" > debian/substvars
+
cp -a policy.html debian/tmp/usr/doc/debian-policy/
cp policy.text.gz debian/tmp/usr/doc/debian-policy/
cat policy.sgml | gzip -9 > debian/tmp/usr/doc/debian-policy/policy.sgml.gz
@@ -35,7 +53,7 @@
mkdir debian/tmp/DEBIAN
cp debian/{postinst,prerm} debian/tmp/DEBIAN/
chmod +x debian/tmp/DEBIAN/{postinst,prerm}
- dpkg-gencontrol
+ dpkg-gencontrol -isp
chown -R root.root debian/tmp
chmod -R go=rX debian/tmp
dpkg --build debian/tmp ..
diff -Pur debian-policy-2.4.1.1/policy.sgml debian-policy-2.4.1.3/policy.sgml
--- debian-policy-2.4.1.1/policy.sgml Tue Apr 14 03:08:04 1998
+++ debian-policy-2.4.1.3/policy.sgml Sun Jul 26 18:01:00 1998
@@ -1,5 +1,9 @@
-<!doctype debiandoc system>
-
+<!doctype debiandoc system [
+<!-- include version information so we don't have to hard code it
+ within the document -->
+<!entity % versiondata SYSTEM "version.ent"> %versiondata;
+]>
+<debiandoc>
<!--
Debian GNU/Linux Policy Manual.
Copyright (C)1996,1997,1998 Ian Jackson and Christian Schwarz;
@@ -19,7 +23,7 @@
<author>Ian Jackson <email/ijackson@gnu.ai.mit.edu/
<author>Christian Schwarz <email/schwarz@debian.org/
<author>revised: David A. Morris <email/bweaver@debian.org/
-<version>version 2.4.1.0, 14 April 1998
+<version>version &version;, &date;
<abstract>
This manual describes the policy requirements for the Debian GNU/Linux
@@ -47,7 +51,7 @@
A copy of the GNU General Public License is available as
<tt>/usr/doc/copyright/GPL</tt> in the Debian GNU/Linux
distribution or on the World Wide Web at
-<tt>http://www.gnu.org/copyleft/gpl.html</tt>. You can also obtain it
+<url id="http://www.gnu.org/copyleft/gpl.html";>. You can also obtain it
by writing to the Free Software Foundation, Inc., 59 Temple Place -
Suite 330, Boston, MA 02111-1307, USA.
<p>
@@ -88,15 +92,15 @@
The current version of this document is always accessible from the
Debian FTP server at
-<tt>ftp://ftp.debian.org/debian/doc/manuals/debian-policy.html.tar.gz</tt>
+<url id="ftp://ftp.debian.org/debian/doc/manuals/debian-policy.html.tar.gz";>
or from the Debian WWW server at
-<tt>http://www.debian.org/doc/manuals/debian-policy/</tt>
+<url id="http://www.debian.org/doc/manuals/debian-policy/";>
<p>
There is also a home page for the <em>Debian Policy Manual</em> that
contains links to the current development version of this document as
well as an archive of old versions. The URL is
-<tt>http://fatman.mathematik.tu-muenchen.de/˜schwarz/debian-policy/</tt>
+<url id="http://fatman.mathematik.tu-muenchen.de/~schwarz/debian-policy/";>
<p>
In addition, this manual is distributed via the Debian package
@@ -427,7 +431,7 @@
<item>
<tt/required/ packages are necessary for the proper functioning of the
system. You must not remove these packages or your system may become
-totally broken and you may probably not even be able to use
+totally broken and you may not even be able to use
<prgn/dpkg/ to put things back. Systems with only the <tt/required/
packages are probably unusable, but they do have enough functionality
to allow the sysadmin to boot and install more software.
@@ -436,7 +440,7 @@
<item>
Important programs, including those which one would expect to find on
any Unix-like system. If the expectation is that an experienced Unix
-person who found it missing would go `What the F*!@<+ is going on,
+person who found it missing would say `What the F*!@<+ is going on,
where is <prgn/foo/', it should be in <tt/important/. This is an
important criterion because we are trying to produce, amongst other
things, a free Unix. Other packages without which the system will not
@@ -1211,7 +1215,7 @@
<p>
In addition, symbolic links should be specified as short as possible,
-i.e., link targets like `foo/../bar' are depreciated.
+i.e., link targets like `foo/../bar' are deprecated.
<p>
Note that when creating a relative link using <prgn/ln/ it is not
--
To UNSUBSCRIBE, email to debian-policy-request@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org
Reply to: