Update Debian packaging information as of 1.29+130-WIP-0930-2.
diff --git a/debian/rules b/debian/rules
index 568e263..5be375a 100644
--- a/debian/rules
+++ b/debian/rules
@@ -44,6 +44,7 @@
debdir=${topdir}/debian
tmpdir=${debdir}/tmp
bfdir=${debdir}/e2fsprogs-bf
+udebdir=${debdir}/e2fsprogs-udeb
maindir=${debdir}/e2fsprogs
stdbuilddir=${debdir}/BUILD-STD
bfbuilddir=${debdir}/BUILD-BF
@@ -52,6 +53,9 @@
MANDIR=/usr/share/man
mandir=${tmpdir}${MANDIR}
+UDEB_NAME = $(package)-udeb_$(MAIN_VERSION)_$(DEB_HOST_ARCH).udeb
+UDEB_PRIORITY = $(shell grep '^Package: e2fsprogs-udeb' debian/control -A 10 | grep ^Priority: | cut -d ' ' -f 2)
+
SUBPACKAGES_DIRS = tmp e2fslibs-dev comerr-dev ss-dev
STAMPSDIR=debian/stampdir
@@ -96,7 +100,7 @@
MIPS_NOPIC_CONF_FLAGS = --with-ccopts="${CCOPTS}" \
--disable-nls \
--disable-swapfs --disable-imager \
- --disable-resizer --disable-debugfs
+ --disable-resizer # --disable-debugfs
# we can't use those flags at configure time
MIPS_CFLAGS= -G 0 -fno-pic -mno-abicalls
@@ -236,12 +240,25 @@
# remove FSIM for now.
rm ${bfdir}/lib/evms/libe2fsim.1.1.1.so
+install-udeb: install-bf
+ dh_testdir
+ dh_testroot
+ dh_installdirs
+
+ cp -a ${bfdir}/lib ${udebdir}/
+ mkdir -p ${udebdir}/sbin
+ cp -a ${bfdir}/sbin/mke2fs ${udebdir}/sbin/
+ ln -s mke2fs ${udebdir}/sbin/mkfs.ext2
+ ln -s mke2fs ${udebdir}/sbin/mkfs.ext3
+ cp -a ${bfdir}/sbin/e2fsck ${udebdir}/sbin/
+ ln -s e2fsck ${udebdir}/sbin/fsck.ext2
+ ln -s e2fsck ${udebdir}/sbin/fsck.ext3
binary-indep:
# no arch-independant debs.
binary-arch: DH_OPTIONS= -a
-binary-arch: install
+binary-arch: install install-udeb
dh_testdir
dh_testroot
@@ -256,9 +273,9 @@
done
# mkinitrd script
- dh_install -p e2fsprogs debian/e2fsprogs.mkinitrd \
- /etc/mkinitrd/scripts/e2fsprogs
- chmod +x ${debdir}/e2fsprogs/etc/mkinitrd/scripts/*
+ mkdir -p debian/e2fsprogs/etc/mkinitrd/scripts
+ install -m755 debian/e2fsprogs.mkinitrd \
+ debian/e2fsprogs/etc/mkinitrd/scripts/e2fsprogs
# symlinks to prepare dh_installdocs run
mkdir -p ${debdir}/e2fsck-static/usr/share/doc/
@@ -284,7 +301,7 @@
${maindir}/usr/share/doc/$$i/copyright ; \
done
- dh_installdocs
+ dh_installdocs -Ne2fsprogs-udeb
install -m 644 debian/e2fsprogs.copyright \
${bfdir}/usr/share/doc/e2fsprogs-bf/copyright
@@ -346,7 +363,7 @@
dh_installdeb
dh_shlibdeps -l${stdbuilddir}/lib
- dh_gencontrol -Ncomerr-dev -Nss-dev -Nuuid-dev
+ dh_gencontrol -Ncomerr-dev -Nss-dev -Nuuid-dev -Ne2fsprogs-udeb
DH_OPTIONS= dh_gencontrol -pcomerr-dev \
-u '-v${COMERR_VERSION}-${MAIN_VERSION}'
DH_OPTIONS= dh_gencontrol -pss-dev \
@@ -354,8 +371,13 @@
DH_OPTIONS= dh_gencontrol -puuid-dev \
-u '-v${UUID_VERSION}-${MAIN_VERSION}'
- dh_md5sums
- dh_builddeb
+ dh_md5sums -Ne2fsprogs-udeb
+ dh_builddeb -Ne2fsprogs-udeb
+
+ # udeb stuff
+ dh_gencontrol -pe2fsprogs-udeb -- -fdebian/files~
+ dpkg-distaddfile $(UDEB_NAME) debian-installer $(UDEB_PRIORITY)
+ dh_builddeb -pe2fsprogs-udeb --filename=$(UDEB_NAME)
binary: binary-indep binary-arch