* debian/changelog: Split dchroot into a separate package.

11 files changed, 83 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index d6dfb56f..aede6108 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-06-14  Roger Leigh  <rleigh@debian.org>
 
+	* debian/changelog: Split dchroot into a separate package.
+
+2006-06-14  Roger Leigh  <rleigh@debian.org>
+
 	* schroot/schroot.cc (main): Output configuration file with a help
 	message in comments, to help migrating dchroot.conf.
 
diff --git a/debian/changelog b/debian/changelog
index 1f186797..55245d67 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,22 @@ schroot (0.99.0-1) unstable; urgency=low
   * schroot.conf supports a personality option to set the process
     execution domain, and dchroot.conf supports an additional third
     personality option to do the same (Closes: #372874).
+  * debian/control:
+    - split dchroot into a separate package.
+    - schroot conflicts with dchroot << 0.13.
+    - dchroot replaces and depends upon schroot, so it can take over
+      dchroot.conf and use the remaining schroot configuration.
+    - dchroot and schroot Suggest debootstrap.
+  * debian/rules:
+    - Use dh_install
+    - Install dchroot lintian override.
+  * debian/dchroot.install: New file.
+  * debian/schroot.install: New file.
+  * debian/schroot.lintian-overrides: Remove dchroot lintian override.
+  * debian/dchroot.lintian-overrides: Add dchroot lintian override.
+  * debian/schroot.preinst: Move from debian/preinst.
+  * debian/schroot.postinst: Move from debian/postinst.
+  * debian/dchroot.postrm: New file.  Remove /etc/dchroot.conf on purge.
 
  --
 
diff --git a/debian/control b/debian/control
index 3288e424..19038bcf 100644
--- a/debian/control
+++ b/debian/control
@@ -9,11 +9,9 @@ Standards-Version: 3.7.2
 Package: schroot
 Architecture: any
 Depends: ${shlibs:Depends}
-Provides: dchroot
-Conflicts: dchroot
-Replaces: dchroot
+Conflicts: dchroot (<< 0.13)
 Enhances: sbuild
-Suggests: lvm-common, unzip
+Suggests: debootstrap, lvm-common, unzip
 Description: Execute commands in a chroot environment
  schroot allows users to execute commands or interactive shells
  in different chroots.  Any number of named chroots may be
@@ -32,5 +30,15 @@ Description: Execute commands in a chroot environment
  all supported chroot types, including sessions.
  .
  schroot shares most of its options with dchroot, but offers vastly
- more functionality.  A dchroot compatibility wrapper is also
- provided, offering the same functionality as the dchroot package.
+ more functionality.
+
+Package: dchroot
+Architecture: any
+Suggests: debootstrap
+Depends: schroot (= ${Source-Version}), ${shlibs:Depends}
+Replaces: schroot
+Description: Execute commands in a chroot environment
+ schroot allows users to execute commands or interactive shells in
+ different chroots.  A typical installation might provide 'stable',
+ 'testing' and 'unstable' chroots.  Users can move between chroots as
+ necessary.
diff --git a/debian/dchroot.install b/debian/dchroot.install
new file mode 100644
index 00000000..77ef722e
--- /dev/null
+++ b/debian/dchroot.install
@@ -0,0 +1,2 @@
+debian/install/usr/bin/dchroot               usr/bin
+debian/install/usr/share/man/man1/dchroot.1  usr/share/man/man1
diff --git a/debian/dchroot.lintian-overrides b/debian/dchroot.lintian-overrides
new file mode 100644
index 00000000..084daa18
--- /dev/null
+++ b/debian/dchroot.lintian-overrides
@@ -0,0 +1 @@
+dchroot binary: setuid-binary usr/bin/dchroot 4755 root/root
diff --git a/debian/dchroot.postrm b/debian/dchroot.postrm
new file mode 100644
index 00000000..43b1f5de
--- /dev/null
+++ b/debian/dchroot.postrm
@@ -0,0 +1,29 @@
+#! /bin/sh
+# postrm script for dchroot
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
+# for details, see /usr/doc/packaging-manual/
+
+if [ "$1" = purge ]; then
+    # Remove /etc/dchroot.conf if present
+    rm -f /etc/dchroot.conf
+fi
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+
diff --git a/debian/rules b/debian/rules
index 1c1e6291..71f5f40c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,6 +36,7 @@ build-stamp:  config.status
 clean:
 	dh_testdir
 	dh_testroot
+	rm -rf debian/install
 	rm -f build-stamp
 
 	-$(MAKE) distclean
@@ -47,17 +48,20 @@ ifneq "$(wildcard /usr/share/misc/config.guess)" ""
 endif
 
 
-	dh_clean 
+	dh_clean
 
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k 
+	dh_clean -k
 	dh_installdirs
 
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/schroot
-	rm -rf $(CURDIR)/debian/schroot/usr/share/gtk-doc
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/install
+	dh_install
+
+	mkdir -p $(CURDIR)/debian/dchroot/usr/share/lintian/overrides
 	mkdir -p $(CURDIR)/debian/schroot/usr/share/lintian/overrides
+	cp $(CURDIR)/debian/dchroot.lintian-overrides $(CURDIR)/debian/dchroot/usr/share/lintian/overrides/dchroot
 	cp $(CURDIR)/debian/schroot.lintian-overrides $(CURDIR)/debian/schroot/usr/share/lintian/overrides/schroot
 
 # Build architecture-independent files here.
@@ -77,7 +81,7 @@ binary-arch: build install
 	dh_strip
 	dh_compress
 	dh_fixperms
-	chmod 4755 $(CURDIR)/debian/schroot/usr/bin/dchroot
+	chmod 4755 $(CURDIR)/debian/dchroot/usr/bin/dchroot
 	chmod 4755 $(CURDIR)/debian/schroot/usr/bin/schroot
 	dh_installdeb
 	dh_shlibdeps
diff --git a/debian/schroot.install b/debian/schroot.install
new file mode 100644
index 00000000..5e897634
--- /dev/null
+++ b/debian/schroot.install
@@ -0,0 +1,8 @@
+debian/install/etc/pam.d                     etc
+debian/install/etc/schroot                   etc
+debian/install/usr/bin/schroot               usr/bin
+debian/install/usr/lib                       usr
+debian/install/usr/share/locale              usr/share
+debian/install/usr/share/man/man1/schroot.1  usr/share/man/man1
+debian/install/usr/share/man/man5            usr/share/man
+debian/install/var/lib                       var
\ No newline at end of file
diff --git a/debian/schroot.lintian-overrides b/debian/schroot.lintian-overrides
index 19504fd4..e6fc9093 100644
--- a/debian/schroot.lintian-overrides
+++ b/debian/schroot.lintian-overrides
@@ -1,2 +1 @@
-schroot binary: setuid-binary usr/bin/dchroot 4755 root/root
 schroot binary: setuid-binary usr/bin/schroot 4755 root/root
diff --git a/debian/postinst b/debian/schroot.postinst
index 720f06e9..720f06e9 100644
--- a/debian/postinst
+++ b/debian/schroot.postinst
diff --git a/debian/preinst b/debian/schroot.preinst
index 13504d30..13504d30 100644
--- a/debian/preinst
+++ b/debian/schroot.preinst