Add libblkid1-udeb package for the Debian Installer.

3 files changed, 31 insertions, 5 deletions

diff --git a/debian/changelog b/debian/changelog
index d4e6cfbd..d26fe067 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ e2fsprogs (1.32+1.33-WIP-2003.03.30-3) unstable; urgency=low
     libkrb5-dev package
   * Change the sectoin of com_err-dev, ss-dev, uuid-dev, libblkid-dev,
     e2fslibs-dev to libdevel
+  * Add libblkid1-udeb package for the Debian Installer.
 
- -- Theodore Y. Ts'o <tytso@mit.edu>  Wed,  9 Apr 2003 23:26:52 -0400
+ -- Theodore Y. Ts'o <tytso@mit.edu>  Thu, 10 Apr 2003 00:15:08 -0400
 
 e2fsprogs (1.32+1.33-WIP-2003.03.30-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 42fbd8dc..d1780cc7 100644
--- a/debian/control
+++ b/debian/control
@@ -74,6 +74,21 @@ Description: Block device id library
  filesystems by hard-coded device names, but via a logical naming 
  system instead.
 
+Package: libblkid1-udeb
+Section: debian-installer
+Priority: required
+Depends: ${shlibs:Depends}
+Provides: libblkid1
+Architecture: any
+Description: Block device id library
+ The blkid library which allows system programs like fsck and 
+ mount to quickly and easily find block devices by filesystem UUID and 
+ LABEL.  This allows system administrators to avoid specifiying 
+ filesystems by hard-coded device names, but via a logical naming 
+ system instead.
+ .
+ This is a minimal package for debian-installer.
+
 Package: libblkid-dev
 Section: libdevel
 Priority: extra
diff --git a/debian/rules b/debian/rules
index 6ad09158..df9ca503 100644
--- a/debian/rules
+++ b/debian/rules
@@ -47,6 +47,7 @@ debdir=${topdir}/debian
 tmpdir=${debdir}/tmp
 bfdir=${debdir}/e2fsprogs-bf
 udebdir=${debdir}/e2fsprogs-udeb
+blkidudebdir=${debdir}/libblkid1-udeb
 maindir=${debdir}/e2fsprogs
 stdbuilddir=${debdir}/BUILD-STD
 bfbuilddir=${debdir}/BUILD-BF
@@ -58,6 +59,9 @@ 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)
 
+BLKID_UDEB_NAME = libblkid1-udeb_$(MAIN_VERSION)_$(DEB_HOST_ARCH).udeb
+BLKID_UDEB_PRIORITY = $(shell grep '^Package: libblkid1-udeb' debian/control -A 10 | grep ^Priority: | cut -d ' ' -f 2)
+
 SUBPACKAGES_DIRS = tmp e2fslibs-dev comerr-dev ss-dev
 
 STAMPSDIR=debian/stampdir
@@ -257,6 +261,8 @@ install-udeb: install-bf
 	cp -a ${bfdir}/sbin/e2fsck ${udebdir}/sbin/
 	ln -s e2fsck ${udebdir}/sbin/fsck.ext2
 	ln -s e2fsck ${udebdir}/sbin/fsck.ext3
+	mkdir -p ${blkidudebdir}/lib
+	mv ${udebdir}/lib/libblkid.* ${blkidudebdir}/lib
 
 binary-indep: 
   # no arch-independant debs.
@@ -308,7 +314,7 @@ binary-arch: install install-udeb
 	install -m 644 debian/libblkid.copyright \
 		${debdir}/libblkid${BLKID_SOVERSION}/usr/share/doc/libblkid${BLKID_SOVERSION}/copyright
 
-	dh_installdocs -Ne2fsprogs-udeb
+	dh_installdocs -Ne2fsprogs-udeb -Nlibblkid1-udeb
 
 	install -m 644 debian/e2fsprogs.copyright \
 	  ${bfdir}/usr/share/doc/e2fsprogs-bf/copyright
@@ -375,7 +381,7 @@ binary-arch: install install-udeb
 	dh_installdeb
 	dh_shlibdeps -l${stdbuilddir}/lib
 
-	dh_gencontrol -Ncomerr-dev -Nss-dev -Nuuid-dev -Ne2fsprogs-udeb
+	dh_gencontrol -Ncomerr-dev -Nss-dev -Nuuid-dev -Ne2fsprogs-udeb -Nlibblkid1-udeb
 	DH_OPTIONS= dh_gencontrol -pcomerr-dev \
 	  -u '-v${COMERR_VERSION}-${MAIN_VERSION}'
 	DH_OPTIONS= dh_gencontrol -pss-dev \
@@ -387,14 +393,18 @@ binary-arch: install install-udeb
 	DH_OPTIONS= dh_gencontrol -plibblkid${BLKID_SOVERSION} \
 	  -u '-v${MAIN_VERSION}'
 
-	dh_md5sums -Ne2fsprogs-udeb
-	dh_builddeb -Ne2fsprogs-udeb
+	dh_md5sums -Ne2fsprogs-udeb -Nlibblkid1-udeb
+	dh_builddeb -Ne2fsprogs-udeb -Nlibblkid1-udeb
 
 	# udeb stuff
 	dh_gencontrol	-pe2fsprogs-udeb -- -fdebian/files~
 	dpkg-distaddfile $(UDEB_NAME) debian-installer $(UDEB_PRIORITY)
 	dh_builddeb -pe2fsprogs-udeb --filename=$(UDEB_NAME)
 
+	dh_gencontrol	-plibblkid1-udeb -- -fdebian/files~
+	dpkg-distaddfile $(BLKID_UDEB_NAME) debian-installer $(BLKID_UDEB_PRIORITY)
+	dh_builddeb -plibblkid1-udeb --filename=$(BLKID_UDEB_NAME)
+
 binary: binary-indep binary-arch
 
 .PHONY: binary binary-arch binary-indep clean checkroot