diff --git a/debian/changelog b/debian/changelog index 4592fd16..f9b12193 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,17 +1,45 @@ -e2fsprogs (1.20-1) unstable; urgency=low +e2fsprogs (1.19+1.20-WIP-0514-2) unstable; urgency=low - * New upstream release: + * Tighten dependency on dephelper. + + -- Yann Dirson Tue, 15 May 2001 21:38:47 +0200 + +e2fsprogs (1.19+1.20-WIP-0514-1) unstable; urgency=low + + * New upstream pre-release snapshot: ** new program: e2image. ** e2fsck validates file descriptor specified in -C (Closes: #55220) ** Fix multiple progress bar fsck bug (Closes: #65267) ** Add devfs support to fsck (Closes: #94159) ** Fix debugfs dump cmd looping on disk errors (Closes: #79163) ** Miscellaneous manual page clarifications (Closes: #63442, #67446, - and #87216) + #87216) + ** Compilation fixes for Hurd (Closes: #52045). + ** New config.{guess,sub} for parisc support (Closes: #94690). ** Improved ext3 support ** tune2fs can now safely modify mounted filesystems + * Added missing @dircategory entry to libext2fs.info (lintian) + * Moved debugfs back from /usr/sbin/ to /sbin/ (Closes: #97035). + * Moved e2label back to /sbin/ as well, as it is now a hard link to + tune2fs. + * New binary package with statically linked e2fsck, recommending a + statically linked shell (Closes: #62611). + * All deps against e2fsprogs itself now versionned (lintian). + * Updated copyright file (upstream location, packaging copyright notice + for previous maintainers and for Alcove). + * Remove call to dh_testversion, use versionned build-dep instead + (lintian). + * Support for DEB_BUILD_OPTIONS debug/nostrip for policy 3.2 + compliance. + * Use dh_shlibdeps -l instead of setting LD_LIBRARY_PATH explicitely - + necessary for new versions of fakeroot, and requires debhelper 3.0.23 + for a fix. Well finally 3.0.23 is buggy, leave this for later. + * Avoid to call ldconfig at "make install" time, too costly. + * Get rid in control files of references to never-released standalone + lib files (split attempted in 1997/98). + * Bumped Standards-Version to 3.5.4. - -- Theodore Tso Wed, 11 May 2001 00:51:14 -0400 + -- Yann Dirson Tue, 15 May 2001 14:28:39 +0200 e2fsprogs (1.19-4) unstable; urgency=medium @@ -533,9 +561,3 @@ e2fsprogs (1.06-2) unstable; urgency=low the -t argument was overriden by the filesystem type listed for the device in /etc/fstab. * added Debian GNU/Linux package maintenance system files - - -Local variables: -mode: debian-changelog -add-log-mailing-address: "dirson@debian.org" -End: diff --git a/debian/control b/debian/control index 92423d41..a6255d6c 100644 --- a/debian/control +++ b/debian/control @@ -2,16 +2,15 @@ Source: e2fsprogs Section: base Priority: required Maintainer: Yann Dirson -Build-Depends: texi2html, texinfo, debhelper -Standards-Version: 3.0.1 +Build-Depends: texi2html, texinfo, debhelper (>= 2), fakeroot (<< 0.4.4-9.2) | debhelper (>= 3.0.24) +Standards-Version: 3.5.4 Package: e2fsprogs Essential: yes Pre-Depends: ${shlibs:Depends} -Suggests: gpart, parted +Suggests: gpart, parted, e2fsck-static Conflicts: e2fslibsg, dump (<< 0.4b4-4), quota (<< 1.55-8.1) -Provides: libcomerr2, libss2, libext2fs2, libe2p2, libuuid1, e2fslibsg -Replaces: e2fslibsg, ss2g, comerr2g +Provides: libcomerr2, libss2, libext2fs2, libe2p2, libuuid1 Architecture: any Description: The EXT2 file system utilities and libraries. EXT2 stands for "Extended Filesystem", version 2. It's the main @@ -20,6 +19,22 @@ Description: The EXT2 file system utilities and libraries. This package contains programs for creating, checking, and maintaining EXT2 filesystems, and the generic `fsck' wrapper. +Package: e2fsck-static +Section: admin +Priority: optional +Depends: e2fsprogs (= ${Source-Version}) +Recommends: sash | zsh30-static | busybox-static +Architecture: any +Description: A statically-linked version of the ext2 filesystem checker. + This may be of some help to you if you filesystem gets corrupted enough + to break the shared libraries used by the dynamically linked checker. + . + This binary takes much more space than its dynamic counterpart located + in e2fsprogs, though. + . + You may want to install a statically-linked shell as well, to be able + to run this program if something like your C library gets corrupted. + Package: comerr-dev Section: devel Priority: extra @@ -48,7 +63,7 @@ Description: Command-line interface parsing library - headers and static librari Package: uuid-dev Section: devel Priority: extra -Depends: ${libcdev:Depends}, e2fsprogs +Depends: ${libcdev:Depends}, e2fsprogs (= ${Source-Version}) Conflicts: e2fsprogs (<< 1.10-6) Replaces: e2fslibs-dev (<< 1.15) Architecture: any @@ -64,7 +79,7 @@ Description: Universally unique id library - headers and static libraries. Package: e2fslibs-dev Section: devel Priority: extra -Depends: ${libcdev:Depends}, comerr-dev, e2fsprogs +Depends: ${libcdev:Depends}, comerr-dev, e2fsprogs (= ${Source-Version}) Suggests: doc-base Provides: ext2fs-dev, e2p-dev Conflicts: e2fsprogs (<< 1.10-6) diff --git a/debian/e2fsck-static.files b/debian/e2fsck-static.files new file mode 100644 index 00000000..15a7716e --- /dev/null +++ b/debian/e2fsck-static.files @@ -0,0 +1,2 @@ +/sbin/e2fsck.static +/usr/share/man/man8/e2fsck.static* diff --git a/debian/e2fsprogs.copyright b/debian/e2fsprogs.copyright index 2925a245..17998e2f 100644 --- a/debian/e2fsprogs.copyright +++ b/debian/e2fsprogs.copyright @@ -2,9 +2,12 @@ This is the Debian GNU/Linux prepackaged version of the EXT2 file system utilities (e2fsck, mke2fs, etc.). The EXT2 utilities were written by Theodore Ts'o and Remy Card . -This package was put together by Yann Dirson , -from sources obtained from a mirror of: - tsx-11.mit.edu:/pub/linux/packages/ext2fs/ +Sources were obtained from http://sourceforge.net/projects/e2fsprogs + +Packaging is copyright (c) 1997-2001 Yann Dirson + copyright (c) 2001 Alcove + copyright (c) 1997 Klee Dienes + copyright (c) 1995-1996 Michael Nonweiler Copyright notice: diff --git a/debian/rules b/debian/rules index 864fb31c..ff906380 100644 --- a/debian/rules +++ b/debian/rules @@ -47,12 +47,19 @@ mandir=${maindir}${MANDIR} SUBPACKAGES_DIRS = tmp e2fslibs-dev comerr-dev ss-dev -installdoc = install -m 644 -installbin = install -m 755 - -CCOPTS = -g -O2 -fsigned-char +CCOPTS = -O2 -fsigned-char LIBC-DEV = libc6-dev +INSTALL = install +INSTALL_PROGRAM = $(INSTALL) -p -o root -g root -m 755 + +ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) +CCOPTS += -g -O1 +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) +INSTALL_PROGRAM += -s +endif + ifeq (${DEB_HOST_ARCH},alpha) CCOPTS += -DHAVE_NETINET_IN_H LIBC-DEV = libc6.1-dev @@ -101,20 +108,19 @@ binary-indep: build # no arch-independant debs. binary-arch: build - dh_testversion 0.56 # == 0.53 + fixes dh_testdir -a dh_testroot -a dh_clean -a dh_installdirs -a mkdir -p ${maindir}/sbin - make -C ${builddir} install DESTDIR=${maindir} + make -C ${builddir} install DESTDIR=${maindir} INSTALL_PROGRAM="${INSTALL_PROGRAM}" LDCONFIG=true # static libs and .h files - make -C ${builddir} install-libs DESTDIR=${maindir} + make -C ${builddir} install-libs DESTDIR=${maindir} LDCONFIG=true -# correct locations - (cd ${maindir}/sbin && mv debugfs ../usr/sbin/) - (cd ${maindir}/sbin && mv e2label ../usr/sbin/) + # statically-linked fsck + ${INSTALL_PROGRAM} ${builddir}/e2fsck/e2fsck.static ${maindir}/sbin + ln -s e2fsck.8.gz ${mandir}/man8/e2fsck.static.8.gz # docs # fully handled by debhelper @@ -123,6 +129,9 @@ binary-arch: build mkdir -p ${debdir}/e2fslibs-dev/usr/share/doc/e2fsprogs ln -sf e2fsprogs ${debdir}/e2fslibs-dev/usr/share/doc/e2fslibs-dev + mkdir -p ${debdir}/e2fsck-static/usr/share/doc/ + ln -sf e2fsprogs ${debdir}/e2fsck-static/usr/share/doc/e2fsck-static + mkdir -p ${maindir}/usr/share/doc/libcomerr${COMERR_MAJOR} mkdir -p ${debdir}/comerr-dev/usr/share/doc/libcomerr${COMERR_MAJOR} ln -sf libcomerr${COMERR_MAJOR} ${debdir}/comerr-dev/usr/share/doc/comerr-dev @@ -192,9 +201,8 @@ binary-arch: build echo "libcdev:Depends=${LIBC-DEV}" >> debian/e2fslibs-dev.substvars dh_installdeb -a - LD_LIBRARY_PATH=${builddir}/lib:/lib:/usr/lib \ - dh_shlibdeps -a - dh_gencontrol -pe2fsprogs -pe2fslibs-dev + dh_shlibdeps -a -l${builddir}/lib + dh_gencontrol -pe2fsprogs -pe2fslibs-dev -pe2fsck-static dh_gencontrol -pcomerr-dev \ -u '-v${COMERR_VERSION}-${MAIN_VERSION}' dh_gencontrol -pss-dev \