From 020c5477eae88a6d5cdc2bf9b5e165c4f217dcce Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Thu, 10 Apr 2003 00:01:19 -0400 Subject: [PATCH] Various Debian fixups: Update debian changelog. Move packages from devel to libdevel. We now supply the /usr/include/com_err.h include file.h --- debian/changelog | 30 ++++++++++++++++++++++++++++++ debian/control | 11 ++++++----- debian/e2fslibs-dev.files | 1 + debian/rules | 2 ++ 4 files changed, 39 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index cb72114..d4e6cfb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,33 @@ +e2fsprogs (1.32+1.33-WIP-2003.03.30-3) unstable; urgency=low + + * Provide /usr/include/com_err.h, which was previously provided by the + libkrb5-dev package + * Change the sectoin of com_err-dev, ss-dev, uuid-dev, libblkid-dev, + e2fslibs-dev to libdevel + + -- Theodore Y. Ts'o Wed, 9 Apr 2003 23:26:52 -0400 + +e2fsprogs (1.32+1.33-WIP-2003.03.30-2) unstable; urgency=low + + * Fix XFS superblock definition. Add support to extract UUID and + labels for JFS and ROMFS. + * Make the random number generator more paranoid about potentially buggy + /dev/random devices. + * The badblocks program now flushes its output as it discovers bad blocks. + * Imported bug fixes to EVMS driver from the EVMS 2.0 tree. Fixed a + few potential hangs, and eliminated a file descriptor leak. + * E2fsck now updates the global free block and inode counters from + the block group specific counters quietly. This is needed for an + experimental kernel patch which improves SMP scalability by not + locking the entire filesystem during block or inode allocation; if + the filesystem is not unmoutned cleanly, the global counts may not + be accurate. + * Fix a bug in fsck which can cause it to hang trying to access the + floppy disk if there the floppy drive has filesystem type of + 'auto'. (Closes: #187812) + + -- Theodore Y. Ts'o Sun, 6 Apr 2003 23:13:50 -0400 + e2fsprogs (1.32+1.33-WIP-2003.03.30-1) unstable; urgency=low * Change compile_et to generate header files that use diff --git a/debian/control b/debian/control index a398a58..42fbd8d 100644 --- a/debian/control +++ b/debian/control @@ -22,7 +22,7 @@ Description: A statically-linked version of the ext2 filesystem checker to run this program if something like your C library gets corrupted. Package: comerr-dev -Section: devel +Section: libdevel Priority: extra Depends: ${libcdev:Depends}, libcomerr2 Suggests: doc-base @@ -34,7 +34,7 @@ Description: The Common Error Description library - headers and static libraries have the problems identified with mechanisms commonly in use. Package: ss-dev -Section: devel +Section: libdevel Priority: extra Depends: ${libcdev:Depends}, libss2 Conflicts: e2fsprogs (<< 1.10-6) @@ -47,7 +47,7 @@ Description: Command-line interface parsing library - headers and static librari It was originally inspired by the Multics SubSystem library. Package: uuid-dev -Section: devel +Section: libdevel Priority: extra Depends: ${libcdev:Depends}, e2fsprogs (= ${Source-Version}) Conflicts: e2fsprogs (<< 1.10-6) @@ -75,7 +75,7 @@ Description: Block device id library system instead. Package: libblkid-dev -Section: devel +Section: libdevel Priority: extra Depends: libblkid1 (= ${Source-Version}) Architecture: any @@ -130,12 +130,13 @@ Description: The EXT2 file system utilities and libraries filesystems, and the generic `fsck' wrapper. Package: e2fslibs-dev -Section: devel +Section: libdevel Priority: extra Depends: comerr-dev, e2fsprogs (= ${Source-Version}) Suggests: doc-base Provides: ext2fs-dev, e2p-dev Conflicts: e2fsprogs (<< 1.10-6) +Replaces: libkrb5-dev (<< 1.3) Architecture: any Description: The headers and static libraries for ext2fs-aware tools-development EXT2FS stands for "Extended Filesystem", version 2. It's the filesystem diff --git a/debian/e2fslibs-dev.files b/debian/e2fslibs-dev.files index 7c69e2e..57211dd 100644 --- a/debian/e2fslibs-dev.files +++ b/debian/e2fslibs-dev.files @@ -2,4 +2,5 @@ usr/lib/*.so usr/lib/*.a usr/include/ext2fs usr/include/e2p +usr/include/com_err.h usr/share/info/libext2fs.info* diff --git a/debian/rules b/debian/rules index df3b8bf..6ad0915 100644 --- a/debian/rules +++ b/debian/rules @@ -217,6 +217,8 @@ install-std: build ${INSTALL_PROGRAM} ${stdbuilddir}/e2fsck/e2fsck.static ${tmpdir}/sbin ln -s e2fsck.8.gz ${mandir}/man8/e2fsck.static.8.gz + ln -s et/com_err.h ${tmpdir}/usr/include + dh_movefiles test -z `find ${tmpdir} -type f` -- 1.8.3.1