Update debian files to support the blkid library, and to fix a number

of Lintian warnings.

Added mk_cmds man page.

diff --git a/debian/blkid-dev.substvars b/debian/blkid-dev.substvars
new file mode 100644 (file)
index 0000000..1f62fda
--- /dev/null
+++ b/debian/blkid-dev.substvars
@@ -0,0 +1 @@
+libcdev:Depends=libc6-dev

diff --git a/debian/changelog b/debian/changelog
index 1444d26..57cee7e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+e2fsprogs (1.32+1.30-WIP-0314-1) unstable; urgency=low
+
+  * New upstream release (Closes: #176814, #174766, #166048, #179671,
+       #173612, #175233, #175113, #170497)
+
+ -- Theodore Y. Ts'o <tytso@mit.edu>  Sun, 16 Mar 2003 18:05:08 -0500
+
 e2fsprogs (1.32-2) unstable; urgency=high
 
   * Applied upstream patch to fix htree problems, and to deactivate it by

diff --git a/debian/control b/debian/control
index f5fe2e4..ededdd0 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.5.6
 Package: e2fsck-static
 Section: admin
 Priority: optional
-Depends: e2fsprogs (= ${Source-Version}), ${misc:Depends}
+Depends: e2fsprogs (= ${Source-Version})
 Recommends: sash | zsh-static | busybox-static | zsh30-static
 Architecture: any
 Description: A statically-linked version of the ext2 filesystem checker
@@ -24,7 +24,7 @@ Description: A statically-linked version of the ext2 filesystem checker
 Package: comerr-dev
 Section: devel
 Priority: extra
-Depends: ${libcdev:Depends}, libcomerr2, ${misc:Depends}
+Depends: ${libcdev:Depends}, libcomerr2
 Suggests: doc-base
 Conflicts: e2fsprogs (<< 1.10-6)
 Architecture: any
@@ -36,7 +36,7 @@ Description: The Common Error Description library - headers and static libraries
 Package: ss-dev
 Section: devel
 Priority: extra
-Depends: ${libcdev:Depends}, libss2, ${misc:Depends}
+Depends: ${libcdev:Depends}, libss2
 Conflicts: e2fsprogs (<< 1.10-6)
 Architecture: any
 Description: Command-line interface parsing library - headers and static libraries
@@ -49,7 +49,7 @@ Description: Command-line interface parsing library - headers and static librari
 Package: uuid-dev
 Section: devel
 Priority: extra
-Depends: ${libcdev:Depends}, e2fsprogs (= ${Source-Version}), ${misc:Depends}
+Depends: ${libcdev:Depends}, e2fsprogs (= ${Source-Version})
 Conflicts: e2fsprogs (<< 1.10-6)
 Replaces: e2fslibs-dev (<< 1.15)
 Architecture: any
@@ -62,10 +62,10 @@ Description: Universally unique id library - headers and static libraries
  .
  for more information.
 
-Package: libblkid
+Package: libblkid1
 Section: libs
 Priority: required
-Depends: ${libcdev:Depends}
+Depends: ${shlibs:Depends}
 Architecture: any
 Description: Block device id library
  The blkid library which allows system programs like fsck and 
@@ -77,7 +77,7 @@ Description: Block device id library
 Package: libblkid-dev
 Section: devel
 Priority: extra
-Depends: libblkid (= ${Source-Version})
+Depends: libblkid1 (= ${Source-Version})
 Architecture: any
 Description: Block device id library - headers and static libraries
  The blkid library which allows system programs like fsck and 
@@ -91,7 +91,7 @@ Description: Block device id library - headers and static libraries
 Package: e2fsprogs-bf
 Section: devel
 Priority: extra
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}
 Conflicts: e2fsprogs
 Architecture: any
 Description: A stripped-down versions of e2fsprogs, for boot-floppies
@@ -104,7 +104,7 @@ Description: A stripped-down versions of e2fsprogs, for boot-floppies
 Package: e2fsprogs-udeb
 Section: debian-installer
 Priority: standard
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}
 Conflicts: e2fsprogs
 Architecture: any
 Description: A stripped-down versions of e2fsprogs, for debian-installer
@@ -117,7 +117,7 @@ Description: A stripped-down versions of e2fsprogs, for debian-installer
 Package: e2fsprogs
 Essential: yes
 Pre-Depends: ${shlibs:Depends}
-Depends: ${misc:Depends}, libblkid
+Depends: 
 Suggests: gpart, parted, e2fsck-static
 Conflicts: e2fslibsg, dump (<< 0.4b4-4), quota (<< 1.55-8.1)
 Provides: libcomerr2, libss2, libext2fs2, libe2p2, libuuid1
@@ -132,7 +132,7 @@ Description: The EXT2 file system utilities and libraries
 Package: e2fslibs-dev
 Section: devel
 Priority: extra
-Depends: ${libcdev:Depends}, comerr-dev, e2fsprogs (= ${Source-Version}), ${misc:Depends}
+Depends: comerr-dev, e2fsprogs (= ${Source-Version})
 Suggests: doc-base
 Provides: ext2fs-dev, e2p-dev
 Conflicts: e2fsprogs (<< 1.10-6)

diff --git a/debian/libblkid-dev.files b/debian/libblkid-dev.files
new file mode 100644 (file)
index 0000000..c5ad6fc
--- /dev/null
+++ b/debian/libblkid-dev.files
@@ -0,0 +1,3 @@
+usr/lib/libblkid*
+usr/include/blkid
+usr/share/man/man3/libblkid.3

diff --git a/debian/libblkid.copyright b/debian/libblkid.copyright
new file mode 100644 (file)
index 0000000..f416aac
--- /dev/null
+++ b/debian/libblkid.copyright
@@ -0,0 +1,21 @@
+This package was added to the e2fsprogs debian source package by
+Theodore Ts'o <tytso@mit.edu> on Sat Mar 15 15:33:37 EST 2003
+
+It is part of the main e2fsprogs distribution, which can be found at:
+
+       http://sourceforge.net/projects/e2fsprogs
+
+Upstream Author: Theodore Ts'o <tytso@mit.edu>
+
+Copyright:
+
+Copyright (C) 1999, 2001 by Andries Brouwer
+Copyright (C) 1999, 2000, 2003 by Theodore Ts'o
+
+You are free to distribute this software under the terms of the GNU
+Lesser (Library) General Public License.
+
+On Debian systems, the complete text of the GNU General Public License
+can be found in /usr/share/common-licenses/LGPL.
+
+

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

diff --git a/debian/rules b/debian/rules
index 3c3f812..df3b8bf 100644 (file)
--- a/debian/rules
+++ b/debian/rules
@@ -35,6 +35,8 @@ SS_VERSION = $(shell grep ELF_VERSION lib/ss/Makefile.in | cut '-d ' -f3)
 SS_SOVERSION = $(shell grep ELF_SO_VERSION lib/ss/Makefile.in | cut '-d ' -f3)
 UUID_VERSION = $(shell grep ELF_VERSION lib/uuid/Makefile.in | cut '-d ' -f3)
 UUID_SOVERSION = $(shell grep ELF_SO_VERSION lib/uuid/Makefile.in | cut '-d ' -f3)
+BLKID_VERSION = $(shell grep ELF_VERSION lib/blkid/Makefile.in | cut '-d ' -f3)
+BLKID_SOVERSION = $(shell grep ELF_SO_VERSION lib/blkid/Makefile.in | cut '-d ' -f3)
 EXT2FS_SOVERSION = $(shell grep ELF_SO_VERSION lib/ext2fs/Makefile.in | cut '-d ' -f3)
 E2P_SOVERSION = $(shell grep ELF_SO_VERSION lib/e2p/Makefile.in | cut '-d ' -f3)
 
@@ -262,10 +264,6 @@ binary-arch: install install-udeb
        dh_testdir
        dh_testroot
 
-  # remove obsolete maint-scripts provided by 1.26 upstream
-       cd debian && rm -f comerr-dev.postinst e2fslibs-dev.postinst \
-               e2fsprogs.postinst e2fsprogs.shlibs e2fsprogs.shlibs.in
-
   # lintian overrides
        for i in $$(cd debian && echo *.lintian-overrides); do \
                pkg=$${i%.lintian-overrides} ;\
@@ -296,16 +294,25 @@ binary-arch: install install-udeb
        mkdir -p ${debdir}/ss-dev/usr/share/doc/libss${SS_SOVERSION}
        ln -sf libss${SS_SOVERSION} ${debdir}/ss-dev/usr/share/doc/ss-dev
 
+       mkdir -p ${debdir}/libblkid${BLKID_SOVERSION}/usr/share/doc/libblkid${BLKID_SOVERSION}
+       mkdir -p ${debdir}/libblkid-dev/usr/share/doc
+       ln -sf libblkid${BLKID_SOVERSION} ${debdir}/libblkid-dev/usr/share/doc/libblkid-dev
+
        for i in libcomerr${COMERR_SOVERSION} libss${SS_SOVERSION}; do \
          install -m 644 debian/$$i.copyright \
            ${maindir}/usr/share/doc/$$i/copyright ; \
        done
 
+       install -m 644 debian/libblkid.copyright \
+               ${debdir}/libblkid${BLKID_SOVERSION}/usr/share/doc/libblkid${BLKID_SOVERSION}/copyright
+
        dh_installdocs -Ne2fsprogs-udeb
 
        install -m 644 debian/e2fsprogs.copyright \
          ${bfdir}/usr/share/doc/e2fsprogs-bf/copyright
 
+  # libblkid is under the the LGPL
+
   # HTML docs
        install -d ${debdir}/e2fslibs-dev/usr/share/doc/e2fslibs-dev/html-info/
        install -p ${stdbuilddir}/doc/libext2fs_*.html \
@@ -327,7 +334,7 @@ binary-arch: install install-udeb
 
        dh_undocumented
 
-       DH_OPTIONS= dh_installchangelogs -pe2fsprogs -pe2fsprogs-bf ChangeLog
+       DH_OPTIONS= dh_installchangelogs -pe2fsprogs -pe2fsprogs-bf -plibblkid${BLKID_SOVERSION} ChangeLog
 
        for i in libcomerr${COMERR_SOVERSION} libss${SS_SOVERSION} ; do \
          mkdir -p ${maindir}/usr/share/doc/$$i ; \
@@ -343,6 +350,7 @@ binary-arch: install install-udeb
        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/blkid-dev.substvars
        echo "libcdev:Depends=${LIBC-DEV}" > debian/e2fslibs-dev.substvars
 
 # Call this mostly to get the maintainer-script snippets
@@ -360,6 +368,8 @@ binary-arch: install install-udeb
        echo "libss ${SS_SOVERSION} libss${SS_SOVERSION}" \
                >> debian/e2fsprogs/DEBIAN/shlibs
 
+       dh_makeshlibs -plibblkid${BLKID_SOVERSION}
+
        dh_installdeb
        dh_shlibdeps -l${stdbuilddir}/lib
 
@@ -370,6 +380,10 @@ binary-arch: install install-udeb
          -u '-v${SS_VERSION}-${MAIN_VERSION}'
        DH_OPTIONS= dh_gencontrol -puuid-dev \
          -u '-v${UUID_VERSION}-${MAIN_VERSION}'
+       DH_OPTIONS= dh_gencontrol -plibblkid-dev \
+         -u '-v${MAIN_VERSION}'
+       DH_OPTIONS= dh_gencontrol -plibblkid${BLKID_SOVERSION} \
+         -u '-v${MAIN_VERSION}'
 
        dh_md5sums -Ne2fsprogs-udeb
        dh_builddeb -Ne2fsprogs-udeb

diff --git a/debian/ss-dev.files b/debian/ss-dev.files
index 682712e..83b3464 100644 (file)
--- a/debian/ss-dev.files
+++ b/debian/ss-dev.files
@@ -3,3 +3,4 @@ usr/lib/libss.a
 usr/include/ss/*
 usr/bin/mk_cmds
 usr/share/ss/*
+usr/share/man/man1/mk_cmds*

diff --git a/debian/ss-dev.undocumented b/debian/ss-dev.undocumented
deleted file mode 100644 (file)
index 841eb26..0000000
--- a/debian/ss-dev.undocumented
+++ /dev/null
@@ -1 +0,0 @@
-mk_cmds.1

diff --git a/lib/ss/ChangeLog b/lib/ss/ChangeLog
index 8a7c1c8..fc6e6b5 100644 (file)
--- a/lib/ss/ChangeLog
+++ b/lib/ss/ChangeLog
@@ -1,5 +1,7 @@
 2003-03-16  Theodore Ts'o  <tytso@mit.edu>
 
+       * mk_cmds.1, Makefile.in: Add (bare-bone) man page
+
        * Makefile.in (DLOPEN_LIB): Include the dlopen library if it is
                present on shared libraries.
 

diff --git a/lib/ss/Makefile.in b/lib/ss/Makefile.in
index 19a4c9b..b3e1120 100644 (file)
--- a/lib/ss/Makefile.in
+++ b/lib/ss/Makefile.in
@@ -148,6 +148,7 @@ install:: libss.a $(INSTALL_HFILES) installdirs ss_err.h mk_cmds
                $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(datadir)/ss/$$i; \
        done
        $(INSTALL) mk_cmds $(DESTDIR)$(bindir)/mk_cmds
+       $(INSTALL_DATA) $(srcdir)/mk_cmds.1 $(DESTDIR)$(man1dir)/mk_cmds.1
 
 uninstall::
        $(RM) -f $(DESTDIR)$(libdir)/libss.a $(DESTDIR)$(bindir)/mk_cmds

diff --git a/lib/ss/mk_cmds.1 b/lib/ss/mk_cmds.1
new file mode 100644 (file)
index 0000000..216e483
--- /dev/null
+++ b/lib/ss/mk_cmds.1
@@ -0,0 +1,59 @@
+.\" Copyright (c) 2003 Theodore Ts'o
+.\"
+.TH MK_CMDS 1 "2003" E2FSPROGS
+.SH NAME
+mk_cmds \- error table compiler
+.SH SYNOPSIS
+.B mk_cmds
+file
+.SH DESCRIPTION
+.B Mk_cmds
+converts a table listing command names and associated help messages
+into a C source file suitable for use with the
+.IR ss (3)
+library.
+
+The source file name must end with a suffix of ``.ct''; the file
+consists of a declaration supplying the name of the command table:
+
+.B command_table
+.I name
+
+followed by entries of the form:
+
+[
+.B request
+|
+.B unimplemented
+] 
+.I name,
+"
+.I string
+"[, abbrev]...;
+
+and a final
+
+.B end
+
+to indicate the end of the table.
+
+A C source file is generated which should be compiled and linked
+with the object files use the ss library.   
+
+A ``#'' in the source file is treated as a comment character, and all
+remaining text to the end of the source line will be ignored.
+
+.SH BUGS
+
+Since the original
+.B mk_cmds
+uses a very simple parser based on
+.IR yacc (1), 
+and this current version of 
+.B mk_cmds
+uses an awk/sed combination of scripts, 
+its error recovery leaves much to be desired.
+
+.SH "SEE ALSO"
+ss (3)
+