Move the blkid and uuidgen programs out of library packages and into e2fsprogs

Move the blkid and uuidgen binaries out of libblkid1 and libuuid1 and
into the e2fsprogs package to support soname transitions and
simulaneous installs of multiarch flavors to coexist.  (It's not worth
creating two whole new packages for two separate binaries, so we just
fold them into e2fsprogs.)  (Closes: #330737, #330736)

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

diff --git a/debian/control b/debian/control
index 370afcb..74b2556 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -215,7 +215,7 @@ Pre-Depends: ${shlibs:Depends}
 Depends: 
 Suggests: gpart, parted, e2fsck-static
 Conflicts: dump (<< 0.4b4-4), quota (<< 1.55-8.1), initscripts (<< 2.85-4), sysvinit (<< 2.85-4)
-Replaces: hurd (<= 20040301-1)
+Replaces: hurd (<= 20040301-1), libblkid1 (<< 1.38+1.39-WIP-2005.12.10-2), libuuid1 (<< 1.38+1.39-WIP-2005.12.10-2)
 Architecture: any
 Description: ext2 file system utilities and libraries
  EXT2 stands for "Extended Filesystem", version 2. It's the main

diff --git a/debian/libblkid1.files b/debian/libblkid1.files
index dd7a7c0..d2f1ccc 100644 (file)
--- a/debian/libblkid1.files
+++ b/debian/libblkid1.files
@@ -1,3 +1 @@
 lib/libblkid*
-sbin/blkid
-usr/share/man/man8/blkid.8

diff --git a/debian/libuuid1.files b/debian/libuuid1.files
index fb1c3cb..da600dc 100644 (file)
--- a/debian/libuuid1.files
+++ b/debian/libuuid1.files
@@ -1,3 +1 @@
 lib/libuuid*
-usr/bin/uuidgen
-usr/share/man/man1/uuidgen.1*