debian: package fuse2fs in its own separate package

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

diff --git a/debian/control.in b/debian/control.in
index 2fa3d7f..56a9928 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -11,6 +11,15 @@ Build-Depends: gettext, texinfo, pkg-config, gcc-multilib [mips mipsel], libfuse
 Standards-Version: 3.9.8
 Homepage: http://e2fsprogs.sourceforge.net
 
+Package: fuse2fs
+Priority: optional
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Architecture: any
+Description: ext2 / ext3 / ext4 file system driver for FUSE
+ fuse2fs is a FUSE file system client that supports reading and
+ writing from devices or image files containing ext2, ext3, and ext4
+ file systems.
+
 ifdef(`E2FSCK_STATIC',``
 Package: e2fsck-static
 Priority: optional
@@ -250,6 +259,7 @@ Multi-Arch: foreign
 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), libblkid1 (<< 1.38+1.39-WIP-2005.12.10-2), libuuid1 (<< 1.38+1.39-WIP-2005.12.10-2)
+Recommends: fuse2fs
 Architecture: any
 Description: ext2/ext3/ext4 file system utilities
  The ext2, ext3 and ext4 file systems are successors of the original ext

diff --git a/debian/fuse2fs.files b/debian/fuse2fs.files
new file mode 100644 (file)
index 0000000..cd37a70
--- /dev/null
+++ b/debian/fuse2fs.files
@@ -0,0 +1,2 @@
+/usr/sbin/fuse2fs
+/usr/share/man/man1/fuse2fs.1

diff --git a/debian/rules b/debian/rules
index 1b282d2..b79afee 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -617,18 +617,7 @@ endif
        dh_installinfo -pcomerr-dev ${stdbuilddir}/lib/et/com_err.info
        dh_installinfo -pe2fslibs-dev ${stdbuilddir}/doc/libext2fs.info
 
-       DH_OPTIONS= dh_installchangelogs -pe2fsprogs \
-               -plibcomerr${COMERR_SOVERSION} \
-               -plibss${SS_SOVERSION} \
-               -pe2fslibs $(DBG_PACKAGES)
-ifneq ($(BUILD_E2FSCK_STATIC),no)
-       DH_OPTIONS= dh_installchangelogs -pe2fsck-static
-endif
-ifneq ($(UTIL_LINUX_NG),yes)
-       DH_OPTIONS= dh_installchangelogs -plibuuid${UUID_SOVERSION} \
-               -puuid-dev -puuid-runtime -plibblkid${BLKID_SOVERSION}
-endif
-
+       dh_installchangelogs
        dh_fixperms
        dh_strip $(call dh_strip_args,e2fsprogs)
 ifneq ($(BUILD_E2FSCK_STATIC),no)
@@ -657,33 +646,6 @@ endif
                /bin/rm debian/$$i.tmp-patch; \
        done
 
-       for i in e2fsprogs e2fslibs \
-           $(if $(filter $(USE_DBGSYM),yes),,e2fsprogs-dbg e2fslibs-dbg) ; \
-       do \
-          $(INSTALL) -p -m 0644 debian/copyright \
-               ${debdir}/$$i/usr/share/doc/$$i/copyright; \
-       done
-
-ifneq ($(USE_DBGSYM),yes)
-ifneq ($(UTIL_LINUX_NG),yes)
-       $(INSTALL) -p -m 0644 debian/uuid-runtime.copyright \
-               ${uuidruntimedbgdir}/usr/share/doc/uuid-runtime-dbg/copyright
-endif
-
-       $(INSTALL) -p -m 0644 debian/libcomerr2.copyright \
-               ${libcomerrdbgdir}/usr/share/doc/libcomerr2-dbg/copyright
-
-       $(INSTALL) -p -m 0644 debian/libss2.copyright \
-               ${libssdbgdir}/usr/share/doc/libss2-dbg/copyright
-
-ifneq ($(UTIL_LINUX_NG),yes)
-       $(INSTALL) -p -m 0644 debian/libblkid.copyright \
-               ${libblkiddbgdir}/usr/share/doc/libblkid1-dbg/copyright
-
-       $(INSTALL) -p -m 0644 debian/libuuid1.copyright \
-               ${libuuiddbgdir}/usr/share/doc/libuuid1-dbg/copyright
-endif
-endif
        dh_compress
 
        dh_makeshlibs -Ne2fsprogs-udeb -Nlibblkid1-udeb -Nlibuuid1-udeb
@@ -706,6 +668,8 @@ ifeq ($(SKIP_UDEB),)
        dh_shlibdeps -pe2fsprogs-udeb -l${stdbuilddir}/lib \
                -u"-Ldebian/e2fsprogs-udeb.shlibs.local"
 endif
+       dh_shlibdeps -pfuse2fs -l${stdbuilddir}/lib \
+               -u"-Ldebian/e2fsprogs.shlibs.local"
 
        dh_gencontrol -Ncomerr-dev -Nss-dev -Nuuid-dev \
                -Ne2fsprogs-udeb -Nlibblkid1-udeb -Nlibuuid1-udeb