diff options
33 files changed, 1441 insertions, 0 deletions
diff --git a/debian/README.Debian b/debian/README.Debian new file mode 100644 index 00000000..c9254039 --- /dev/null +++ b/debian/README.Debian @@ -0,0 +1,71 @@ +e2fsprogs for Debian +==================== + +e2fsprogs includes the uuidgen(1) program, although it is not directly +to e2fsprogs - it would belong to the libuuid package, but the uuid +shared lib is currently part of the e2fsprogs package. See below for +more details. + + +Here's the documentation for the Conflicts/Provides fields: + +* old dump and quota packages used to depend on old (libc5) e2fsprogs +itself, as it contained the shared libs. We must conflict with these +incompatible versions. + + +* All -g package names were a transient experiment during hamm +development. + + +* Here's the reasonning for not having the libs outside of the e2fsprogs package: + +If we have: + +e2fsprogs_1.10-2 is essential + +e2fsprogs_1.10-11 is essential + predepends on comerr2g + +comerr2g_2.0-1.10-11: + is not essential + conflicts with e2fsprogs_1.10-2 + +...then e2fsprogs_1.10-11 can't be installed before comerr2g because +of the predependency, and comerr2g cannot be installed before +e2fsprogs_1.10-11 because of the conflict. + +This totally comes from the fact that e2fsprogs was initially built as +an *essential package with shared libs*. + +My initial solution, namely changing the predependency into a simple +dependency, turns out to be a system-integrity problem: + +$ dpkg -i e2fsprogs_1.10-11*deb comerr2g_2.0-1.10-11*deb + +...will, if comerr2g fails to unpack or configure, let e2fsprogs in an +unusable state. + + +* This raises the problem that most of these libs are general-purpose +libs, and will be used by more and more packages. The lib-dependency +mechanism requires for proper fonctionning that we keep track of these +libs changing version, as well as infos such as libc5/6 issues. + +The standard way to do it is using standalone packages for those libs, +which is not possible here (see above). + +My solution in this case is the use of the following virtual packages: + + libss2, libcomerr2, libe2p2, libuuid1, libext2fs2 + +These are automatically referenced thanks to the shlibs file. They +are currently provided by e2fsprogs. + + +* e2fsprogs still Provides/Conflicts with e2fslibsg to allow upgrading +from pre 1.10-13 releases (from unstable hamm). This does not seem to +be possible for ss2g and comerr2g for some still-to-be-investigated +reason. + +Yann Dirson <dirson@debian.org> diff --git a/debian/TODO b/debian/TODO new file mode 100644 index 00000000..63978475 --- /dev/null +++ b/debian/TODO @@ -0,0 +1,16 @@ +e2fsprogs Debian TODO file as of 1.10-13. +This file may or may not be up to date. + +* Report to Ted: inconsistent "et/com_err.h", <et/com_err.h>, <com_err.h> + under lib/ +* Does <ext2fs/ext2fs.h> really need "et/com_err.h" and other awful "" + includes ? +* Include file not installed for libe2p ? +* What about making com_err more self-consistant ("et" / "com_err") + +* Suppress as many references as possible to the libcom_err version number in + source control files and debian/ subdir. + +* Maybe make -dbg packages. Look at how others do it. + +* Fix com_err.texinfo. diff --git a/debian/attic/comerrg-dev.info b/debian/attic/comerrg-dev.info new file mode 100644 index 00000000..8bd344b7 --- /dev/null +++ b/debian/attic/comerrg-dev.info @@ -0,0 +1,4 @@ +DESCR="The Common Error Description library." +SECTION_MATCH="Development" +SECTION_NAME="Development" +FILE=com_err.info diff --git a/debian/attic/comerrg-dev.menu b/debian/attic/comerrg-dev.menu new file mode 100644 index 00000000..7dddab30 --- /dev/null +++ b/debian/attic/comerrg-dev.menu @@ -0,0 +1,7 @@ +?package(comerrg-dev):needs="dwww" section="Apps/Programming"\ + title="The com_err library" \ + longtitle="The Common Error Description library"\ + description="libcomerr is an attempt to present a common error-handling mechanism to \ + manipulate the most common form of error code in a fashion that does not \ + have the problems identified with mechanisms commonly in use." \ + command="/usr/doc/comerrg-dev/html-info/com_err_toc.html" diff --git a/debian/attic/e2fslibsg-dev.info b/debian/attic/e2fslibsg-dev.info new file mode 100644 index 00000000..e1be9503 --- /dev/null +++ b/debian/attic/e2fslibsg-dev.info @@ -0,0 +1,4 @@ +DESCR="Library of routines to manipulate an ext2 filesystem." +SECTION_MATCH="Development" +SECTION_NAME="Development" +FILE=libext2fs.info diff --git a/debian/attic/e2fslibsg-dev.menu b/debian/attic/e2fslibsg-dev.menu new file mode 100644 index 00000000..7ace8c09 --- /dev/null +++ b/debian/attic/e2fslibsg-dev.menu @@ -0,0 +1,4 @@ +?package(e2fslibsg-dev):needs="dwww" section="Apps/Programming"\ + title="The ext2fs library." \ + longtitle="A library to handle low-level structures in an ext2 filesystem"\ + command="/usr/doc/e2fslibsg-dev/html-info/libext2fs_toc.html" diff --git a/debian/attic/libs/comerr2g.files b/debian/attic/libs/comerr2g.files new file mode 100644 index 00000000..4f1f552c --- /dev/null +++ b/debian/attic/libs/comerr2g.files @@ -0,0 +1,2 @@ +lib/libcom_err.so.?.* +lib/libcom_err.so.? diff --git a/debian/attic/libs/control b/debian/attic/libs/control new file mode 100644 index 00000000..42051205 --- /dev/null +++ b/debian/attic/libs/control @@ -0,0 +1,114 @@ +Source: e2fsprogs +Section: base +Priority: required +Maintainer: Yann Dirson <dirson@debian.org> +Standards-Version: 2.4.0.0 + +Package: e2fsprogs +Essential: yes +Depends: ${shlibs:Depends} +Conflicts: e2fsprogsg, dump (<< 0.4b4-4), quota (<< 1.55-8.1) +Architecture: any +Description: The EXT2 file system utilities. + EXT2 stands for "Extended Filesystem", version 2. It's the main + filesystem type used for hard disks on Debian and other Linux systems. + . + This package contains programs for creating, checking, and maintaining EXT2 + filesystems, and the generic `fsck' wrapper. + . + This release may break older versions of dump and quota. + +Package: comerr2g +Depends: ${shlibs:Depends} +Conflicts: e2fsprogs (<< 1.10-6), comerr2 +Architecture: any +Description: The Common Error Description library - shared libraries. + libcomerr is an attempt to present a common error-handling mechanism to + manipulate the most common form of error code in a fashion that does not + have the problems identified with mechanisms commonly in use. + . + It is mainly used by the EXT2-filesystem tools. + +Package: ss2g +Depends: ${shlibs:Depends} +Conflicts: e2fsprogs (<< 1.10-6), ss2 +Architecture: any +Description: "Sub-System" library for simple command-line interface parsing - shared libs + This package contains the shared libs to support command-line + interface parsers generated with the ssg-dev package. + . + It was originally inspired by the Multics SubSystem library. + +Package: e2fslibsg +Depends: ${shlibs:Depends} +Provides: ext2fs2g, e2p2g, uuid1g +Conflicts: e2fsprogs (<= 1.10-7) +Architecture: any +Description: The EXT2 file system shared libs. + EXT2 stands for "Extended Filesystem", version 2. It's the filesystem type + used for hard disks on Debian and other Linux systems. + . + This package contains shared libraries needed by the utility programs. + +Package: comerrg-dev +Section: devel +Priority: extra +Depends: ${libcdev:Depends}, comerr2g +Suggests: doc-base +Conflicts: e2fsprogs (<< 1.10-6), comerr-dev +Architecture: any +Description: The Common Error Description library - headers and static libraries. + libcomerr is an attempt to present a common error-handling mechanism to + manipulate the most common form of error code in a fashion that does not + have the problems identified with mechanisms commonly in use. + +Package: ssg-dev +Section: devel +Priority: extra +Depends: ${libcdev:Depends}, ss2g +Conflicts: e2fsprogs (<< 1.10-6), ss-dev +Architecture: any +Description: "Sub-System" library for simple command-line interface parsing - devel. files + This package includes a tool that parses a command table to generate + a simple command-line interface parser, the include files needed to + compile and use it, and the static libs. + . + It was originally inspired by the Multics SubSystem library. + +Package: e2fslibsg-dev +Section: devel +Priority: extra +Depends: ${libcdev:Depends}, e2fslibsg, comerrg-dev +Suggests: doc-base +Provides: ext2fsg-dev, e2pg-dev, uuidg-dev +Conflicts: e2fsprogs (<< 1.10-6), e2fslibs-dev +Architecture: any +Description: The headers and static libraries for ext2fs-aware tools-development. + EXT2FS stands for "Extended Filesystem", version 2. It's the filesystem + type used for hard disks on Debian and other Linux systems. + . + This package contains the headers and shared libraries needed to compile + ext2fs-aware programs. Only programmers that really manipulate + features specific to the ext2 filesystem will need this. Most + programmers will use the generic filesystem-independent interface + from libc. + . + It also contains dev files for 2 other libs (e2p and uuid) used by + the e2fsprogs, but which are not yet packaged all by themselves + because they lack documentation. They may also lack some support + files, by I can't really know until someone uses them... + . + libe2p is for user-level e2fsprogs commands. It's used by dumpe2fs, + chattr, and lsattr. Functions in libe2p typically have two + characteristics (a) don't require that block device containing the + filesystem be opened directly (functions in libext2fs do), and (b) + libe2p typically contains printf statements or parse user input, and so + have more internationalization issues. + . + libuuid generates and parses 128-bit universally unique id's (UUID's), + using a standard which is blessed by both Microsoft and DCE, and is + being proposed as an internet standard. See the internet-draft: + . + draft-leach-uuids-guids-01.txt + . + for more information. diff --git a/debian/attic/libs/e2fslibsg.files b/debian/attic/libs/e2fslibsg.files new file mode 100644 index 00000000..c7770846 --- /dev/null +++ b/debian/attic/libs/e2fslibsg.files @@ -0,0 +1,3 @@ +lib/*.so.?.* +lib/*.so.? +usr/doc/e2fslibsg/* diff --git a/debian/attic/libs/rules b/debian/attic/libs/rules new file mode 100644 index 00000000..3cf3c8d0 --- /dev/null +++ b/debian/attic/libs/rules @@ -0,0 +1,182 @@ +#! /usr/bin/make -f +# -*- makefile -*- +# +# Invoke each target with `./debian/rules <target>'. All targets should be +# invoked with the package root as the current directory. +# +# The `binary' target must be run as root, as it needs to install files with +# specific ownerships. + +# Uncomment this to turn on verbose mode. +export DH_VERBOSE=1 + +package = e2fsprogs +ARCH = $(shell dpkg --print-architecture) + +# find the version for the main package, from changelog file +MAIN_VERSION = $(shell head -1 debian/changelog | cut '-d ' -f 2 | sed 's/[()]//g') +# find versions for libraries going into their own packages, from their Makefile.in's +COMERR_VERSION = $(shell grep ELF_VERSION lib/et/Makefile.in | cut '-d ' -f3) +COMERR_MAJOR = $(word 1,$(subst ., ,$(COMERR_VERSION))) +SS_VERSION = $(shell grep ELF_VERSION lib/ss/Makefile.in | cut '-d ' -f3) +SS_MAJOR = $(word 1,$(subst ., ,$(SS_VERSION))) + +topdir = $(shell pwd) +debdir = $(topdir)/debian +maindir = $(debdir)/tmp +builddir = $(topdir)/builddir +docdir = $(maindir)/usr/doc/$(package) + +SUBPACKAGES_DIRS = tmp e2fslibsg e2fslibsg-dev comerr$(COMERR_MAJOR)g comerrg-dev \ + ss$(SS_MAJOR)g ssg-dev + +installdoc = install -m 644 +installbin = install -m 755 + +ifeq ($(ARCH),alpha) +CCOPTS = -g -O2 -fsigned-char -DHAVE_NETINET_IN_H +LIBC-DEV = libc6.1-dev +else +CCOPTS = -g -O2 -fsigned-char +LIBC-DEV = libc6-dev +endif + +build: configured + dh_testdir + make -C $(builddir) + make -C $(builddir)/misc findsuper + cd doc && texi2html -split_chapter libext2fs.texinfo + cd lib/et && texi2html -split_chapter -expandinfo com_err.texinfo + touch build + +configured: + dh_testdir + mkdir -p $(builddir) + cd $(builddir) && CFLAGS="$(CFLAGS)" \ + ../configure --enable-elf-shlibs --enable-dynamic-e2fsck \ + --with-ccopts="$(CCOPTS)" + touch configured + +clean: + dh_testdir + rm -f build configured install + -make -C $(builddir) -i distclean + rm -rf $(builddir) + rm -f doc/libext2fs_*.html lib/et/com_err_*.html + dh_clean + +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 -k + dh_installdirs -a + + make -C $(builddir) install DESTDIR=$(maindir) + install -m 755 $(builddir)/misc/findsuper $(maindir)/sbin + # static libs and .h files + make -C $(builddir) install-libs DESTDIR=$(maindir) + install -m 644 $(builddir)/lib/ss/ss_err.h $(maindir)/usr/include/ss/ + +# fix and install compile_et script + sed s%$(topdir)/lib/et%/usr/share/comerr% \ + <$(builddir)/lib/et/compile_et \ + >$(debdir)/comerrg-dev/usr/bin/compile_et + chmod 755 $(debdir)/comerrg-dev/usr/bin/compile_et +# add support files for compile_et + install -m 644 lib/et/et_c.awk lib/et/et_h.awk \ + $(debdir)/comerrg-dev/usr/share/comerr/ + +# fix and install mk_cmds script + sed s%$(topdir)/lib/ss%/usr/share/ss% \ + <$(builddir)/lib/ss/mk_cmds \ + >$(debdir)/ssg-dev/usr/bin/mk_cmds + chmod 755 $(debdir)/ssg-dev/usr/bin/mk_cmds +# add support files for mk_cmds + install -m 644 lib/ss/ct_c.awk lib/ss/ct_c.sed \ + $(debdir)/ssg-dev/usr/share/ss/ + +# docs + mkdir -p $(debdir)/e2fslibsg-dev/usr/doc/e2fslibsg + ln -sf e2fslibsg $(debdir)/e2fslibsg-dev/usr/doc/e2fslibsg-dev + mkdir -p $(maindir)/usr/doc/e2fslibsg + ln -sf e2fslibsg $(maindir)/usr/doc/e2fsprogs + mkdir -p $(debdir)/comerrg-dev/usr/doc/comerr$(COMERR_MAJOR)g + ln -sf comerr$(COMERR_MAJOR)g $(debdir)/comerrg-dev/usr/doc/comerrg-dev + mkdir -p $(debdir)/ssg-dev/usr/doc/ss$(SS_MAJOR)g + ln -sf ss$(SS_MAJOR)g $(debdir)/ssg-dev/usr/doc/ssg-dev + dh_installdocs -a + + # HTML docs + install -d $(debdir)/e2fslibsg-dev/usr/doc/e2fslibsg-dev/html-info/ + install -p $(topdir)/doc/libext2fs_*.html \ + $(debdir)/e2fslibsg-dev/usr/doc/e2fslibsg-dev/html-info/ + install -d $(debdir)/comerrg-dev/usr/doc/comerrg-dev/html-info/ + install -p $(topdir)/lib/et/com_err_*.html \ + $(debdir)/comerrg-dev/usr/doc/comerrg-dev/html-info/ + + # texinfo docs + install -p $(topdir)/doc/libext2fs.texinfo \ + $(debdir)/e2fslibsg-dev/usr/doc/e2fslibsg/libext2fs.texi + install -p $(topdir)/lib/et/com_err.texinfo \ + $(debdir)/comerrg-dev/usr/doc/comerr2g/com_err.texi + + # doc-base support + install -d $(debdir)/e2fslibsg-dev/usr/share/doc-base/ + install -p -m 644 $(debdir)/libext2fs.docbase \ + $(debdir)/e2fslibsg-dev/usr/share/doc-base/libext2fs + install -d $(debdir)/comerrg-dev/usr/share/doc-base/ + install -p -m 644 $(debdir)/com_err.docbase \ + $(debdir)/comerrg-dev/usr/share/doc-base/com_err + + # examples + dh_installexamples -a + + # dh_installmanpages still makes a mess as of 0.54 (see below dh_movefiles) + install -p $(topdir)/lib/et/compile_et.1 $(maindir)/usr/man/man1/ + install -d $(maindir)/usr/man/man3/ + install -p $(topdir)/lib/et/com_err.3 $(maindir)/usr/man/man3/ + ln -s e2fsck.8 $(maindir)/usr/man/man8/fsck.ext2.8 + ln -s mke2fs.8 $(maindir)/usr/man/man8/mkfs.ext2.8 + + dh_movefiles -a + # cleanup empty dirs + cd $(maindir) && rmdir usr/man/cat? bin lib usr/include/* usr/include \ + usr/info usr/lib usr/man/man3 usr/doc/e2fslibsg + +# dh_installmenu -a + + # broken + useless in 0.52 + # dh_installmanpages -a + + dh_undocumented -a + + dh_installchangelogs -pe2fslibsg -pcomerr$(COMERR_MAJOR)g -pss$(SS_MAJOR)g ChangeLog + + dh_strip -a + dh_compress -a + dh_fixperms -a + + echo "libcdev:Depends=$(LIBC-DEV)" > debian/comerrg-dev.substvars + echo "libcdev:Depends=$(LIBC-DEV)" > debian/ssg-dev.substvars + echo "libcdev:Depends=$(LIBC-DEV)" > debian/e2fslibsg-dev.substvars + + dh_installdeb -a + LD_LIBRARY_PATH=$(builddir)/lib:/lib:/usr/lib \ + dh_shlibdeps -a + dh_gencontrol -u '-isp' -pe2fsprogs -pe2fslibsg -pe2fslibsg-dev + dh_gencontrol -u '-isp' -pcomerr$(COMERR_MAJOR)g -pcomerrg-dev \ + -u '-v$(COMERR_VERSION)-$(MAIN_VERSION)' + dh_gencontrol -u '-isp' -pss$(SS_MAJOR)g -pssg-dev \ + -u '-v$(SS_VERSION)-$(MAIN_VERSION)' + dh_makeshlibs -a +# dh_du -a + dh_md5sums -a + dh_builddeb -a + +binary: binary-indep binary-arch + +.PHONY: binary binary-arch binary-indep clean checkroot diff --git a/debian/attic/libs/ss2g.files b/debian/attic/libs/ss2g.files new file mode 100644 index 00000000..5b717cb7 --- /dev/null +++ b/debian/attic/libs/ss2g.files @@ -0,0 +1,2 @@ +lib/libss.so.?.* +lib/libss.so.? diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 00000000..7d90fc89 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,526 @@ +e2fsprogs (1.19-4) unstable; urgency=medium + + * Added texinfo to build-deps (Closes: #87685). + + -- Yann Dirson <dirson@debian.org> Tue, 3 Apr 2001 09:03:13 +0200 + +e2fsprogs (1.19-3) unstable; urgency=low + + * Drop findsuper binary, and suggest gpart (Closes: #74034). + * Drop flushb and extend at upstream request (Closes: #39506). + * Applied upstream fix for chattr on large files (Closes: #72690). + * Applied clarification patch to tune2fs.8 (Closes: #67446). + * Applied typo patch to compile_et.1 (Closes: #63786). + * Include <sys/mount.h> in e2fsck/journal.c (Closes: #71775). + * Suggest parted. + + -- Yann Dirson <dirson@debian.org> Mon, 4 Dec 2000 22:08:06 +0100 + +e2fsprogs (1.19-2) unstable; urgency=low + + * Clarified libuuid copyright to LGPL-2, excluding LGPL-2.1. + * Added build-dependency on debhelper (Closes: #67532). + * Don't paralelize fsck runs on same drive for hd[efgh] (Closes: + #59103). + * Upload pristine source, -1 was erroneously uploaded as a + debian-specific package. + + -- Yann Dirson <dirson@debian.org> Thu, 3 Aug 2000 00:30:49 +0200 + +e2fsprogs (1.19-1) unstable; urgency=low + + * New upstream release: + ** new program: resize2fs. + ** ext3 support. + ** NLS support (non-default, activated). + ** Compression support (non-default, activated). + ** Progress bar nice to serial console (Closes: #66079) + ** Ensure filetype feature is turned off for Hurd filesystems (Closes: + #61863) + * Updated main copyright file for a number of things. + * Fixed NLS support for flushb and extend. + * Started to add build-depends. + * Include new e2p header. + + -- Yann Dirson <dirson@debian.org> Wed, 19 Jul 2000 01:55:27 +0200 + +e2fsprogs (1.18-3) frozen unstable; urgency=medium + + * Fix Y2K display-only bug in debugfs - "ls -l" displayed raw tm_year, + causing 2000 to be displayed as "100" (Closes: #57135). Potato should + be y2k-clean. + * Remove empty dirs /usr/share/et/ and /usr/share/ss/ from package + e2fsprogs (Closes: #52900). + + -- Yann Dirson <dirson@debian.org> Mon, 21 Feb 2000 23:06:47 +0100 + +e2fsprogs (1.18-2) unstable; urgency=low + + * Test for "__sparc__" instead of "sparc" as a cpp macro in mke2fs.c + (tests in other places are correct) (Closes: #50012). + + -- Yann Dirson <dirson@debian.org> Fri, 12 Nov 1999 21:40:27 +0100 + +e2fsprogs (1.18-1) unstable; urgency=low + + * New upstream (bugfix) release. + + -- Yann Dirson <dirson@debian.org> Fri, 12 Nov 1999 17:27:20 +0100 + +e2fsprogs (1.17-2) unstable; urgency=low + + * Applied upstream patch to fix segfault (Closes: #49535). + + -- Yann Dirson <dirson@debian.org> Tue, 9 Nov 1999 22:14:53 +0100 + +e2fsprogs (1.17-1) unstable; urgency=low + + * New upstream (bugfix) release. + + -- Yann Dirson <dirson@debian.org> Wed, 27 Oct 1999 23:46:39 +0200 + +e2fsprogs (1.16-2) unstable; urgency=low + + * Fixed build of a link list in fsck.c (Closes: #48312). + + -- Yann Dirson <dirson@debian.org> Tue, 26 Oct 1999 01:17:36 +0200 + +e2fsprogs (1.16-1) unstable; urgency=low + + * New upstream release. + * Re-applied Hurd patches that did not seem to have been received + upstream. + + -- Yann Dirson <dirson@debian.org> Sun, 24 Oct 1999 16:11:59 +0200 + +e2fsprogs (1.15-3) unstable; urgency=low + + * Fixed minor typo for the Hurd. + * Fixed various Hurd defines to __GNU__ (Closes: #44407). + * Switched doc/ and info/ to FHS. + * Cleaned up debian/rules to use new debhelper features. + * Bounced Standards-Version to 3.0.1. + * Do not install buggy com_err.info, shipped as HTML. + * Removed partinfo from the package, following the wish of upstream + author, because of duplicate functionality with "fdisk -l" (Closes: + #42139). + + -- Yann Dirson <dirson@debian.org> Mon, 20 Sep 1999 23:04:06 +0200 + +e2fsprogs (1.15-2) unstable; urgency=medium + + * Changed build directory do debian/BUILD/ - related cleanups in + debian/rules. + * Fixed partinfo.c to have it compiled, and fixed display of partition + device in error messages. + * Added /usr/sbin/partinfo to the package (Closes: #42139). + * Added note about uuidgen(1) in README.Debian. + * Documented in manpage that default mke2fs behaviour is now -r1 -s1 + (Closes: #44478). + * Documented in mke2fs.8 that -r1 forces -s1, thus ignoring -s0. + * Added warning message when -s0 is ignored because of -r1. + * Documented -n option of mke2fs. + * Fixed display buglet causing trailing commas in list of superblock + backups when sparse flag is on and last group has no superblock + backup. + * Closes: #42434, #43134. + + -- Yann Dirson <dirson@debian.org> Wed, 8 Sep 1999 00:46:38 +0200 + +e2fsprogs (1.15-1) unstable; urgency=low + + * New upstream release (Closes: Bug#41763). + * All changes to upstream files in 1.14-3 were integrated upstream. + * Separated libuuid-dev from e2fslibs-dev because it now has manpages. + * Fixed debian/rules for POSIX "rmdir -p" + * Corrected the location of the GPL in copyright file. + * Moved the manpages to /usr/share/. + * Bumped Standards-Version to 3.0.0. + + -- Yann Dirson <dirson@debian.org> Fri, 23 Jul 1999 01:37:51 +0200 + +e2fsprogs (1.14-3) unstable; urgency=low + + * Fail with error message when /dev/null cannot be opened (Fixes: + Bug#35595). + * Fixed typo in e2fsck/unix.c (Fixes: Bug#36960). + * Added "emeregency help" options summary to e2fsck (Fixes: Bug#11372). + * Prepared debian/rules for usr/share/man/. + + -- Yann Dirson <dirson@debian.org> Tue, 1 Jun 1999 23:37:12 +0200 + +e2fsprogs (1.14-2) unstable; urgency=low + + * Fixed fsck(1) not to coredump when it does not find its argument in + /etc/fstab (Fixes: Bug#33533, Bug#34320, part of Bug#34131). + * Fixed spelling of upstream author's name. + * Cleaned debian/*.files up. + * Undid the <linux/types.h> changes. + * Changed "rmdir -p" invocations in debian/rules into "-rmdir -p" to + turn around changed behaviour in fileutils_4.0. + + -- Yann Dirson <dirson@debian.org> Fri, 12 Mar 1999 23:50:47 +0100 + +e2fsprogs (1.14-1) unstable; urgency=low + + * New upstream release (Fixes: Bug#33113). + * All patches we used for 1.12 are obsoleted by 1.14. + * Still have to install com_err.info from debian/rules though. + * Incorporated patches from Gordon Matzigkeit for hurd cross-compilation: + * - configure.in: Change cross-compile default for sizeof (long + long) to 8, so that __s64 and __u64 get defined in ext2fs.h. + (BUILD_CC): Discover a native compiler if we are cross-compling + (used for util/subst). + - Include linux/types.h instead of asm/types.h, so that + non-Linux platforms use the stubbed version provided with this + package. + - misc/Makefile.in (findsuper): Add a rule so that findsuper gets built + with the right compiler flags. + - etc. + + -- Yann Dirson <dirson@debian.org> Wed, 10 Feb 1999 23:23:03 +0100 + +e2fsprogs (1.12-4) frozen unstable; urgency=low + + * Ship flushb(8) and extend(8) were missing in all 1.12 packages + (Fixes: Bug#28771). + * Add extend.8 link to undocumented.7. + * Replaced my (ad-hoc) fix for Bug#25684 with (really better) one + from upstream. + + -- Yann Dirson <dirson@debian.org> Mon, 2 Nov 1998 20:53:28 +0100 + +e2fsprogs (1.12-3) frozen unstable; urgency=low + + * Fixed <ext2fs/ext2fs.h> to use angle brackets instead of double + quotes when including files from /usr/include/. + * Made e2fslibs-dev depend on comerr-dev (Fixes: Bug#26282, + Bug#27497). + * Fixed mke2fs' display with inode numbers > 9999 (Fixes: Bug#25684). + * Use -D__NO_STRING_INLINES on powerpc to allow building the boot + blocks in QUIK, the powermac boot loader - reported by Matt + McLean. + * Removed unsupported info and texi entries from docbase files. + + -- Yann Dirson <dirson@debian.org> Mon, 19 Oct 1998 23:32:41 +0200 + +e2fsprogs (1.12-2.1) unstable; urgency=low + + * Non-maintainer upload + config.guess and config.sub files modified, to recognize a Arm + architecture. + + -- Turbo Fredriksson <turbo@debian.org> Thu, 13 Aug 1998 19:15:56 -0400 + +e2fsprogs (1.12-2) unstable; urgency=low + + * Really install e2label.8 manpage. + * Removed path from ldconfig invocation, obeying packaging manual. + * Improved the subst.c patch (thanks to Peter Moulder). + + -- Yann Dirson <dirson@debian.org> Thu, 14 Jul 1998 14:10:06 +0200 + +e2fsprogs (1.12-1) unstable; urgency=low + + * New upstream release - at last out of alpha status ! + * Removed some obsolete files from debian/attic. + * Patched util/subst.c to expand env variables, and MCONFIG.in to + have ${prefix} exported to the `subst' process, so that we get + correct paths in mk_cmds and compile_et. Forwarded upstream. + * Debian-specific /usr/share/comerr/ renamed to /usr/share/et/, now + installed upstream. + * Removed -isp from dh_gencontrol invocation - now the default. + * Passed lintian 0.5.0. + + -- Yann Dirson <dirson@debian.org> Fri, 10 Jul 1998 22:49:18 +0200 + +e2fsprogs (1.10-17) frozen unstable; urgency=low + + * Commented out obsolete code in fsck.c that assumed fstab entries + declared `noauto' should not be checked - successfully forwarded + upstream (Fixes: Bug#17244). + + -- Yann Dirson <dirson@debian.org> Fri, 15 May 1998 01:14:54 +0200 + +e2fsprogs (1.10-16) frozen unstable; urgency=low + + * Changed <linux/types.h> to <asm/types.h> in lib/uuid/uuidP.h to + allow compilation with glibc 2.0.7pre1 (Fixes: Bug#22039). + * Use "build-stamp" as a stamp file instead of "build". + * Restored "Provides: e2fslibsg" in order to allow upgrade from + unstable hamm. Documented in README.Debian so that it does not + get removed again (Fixes: Bug#22019). + + -- Yann Dirson <dirson@debian.org> Mon, 4 May 1998 21:11:38 +0200 + +e2fsprogs (1.10-15) frozen unstable; urgency=low + + * Added call to ldconfig in e2fsprogs.postinst. + * Fixes checks for install-docs in postinst/prerm (Fixes: Bug#20303, + Bug#20304, Bug#20590). + * Removed e2fslibsg from what e2fsprogs provides (was just forgotten). + * Passed lintian 0.4.2. + + -- Yann Dirson <dirson@debian.org> Sun, 26 Apr 1998 22:27:11 +0200 + +e2fsprogs (1.10-14) frozen unstable; urgency=low + + * Fixed checks for install-docs to use -x. + * Applied patch for sparc from Juan to fsck.c to compile with glibc + 2.1 (Fixes: Bug#20841). + + -- Yann Dirson <dirson@debian.org> Tue, 14 Apr 1998 17:12:19 +0200 + +e2fsprogs (1.10-13) frozen unstable; urgency=low + + * test for /usr/sbin/install-docs before trying to run it in + postinst and prerm (Fixes: Bug#19461, Bug#19469, Bug#19949, + Bug#20006). + * comerrg-dev now suggests doc-base. + * moved binary packages ss2g, comerr2g and e2fslibsg back into + binary package e2fsprogs. + * use new virtual packages libcomerr2, libss2, libext2fs2, libe2p2, + libuuid1 in shlibs and dependencies. + * Changed e2fsprogs dependency on libs to a Pre-Depends (Fixes: + Bug#18221). + * Not conflicting with old ss2g and comerr2g - these will have to be + removed by hand. + * Turned around dpkg's bug #17624 in e2fsprogs.preinst. + * Updated README.Debian to explain the new package architecture. + * Passed lintian 0.3.4. + + -- Yann Dirson <dirson@debian.org> Fri, 20 Mar 1998 13:03:11 +0100 + +e2fsprogs (1.10-12) unstable; urgency=low + + * Corrected doc menu entries to point to the real documents' places. + * Fixed mk_cmds to really find its support scripts (Fixes: Bug#18779). + * Made mk_cmds and compile_et use "sh -e". + * Have missing file /usr/include/ss/ss_err.h installed (Fixes: Bug#18778). + * Corrected typo in Description (Fixes: Bug#18890). + * Fixed descriptions for ss* packages, thanks to Greg Stark (Fixes: + Bug#18373, Bug#18447). + * Added description of e2p and uuid libs in e2fslibsg-dev description. + * Included texinfo sources. + * Added doc-base support - suppressed direct menu/dwww support. + * Complies with standards version 2.4.0.0. + * Passed lintian 0.3.0: + * removed .du control file. + * updated FSF address. + * fixed in *.files nasty ldconfig-symlink-before-shlib-in-deb's. + * turned relative links from /usr/lib into /lib into absolute ones. + + -- Yann Dirson <dirson@debian.org> Sun, 8 Mar 1998 19:42:58 +0100 + +e2fsprogs (1.10-11) unstable; urgency=low + + * Switched to debhelper (Fixes:Bug#16307). + * Updated standards to 2.3.0.1 + * Changed maintainer's mail address. + * Added conflicts with old versions of dump and quota. + * Added html-converted texi docs for libs, with menu(dwww) support. + * Added findsuper.8 link to undocumented. + * Changed version number of lib packages to reflect the lib versions. + * Moved libss into its own packages; added mk_cmds script and + support files for libss development (Fixes:Bug#17233). + * Added README.Debian file documenting all those dependency stuff. + * Included example error tables from libext2fs and libss in + comerr-dev. + * Included example command tables from debugfs in ss-dev. + * Added section/priority files in packages (-isp). + * Changed names/relations for doc dirs to comply with policy. + * Removed call to ldconfig from e2fsprogs.postinst. + + -- Yann Dirson <dirson@debian.org> Thu, 29 Jan 1998 18:10:03 +0100 + +e2fsprogs (1.10-10) unstable; urgency=low + + * Added patch from Michael Alan Dorman for compilation on alpha-Linux + (Closes:Bug#15596). + * Added '-fsigned-char' to COPTS to allow compilation on ppc-Linux + (Closes:Bug#15976). + * Suppressed Essential flag on libs, as well as useless Replaces + (Closes: Bug#16480). + * Suppressed reference to obsolete package `e2fsprogsg' in control + info, but Conflicts for security (Closes:Bug#16791). + + -- Yann Dirson <dirson@univ-mlv.fr> Wed, 7 Jan 1998 22:35:08 +0100 + +e2fsprogs (1.10-9) unstable; urgency=low + + * Fixed comerr2g.shlibs to reflect package-name change. + * Fixed problem with ss include files being removed from /usr on make + install (indeed fixed in 1.10-8). + * Added changelog file to comerr2g package (indeed fixed in 1.10-8). + * Corrected link from flushb.8 to undocumented (Closes:Bug#15335,Bug#15660,Bug#15675). + * Added /sbin/findsuper (Closes:Bug#15224). + * Fixed /usr/bin/compile_et script (Closes:Bug#15487). + * Included awk scripts in /usr/share/comerr, for use by compile_et. + * Changed back the name from "e2fsprogsg" to "e2fsprogs" to get better + dependencies. + * Strip libraries (Closes:Bug#15667). + + -- Yann Dirson <dirson@univ-mlv.fr> Tue, 9 Dec 1997 22:52:42 +0100 + +e2fsprogs (1.10-8) unstable; urgency=low + + * Added latest patch from Ted for autodetection of llseek() proto. + * Switched to libc6, without libc5 compatibility (yet ?). + * Turned Pre-Depends into Depends to allow installation. Dirty + though. But what were Pre-Depends for anyway ? + + -- Yann Dirson <dirson@univ-mlv.fr> Sun, 23 Nov 1997 23:03:02 +0100 + +e2fsprogs (1.10-7) unstable; urgency=HIGH + + * Turned "#if (__GLIBC__ == 2)" into "#if 1" to turn around missing llseek() + prototype in libc_5.4.33-5 as well as libc6. + + -- Yann Dirson <dirson@univ-mlv.fr> Tue, 21 Oct 1997 12:53:27 +0200 + +e2fsprogs (1.10-6) unstable; urgency=low + + * Official libc6 patches from Ted. + * Converted to debstd - let it do the stripping stuff. + * Separated libcomerr into a standalone lib - includes full doc and tools. + * Separated development files into e2fslibs-dev, which Provides the 4 other + -dev packages. + * Now Provides the 4 other lib packages, to make it possible not to depend + upon e2fsprogs itself. These libs WILL be taken out of "progs" in the + next release. + + -- Yann Dirson <dirson@univ-mlv.fr> Wed, 24 Sep 1997 10:46:00 +0200 + +e2fsprogs (1.10-5.1) experimental; urgency=low + + * Applied patch from Ted for libc6 compatibility, for test purpose. + + -- Yann Dirson <dirson@univ-mlv.fr> Thu, 11 Sep 1997 09:09:42 +0200 + +e2fsprogs (1.10-5) unstable; urgency=medium + + * Switched back to libc5 because of possible bug in libc6-2.0.4-provided + llseek() causing problem with partitions > 2Gb. + * Switched back to libc-provided llseek(). + + -- Yann Dirson <dirson@univ-mlv.fr> Tue, 5 Aug 1997 16:54:40 +0200 + +e2fsprogs (1.10-4.1) unstable; urgency=low + + * Make use of shipped llseek instead of glibc's which seems buggy + [unreleased - could not compile due to possible gcc bug]. + * Corrected compiler-options handling in debian/rules (use CCOPTS instead + of CFLAGS which is messed with in configure.in). + + -- Yann Dirson <dirson@univ-mlv.fr> Mon, 28 Jul 1997 19:47:02 +0200 + +e2fsprogs (1.10-4) unstable; urgency=low + + * Switched to libc6. + * Added calls to update-info in postins/prerm. + * Misc changes to debian/rules; some cleanup in Makefiles. + + -- Yann Dirson <dirson@univ-mlv.fr> Thu, 10 Jul 1997 19:42:54 +0200 + +e2fsprogs (1.10-3) stable unstable; urgency=low + + * New maintainer (closed many obsolete bug-reports). + * updated "copyright" to show new location on tsx-11. + * started debian/rules cleanup, towards new policy conformance. + * Added flushb.8 link to undocumented.7 (bug #8644). + * Added {fsck,mkfs}.ext2.8 links to existing manpages (bugs #5598, + #6286). + + -- Yann Dirson <dirson@univ-mlv.fr> Wed, 25 Jun 1997 14:59:58 +0200 + +e2fsprogs (1.10-2) frozen unstable; urgency=low + + * Add 'ldconfig' to postinst (should fix #9020). + * Define HAVE_NETINET_IN_H on alpha/glibc. + + -- Klee Dienes <klee@debian.org> Tue, 29 Apr 1997 17:24:12 -0400 + +e2fsprogs (1.10-1) frozen unstable; urgency=medium + + * Upstream bug-fix release. + + -- Klee Dienes <klee@debian.org> Thu, 24 Apr 1997 14:54:12 -0400 + +e2fsprogs (1.09-1) frozen; urgency=medium + + * Upstream bug-fix release. + + -- Klee Dienes <klee@debian.org> Thu, 24 Apr 1997 14:54:12 -0400 + +e2fsprogs (1.06-4) unstable; urgency=low + + * Added empty entries to shlibs.local, to neatly solve the pre-depends + problem, as suggested by Ian Jackson. + + -- Michael Nonweiler <mrn20@cam.ac.uk> Wed, 13 Nov 1996 08:13:28 +0000 + +e2fsprogs (1.06-3) unstable; urgency=low + + * Hard coded Pre-Depends line, as a temporary fix for the pre-depends + contains e2fsprogs problem. + + -- Michael Nonweiler <mrn20@cam.ac.uk> Sat, 9 Nov 1996 12:57:44 +0000 + +e2fsprogs (1.06-2) unstable; urgency=low + + * New packaging format + * Fixes packaging bugs - + Files in /lib are now stripped of all unneeded symbols (Bug#5121) + Calls to ldconfig in maintainer scripts have been removed (Bug#4247) + + -- Michael Nonweiler <mrn20@cam.ac.uk> Tue, 5 Nov 1996 21:14:54 +0000 + + * Oct 18 1996 Michael Meskes <meskes@debian.org> + upgraded to latest upstream version, to 1.06 from 1.05 + * Oct 18 1996 Michael Meskes <meskes@debian.org> + upgraded to latest upstream version, to 1.05 from 1.04 + gzip manpages + minor changes to debian.rules + * Jun 23 1996 Michael R. Nonweiler <mrn20@cam.ac.uk> + upgraded to latest upstream version, to 1.04 from 1.02 + another tidy-up of debian.rules + section and priority added to debian.control, + since this is an essential base package. + + * Mar 5 1996 Michael R. Nonweiler <mrn20@cam.ac.uk> + upgraded to latest upstream version, to 1.02 from 1.01 + * copied "configure" usr_prefix change (see below), into configure.in + * updated debian.control file, added Pre-Depends field + created preinst script to check dpkg --assert-predepends + tidyed and fixed debian.rules + * set e2fsck to link shared, as suggested by Bruce Perens + in Bug#2332 + * corrected problem in e2fsck error message, Bug#2534 + * added Architecture field + * very minor correction to expected output of a build time test + + * Nov 20 1995 Andrew D. Fernandes <adfernan@cnd.mcgill.ca> + removed debugging symbols from libs and enabled more + optimization as suggested by Rolf Rossius + also removed the /var/catman pages + + * Nov 19 1995 Andrew D. Fernandes <adfernan@cnd.mcgill.ca> + changed to elf compilation + + * Oct 7 1995 Andrew D. Fernandes <adfernan@cnd.mcgill.ca> + Upgraded to latest version, to 1.01 from 0.5b. + * changed the installation groups from bin to root in MCONFIG.in + * changed configure to set usr_prefix="\${prefix}/usr" + * moved the cat pages to /var/catman in MCONFIG.in + + * Aug 3 1995 Bruce Perens <Bruce@Pixar.com> + Made "fsck -t <filesystem-type> <device>" work correctly. Formerly + 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/comerr-dev.doc-base b/debian/comerr-dev.doc-base new file mode 100644 index 00000000..289ab002 --- /dev/null +++ b/debian/comerr-dev.doc-base @@ -0,0 +1,12 @@ +Document: com_err +Title: The com_err library +Author: Ken Raeburn and Bill Sommerfeld +Abstract: A library, and associated utilities, + which allow a more uniform way for libraries + to return errors to their callers, and for programs + to describe errors and exceptional conditions to their users. +Section: Apps/Programming + +Format: HTML +Index: /usr/share/doc/comerr-dev/html-info/com_err_toc.html +Files: /usr/share/doc/comerr-dev/html-info/*.html diff --git a/debian/comerr-dev.examples b/debian/comerr-dev.examples new file mode 100644 index 00000000..36e3ff0b --- /dev/null +++ b/debian/comerr-dev.examples @@ -0,0 +1,2 @@ +lib/ss/ss_err.et +debian/BUILD/lib/ext2fs/ext2_err.et diff --git a/debian/comerr-dev.files b/debian/comerr-dev.files new file mode 100644 index 00000000..8aeb7c3d --- /dev/null +++ b/debian/comerr-dev.files @@ -0,0 +1,7 @@ +usr/lib/libcom_err.a +usr/lib/libcom_err.so +usr/include/et/* +usr/share/man/man1/compile_et* +usr/share/man/man3/com_err.3* +usr/bin/compile_et +usr/share/et/* diff --git a/debian/comerr-dev.postinst b/debian/comerr-dev.postinst new file mode 100644 index 00000000..5c7fb838 --- /dev/null +++ b/debian/comerr-dev.postinst @@ -0,0 +1,6 @@ +#!/bin/sh -e + +# install-info --description='The Common Error Description library.' \ +# --section "Devel.*" "Development" --quiet /usr/info/com_err.info + +#DEBHELPER# diff --git a/debian/control b/debian/control new file mode 100644 index 00000000..92423d41 --- /dev/null +++ b/debian/control @@ -0,0 +1,92 @@ +Source: e2fsprogs +Section: base +Priority: required +Maintainer: Yann Dirson <dirson@debian.org> +Build-Depends: texi2html, texinfo, debhelper +Standards-Version: 3.0.1 + +Package: e2fsprogs +Essential: yes +Pre-Depends: ${shlibs:Depends} +Suggests: gpart, parted +Conflicts: e2fslibsg, dump (<< 0.4b4-4), quota (<< 1.55-8.1) +Provides: libcomerr2, libss2, libext2fs2, libe2p2, libuuid1, e2fslibsg +Replaces: e2fslibsg, ss2g, comerr2g +Architecture: any +Description: The EXT2 file system utilities and libraries. + EXT2 stands for "Extended Filesystem", version 2. It's the main + filesystem type used for hard disks on Debian and other Linux systems. + . + This package contains programs for creating, checking, and maintaining EXT2 + filesystems, and the generic `fsck' wrapper. + +Package: comerr-dev +Section: devel +Priority: extra +Depends: ${libcdev:Depends}, libcomerr2 +Suggests: doc-base +Conflicts: e2fsprogs (<< 1.10-6) +Architecture: any +Description: The Common Error Description library - headers and static libraries. + libcomerr is an attempt to present a common error-handling mechanism to + manipulate the most common form of error code in a fashion that does not + have the problems identified with mechanisms commonly in use. + +Package: ss-dev +Section: devel +Priority: extra +Depends: ${libcdev:Depends}, libss2 +Conflicts: e2fsprogs (<< 1.10-6) +Architecture: any +Description: Command-line interface parsing library - headers and static libraries. + This package includes a tool that parses a command table to generate + a simple command-line interface parser, the include files needed to + compile and use it, and the static libs. + . + It was originally inspired by the Multics SubSystem library. + +Package: uuid-dev +Section: devel +Priority: extra +Depends: ${libcdev:Depends}, e2fsprogs +Conflicts: e2fsprogs (<< 1.10-6) +Replaces: e2fslibs-dev (<< 1.15) +Architecture: any +Description: Universally unique id library - headers and static libraries. + libuuid generates and parses 128-bit universally unique id's (UUID's), + using a standard which is blessed by both Microsoft and DCE, and is + being proposed as an internet standard. See the internet-draft: + . + draft-leach-uuids-guids-01.txt + . + for more information. + +Package: e2fslibs-dev +Section: devel +Priority: extra +Depends: ${libcdev:Depends}, comerr-dev, e2fsprogs +Suggests: doc-base +Provides: ext2fs-dev, e2p-dev +Conflicts: e2fsprogs (<< 1.10-6) +Architecture: any +Description: The headers and static libraries for ext2fs-aware tools-development. + EXT2FS stands for "Extended Filesystem", version 2. It's the filesystem + type used for hard disks on Debian and other Linux systems. + . + This package contains the headers and shared libraries needed to compile + ext2fs-aware programs. Only programmers that really manipulate + features specific to the ext2 filesystem will need this. Most + programmers will use the generic filesystem-independent interface + from libc. + . + It also contains dev files for the e2p lib used by + the e2fsprogs, but which is not yet packaged all by itself + because it lacks documentation. It may also lack some support + files, by I can't really know until someone uses it... + . + libe2p is for user-level e2fsprogs commands. It's used by dumpe2fs, + chattr, and lsattr. Functions in libe2p typically have two + characteristics (a) don't require that block device containing the + filesystem be opened directly (functions in libext2fs do), and (b) + libe2p typically contains printf statements or parse user input, and so + have more internationalization issues. diff --git a/debian/e2fslibs-dev.doc-base b/debian/e2fslibs-dev.doc-base new file mode 100644 index 00000000..3a7ed72c --- /dev/null +++ b/debian/e2fslibs-dev.doc-base @@ -0,0 +1,10 @@ +Document: libext2fs +Title: The EXT2FS library +Author: Theodore Ts'o +Abstract: The EXT2FS library is designed to allow + user-level programs to manipulate an ext2 filesystem. +Section: Apps/Programming + +Format: HTML +Index: /usr/share/doc/e2fsprogs/html-info/libext2fs_toc.html +Files: /usr/share/doc/e2fsprogs/html-info/*.html diff --git a/debian/e2fslibs-dev.files b/debian/e2fslibs-dev.files new file mode 100644 index 00000000..f269eca4 --- /dev/null +++ b/debian/e2fslibs-dev.files @@ -0,0 +1,4 @@ +usr/lib/*.so +usr/lib/*.a +usr/include/ext2fs/* +usr/include/e2p/* diff --git a/debian/e2fslibs-dev.postinst b/debian/e2fslibs-dev.postinst new file mode 100644 index 00000000..4770b4bb --- /dev/null +++ b/debian/e2fslibs-dev.postinst @@ -0,0 +1,6 @@ +#!/bin/sh -e + +# install-info --description='The ext2fs library.' \ +# --section "Devel.*" "Development" --quiet /usr/info/libext2fs.info + +#DEBHELPER# diff --git a/debian/e2fsprogs.copyright b/debian/e2fsprogs.copyright new file mode 100644 index 00000000..2925a245 --- /dev/null +++ b/debian/e2fsprogs.copyright @@ -0,0 +1,52 @@ +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 <tytso@mit.edu> and Remy Card <card@masi.ibp.fr>. + +This package was put together by Yann Dirson <dirson@debian.org>, +from sources obtained from a mirror of: + tsx-11.mit.edu:/pub/linux/packages/ext2fs/ + +Copyright notice: + +This package, the EXT2 filesystem utilities, are protected by the GNU +Public License, with the following exception --- + + If the version string in the file version.h contains the + string "pre-", then this package must be distributed in source + form only. You can give a copy of the binary for e2fsck to + help a friend recover his or her filesystem, as the need + arises. However, "pre" indicates that this release is under + development, and available for ALPHA testing. So for your + protection as much as mine, I'd rather not have it appear in a + some distribution --- especially not a CD-ROM distribution! + +The most recent officially distributed version can be found on +tsx-11.mit.edu, in /pub/linux/packages/ext2fs. If you need to make a +distribution, that's the one you should use. If there is some reason +why you'd like a more recent version that is still in ALPHA testing +for your distribution, please contact me (tytso@mit.edu), and we can +see if we can't come to an arrangement. The release schedules for +this package are flexible, if you give me enough lead time. + + + Theodore Ts'o + 26-Mar-97 + +On Debian GNU systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + + +The 1.19 RELEASE-NOTES mentions that the UUID library (libuuid) is +covered by the LGPL. After clarification from upstream author, it +appears to refer to the so-called "Library General Public License" +(aka LGPL v2), and not the "Lesser General Public License" (aka LGPL +v2.1). + +On Debian GNU systems, the complete text of the GNU LGPL v2 can be +found in `/usr/share/common-licenses/LGPL-2'. + + +The ss and com_err libraries, available in separate packages, fall +under another licence. Please refer to the relevant copyright files +for these libs. + diff --git a/debian/e2fsprogs.docs b/debian/e2fsprogs.docs new file mode 100644 index 00000000..7af9733b --- /dev/null +++ b/debian/e2fsprogs.docs @@ -0,0 +1,2 @@ +README +RELEASE-NOTES diff --git a/debian/e2fsprogs.postinst b/debian/e2fsprogs.postinst new file mode 100644 index 00000000..efaa3020 --- /dev/null +++ b/debian/e2fsprogs.postinst @@ -0,0 +1,7 @@ +#! /bin/sh + +set -e + +ldconfig + +#DEBHELPER# diff --git a/debian/e2fsprogs.preinst b/debian/e2fsprogs.preinst new file mode 100644 index 00000000..97d2f9c8 --- /dev/null +++ b/debian/e2fsprogs.preinst @@ -0,0 +1,25 @@ +#!/bin/sh + +dpkg --assert-support-predepends 2> /dev/null + +case $? in + 0) ;; # fine, supported + 1) exit 1 ;; # dpkg writes an error message to stdio + 2) cat <<EOT +This package requires features of dpkg unavailable in this version. +Please upgrade to a more recent version (>=1.1.0) of dpkg. +EOT + exit 1 ;; # dpkg didn't recognise the option + *) exit 2 ;; +esac + +# # turn around bug in dpkg (Bug#17624) +# if [ -L /usr/doc/e2fsprogs ] +# then +# echo 'preinst: removing buggy /usr/doc/e2fsprogs symlink (Bug#17624)' +# rm -f /usr/doc/e2fsprogs +# fi + +#DEBHELPER# + +exit 0 diff --git a/debian/e2fsprogs.shlibs b/debian/e2fsprogs.shlibs new file mode 100644 index 00000000..4e8d675d --- /dev/null +++ b/debian/e2fsprogs.shlibs @@ -0,0 +1,5 @@ +libext2fs 2 libext2fs2 +libe2p 2 libe2p2 +libuuid 1 libuuid1 +libcom_err 2 libcomerr2 +libss 2 libss2 diff --git a/debian/libcomerr2.copyright b/debian/libcomerr2.copyright new file mode 100644 index 00000000..578628a5 --- /dev/null +++ b/debian/libcomerr2.copyright @@ -0,0 +1,24 @@ +This is the Debian GNU/Linux prepackaged version of the Common Error +Description library. It is currently distributed together with the EXT2 file +system utilities, which are otherwise packaged as "e2fsprogs". + +This package was put together by Yann Dirson <dirson@debian.org>, +from sources obtained from a mirror of: + tsx-11.mit.edu:/pub/linux/packages/ext2fs/ + +From the original distribution: + +Copyright 1987, 1988 by the Student Information Processing Board + of the Massachusetts Institute of Technology + +Permission to use, copy, modify, and distribute this software +and its documentation for any purpose and without fee is +hereby granted, provided that the above copyright notice +appear in all copies and that both that copyright notice and +this permission notice appear in supporting documentation, +and that the names of M.I.T. and the M.I.T. S.I.P.B. not be +used in advertising or publicity pertaining to distribution +of the software without specific, written prior permission. +M.I.T. and the M.I.T. S.I.P.B. make no representations about +the suitability of this software for any purpose. It is +provided "as is" without express or implied warranty. diff --git a/debian/libss2.copyright b/debian/libss2.copyright new file mode 100644 index 00000000..578628a5 --- /dev/null +++ b/debian/libss2.copyright @@ -0,0 +1,24 @@ +This is the Debian GNU/Linux prepackaged version of the Common Error +Description library. It is currently distributed together with the EXT2 file +system utilities, which are otherwise packaged as "e2fsprogs". + +This package was put together by Yann Dirson <dirson@debian.org>, +from sources obtained from a mirror of: + tsx-11.mit.edu:/pub/linux/packages/ext2fs/ + +From the original distribution: + +Copyright 1987, 1988 by the Student Information Processing Board + of the Massachusetts Institute of Technology + +Permission to use, copy, modify, and distribute this software +and its documentation for any purpose and without fee is +hereby granted, provided that the above copyright notice +appear in all copies and that both that copyright notice and +this permission notice appear in supporting documentation, +and that the names of M.I.T. and the M.I.T. S.I.P.B. not be +used in advertising or publicity pertaining to distribution +of the software without specific, written prior permission. +M.I.T. and the M.I.T. S.I.P.B. make no representations about +the suitability of this software for any purpose. It is +provided "as is" without express or implied warranty. diff --git a/debian/rules b/debian/rules new file mode 100644 index 00000000..864fb31c --- /dev/null +++ b/debian/rules @@ -0,0 +1,211 @@ +#! /usr/bin/make -f +# -*- makefile -*- +# +# Invoke each target with `./debian/rules <target>'. All targets should be +# invoked with the package root as the current directory. +# +# The `binary' target must be run as root, as it needs to install files with +# specific ownerships. + +# be paranoid +export LC_ALL=C + +DEB_BUILD_ARCH := $(shell dpkg --print-architecture) +DEB_BUILD_GNU_TYPE := $(shell ./config.guess) +ifndef DEB_HOST_ARCH + DEB_HOST_ARCH := ${DEB_BUILD_ARCH} +endif +DEB_HOST_GNU_CPU := $(patsubst hurd-%,%,$(DEB_HOST_ARCH)) +ifeq ($(filter-out hurd-%,${DEB_HOST_ARCH}),) + DEB_HOST_GNU_SYSTEM := gnu +else +# FIXME: we won't always have only Hurd and Linux + DEB_HOST_GNU_SYSTEM := linux +endif +DEB_HOST_GNU_TYPE := ${DEB_HOST_GNU_CPU}-${DEB_HOST_GNU_SYSTEM} + + +# find the version for the main package, from changelog file +MAIN_VERSION = $(shell head -1 debian/changelog | cut '-d ' -f 2 | sed 's/[()]//g') +# find versions for libraries going into their own packages, from their Makefile.in's +COMERR_VERSION = $(shell grep ELF_VERSION lib/et/Makefile.in | cut '-d ' -f3) +COMERR_MAJOR = $(word 1,$(subst ., ,${COMERR_VERSION})) +SS_VERSION = $(shell grep ELF_VERSION lib/ss/Makefile.in | cut '-d ' -f3) +SS_MAJOR = $(word 1,$(subst ., ,${SS_VERSION})) +UUID_VERSION = $(shell grep ELF_VERSION lib/uuid/Makefile.in | cut '-d ' -f3) +UUID_MAJOR = $(word 1,$(subst ., ,${UUID_VERSION})) + +package=e2fsprogs + +topdir=$(shell pwd) +debdir=${topdir}/debian +maindir=${debdir}/tmp +builddir=${debdir}/BUILD +docdir=${maindir}/usr/share/doc/${package} +MANDIR=/usr/share/man +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 +LIBC-DEV = libc6-dev + +ifeq (${DEB_HOST_ARCH},alpha) +CCOPTS += -DHAVE_NETINET_IN_H +LIBC-DEV = libc6.1-dev +else +CCOPTS += -D__NO_STRING_INLINES +endif + +build: build-stamp +build-stamp: configure-stamp + dh_testdir + make -C ${builddir} + ( cd ${builddir}/doc && \ + texi2html -split_chapter ${topdir}/doc/libext2fs.texinfo ) + ( cd ${builddir}/lib/et && make com_err.info && \ + texi2html -split_chapter -expandinfo ${topdir}/lib/et/com_err.texinfo ) + touch build-stamp + +configure-stamp: + dh_testdir + mkdir -p ${builddir} +ifeq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH)) + cd ${builddir} && CFLAGS="${CFLAGS}" \ + ${topdir}/configure --with-ccopts="${CCOPTS}" \ + --enable-elf-shlibs --enable-dynamic-e2fsck \ + --enable-nls --enable-compression \ + --mandir=${MANDIR} --infodir=/usr/share/info +else + cd ${builddir} && CFLAGS="${CFLAGS}" CC="${DEB_HOST_GNU_TYPE}-gcc" \ + ${topdir}/configure --with-ccopts="${CCOPTS}" \ + --enable-elf-shlibs --enable-dynamic-e2fsck \ + --enable-nls --enable-compression \ + --mandir=${MANDIR} --infodir=/usr/share/info \ + --build=$(DEB_BUILD_GNU_TYPE) $(DEB_HOST_GNU_TYPE) +endif + touch configure-stamp + +clean: + dh_testdir + rm -f build-stamp configure-stamp install + -make -C ${builddir} -i distclean + rm -rf ${builddir} + rm -f doc/libext2fs_*.html lib/et/com_err_*.html + dh_clean + +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} + # static libs and .h files + make -C ${builddir} install-libs DESTDIR=${maindir} + +# correct locations + (cd ${maindir}/sbin && mv debugfs ../usr/sbin/) + (cd ${maindir}/sbin && mv e2label ../usr/sbin/) + +# docs + # fully handled by debhelper + rm -rf ${maindir}/usr/share/info + + mkdir -p ${debdir}/e2fslibs-dev/usr/share/doc/e2fsprogs + ln -sf e2fsprogs ${debdir}/e2fslibs-dev/usr/share/doc/e2fslibs-dev + + 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 + + mkdir -p ${maindir}/usr/share/doc/libss${SS_MAJOR} + mkdir -p ${debdir}/ss-dev/usr/share/doc/libss${SS_MAJOR} + ln -sf libss${SS_MAJOR} ${debdir}/ss-dev/usr/share/doc/ss-dev + + mkdir -p ${debdir}/uuid-dev/usr/share/doc/e2fsprogs + ln -sf e2fsprogs ${debdir}/uuid-dev/usr/share/doc/uuid-dev + + dh_installdocs -a + + for i in libcomerr${COMERR_MAJOR} libss${SS_MAJOR}; do \ + install -m 644 debian/$$i.copyright ${maindir}/usr/share/doc/$$i/copyright ;\ + done + + # HTML docs + install -d ${debdir}/e2fslibs-dev/usr/share/doc/e2fslibs-dev/html-info/ + install -p ${builddir}/doc/libext2fs_*.html \ + ${debdir}/e2fslibs-dev/usr/share/doc/e2fslibs-dev/html-info/ + install -d ${debdir}/comerr-dev/usr/share/doc/comerr-dev/html-info/ + install -p ${builddir}/lib/et/com_err_*.html \ + ${debdir}/comerr-dev/usr/share/doc/comerr-dev/html-info/ + + # texinfo docs + install -p ${topdir}/doc/libext2fs.texinfo \ + ${debdir}/e2fslibs-dev/usr/share/doc/e2fslibs-dev/libext2fs.texi + install -p ${topdir}/lib/et/com_err.texinfo \ + ${debdir}/comerr-dev/usr/share/doc/libcomerr${COMERR_MAJOR}/com_err.texi + + # info docs +# dh_installinfo -pcomerr-dev ${builddir}/lib/et/com_err.info + dh_installinfo -pe2fslibs-dev ${builddir}/doc/libext2fs.info + + # examples + dh_installexamples -a + + # dh_installmanpages still makes a mess as of 0.54 (see below dh_movefiles) + ln -s e2fsck.8 ${mandir}/man8/fsck.ext2.8 + ln -s mke2fs.8 ${mandir}/man8/mkfs.ext2.8 + + dh_movefiles -a + # cleanup empty dirs + cd ${maindir}/usr/include/ && rmdir * && cd .. && rmdir include/ + cd ${maindir}/usr/share/ && rmdir et ss && cd man && rmdir man3 + cd ${maindir}/usr && rmdir lib + + # broken + useless in 0.52 + # dh_installmanpages -a + + dh_undocumented -a + + dh_installchangelogs -pe2fsprogs ChangeLog + for i in libcomerr${COMERR_MAJOR} libss${SS_MAJOR}; do \ + ln -s ../e2fsprogs/changelog.Debian.gz ${maindir}/usr/share/doc/$$i/ ;\ + ln -s ../e2fsprogs/changelog.gz ${maindir}/usr/share/doc/$$i/ ;\ + done + + dh_strip -a + dh_compress -a + dh_fixperms -a + + echo "libcdev:Depends=${LIBC-DEV}" >> debian/comerr-dev.substvars + echo "libcdev:Depends=${LIBC-DEV}" >> debian/ss-dev.substvars + echo "libcdev:Depends=${LIBC-DEV}" >> debian/uuid-dev.substvars + 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_gencontrol -pcomerr-dev \ + -u '-v${COMERR_VERSION}-${MAIN_VERSION}' + dh_gencontrol -pss-dev \ + -u '-v${SS_VERSION}-${MAIN_VERSION}' + dh_gencontrol -puuid-dev \ + -u '-v${UUID_VERSION}-${MAIN_VERSION}' +# We do this one by hand +# dh_makeshlibs -a + dh_md5sums -a + dh_builddeb -a + +binary: binary-indep binary-arch + +.PHONY: binary binary-arch binary-indep clean checkroot diff --git a/debian/shlibs.local b/debian/shlibs.local new file mode 100644 index 00000000..1cd5693a --- /dev/null +++ b/debian/shlibs.local @@ -0,0 +1,5 @@ +libext2fs 2 +libe2p 2 +libuuid 1 +libcom_err 2 +libss 2 diff --git a/debian/ss-dev.examples b/debian/ss-dev.examples new file mode 100644 index 00000000..b7930bb7 --- /dev/null +++ b/debian/ss-dev.examples @@ -0,0 +1 @@ +debugfs/debug_cmds.ct diff --git a/debian/ss-dev.files b/debian/ss-dev.files new file mode 100644 index 00000000..682712e7 --- /dev/null +++ b/debian/ss-dev.files @@ -0,0 +1,5 @@ +usr/lib/libss.so +usr/lib/libss.a +usr/include/ss/* +usr/bin/mk_cmds +usr/share/ss/* diff --git a/debian/ss-dev.undocumented b/debian/ss-dev.undocumented new file mode 100644 index 00000000..841eb269 --- /dev/null +++ b/debian/ss-dev.undocumented @@ -0,0 +1 @@ +mk_cmds.1 diff --git a/debian/uuid-dev.files b/debian/uuid-dev.files new file mode 100644 index 00000000..4a8dcb7b --- /dev/null +++ b/debian/uuid-dev.files @@ -0,0 +1,5 @@ +usr/lib/libuuid.so +usr/lib/libuuid.a +usr/include/uuid/* +usr/share/man/man3/libuuid* +usr/share/man/man3/uuid_* |