dselect is its own package now

diff --git a/ChangeLog b/ChangeLog
index a92607cf2c4c57d760ed4ef947cfec40d903a0bd..044bff7fb8da2d2a522f587d6b6af8f6a813fde2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Oct 11 18:18:25 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
+
+  * Move dselect into its own package
+
 Mon Oct 11 17:37:47 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
 
   * Added support for HURD to start-stop-daemon
@@ -20,8 +24,8 @@ Mon Oct 11 02:13:15 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
 
 Thu Oct  7 01:16:23 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
 
-  * Check if codenumber is between 0 and 99 instead of just checking
-    for a number
+  * Check if sequencecode is between 0 and 99 instead of just checking
+    for a number in update-rc.d
 
 Wed Oct  6 14:40:33 CEST 1999 Wichert Akkerman <wakkerma@debian.org>
 

diff --git a/debian/changelog b/debian/changelog
index 4f3e93c689e6f42cd9f028e823ba946357b7ee5c..d21fcf62bc3a25739b2e0435fffdeb4b097bdf12 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,20 @@
+dpkg (1.4.1.15) unstable; urgency=low
+
+  * non-maintainer release.
+  * Move dselect into its own package
+  * Changes to support HURD
+  * Remove conffiles before directories when purging
+  * Check if integrity from other packages will broken when processing
+    an archive
+  * dpkg-deb can handle package made with Linux ar.
+  * Add check to update-alternatives to see if the sequencecode is between
+    0 and 99
+
+ -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED
+
 dpkg (1.4.1.14) unstable; urgency=low
 
-  * Non-maintainer release.
+  * non-maintainer release.
   * dpkg-source works again on empty diffs, Closes: Bug# 46159
   * Install locale-files in /usr/share, Closes: Bug# 46631
   * Make /usr/share/doc/dpkg-dev a symlink to /usr/share/doc/dpkg

diff --git a/debian/control b/debian/control
index 5b6f438d4fb2518b6dd1f4ba74dad99a9d295019..b052fcead9a3ea50c87d30c39f64348031f93547 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -38,3 +38,13 @@ Description: Package building tools for Debian
  .
  Most Debian source packages will require additional tools to build -
  for example, most packages need the `make' and the C compiler `gcc'.
+
+Package: dselect
+Architecture: any
+Priority: important
+Depends: ${shlibs:Depends}
+Replaces: dpkg (<< 1.4.1.15)
+Description: a user tool to manage Debian GNU/Linux packages
+ dselect is the primary user interface for installing, removing and
+ managing Debian GNU/Linux packages. It is an front-end to dpkg.
+

diff --git a/debian/dselect-postinst b/debian/dselect-postinst
new file mode 100755 (executable)
index 0000000..c9d6e51
--- /dev/null
+++ b/debian/dselect-postinst
@@ -0,0 +1,7 @@
+#! /bin/sh
+
+if [ "$1" = configure ]; then
+    if [ -d /usr/doc -a ! -e /usr/doc/dselect -a -d /usr/share/doc/dselect ] ; then
+        ln -s ../share/doc/dselect /usr/doc/dselect
+    fi
+fi

diff --git a/debian/dselect-prerm b/debian/dselect-prerm
new file mode 100755 (executable)
index 0000000..c5b8761
--- /dev/null
+++ b/debian/dselect-prerm
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = remove -o "$1" = "upgrade" ]; then
+    if [ -L /usr/doc/dselect ]; then
+        rm -f /usr/doc/dselect
+    fi
+fi
+

diff --git a/debian/rules b/debian/rules
index dc2ee19412db1dd635b49a48e87cb4b0ac8d3073..f6ca5b9c1b3a818ee1807d018560ce935adb4242 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -58,23 +58,16 @@ binary: binary-arch binary-indep
 
 binary-trees: build
        $(checkdir)
-       -$(RM) -r debian/tmp-{main,dev}
-       install -d debian/tmp-{main,dev}/{DEBIAN,etc/dpkg,usr/share/doc/dpkg}
+       -$(RM) -r debian/tmp-{main,dev,dselect}
+       install -d debian/tmp-{main,dev,dselect}/{DEBIAN,etc/dpkg,usr/share/doc/dpkg}
        install -d debian/tmp-dev/usr/{lib/dpkg,share/doc/dpkg-dev,sbin,bin}
        install -d debian/tmp-dev/usr/share/man/{ja/man1,man1,ja/man8,man8}
        install -d debian/tmp-dev/usr/share/emacs/site-lisp/dpkg-dev
        install -d debian/tmp-main/sbin
-       set -e; if [ $(arch) = i386 ]; then \
-               sed -e 's/^# i386elf: //' <debian/preinst >$(mcidir)/preinst ; \
-       else \
-               sed -e '/^# i386elf: /d' debian/preinst >$(mcidir)/preinst ; \
-       fi
-       set -e; if [ -f debian/shlibs.default.$(arch) ]; then \
-               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} $(mcidir)/.
+       install -d debian/tmp-dselect/usr/share/man/{ja/man1,man1,ja/man8,man8}
+       install -d debian/tmp-dselect/usr/{bin,lib/dpkg}
+       install -d debian/tmp-dselect/var/lib/dpkg
+
        $(MAKE) -C $(BUILD) top_distdir=. dist 
        $(MAKE) -C $(BUILD) \
                prefix=$(DIR)/debian/tmp-main/usr \
@@ -85,19 +78,34 @@ binary-trees: build
                sharedstatedir=$(DIR)/debian/tmp-main/var/lib \
                localstatedir=$(DIR)/debian/tmp-main/var/lib \
                install
-       install -m 755 debian/dev-postinst debian/tmp-dev/DEBIAN/postinst
-       install -m 755 debian/dev-prerm debian/tmp-dev/DEBIAN/prerm
+# Setup the dpkg-dev tree
+       set -e; if [ -f debian/shlibs.default.$(arch) ]; then \
+               echo /etc/dpkg/shlibs.default >debian/tmp-dev/DEBIAN/conffiles ; \
+               cp debian/shlibs.default.$(arch) \
+                       debian/tmp-dev/etc/dpkg/shlibs.default ; \
+       fi
+       install -p -m 755 debian/dev-postinst debian/tmp-dev/DEBIAN/postinst
+       install -p -m 755 debian/dev-prerm debian/tmp-dev/DEBIAN/prerm
        install -d debian/tmp-dev/etc/emacs/site-start.d
-       install -m 644 debian/50dpkg-dev.el debian/tmp-dev/etc/emacs/site-start.d/.
+       install -p -m 644 debian/50dpkg-dev.el debian/tmp-dev/etc/emacs/site-start.d/.
        install -d debian/tmp-dev/usr/lib/emacsen-common/packages/{install,remove}
-       install -m 755 debian/emacsen-common-remove \
+       install -p -m 755 debian/emacsen-common-remove \
            debian/tmp-dev/usr/lib/emacsen-common/packages/remove/dpkg-dev
-       install -m 755 debian/emacsen-common-install \
+       install -p -m 755 debian/emacsen-common-install \
        debian/tmp-dev/usr/lib/emacsen-common/packages/install/dpkg-dev
        cp scripts/debian-changelog-mode.el \
            debian/tmp-dev/usr/share/emacs/site-lisp/dpkg-dev
        rm -f debian/tmp-main/usr/share/{x,}emacs/site-lisp/debian-changelog-mode.el*
-       chmod +x $(mcidir)/{postinst,prerm,preinst}
+       ln -s dpkg debian/tmp-dev/usr/share/doc/dpkg-dev
+# Setup the dpkg tree
+       install -p -m 755 debian/{prerm,postinst} $(mcidir)/
+       set -e; if [ $(arch) = i386 ]; then \
+               sed -e 's/^# i386elf: //' <debian/preinst >$(mcidir)/preinst ; \
+       else \
+               sed -e '/^# i386elf: /d' debian/preinst >$(mcidir)/preinst ; \
+       fi
+       chmod +x $(mcidir)/preinst
+
        find debian/tmp-main/usr/share/man -type f | xargs gzip -9vf
        set -e; for f in dpkg-buildpackage dpkg-gencontrol dpkg-distaddfile \
                  dpkg-parsechangelog dpkg-genchanges dpkg-shlibdeps; do \
@@ -106,8 +114,20 @@ binary-trees: build
        done
        ln -s ../man7/undocumented.7.gz debian/tmp-main/usr/share/man/man1/dpkg-divert.1.gz
        gzip -9vf debian/tmp-main/usr/share/doc/dpkg/changelog*
-       cp debian/copyright debian/tmp-main/usr/share/doc/dpkg/copyright
-       ln -s dpkg debian/tmp-dev/usr/share/doc/dpkg-dev
+       install -p -m 644 debian/copyright debian/tmp-main/usr/share/doc/dpkg/copyright
+# Setup the dselect tree
+       install -p -m 755 debian/dselect-postinst debian/tmp-dselect/DEBIAN/postinst
+       install -p -m 755 debian/dselect-prerm debian/tmp-dselect/DEBIAN/prerm
+       set -e; for f in \
+ usr/share/man/{ja,.}/man8/dselect.8.gz \
+ usr/lib/dpkg/methods \
+ var/lib/dpkg/methods \
+ usr/bin/dselect \
+               ; do if [ -e debian/tmp-main/$$f -o -L debian/tmp-main/$$f ] ; \
+                       then mv -v debian/tmp-main/$$f debian/tmp-dselect/$$f; \
+               fi done
+       ln -s dpkg debian/tmp-dev/usr/share/doc/dselect
+# Move stuff from the dpkg tree to the other trees
        set -e; for f in \
  usr/share/doc/dpkg/{internals.html,changelog.manuals.gz} \
  usr/bin/dpkg-{source,genchanges,gencontrol,shlibdeps,buildpackage,parsechangelog} \
@@ -153,7 +173,7 @@ binary-indep: binary-trees
 
 binary-arch: binary-trees
        $(checkdir)
-       mv debian/tmp-main/usr/sbin/start-stop-daemon debian/tmp-main/sbin/start-stop-daemon
+#      mv debian/tmp-main/usr/sbin/start-stop-daemon debian/tmp-main/sbin/start-stop-daemon
        -strip debian/tmp-main/usr/{bin,sbin}/* debian/tmp-main/sbin/*
        -strip --strip-unneeded debian/tmp-main/usr/lib/libdpkg.so.*
        -strip --strip-debug debian/tmp-main/usr/lib/libdpkg.a
@@ -169,6 +189,13 @@ binary-arch: binary-trees
                dpkg-distaddfile -f$(DIR)/debian/files $${file}.gz byhand -
        dpkg-deb --build debian/tmp-main ..
 
+       -strip debian/tmp-dselect/usr/{bin,sbin}/*      
+       dpkg-shlibdeps -dDepends debian/tmp-dselect/usr/bin/*
+       dpkg-gencontrol -pdselect -Pdebian/tmp-dselect
+       chown -R root.root debian/tmp-main
+       chmod -R g-ws,a+r,u+w debian/tmp-main
+       dpkg-deb --build debian/tmp-dselect ..
+
 define checkdir
        test -f include/dpkg.h.in
 endef