Whamcloud - gitweb
git://git.whamcloud.com / tools / e2fsprogs.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
debian: update watch file to check the GPG signed tar files
[tools/e2fsprogs.git] / debian / rules
diff --git a/debian/rules b/debian/rules
index afb548c..b13e483 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -12,13 +12,6 @@
 # be paranoid
 export LC_ALL ?= C
 
-# Allow distro-specific behaviour
-DISTRO :=$(shell sed -ne '/DISTRIB_ID/s/.*=//p' /etc/lsb-release 2>/dev/null || echo Debian)
-SYS_BLKID_VER := $(shell dpkg-query -W libblkid1 | cut -f 2 | cut -b 1)
-ifeq ($(SYS_BLKID_VER),2)
-UTIL_LINUX_NG ?= yes
-endif
-
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
 DEB_HOST_ARCH          ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
@@ -28,6 +21,10 @@ DEB_HOST_GNU_TYPE    ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE     ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_HOST_MULTIARCH     ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null)
 
+# Allow distro-specific behaviour
+DISTRO :=$(shell sed -ne '/DISTRIB_ID/s/.*=//p' /etc/lsb-release 2>/dev/null || echo Debian)
+UTIL_LINUX_NG ?= yes
+
 # find the version for the main package, from changelog file
 MAIN_VERSION = $(shell head -n 1 debian/changelog | cut '-d ' -f 2 | sed 's/[()]//g')
 # find versions for libraries going into their own packages, from their Makefile.in's,
@@ -81,7 +78,6 @@ maindir               ?= ${debdir}/e2fsprogs
 e2fsckstaticdir        ?= ${debdir}/e2fsck-static
 debugdir       ?= ${debdir}/e2fsprogs-dbg
 stdbuilddir    ?= ${debdir}/BUILD-STD
-bfbuilddir     ?= ${debdir}/BUILD-BF
 staticbuilddir ?= ${debdir}/BUILD-STATIC
 mipsbuilddir   ?= ${debdir}/BUILD-MIPS
 mipsbuilddir64 ?= ${debdir}/BUILD-MIPS-64
@@ -115,12 +111,22 @@ INSTALL_PROGRAM ?= $(INSTALL) -p -o root -g root -m 0755
 #INSTALL_PROGRAM += -s
 #endif
 
+ifneq (,$(findstring update-symbols,$(DEB_BUILD_OPTIONS)))
+SYMBOL_LIBS := e2fslibs libcomerr2 libss2
+ifneq ($(UTIL_LINUX_NG),yes)
+SYMBOL_LIBS += libblkid1 libuuid1
+endif
+endif
+
 DEFAULT_CFLAGS ?= -g -O2
 DEFAULT_LDFLAGS ?= -Wl,-Bsymbolic-functions
 
-CFLAGS += $(shell dpkg-buildflags --get CFLAGS)
-LDFLAGS += $(shell dpkg-buildflags --get LDFLAGS)
-CPPFLAGS += $(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS ?= $(shell if dpkg-buildflags > /dev/null 2>&1 ; then \
+       dpkg-buildflags --get CFLAGS; else echo $(DEFAULT_CFLAGS) ; fi)
+LDFLAGS ?= $(shell if dpkg-buildflags > /dev/null 2>&1 ; then \
+       dpkg-buildflags --get LDFLAGS; else echo $(DEFAULT_LDFLAGS) ; fi)
+CPPFLAGS ?= $(shell if dpkg-buildflags > /dev/null 2>&1 ; then \
+       dpkg-buildflags --get CPPFLAGS; fi)
 
 ifeq (${DEB_HOST_ARCH},alpha)
 CFLAGS += -DHAVE_NETINET_IN_H
@@ -128,22 +134,42 @@ else
 CFLAGS += -D__NO_STRING_INLINES
 endif
 
-ifeq (${DEB_HOST_ARCH_OS},linux)
+ifneq (${DEB_HOST_ARCH_OS},linux)
+SKIP_STATIC = yes
+endif
+
+ifeq ($(SKIP_STATIC),yes)
+BUILD_STATIC =
+E2FSCK_STATIC = ${stdbuilddir}/e2fsck/e2fsck.static
+else
 BUILD_STATIC = build-static
 E2FSCK_STATIC = ${staticbuilddir}/e2fsck/e2fsck.static
+endif
+
+ifneq ($(SKIP_UDEB),)
+SKIP_BF ?= yes
+endif
+
+ifeq ($(SKIP_BF),yes)
+BUILD_BF =
+bfbuilddir     ?= ${stdbuilddir}
 else
-E2FSCK_STATIC = ${stdbuilddir}/e2fsck/e2fsck.static
+BUILD_BF = build-bf
+bfbuilddir     ?= ${debdir}/BUILD-BF
 endif
 
 BF_CFLAGS = -Os -fomit-frame-pointer
 
-COMMON_CONF_FLAGS = --disable-e2initrd-helper --enable-elf-shlibs \
-       --enable-quota --infodir=/usr/share/info
 ifeq ($(UTIL_LINUX_NG),yes)
-COMMON_CONF_FLAGS += --disable-fsck --disable-libblkid \
+UTIL_CONF_FLAGS ?= --disable-fsck --disable-libblkid \
                        --disable-libuuid --disable-uuidd
 else
-COMMON_CONF_FLAGS += --enable-fsck
+UTIL_CONF_FLAGS ?= --enable-fsck --enable-libblkid \
+                       --enable-libuuid --enable-uuidd
+endif
+
+ifeq ($(DEB_BUILD_GNU_SYSTEM), gnu) 
+UTIL_CONF_FLAGS +=  --disable-fuse2fs
 endif
 
 ifneq ($(strip $(DEB_HOST_MULTIARCH)),)
@@ -156,10 +182,16 @@ else
 USRLIB ?= /usr/lib
 endif
 
-STD_CONF_FLAGS ?= --enable-symlink-install $(MULTIARCH_CONF)
+BACKTRACE_CONF_FLAGS ?= $(shell if ${debdir}/scripts/test-backtrace ; then echo --disable-backtrace ; fi)
+
+COMMON_CONF_FLAGS = --disable-e2initrd-helper --enable-quota \
+       --infodir=/usr/share/info  --enable-symlink-install \
+       $(MULTIARCH_CONF) $(BACKTRACE_CONF_FLAGS) $(UTIL_CONF_FLAGS)
 
-BF_CONF_FLAGS ?= --disable-nls --disable-imager --disable-testio-debug \
-       --disable-uuidd --disable-tls --disable-debugfs
+STD_CONF_FLAGS ?= --enable-elf-shlibs
+
+BF_CONF_FLAGS ?= --enable-elf-shlibs --disable-nls --disable-imager \
+       --disable-testio-debug --disable-uuidd --disable-tls --disable-debugfs
 
 STATIC_CONF_FLAGS ?= --disable-nls --disable-imager \
        --disable-uuidd --disable-tls
@@ -191,6 +223,19 @@ else
 M4_ARGS+=-UDO_MULTIARCH
 endif
 
+ifneq ($(BUILD_E2FSCK_STATIC),no)
+M4_ARGS+=-DE2FSCK_STATIC
+else
+M4_ARGS+=-UE2FSCK_STATIC
+endif
+
+ifeq ($(SKIP_UDEB),)
+INSTALL_UDEB = install-udeb
+M4_ARGS+=-DUDEB_PKGS
+else
+M4_ARGS+=-UUDEB_PKGS
+endif
+
 FILES_FIXUP= libcomerr2.files comerr-dev.files libss2.files ss-dev.files \
        libuuid1.files uuid-dev.files libblkid1.files libblkid-dev.files \
        e2fslibs.files e2fslibs-dev.files
@@ -223,21 +268,27 @@ ${CFGSTDSTAMP}:
 ifeq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
        cd ${stdbuilddir} && AWK=/usr/bin/awk \
                ${topdir}/configure ${COMMON_CONF_FLAGS} ${STD_CONF_FLAGS} \
-               CFLAGS="${CFLAGS}" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)"
+               ${EXTRA_CONF_FLAGS} CFLAGS="${CFLAGS}" CPPFLAGS="$(CPPFLAGS)" \
+               LDFLAGS="$(LDFLAGS)"
 else
        cd ${stdbuilddir} && AWK=/usr/bin/awk CC="${DEB_HOST_GNU_TYPE}-gcc" \
                ${topdir}/configure ${COMMON_CONF_FLAGS} ${STD_CONF_FLAGS} \
-               --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) \
-               CFLAGS="${CFLAGS}" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)"
+               ${EXTRA_CONF_FLAGS} --build=$(DEB_BUILD_GNU_TYPE) \
+               --host=$(DEB_HOST_GNU_TYPE) CFLAGS="${CFLAGS}" \
+               CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)"
 endif
 
   # specially-built MIPS libs
 ifneq ($(ismips),)
        mkdir -p ${mipsbuilddir} ${mipsbuilddir64}
        cd ${mipsbuilddir} && AWK=/usr/bin/awk \
-               ${topdir}/configure ${MIPS_NOPIC_CONF_FLAGS} CFLAGS="${CFLAGS}"
+               ${topdir}/configure ${COMMON_CONF_FLAGS} \
+               ${MIPS_NOPIC_CONF_FLAGS} CFLAGS="${CFLAGS}" \
+               CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)"
        cd ${mipsbuilddir64} && AWK=/usr/bin/awk \
-               ${topdir}/configure ${MIPS_NOPIC_CONF_FLAGS} CFLAGS="${CFLAGS}"
+               ${topdir}/configure ${COMMON_CONF_FLAGS} \
+               ${MIPS_NOPIC_CONF_FLAGS} CFLAGS="${CFLAGS}" \
+               CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)"
 endif
 
        mkdir -p ${STAMPSDIR}
@@ -251,12 +302,14 @@ ${CFGBFSTAMP}:
 ifeq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
        cd ${bfbuilddir} && AWK=/usr/bin/awk \
                ${topdir}/configure ${COMMON_CONF_FLAGS} ${BF_CONF_FLAGS} \
-               CFLAGS="${CFLAGS} ${BF_CFLAGS}" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)"
+               ${EXTRA_CONF_FLAGS} CFLAGS="${CFLAGS} ${BF_CFLAGS}" \
+               CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)"
 else
        cd ${bfbuilddir} && AWK=/usr/bin/awk CC="${DEB_HOST_GNU_TYPE}-gcc" \
                ${topdir}/configure ${COMMON_CONF_FLAGS} ${BF_CONF_FLAGS} \
-               --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) \
-               CFLAGS="${CFLAGS}" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)"
+               ${EXTRA_CONF_FLAGS} --build=$(DEB_BUILD_GNU_TYPE) \
+               --host=$(DEB_HOST_GNU_TYPE) CFLAGS="${CFLAGS}" \
+               CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)"
 endif
        mkdir -p ${STAMPSDIR}
        touch ${CFGBFSTAMP}
@@ -267,37 +320,34 @@ ${CFGSTATICSTAMP}:
 
        mkdir -p ${staticbuilddir}
 ifeq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
-       if type diet > /dev/null  2>&1 ; then \
-               cd ${staticbuilddir} && AWK=/usr/bin/awk \
-               ${topdir}/configure ${STATIC_CONF_FLAGS} \
-               --with-diet-libc CFLAGS="${CFLAGS}"; \
-       else \
-               cd ${staticbuilddir} && AWK=/usr/bin/awk \
-                       ${topdir}/configure ${STATIC_CONF_FLAGS} \
-                       CFLAGS="${CFLAGS}"; \
-       fi
+       cd ${staticbuilddir} && AWK=/usr/bin/awk ${topdir}/configure \
+               ${COMMON_CONF_FLAGS} ${STATIC_CONF_FLAGS} ${EXTRA_CONF_FLAGS} \
+               CFLAGS="${CFLAGS}" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)"
 else
        cd ${staticbuilddir} && AWK=/usr/bin/awk CC="${DEB_HOST_GNU_TYPE}-gcc" \
                ${topdir}/configure ${COMMON_CONF_FLAGS} ${STATIC_CONF_FLAGS} \
-               --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) \
-               CFLAGS="${CFLAGS}" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)"
+               ${EXTRA_CONF_FLAGS} --build=$(DEB_BUILD_GNU_TYPE) \
+               --host=$(DEB_HOST_GNU_TYPE) CFLAGS="${CFLAGS}" \
+               CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)"
 endif
        mkdir -p ${STAMPSDIR}
        touch ${CFGSTATICSTAMP}
 
 build-arch: build
 build-indep: build
-build: build-std build-bf $(BUILD_STATIC)
+build: build-std $(BUILD_BF) $(BUILD_STATIC)
 
 build-std: ${BUILDSTDSTAMP}
 ${BUILDSTDSTAMP}: ${CFGSTDSTAMP}
        dh_testdir
        $(MAKE) -C ${stdbuilddir} V=1 all
+ifneq ($(BUILD_E2FSCK_STATIC),no)
        $(MAKE) -C ${stdbuilddir}/e2fsck V=1 e2fsck.static
+endif
        $(MAKE) -C ${stdbuilddir}/po V=1 update-gmo
 
-       ( cd ${stdbuilddir}/doc && $(MAKE) V=1 libext2fs_abt.html )
-       ( cd ${stdbuilddir}/lib/et && $(MAKE) V=1 com_err.info com_err_abt.html )
+       ( cd ${stdbuilddir}/doc && $(MAKE) V=1 libext2fs.html )
+       ( cd ${stdbuilddir}/lib/et && $(MAKE) V=1 com_err.info com_err.html )
 
   # specially-built MIPS libs
 ifneq ($(ismips),)
@@ -319,21 +369,24 @@ ${BUILDBFSTAMP}: ${CFGBFSTAMP}
        $(MAKE) -C ${bfbuilddir} V=1 libs
        $(MAKE) -C ${bfbuilddir}/e2fsck V=1 all
        $(MAKE) -C ${bfbuilddir}/misc V=1 all
+       $(MAKE) -C ${bfbuilddir}/resize V=1 all
        touch ${BUILDBFSTAMP}
 
 build-static: ${BUILDSTATICSTAMP}
 ${BUILDSTATICSTAMP}: ${CFGSTATICSTAMP}
        dh_testdir
        $(MAKE) -C ${staticbuilddir} V=1 libs
+ifneq ($(BUILD_E2FSCK_STATIC),no)
        $(MAKE) -C ${staticbuilddir}/e2fsck V=1 all e2fsck.static
+endif
        touch ${BUILDSTATICSTAMP}
 
 clean:
        dh_testdir
        rm -rf ${STAMPSDIR}
-       [ ! -f ${stdbuilddir}/Makefile ] || $(MAKE) -C ${stdbuilddir} distclean
-       [ ! -f ${bfbuilddir}/Makefile ] || $(MAKE) -C ${bfbuilddir} distclean
-       [ ! -f ${staticbuilddir}/Makefile ] || $(MAKE) -C ${staticbuilddir} distclean
+       [ ! -f ${stdbuilddir}/Makefile ] || $(MAKE) -C ${stdbuilddir} V=1 distclean
+       [ ! -f ${bfbuilddir}/Makefile ] || $(MAKE) -C ${bfbuilddir} V=1 distclean
+       [ ! -f ${staticbuilddir}/Makefile ] || $(MAKE) -C ${staticbuilddir} V=1 distclean
        rm -rf ${stdbuilddir} ${bfbuilddir} ${staticbuilddir} ${mipsbuilddir} ${mipsbuilddir64}
        rm -f debian/*.substvars
        dh_clean
@@ -355,17 +408,16 @@ install-std: build
        dh_installdirs
 
        mkdir -p ${tmpdir}/sbin
-       $(MAKE) -C ${stdbuilddir} install DESTDIR=${tmpdir} \
+       $(MAKE) -C ${stdbuilddir} V=1 install DESTDIR=${tmpdir} \
                INSTALL_PROGRAM="${INSTALL_PROGRAM}" LDCONFIG=true
   # static libs and .h files
-       $(MAKE) -C ${stdbuilddir} install-libs DESTDIR=${tmpdir} LDCONFIG=true
+       $(MAKE) -C ${stdbuilddir} V=1 install-libs DESTDIR=${tmpdir} LDCONFIG=true
 
+ifneq ($(BUILD_E2FSCK_STATIC),no)
   # statically-linked fsck
        ${INSTALL_PROGRAM} $(E2FSCK_STATIC) ${tmpdir}/sbin
        cp ${mandir}/man8/e2fsck.8 ${mandir}/man8/e2fsck.static.8
-  # remove static quota library for now
-       rm ${tmpdir}/usr/include/quota/mkquota.h
-       find ${tmpdir}/usr/lib -name quota.pc -o -name libquota.a | xargs rm
+endif
 
 ifeq ($(DEB_BUILD_GNU_SYSTEM), gnu) 
        ${INSTALL} -m 0644 misc/mke2fs-hurd.conf ${tmpdir}/etc/mke2fs.conf
@@ -387,13 +439,13 @@ install-udeb: build
        dh_testdir
        dh_testroot
 
-       $(MAKE) -C ${bfbuilddir} install-shlibs-libs-recursive DESTDIR=${udebdir} \
+       $(MAKE) -C ${bfbuilddir} V=1 install-shlibs-libs-recursive DESTDIR=${udebdir} \
                INSTALL_PROGRAM="${INSTALL_PROGRAM}" LDCONFIG=true
-       $(MAKE) -C ${bfbuilddir}/e2fsck install DESTDIR=${udebdir} \
+       $(MAKE) -C ${bfbuilddir}/e2fsck V=1 install DESTDIR=${udebdir} \
                INSTALL_PROGRAM="${INSTALL_PROGRAM}" LDCONFIG=true
-       $(MAKE) -C ${bfbuilddir}/misc install DESTDIR=${udebdir} \
+       $(MAKE) -C ${bfbuilddir}/misc V=1 install DESTDIR=${udebdir} \
                INSTALL_PROGRAM="${INSTALL_PROGRAM}" LDCONFIG=true
-       $(MAKE) -C ${bfbuilddir}/resize install DESTDIR=${udebdir} \
+       $(MAKE) -C ${bfbuilddir}/resize V=1 install DESTDIR=${udebdir} \
                INSTALL_PROGRAM="${INSTALL_PROGRAM}" LDCONFIG=true
 
        rm -rf ${udebdir}/usr
@@ -401,10 +453,10 @@ install-udeb: build
                -a ! -name mke2fs -a ! -name tune2fs \
                -a ! -name resize2fs -a ! -name badblocks -print | xargs rm
 
-       (cd ${udebdir}/sbin; ln -s e2fsck fsck.ext2 ; \
-               ln -s e2fsck fsck.ext3 ; ln -s e2fsck fsck.ext4 ; \
-               ln -s mke2fs mkfs.ext2 ; ln -s mke2fs mkfs.ext3 ; \
-               ln -s mke2fs mkfs.ext4)
+       (cd ${udebdir}/sbin; ln -sf e2fsck fsck.ext2 ; \
+               ln -sf e2fsck fsck.ext3 ; ln -sf e2fsck fsck.ext4 ; \
+               ln -sf mke2fs mkfs.ext2 ; ln -sf mke2fs mkfs.ext3 ; \
+               ln -sf mke2fs mkfs.ext4)
 
 ifneq ($(UTIL_LINUX_NG),yes)
        mkdir -p ${blkidudebdir}/lib
@@ -418,7 +470,7 @@ binary-indep:
   # no arch-independant debs.
 
 binary-arch: DH_OPTIONS= -a
-binary-arch: install install-udeb
+binary-arch: install $(INSTALL_UDEB)
        dh_testdir
        dh_testroot
 
@@ -492,9 +544,12 @@ endif
        DH_OPTIONS= dh_installchangelogs -pe2fsprogs \
                -plibcomerr${COMERR_SOVERSION} \
                -plibss${SS_SOVERSION} \
-               -pe2fslibs -pe2fsck-static \
+               -pe2fslibs \
                -pe2fsprogs-dbg -pe2fslibs-dbg \
                -plibcomerr2-dbg -plibss2-dbg
+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 -puuid-runtime-dbg -plibuuid1-dbg \
@@ -502,62 +557,26 @@ ifneq ($(UTIL_LINUX_NG),yes)
 endif
 
        dh_fixperms
+       dh_strip -pe2fsprogs --dbg-package=e2fsprogs-dbg
+ifneq ($(BUILD_E2FSCK_STATIC),no)
+       dh_strip -pe2fsck-static --dbg-package=e2fsprogs-dbg
+endif
 ifneq ($(ismips),)
-       dh_strip -k -Xlib64ext2fs-nopic.a
+       dh_strip -pe2fslibs --dbg-package=e2fslibs-dbg -Xlib64ext2fs-nopic.a
 else
-       dh_strip -k
-endif
-
-       # debug package stuff
-       rm -rf ${udebdir}/usr
-ifneq ($(UTIL_LINUX_NG),yes)
-       rm -rf ${blkidudebdir}/usr
-       rm -rf ${uuidudebdir}/usr
-endif
-
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-       mkdir -p ${debugdir}/$(USRLIB)
-       mv ${maindir}/usr/lib/debug ${debugdir}/$(USRLIB)
-       rm -rf ${maindir}/usr/lib/debug
-       mv ${e2fsckstaticdir}/usr/lib/debug/sbin/* \
-               ${debugdir}/$(USRLIB)/debug
-       rm -rf ${e2fsckstaticdir}/usr/lib
-
-ifneq ($(UTIL_LINUX_NG),yes)
-       mkdir -p ${uuidruntimedbgdir}/$(USRLIB)
-       mv ${uuidruntimedir}/usr/lib/debug ${uuidruntimedbgdir}/$(USRLIB)
-       rmdir ${uuidruntimedir}/usr/lib
+       dh_strip -pe2fslibs --dbg-package=e2fslibs-dbg
 endif
-
-       mkdir -p ${libext2dbgdir}/$(USRLIB)
-       mv ${libext2dir}/usr/lib/debug ${libext2dbgdir}/$(USRLIB)
-       rmdir ${libext2dir}/usr/lib
-
-       mkdir -p ${libcomerrdbgdir}/$(USRLIB)
-       mv ${libcomerrdir}/usr/lib/debug ${libcomerrdbgdir}/$(USRLIB)
-       rmdir ${libcomerrdir}/usr/lib
-
-       mkdir -p ${libssdbgdir}/$(USRLIB)
-       mv ${libssdir}/usr/lib/debug ${libssdbgdir}/$(USRLIB)
-       rmdir ${libssdir}/usr/lib
-
+       dh_strip -plibss${SS_SOVERSION} --dbg-package=libss${SS_SOVERSION}-dbg
+       dh_strip -plibcomerr${COMERR_SOVERSION} \
+               --dbg-package=libcomerr${COMERR_SOVERSION}-dbg
 ifneq ($(UTIL_LINUX_NG),yes)
-       mkdir -p ${libuuiddbgdir}/$(USRLIB)
-       mv ${libuuiddir}/usr/lib/debug ${libuuiddbgdir}/$(USRLIB)
-       rmdir ${libuuiddir}/usr/lib
-
-       mkdir -p ${libblkiddbgdir}/$(USRLIB)
-       mv ${libblkiddir}/usr/lib/debug ${libblkiddbgdir}/$(USRLIB)
-       rmdir ${libblkiddir}/usr/lib
-endif
+       dh_strip -plibblkid${BLKID_SOVERSION} \
+               --dbg-package=libblkid${BLKID_SOVERSION}-dbg
+       dh_strip -plibuuid${UUID_SOVERSION} --dbg-package=libuuid${UUID_SOVERSION}-dbg
 endif
+       dh_strip
 
        # dpkg symbol handling
-ifneq (,$(findstring update-symbols,$(DEB_BUILD_OPTIONS)))
-SYMBOL_LIBS := e2fslibs libcomerr2 libss2
-ifneq ($(UTIL_LINUX_NG),yes)
-SYMBOL_LIBS += libblkid1 libuuid1
-endif
        for i in $(SYMBOL_LIBS); \
        do \
                echo "Generating symbols for $$i..."; \
@@ -566,7 +585,6 @@ endif
                patch debian/$$i.symbols < debian/$$i.tmp-patch; \
                /bin/rm debian/$$i.tmp-patch; \
        done
-endif
 
        for i in e2fsprogs e2fsprogs-dbg e2fslibs e2fslibs-dbg; do \
           $(INSTALL) -p -m 0644 debian/copyright \
@@ -595,7 +613,8 @@ endif
        dh_compress
 
        dh_makeshlibs -Ne2fsprogs-udeb -Nlibblkid1-udeb -Nlibuuid1-udeb
-       dh_makeshlibs -plibcomerr${COMERR_SOVERSION} \
+ifeq ($(SKIP_UDEB),)
+       dh_makeshlibs --add-udeb=e2fsprogs-udeb -plibcomerr${COMERR_SOVERSION} \
                -V 'libcomerr2 (>= 1.33-3)'
 ifneq ($(UTIL_LINUX_NG),yes)
        dh_makeshlibs -plibblkid${BLKID_SOVERSION} -V 'libblkid1 (>= 1.39-1)'
@@ -603,13 +622,16 @@ ifneq ($(UTIL_LINUX_NG),yes)
                debian/libblkid1/DEBIAN/shlibs
        echo "udeb: libuuid 1 libuuid1-udeb" >> debian/libuuid1/DEBIAN/shlibs
 endif
+endif
 
        dh_installdeb
        dh_shlibdeps -l${stdbuilddir}/lib
        dh_shlibdeps -pe2fsprogs -l${stdbuilddir}/lib \
                -u"-Ldebian/e2fsprogs.shlibs.local"
+ifeq ($(SKIP_UDEB),)
        dh_shlibdeps -pe2fsprogs-udeb -l${stdbuilddir}/lib \
                -u"-Ldebian/e2fsprogs-udeb.shlibs.local"
+endif
 
        dh_gencontrol -Ncomerr-dev -Nss-dev -Nuuid-dev \
                -Ne2fsprogs-udeb -Nlibblkid1-udeb -Nlibuuid1-udeb
@@ -621,24 +643,30 @@ ifneq ($(UTIL_LINUX_NG),yes)
        DH_OPTIONS= dh_gencontrol -puuid-dev \
          -u '-v${UUID_VERSION}-${MAIN_VERSION} -VmainBinary=${MAIN_VERSION}'
 endif
+ifeq ($(SKIP_UDEB),)
        dh_gencontrol   -pe2fsprogs-udeb -- -fdebian/files~
 ifneq ($(UTIL_LINUX_NG),yes)
        dh_gencontrol   -plibblkid1-udeb -- -fdebian/files~
        dh_gencontrol   -plibuuid1-udeb -- -fdebian/files~
 endif
+endif
 
+ifeq ($(SKIP_UDEB),)
        dpkg-distaddfile $(UDEB_NAME) debian-installer $(UDEB_PRIORITY)
 ifneq ($(UTIL_LINUX_NG),yes)
        dpkg-distaddfile $(BLKID_UDEB_NAME) debian-installer $(BLKID_UDEB_PRIORITY)
        dpkg-distaddfile $(UUID_UDEB_NAME) debian-installer $(UUID_UDEB_PRIORITY)
 endif
+endif
        dh_md5sums -Ne2fsprogs-udeb -Nlibblkid1-udeb -Nlibuuid1-udeb
        dh_builddeb -Ne2fsprogs-udeb -Nlibblkid1-udeb -Nlibuuid1-udeb
+ifeq ($(SKIP_UDEB),)
        dh_builddeb -pe2fsprogs-udeb --filename=$(UDEB_NAME)
 ifneq ($(UTIL_LINUX_NG),yes)
        dh_builddeb -plibblkid1-udeb --filename=$(BLKID_UDEB_NAME)
        dh_builddeb -plibuuid1-udeb --filename=$(UUID_UDEB_NAME)
 endif
+endif
 
 binary: binary-indep binary-arch
 
Mirror of git://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git