dpkg (1.4.0) unstable; urgency=low (HIGH for new source format)

  * Corrected buffer overrun when dpkg-deb generates filename.  (Bug#4467.)
  * dpkg-shlibdeps works with DEBIAN/shlibs (thanks Heiko Schlittermann).
  * Added libm.so.5 to shlibs.default for i386/m68k.

  * Split binary package into two: dpkg and dpkg-dev.
  * dpkg-source(1) documents mode and ownership setting during extraction.

  * dpkg-scanpackages moved to /usr/bin.
  * Include /usr/bin/dpkg-deb, not dpkg-deb.dist; don't rename in scripts.
  * Copyright file changed slightly.
  * debian-changelog-mode uses magic key substitution strings.  (Bug#4419.)
  * Changed email address in control file to <ian@chiark.greenend.org.uk>.
  * Manuals and own Standards-Version: updated to 2.1.1.0.

 -- Ian Jackson <ian@chiark.greenend.org.uk>  Thu, 12 Sep 1996 01:13:33 +0100

8 files changed, 105 insertions, 52 deletions

diff --git a/debian/changelog b/debian/changelog
index 3de336564..c0ccf5fb8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+dpkg (1.4.0) unstable; urgency=low (HIGH for new source format)
+
+  * Corrected buffer overrun when dpkg-deb generates filename.  (Bug#4467.)
+  * dpkg-shlibdeps works with DEBIAN/shlibs (thanks Heiko Schlittermann).
+  * Added libm.so.5 to shlibs.default for i386/m68k.
+
+  * Split binary package into two: dpkg and dpkg-dev.
+  * dpkg-source(1) documents mode and ownership setting during extraction.
+
+  * dpkg-scanpackages moved to /usr/bin.
+  * Include /usr/bin/dpkg-deb, not dpkg-deb.dist; don't rename in scripts.
+  * Copyright file changed slightly.
+  * debian-changelog-mode uses magic key substitution strings.  (Bug#4419.)
+  * Changed email address in control file to <ian@chiark.greenend.org.uk>.
+  * Manuals and own Standards-Version: updated to 2.1.1.0.
+
+ -- Ian Jackson <ian@chiark.greenend.org.uk>  Thu, 12 Sep 1996 01:13:33 +0100
+
 dpkg (1.3.14) unstable; urgency=low
 
   * dpkg-buildpackage new -tc (clean source tree) option.
diff --git a/debian/control b/debian/control
index e6da27bc7..fdc01ef70 100644
--- a/debian/control
+++ b/debian/control
@@ -1,16 +1,13 @@
 Source: dpkg
 Section: base
 Priority: required
-Maintainer: Ian Jackson <ian@chiark.chu.cam.ac.uk>
-Standards-Version: 2.0.1.0
+Maintainer: Ian Jackson <ian@chiark.greenend.org.uk>
+Standards-Version: 2.1.0.0
 
 Package: dpkg
 Architecture: any
 Essential: yes
 Pre-Depends: ${shlibs:Pre-Depends}
-Suggests: cpio (>= 2.4.2-2), patch
-Conflicts: dpkgname
-Replaces: dpkgname
 Description: Package maintenance system for Debian Linux
  This package contains the programs which handle the installation and
  removal of packages on your system.
@@ -19,5 +16,24 @@ Description: Package maintenance system for Debian Linux
  a more low-level and less user-friendly interface is available in
  the form of the `dpkg' command.
  .
- In order to manipulate source packages using `dpkg-source' you will
- need to install the `cpio' and `patch' packages.
+ In order to unpack and build Debian source packages you will need to
+ install the developers' package `dpkg-dev' as well as this one.
+
+Package: dpkg-dev
+Section: devel
+Priority: important
+Architecture: all
+Recommends: cpio (>= 2.4.2-2), patch
+Conflicts: dpkgname
+Replaces: dpkgname, dpkg (<< 1.4.0)
+Description: Package building tools for Debian Linux
+ This package contains the tools (including dpkg-source) required to
+ unpack, build and upload Debian source packages.  It also contains
+ the programmers' and Debian policy manuals, which are the
+ documentation for package developers.
+ .
+ `cpio' and `patch' are also required to manipulate source packages.
+ Some older cpios are insufficient - use at least 2.4.2-2.
+ .
+ Most Debian source packages will require additional tools to build -
+ for example, most packages need the `make' and the C compiler `gcc'.
diff --git a/debian/copyright b/debian/copyright
index 6f29f5164..fe0baf1e9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,11 @@
 This is Debian Linux's package maintenance system.
 
-For an example of how to construct packages see the `hello' package
-which is part of Debian.
+To build your own packages install the `dpkg-dev' package and read the
+manuals which it installs in /usr/doc/dpkg and look at the `hello'
+example package.
 
-Copyright (C) 1994,1995,1996 Ian Jackson <iwj10@cus.cam.ac.uk>
+
+Copyright (C) 1994,1995,1996 Ian Jackson <ian@chiark.chu.cam.ac.uk>
 Copyright (C) 1995,1996 Erick Branderhorst <branderhorst@heel.fgg.eur.nl>
 Copyright (C) 1996 Miquel van Smoorenburg <miquels@cistron.nl>
 Copyright (C) 1996 Kim-Minh Kaplan <kkaplan@cdfhp3.in2p3.fr>
diff --git a/debian/dev-README b/debian/dev-README
new file mode 100644
index 000000000..9c9df842c
--- /dev/null
+++ b/debian/dev-README
@@ -0,0 +1,2 @@
+All dpkg documentation in /usr/doc, including the developers'
+information which comes in the dpkg-dev package, is in /usr/doc/dpkg.
diff --git a/debian/postinst b/debian/postinst
index 545c24b9f..ff2566925 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -116,9 +116,7 @@ then
 	touch diversions
 fi
 
-cd /usr/bin
-if test dpkg-deb.dist -ef dpkg-deb; then rm dpkg-deb.dist; fi
-if test -f dpkg-deb.dist; then mv dpkg-deb.dist dpkg-deb; fi
+rm -f /usr/bin/dpkg-deb.dist
 
 if test -d /DEBIAN
 then
diff --git a/debian/prerm b/debian/prerm
index 59a60677a..0da7a2d13 100644..100755
--- a/debian/prerm
+++ b/debian/prerm
@@ -1,9 +1,8 @@
-#!/bin/sh -
+#!/bin/sh
 
 set -e
 
 cd /usr/bin
-test -f dpkg-deb.dist || ln dpkg-deb dpkg-deb.dist
 
 install-info --quiet --remove /usr/info/Guidelines
 install-info --quiet --remove /usr/info/debian-guidelines
diff --git a/debian/rules b/debian/rules
index 6774a7f04..82ab3d3a7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 DIR:=$(shell pwd)
 
 arch=$(shell dpkg --print-architecture)
-cidir=debian/tmp/DEBIAN
+mcidir=debian/tmp-main/DEBIAN
 
 build:
 	$(checkdir)
@@ -21,57 +21,74 @@ clean:
 
 binary:		binary-arch binary-indep
 
-binary-indep:	build
+binary-trees:	checkroot 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)
-	-rm -rf debian/tmp
-	install -d debian/tmp debian/tmp/DEBIAN debian/tmp/etc/dpkg
-	install -d debian/tmp/usr/doc/{copyright,dpkg}
+	-rm -rf debian/tmp-{main,dev}
+	install -d debian/tmp-{main,dev}/{DEBIAN,etc/dpkg,usr/doc/dpkg}
+	install -d debian/tmp-dev/usr/{lib/dpkg,doc/dpkg-dev,man/man1,man/man8,sbin,bin}
 	set -e; if [ $(arch) = i386 ]; then \
-		sed -e 's/^# i386elf: //' <debian/preinst >$(cidir)/preinst ; \
+		sed -e 's/^# i386elf: //' <debian/preinst >$(mcidir)/preinst ; \
 	else \
-		sed -e '/^# i386elf: /d' debian/preinst >$(cidir)/preinst ; \
+		sed -e '/^# i386elf: /d' debian/preinst >$(mcidir)/preinst ; \
 	fi
 	set -e; if [ -f debian/shlibs.default.$(arch) ]; then \
-		echo /etc/dpkg/shlibs.default >$(cidir)/conffiles ; \
-		cp debian/shlibs.default.$(arch) debian/tmp/etc/dpkg/shlibs.default ; \
+		echo /etc/dpkg/shlibs.default >debian/tmp-dev/DEBIAN/conffiles ; \
+		cp debian/shlibs.default.$(arch) \
+			debian/tmp-dev/etc/dpkg/shlibs.default ; \
 	fi
-	cp debian/{prerm,postinst} $(cidir)/.
-	chmod +x $(cidir)/{postinst,prerm,preinst}
-	$(MAKE) prefix=$(DIR)/debian/tmp/usr \
-		datadir=$(DIR)/debian/tmp/var/lib/dpkg \
-		etcdir=$(DIR)/debian/tmp/etc \
+	cp debian/{prerm,postinst} $(mcidir)/.
+	chmod +x $(mcidir)/{postinst,prerm,preinst}
+	$(MAKE) prefix=$(DIR)/debian/tmp-main/usr \
+		datadir=$(DIR)/debian/tmp-main/var/lib/dpkg \
+		etcdir=$(DIR)/debian/tmp-main/etc \
 		install
-	find debian/tmp/usr/man -type f | xargs gzip -9v
+	find debian/tmp-main/usr/man -type f | xargs gzip -9v
 	set -e; for f in dpkg-buildpackage dpkg-gencontrol dpkg-distaddfile \
 		  dpkg-parsechangelog dpkg-genchanges dpkg-shlibdeps; do \
-		rm debian/tmp/usr/man/man1/$$f.1; \
-		ln -s dpkg-source.1.gz debian/tmp/usr/man/man1/$$f.1.gz ; \
+		rm debian/tmp-main/usr/man/man1/$$f.1; \
+		ln -s dpkg-source.1.gz debian/tmp-main/usr/man/man1/$$f.1.gz ; \
 	done
-	gzip -9v debian/tmp/usr/doc/dpkg/changelog.*
-	cp debian/copyright debian/tmp/usr/doc/dpkg/copyright
-	cp TODO debian/tmp/usr/doc/dpkg/WISHLIST
-	touch debian/tmp/var/lib/dpkg/{status,available}
+	gzip -9v debian/tmp-main/usr/doc/dpkg/changelog.*
+	cp debian/copyright debian/tmp-main/usr/doc/dpkg/copyright
+	cp debian/copyright debian/tmp-dev/usr/doc/dpkg-dev/copyright
+	cp debian/dev-README debian/tmp-dev/usr/doc/dpkg-dev/README
+	cp TODO debian/tmp-dev/usr/doc/dpkg/WISHLIST
+	set -e; for f in \
+ usr/doc/dpkg/{programmer.html,policy.html,developer-keys.pgp,changelog.manuals.gz} \
+ usr/bin/dpkg-{source,genchanges,gencontrol,shlibdeps,buildpackage,parsechangelog} \
+ usr/bin/{dpkg-distaddfile,822-date,dpkg-scanpackages} \
+ usr/man/man1/dpkg-{source,genchanges,gencontrol,shlibdeps,buildpackage}.1.gz \
+ usr/man/man1/{dpkg-parsechangelog,dpkg-distaddfile,822-date}.1.gz \
+ usr/man/man5 usr/man/man8/dpkg-scanpackages.8.gz usr/lib/emacs \
+ usr/lib/dpkg/parsechangelog usr/lib/dpkg/controllib.pl \
+		; do mv debian/tmp-main/$$f debian/tmp-dev/$$f; done
+
+binary-indep:	checkroot build binary-trees
+	$(checkdir)
+	dpkg-gencontrol -pdpkg-dev -Pdebian/tmp-dev
+	chown -R root.root debian/tmp-dev
+	chmod -R g-ws,a+r,u+w debian/tmp-dev
+	dpkg-deb --build debian/tmp-dev ..
+	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 binary-trees
+	touch debian/tmp-main/var/lib/dpkg/{status,available}
 	dpkg-shlibdeps -dPre-Depends main/dpkg dselect/dselect
-	dpkg-gencontrol
-	chown -R root.root debian/tmp
-	chmod -R g-ws,a+r,u+w debian/tmp
-	set -e; cd debian/tmp; \
+	dpkg-gencontrol -pdpkg -Pdebian/tmp-main
+	chown -R root.root debian/tmp-main
+	chmod -R g-ws,a+r,u+w debian/tmp-main
+	set -e; cd debian/tmp-main; \
 	 version=`sed -n 's/^Version: //p' DEBIAN/control`; \
 	 file=dpkg_$${version}_$(arch).nondebbin.tar; \
 	 tar cf ../../../$${file} usr var && gzip -9vf ../../../$${file}; \
 	 cd ../..; dpkg-distaddfile $${file}.gz byhand -
-	mv debian/tmp/usr/bin/dpkg-deb{,.dist}
-	rm debian/tmp/var/lib/dpkg/{status,available}
-	dpkg-deb --build debian/tmp ..
+	rm debian/tmp-main/var/lib/dpkg/{status,available}
+	dpkg-deb --build debian/tmp-main ..
 
 define checkdir
 	test -f include/dpkg.h
diff --git a/debian/shlibs.default.i386 b/debian/shlibs.default.i386
index ab18adb89..10591b270 100644
--- a/debian/shlibs.default.i386
+++ b/debian/shlibs.default.i386
@@ -1,4 +1,5 @@
 libc 5		libc5 (>= 5.2.18)
+libm 5		libc5 (>= 5.2.18)
 libncurses 3.0	ncurses3.0
 libICE	6	elf-x11r6lib
 libPEX5	6	elf-x11r6lib