deliver more stuff

diff --git a/debian/changelog b/debian/changelog
index 2a088207c43de92cd2fab157918f59ab886b070e..9339e81bc48225a58cc7d554c7eb1d61cbba2768 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 util-linux (2.13~rc1-0) experimental-UNRELEASED; urgency=low
 
-  * New upstream (util-linux-ng).  Closes: #431817
+  * New upstream (util-linux-ng).  Closes: #431817, #355536
     - several patches were not ported forward from 2.12-19
       - no kerneli support in crypto loop, since it is not in 2.6 kernels.
       - 20guesshelper: filesystem detection has been dropped.  Mount is built
@@ -8,13 +8,16 @@ util-linux (2.13~rc1-0) experimental-UNRELEASED; urgency=low
       - 20xgethostname: does anyone care?
       - 30nfs*: NFS support has moved to nfs-utils, and removed from
         util-linux.  Add Depends: nfs-common until Lenny ships.
+        Closes: #417996
     - umounting usb sticks as a user no longer segfaults. Closes: #410031
   * Add LSB formatted dependency info in hwclock.sh.  Closes: #330227
   * Reflect Debian locations in getopt manpage.  Closes: #352221
-  * Conflict/Replaces/Provides: schedutils.  Closes: #322883
+  * Conflict/Replaces/Provides: schedutils.  Closes: #322883, #384045
   * README.Debian.hwclock needs a .gz in hwclock.sh.  Closes: #393539
+  * Deliver tailf.  Closes: #327906
+  * Deliver partx.  Closes: #296615
 
- -- LaMont Jones <lamont@debian.org>  Mon,  9 Jul 2007 12:14:07 -0600
+ -- LaMont Jones <lamont@debian.org>  Mon,  9 Jul 2007 14:58:50 -0600
 
 util-linux (2.12r-20) unstable-UNRELEASED; urgency=low
 
@@ -1720,3 +1723,4 @@ util-linux (2.5-1) unstable; urgency=low
  -- Guy Maor <maor@ece.utexas.edu>  Thu, 18 Apr 1996 04:32:22 -0500
 
 
+       partx/{addpart,delpart,partx}

diff --git a/debian/rules b/debian/rules
index a36388ce17859f2569107f75d196030db3837427..8401c84d07d4733e7dc35370a2877274056fdfdb 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -59,10 +59,12 @@ clean:
 # Architecture independant stuff
 
 SUIDFILES = debian/tmp-mount/bin/{u,}mount
-BINFILES  = sys-utils/arch text-utils/more
+BINFILES  = sys-utils/arch text-utils/{more,tailf}
 UBINFILES = sys-utils/{ipcs,ipcrm,setsid} \
        misc-utils/{namei,setterm,mcookie,whereis,ddate} \
-       getopt/getopt text-utils/{rev,line,pg}
+       getopt/getopt text-utils/{rev,line,pg} \
+       schedutils/{chrt,ionice,taskset} \
+       partx/{addpart,delpart,partx}
 SBINFILES = disk-utils/mkswap
 
 ifeq ($(DEB_HOST_ARCH_OS),linux)
@@ -94,10 +96,11 @@ BSDDOCFILES = debian/README.script
 
 # Architecture independant docs
 
-MAN1FILES = text-utils/{pg,more,line,rev}.1 misc-utils/{namei.1,mcookie.1} \
-            misc-utils/{chkdupexe.1,setterm.1,whereis.1,ddate.1} \
-           sys-utils/arch.1 getopt/getopt.1 sys-utils/{ipcrm.1,ipcs.1,setsid.1} 
-MAN8FILES = disk-utils/mkswap.8
+MAN1FILES = text-utils/{pg,tailf,more,line,rev}.1 \
+           misc-utils/{namei,mcookie,chkdupexe,setterm,whereis,ddate}.1 \
+           sys-utils/{arch,ipcrm,ipcs,setsid}.1 getopt/getopt.1 \
+           schedutils/{chrt,ionice,taskset}.1
+MAN8FILES = disk-utils/mkswap.8 partx/{addpart,delpart,partx}.8
 ifeq ($(DEB_HOST_ARCH_OS),linux)
 ifneq ($(arch),$(nohwclock))
 MAN8FILES += hwclock/hwclock.8