dpkg (1.3.14) unstable; urgency=low

  * dpkg-buildpackage new -tc (clean source tree) option.

  * Formatted documentation removed by `make clean' and so not in source.
  * Manuals and own Standards-Version: updated to 2.1.0.0.
  * Distribute {policy,programmer}.{html.tar,ps}.gz with each upload.

 -- Ian Jackson <ian@chiark.chu.cam.ac.uk>  Sun, 1 Sep 1996 20:43:40 +0100

debian/changelog

@@ -1,3 +1,13 @@
+dpkg (1.3.14) unstable; urgency=low
+
+  * dpkg-buildpackage new -tc (clean source tree) option.
+
+  * Formatted documentation removed by `make clean' and so not in source.
+  * Manuals and own Standards-Version: updated to 2.1.0.0.
+  * Distribute {policy,programmer}.{html.tar,ps}.gz with each upload.
+
+ -- Ian Jackson <ian@chiark.chu.cam.ac.uk>  Sun, 1 Sep 1996 20:43:40 +0100
+
 dpkg (1.3.13) unstable; urgency=low (HIGH for building new src X programs)
 
   * X shared libraries added to shlibs.default (=> `elf-x11r6lib').

debian/rules

@@ -21,8 +21,14 @@ clean:
 
 binary:		binary-arch binary-indep
 
-binary-indep:
+binary-indep:	build
 	$(checkdir)
+	set -e -x; cd doc; for f in policy programmer; do \
+		debiandoc2ps -pa4 -O $$f.sgml | gzip -9v >../../$$f.ps.gz; \
+		dpkg-distaddfile -f../debian/files $$f.ps.gz byhand -; \
+		GZIP=-9v tar zcf ../../$$f.html.tar.gz $$f.html; \
+		dpkg-distaddfile -f../debian/files $$f.html.tar.gz byhand -; \
+	done
 
 binary-arch:	checkroot build
 	$(checkdir)

doc/Makefile.in

@@ -74,8 +74,8 @@ clean:
 		rm -f $(SGMLDOCSTAMPS)
 		rm -f database-structure.ps database-structure.monops ps
 		rm -f *.{aux,cp,dvi,fn,ky,log,pg,toc,tp,vr,bak}
-		rm -f guidelines.info* *.sasp*
-		rm -rf {programmer,policy}.html
+		rm -f guidelines.info*
+		rm -rf {programmer,policy}.{html*,sasp*,text*,ps*,lout*}
 
 distclean:
 		rm -f Makefile *.orig *~ *.~* ./#*#

doc/changelog

@@ -1,3 +1,18 @@
+debian-manuals (2.1.0.0) unstable;
+
+  * Upstream changelog must be installed too (was just recommended).
+
+  * Modification to use dpkg-shlibdeps added to conversion instructions.
+  * Packages which are buggy and orphaned but which are preserved for
+    compatibility go in contrib.
+
+  * Programmers' manual source package section refers to conversion
+    instructions in policy manual.
+  * Make it clear that recommending a non-free or contrib package puts a
+    package in contrib.
+
+ -- Ian Jackson <ian@chiark.chu.cam.ac.uk>  Sun, 1 Sep 1996 17:47:18 +0100
+
 debian-manuals (2.0.1.0) unstable;
 
   * varargs.h and libtermcap are obsolete - use stdarg.h and ncurses.

doc/manuals-version

@@ -1,2 +1,2 @@
-<!entity manuals-version "2.0.0.0">
-<!entity dpkg-version "1.3.12">
+<!entity manuals-version "2.1.0.0">
+<!entity dpkg-version "1.3.14">

doc/policy.sgml

@@ -141,7 +141,10 @@ distributed is not the complete source code required to compile the
 program (ie, the program cannot be compiled using only packages in the
 main Debian distribution), or
 <item>
-which depend for their use on non-free or contrib packages, or
+which depend for their use on non-free or contrib
+packages<footnote>This includes all packages which declare a
+dependency on a non-free or contrib package, and almost all packages
+which declare a recommendation.</footnote>, or
 <item>
 allow free use only for a trial period (shareware), or
 <item>
@@ -151,6 +154,9 @@ or
 are only installer-packages which require the user to supply a
 separate file to be installed, or
 <item>
+which are buggy and no longer maintained, but are preserved for
+backward compatibility, or
+<item>
 which fail to meet some other policy requirements,
 </list>
 may only be placed in the semi-supported contrib section of the Debian
@@ -520,21 +526,27 @@ These files should not be referenced by any program - they're there
 for the benefit of the system administrator and users, as
 documentation only.
 
-<sect1 id="instchangelog"><tt>/usr/doc/<var/package//changelog.Debian.gz</tt>
+<sect1 id="instchangelog"><tt>/usr/doc/<var/package//changelog.Debian.gz</>
+and <tt>/usr/doc/<var/package//changelog.upstream.gz</>.
 <p>
 
 This installed file must contain a copy of the <tt>debian/changelog</>
-file from your Debian source tree.
+file from your Debian source tree, and a copy of the upstream
+changelog file if there is one.  They should usually be installed in
+<tt>/usr/doc/<var/package/</> as <tt/changelog.Debian.gz/ and
+<tt/changelog.gz/ respectively.
 <p>
 
-It should be installed compressed using <tt/gzip -9/, as it will
-become large with time even if it starts out small.
+Both should be installed compressed using <tt/gzip -9/, as they will
+become large with time even if they start out small.
 <p>
 
 If the package has only one changelog which is used both as the Debian
 changelog and the upstream one because there is no separate upstream
-maintainer then the changelog should usually be installed as
-<tt>/usr/doc/<var/package//changelog.gz</> instead.
+maintainer then that changelog should usually be installed as
+<tt>/usr/doc/<var/package//changelog.gz</>; if there is a separate
+upstream maintainer, but no upstream changelog, then the Debian
+changelog should still be called <tt/changelog.Debian.gz/.
 
 <sect1 id="copyrightfile"><tt>/usr/doc/<var/package//copyright</tt>
 <p>
@@ -1512,6 +1524,11 @@ Ensure that the package's Debian-specific and upstream changelogs are
 installed.
 </list>
 
+<item>
+Change the package to use <prgn/dpkg-shlibdeps/ to determine its
+shared library dependencies and substitute them in.  Shared library
+dependencies should no longer be hardwired in the source package.
+
 <item>
 Check that the <tt>debian/README</> is really the copyright file, and
 if so rename it to <tt>debian/copyright</> and edit

doc/programmer.sgml

@@ -359,6 +359,11 @@ fields is available in <ref id="controlfields">.
 The Debian binary packages in the distribution are generated from
 Debian sources, which are in a special format to assist the easy and
 automatic building of binaries.
+<p>
+
+There was a previous version of the Debian source format, which is now
+being phased out.  Instructions for converting an old-style package
+are given in the Debian policy manual.
 
 <sect id="sourcetools">Tools for processing source packages
 <p>

scripts/dpkg-buildpackage.sh

@@ -24,6 +24,7 @@ Options: -r<gain-root-command>
          -si (default) src includes orig for rev. 0 or 1    } genchanges
          -sa           uploaded src always includes orig    }
          -sd           uploaded src is diff and .dsc only   }
+         -tc           clean source tree when finished
          -h            print this message
 END
 }
@@ -32,6 +33,7 @@ rootcommand=''
 pgpcommand=pgp
 signsource='withecho signfile'
 signchanges='withecho signfile'
+cleansource=false
 binarytarget=binary
 sourcestyle=''
 version=''
@@ -50,6 +52,7 @@ do
 	-si)	sourcestyle=-si ;;
 	-sa)	sourcestyle=-sa ;;
 	-sd)	sourcestyle=-sd ;;
+	-tc)	cleansource=true ;;
 	-b)	binaryonly=-b ;;
 	-B)	binaryonly=-b; binarytarget=binary-arch ;;
 	-v*)	version="$value" ;;
@@ -124,4 +127,9 @@ else
 fi
 
 $signchanges "$pva.changes"
+
+if $cleansource; then
+	withecho $rootcommand debian/rules clean
+fi
+
 echo "dpkg-buildpackage: $srcmsg"

scripts/dpkg-source.1

@@ -530,6 +530,12 @@ would have done.
 .I pgp-command
 should not contain spaces or any other shell metacharacters.
 .TP
+.B -tc
+Clean the source tree (using
+.I gain-root-command
+.BR "debian/rules clean" )
+after the package has been built.
+.TP
 .BR -us ", " -uc
 Do not PGP-sign the source package or the changelog, respectively.
 .SH DPKG-DISTADDFILE ARGUMENTS

version.h

@@ -1 +1 @@
-#define DPKG_VERSION "1.3.12" /* This line modified by Makefile */
+#define DPKG_VERSION "1.3.14" /* This line modified by Makefile */