From df52d7782d68d0c15d42b93b78e8352ca38ee573 Mon Sep 17 00:00:00 2001 From: Scott James Remnant Date: Thu, 16 Jul 2009 13:57:25 +0100 Subject: [PATCH] build libblkid binary packages The blkid library and tool have moved from e2fsprogs to util-linux-ng, and is now built and used by default. Merge the changes from Ubuntu to create these packages. --- debian/control | 55 +++++++++++++++++++++++++++++++++++-- debian/libblkid-dev.files | 4 +++ debian/libblkid.copyright | 19 +++++++++++++ debian/libblkid1-udeb.dirs | 1 + debian/libblkid1.files | 1 + debian/libblkid1.symbols | 47 +++++++++++++++++++++++++++++++ debian/rules | 13 +++++++++ debian/shlibs.local | 1 + debian/util-linux-udeb.dirs | 1 + 9 files changed, 140 insertions(+), 2 deletions(-) create mode 100644 debian/libblkid-dev.files create mode 100644 debian/libblkid.copyright create mode 100644 debian/libblkid1-udeb.dirs create mode 100644 debian/libblkid1.files create mode 100644 debian/libblkid1.symbols create mode 100644 debian/util-linux-udeb.dirs diff --git a/debian/control b/debian/control index 472b0f58..3d8192f8 100644 --- a/debian/control +++ b/debian/control @@ -1,5 +1,5 @@ Source: util-linux -Build-Depends: libncurses5-dev, libslang2-dev (>=2.0.4), gettext, zlib1g-dev, libblkid-dev, uuid-dev, dpkg-dev (>=1.13.12), libselinux1-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], debhelper (>=5), lsb-release, pkg-config +Build-Depends: libncurses5-dev, libslang2-dev (>=2.0.4), gettext, zlib1g-dev, uuid-dev, dpkg-dev (>=1.13.12), libselinux1-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], debhelper (>=5), lsb-release, pkg-config Section: base Priority: required Uploaders: Scott James Remnant @@ -16,7 +16,7 @@ Essential: yes Depends: lsb-base (>= 3.0-6), tzdata (>=2006c-2) Pre-Depends: ${shlibs:Depends} Suggests: util-linux-locales, kbd | console-tools, dosfstools -Replaces: schedutils, miscutils, setterm, fdisk, linux32, sparc-utils, ${util-linux:Conflicts} +Replaces: schedutils, miscutils, setterm, fdisk, linux32, sparc-utils, e2fsprogs, ${util-linux:Conflicts} Conflicts: schedutils, setterm, fdisk, kbd (<< 1.05-3), console-tools (<< 1:0.2.3-21), linux32, ${util-linux:Conflicts} Provides: schedutils, linux32 Description: Miscellaneous system utilities @@ -76,3 +76,54 @@ Depends: ${shlibs:Depends} XC-Package-Type: udeb XB-Installer-Menu-Item: 99999 Description: Manually partition a hard drive (cfdisk) + +Package: libblkid1 +Section: libs +Priority: required +Depends: ${shlibs:Depends} +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 specifying + filesystems by hard-coded device names, but via a logical naming + system instead. + +Package: libblkid1-udeb +XC-Package-Type: udeb +Section: debian-installer +Priority: optional +Depends: ${shlibs:Depends} +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 +Depends: libc6-dev | libc-dev, libblkid1 (= ${binary:Version}), uuid-dev +Architecture: any +Description: block device id library - headers and static libraries + 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 package contains the development environment for the blkid library. + +Package: util-linux-udeb +Architecture: any +Priority: optional +Section: debian-installer +Depends: ${shlibs:Depends} +XC-Package-Type: udeb +Description: Miscellaneous system utilities + This is a minimal version of util-linux for debian-installer. It only + contains the blkid binary at the moment. diff --git a/debian/libblkid-dev.files b/debian/libblkid-dev.files new file mode 100644 index 00000000..31ec0f01 --- /dev/null +++ b/debian/libblkid-dev.files @@ -0,0 +1,4 @@ +usr/lib/libblkid* +usr/include/blkid +usr/share/man/man3/libblkid.3 +usr/lib/pkgconfig/blkid.pc diff --git a/debian/libblkid.copyright b/debian/libblkid.copyright new file mode 100644 index 00000000..8d2fd96f --- /dev/null +++ b/debian/libblkid.copyright @@ -0,0 +1,19 @@ +This is libblkid, previously part of e2fsprogs this is now part of +util-linux-ng and has thus moved to the util-linux Debian source +package. + +Upstream Author: Theodore Ts'o + +Copyright: + +Copyright (C) 1999, 2001 by Andries Brouwer +Copyright (C) 1999, 2000, 2003 by Theodore Ts'o +Copyright (C) 2001 Andreas Dilger +Copyright (C) 2008 Kay Sievers +Copyright (C) 2009 Karel Zak + +You are free to distribute this software under the terms of the GNU +Lesser (Library) General Public License. + +On Debian systems, the complete text of the GNU Lesser (Library) +General Public License can be found in /usr/share/common-licenses/LGPL. diff --git a/debian/libblkid1-udeb.dirs b/debian/libblkid1-udeb.dirs new file mode 100644 index 00000000..c3af8579 --- /dev/null +++ b/debian/libblkid1-udeb.dirs @@ -0,0 +1 @@ +lib/ diff --git a/debian/libblkid1.files b/debian/libblkid1.files new file mode 100644 index 00000000..d2f1ccc2 --- /dev/null +++ b/debian/libblkid1.files @@ -0,0 +1 @@ +lib/libblkid* diff --git a/debian/libblkid1.symbols b/debian/libblkid1.symbols new file mode 100644 index 00000000..b0854dc5 --- /dev/null +++ b/debian/libblkid1.symbols @@ -0,0 +1,47 @@ +libblkid.so.1 libblkid1 #MINVER# + BLKID_1.0@BLKID_1.0 2.16-1 + BLKID_2.15@BLKID_2.15 2.16-1 + blkid_dev_devname@BLKID_1.0 2.16-1 + blkid_dev_has_tag@BLKID_1.0 2.16-1 + blkid_dev_iterate_begin@BLKID_1.0 2.16-1 + blkid_dev_iterate_end@BLKID_1.0 2.16-1 + blkid_dev_next@BLKID_1.0 2.16-1 + blkid_dev_set_search@BLKID_1.0 2.16-1 + blkid_devno_to_devname@BLKID_1.0 2.16-1 + blkid_do_probe@BLKID_2.15 2.16-1 + blkid_do_safeprobe@BLKID_2.15 2.16-1 + blkid_encode_string@BLKID_2.15 2.16-1 + blkid_evaluate_tag@BLKID_2.15 2.16-1 + blkid_find_dev_with_tag@BLKID_1.0 2.16-1 + blkid_free_probe@BLKID_2.15 2.16-1 + blkid_gc_cache@BLKID_1.0 2.16-1 + blkid_get_cache@BLKID_1.0 2.16-1 + blkid_get_dev@BLKID_1.0 2.16-1 + blkid_get_dev_size@BLKID_1.0 2.16-1 + blkid_get_devname@BLKID_1.0 2.16-1 + blkid_get_library_version@BLKID_1.0 2.16-1 + blkid_get_tag_value@BLKID_1.0 2.16-1 + blkid_known_fstype@BLKID_1.0 2.16-1 + blkid_new_probe@BLKID_2.15 2.16-1 + blkid_parse_tag_string@BLKID_1.0 2.16-1 + blkid_parse_version_string@BLKID_1.0 2.16-1 + blkid_probe_all@BLKID_1.0 2.16-1 + blkid_probe_all_new@BLKID_1.0 2.16-1 + blkid_probe_filter_types@BLKID_2.15 2.16-1 + blkid_probe_filter_usage@BLKID_2.15 2.16-1 + blkid_probe_get_value@BLKID_2.15 2.16-1 + blkid_probe_has_value@BLKID_2.15 2.16-1 + blkid_probe_invert_filter@BLKID_2.15 2.16-1 + blkid_probe_lookup_value@BLKID_2.15 2.16-1 + blkid_probe_numof_values@BLKID_2.15 2.16-1 + blkid_probe_reset_filter@BLKID_2.15 2.16-1 + blkid_probe_set_device@BLKID_2.15 2.16-1 + blkid_probe_set_request@BLKID_2.15 2.16-1 + blkid_put_cache@BLKID_1.0 2.16-1 + blkid_reset_probe@BLKID_2.15 2.16-1 + blkid_safe_string@BLKID_2.15 2.16-1 + blkid_send_uevent@BLKID_2.15 2.16-1 + blkid_tag_iterate_begin@BLKID_1.0 2.16-1 + blkid_tag_iterate_end@BLKID_1.0 2.16-1 + blkid_tag_next@BLKID_1.0 2.16-1 + blkid_verify@BLKID_1.0 2.16-1 diff --git a/debian/rules b/debian/rules index 58910736..441646ae 100755 --- a/debian/rules +++ b/debian/rules @@ -110,6 +110,19 @@ endif if [ -f debian/util-linux/sbin/hwclock ] ; then \ install -m 644 debian/hwclock.rules debian/util-linux/lib/udev/rules.d/85-hwclock.rules; \ fi + # copy library and symlink into udeb + ln debian/libblkid1/lib/libblkid.so.1.* debian/libblkid1-udeb/lib/ + ln debian/libblkid1/lib/libblkid.so.1 debian/libblkid1-udeb/lib/ + ln debian/util-linux/sbin/blkid debian/util-linux-udeb/sbin/ + # overwrite copyright + install -m 644 debian/libblkid.copyright debian/libblkid1/usr/share/doc/libblkid1/copyright + install -m 644 debian/libblkid.copyright debian/libblkid-dev/usr/share/doc/libblkid-dev/copyright + # dpkg symbol handling + echo "Generating symbols for libblkid1..." + dpkg-gensymbols -plibblkid1 -Pdebian/libblkid1 > debian/libblkid1.tmp-patch + cat debian/libblkid1.tmp-patch + patch debian/libblkid1.symbols < debian/libblkid1.tmp-patch + rm debian/libblkid1.tmp-patch cd debian; if [ -f util-linux/sbin/fdisk ]; then \ ln util-linux/sbin/*fdisk fdisk-udeb/usr/sbin/; \ S=fdisk-udeb/usr/sbin/cfdisk; if [ -f $$S ]; then mv $$S cfdisk-udeb/usr/sbin/; fi; \ diff --git a/debian/shlibs.local b/debian/shlibs.local index 26616108..eaaed72e 100644 --- a/debian/shlibs.local +++ b/debian/shlibs.local @@ -1 +1,2 @@ libblkid 1 libblkid1 (>=1.37-1) +udeb: libblkid 1 libblkid1-udeb diff --git a/debian/util-linux-udeb.dirs b/debian/util-linux-udeb.dirs new file mode 100644 index 00000000..e1ae85e0 --- /dev/null +++ b/debian/util-linux-udeb.dirs @@ -0,0 +1 @@ +sbin -- 2.39.5