Merge branch 'maint' into next

[tools/e2fsprogs.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index d97fcb1..d3e2494 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -64,7 +64,7 @@ CFGBFSTAMP=${STAMPSDIR}/configure-bf-stamp
 BUILDSTDSTAMP=${STAMPSDIR}/build-std-stamp
 BUILDBFSTAMP=${STAMPSDIR}/build-bf-stamp
 
-CCOPTS = -g -fsigned-char
+CCOPTS = -g
 
 INSTALL = install
 INSTALL_PROGRAM = $(INSTALL) -p -o root -g root -m 0755
@@ -92,13 +92,11 @@ STD_CONF_FLAGS = --with-ccopts="${CCOPTS}" --enable-compression \
                --enable-blkid-devmapper
 
 BF_CONF_FLAGS = --with-ccopts="${CCOPTS} ${BF_CCOPTS}" \
-       --disable-nls --disable-swapfs --disable-imager \
+       --disable-nls --disable-imager \
        --disable-debugfs  --disable-e2initrd-helper
 
 MIPS_NOPIC_CONF_FLAGS = --with-ccopts="${CCOPTS}" \
-       --disable-nls \
-       --disable-swapfs --disable-imager \
-        --disable-resizer # --disable-debugfs
+       --disable-nls --disable-imager --disable-resizer # --disable-debugfs
 
 # we can't use those flags at configure time
 MIPS_CFLAGS= -G 0 -fno-pic -mno-abicalls
@@ -191,8 +189,8 @@ ${BUILDBFSTAMP}: ${CFGBFSTAMP}
 clean:
        dh_testdir
        rm -rf ${STAMPSDIR}
-       -make -C ${stdbuilddir} -i distclean
-       -make -C ${bfbuilddir} -i distclean
+       [ ! -f ${stdbuilddir}/Makefile ] || make -C ${stdbuilddir} distclean
+       [ ! -f ${bfbuilddir}/Makefile ] || make -C ${bfbuilddir} distclean
        rm -rf ${stdbuilddir} ${bfbuilddir} ${mipsbuilddir} ${mipsbuilddir64}
        rm -f doc/libext2fs/*.html lib/et/com_err/*.html debian/*.substvars
        dh_clean
@@ -221,7 +219,7 @@ install-std: build
 
   # statically-linked fsck
        ${INSTALL_PROGRAM} ${stdbuilddir}/e2fsck/e2fsck.static ${tmpdir}/sbin
-       ln -s e2fsck.8.gz ${mandir}/man8/e2fsck.static.8.gz
+       cp ${mandir}/man8/e2fsck.8 ${mandir}/man8/e2fsck.static.8
 
        ln -s et/com_err.h ${tmpdir}/usr/include
 
@@ -291,8 +289,6 @@ binary-arch: install install-udeb
 
 
   # symlinks to prepare dh_installdocs run
-       mkdir -p ${debdir}/e2fsck-static/usr/share/doc/
-       ln -sf e2fsprogs ${debdir}/e2fsck-static/usr/share/doc/e2fsck-static
 
        mkdir -p ${debdir}/libblkid${BLKID_SOVERSION}/usr/share/doc/libblkid${BLKID_SOVERSION}
        mkdir -p ${debdir}/libblkid-dev/usr/share/doc
@@ -308,7 +304,7 @@ binary-arch: install install-udeb
 
        mkdir -p ${debdir}/libuuid${UUID_SOVERSION}/usr/share/doc/libuuid${UUID_SOVERSION}
        mkdir -p ${debdir}/uuid-dev/usr/share/doc
-       ln -sf libuuid${UUID_SOVERSION} ${debdir}/uuid-dev/usr/share/doc/uuid-dev
+#      ln -sf libuuid${UUID_SOVERSION} ${debdir}/uuid-dev/usr/share/doc/uuid-dev
 
        mkdir -p ${debdir}/e2fslibs/usr/share/doc/e2fslibs
        mkdir -p ${debdir}/e2fslibs-dev/usr/share/doc
@@ -343,18 +339,22 @@ binary-arch: install install-udeb
                ${debdir}/ss-dev/usr/share/doc/libss${SS_SOVERSION}/examples
 
        $(INSTALL) -d ${debdir}/uuid-dev/usr/share/doc/libuuid${UUID_SOVERSION}
-       $(INSTALL) -p -m 0644 doc/draft-leach-uuids-guids-01.txt \
-               ${debdir}/uuid-dev/usr/share/doc/libuuid${UUID_SOVERSION}
+
+       if test -f /etc/lsb-release && \
+               grep -q DISTRIB_ID=Ubuntu /etc/lsb-release; then \
+       $(INSTALL) -p -m 0644 e2fsck/e2fsck.conf.ubuntu \
+               ${debdir}/e2fsprogs/etc/e2fsck.conf; \
+       fi
 
        dh_installinfo -pcomerr-dev ${stdbuilddir}/lib/et/com_err.info
        dh_installinfo -pe2fslibs-dev ${stdbuilddir}/doc/libext2fs.info
 
-       DH_OPTIONS= dh_installchangelogs -pe2fsprogs -plibblkid${BLKID_SOVERSION}
-       DH_OPTIONS= dh_installchangelogs -pe2fsprogs -plibcomerr${COMERR_SOVERSION}
-       DH_OPTIONS= dh_installchangelogs -pe2fsprogs -plibss${SS_SOVERSION}
-       DH_OPTIONS= dh_installchangelogs -pe2fsprogs -plibuuid${UUID_SOVERSION}
-       DH_OPTIONS= dh_installchangelogs -pe2fsprogs -pe2fslibs
+       DH_OPTIONS= dh_installchangelogs -pe2fsprogs \
+               -plibblkid${BLKID_SOVERSION} -plibcomerr${COMERR_SOVERSION} \
+               -plibss${SS_SOVERSION} -plibuuid${UUID_SOVERSION} \
+               -pe2fslibs -puuid-dev -pe2fsck-static
 
+       dh_fixperms
 ifneq ($(ismips),)
        dh_strip -Xlib64ext2fs-nopic.a
 else
@@ -362,16 +362,17 @@ else
 endif
 
        dh_compress
-       dh_fixperms
 
        dh_makeshlibs -Ne2fsprogs-udeb -Nlibblkid1-udeb -Nlibuuid1-udeb
        dh_makeshlibs -plibcomerr${COMERR_SOVERSION} \
                -V 'libcomerr2 (>= 1.33-3)'
+       dh_makeshlibs -plibblkid${BLKID_SOVERSION} -V 'libblkid1 (>= 1.39-1)'
        echo "udeb: libblkid 1 libblkid1-udeb" >> \
                debian/libblkid1/DEBIAN/shlibs
        echo "udeb: libuuid 1 libuuid1-udeb" >> debian/libuuid1/DEBIAN/shlibs
 
        dh_installdeb
+       rm debian/e2fsprogs-udeb/DEBIAN/conffiles
        dh_shlibdeps -l${stdbuilddir}/lib
        dh_shlibdeps -pe2fsprogs -l${stdbuilddir}/lib \
                -u"-Ldebian/e2fsprogs.shlibs.local"