Hi,
I have just done an NMU of util-linux, as it was preventing the upload
of the new version of HAL, which was in turn blocking GNU/kFreeBSD
development.
Please find the diff of the NMU attached.
Aurelien
--
Aurelien Jarno GPG: 1024D/F1BCDB73
aurel...@aurel32.net http://www.aurel32.net
diff -u util-linux-2.16/debian/libblkid1.symbols util-linux-2.16/debian/libblkid1.symbols
--- util-linux-2.16/debian/libblkid1.symbols
+++ util-linux-2.16/debian/libblkid1.symbols
@@ -2,46 +2,46 @@
- blkid_...@blkid_1.0 2.16-1
- blkid_2...@blkid_2.15 2.16-1
- blkid_dev_devn...@blkid_1.0 2.16-1
- blkid_dev_has_...@blkid_1.0 2.16-1
- blkid_dev_iterate_be...@blkid_1.0 2.16-1
- blkid_dev_iterate_...@blkid_1.0 2.16-1
- blkid_dev_n...@blkid_1.0 2.16-1
- blkid_dev_set_sea...@blkid_1.0 2.16-1
- blkid_devno_to_devn...@blkid_1.0 2.16-1
- blkid_do_pr...@blkid_2.15 2.16-1
- blkid_do_safepr...@blkid_2.15 2.16-1
- blkid_encode_str...@blkid_2.15 2.16-1
- blkid_evaluate_...@blkid_2.15 2.16-1
- blkid_find_dev_with_...@blkid_1.0 2.16-1
- blkid_free_pr...@blkid_2.15 2.16-1
- blkid_gc_ca...@blkid_1.0 2.16-1
- blkid_get_ca...@blkid_1.0 2.16-1
- blkid_get_...@blkid_1.0 2.16-1
- blkid_get_dev_s...@blkid_1.0 2.16-1
- blkid_get_devn...@blkid_1.0 2.16-1
- blkid_get_library_vers...@blkid_1.0 2.16-1
- blkid_get_tag_va...@blkid_1.0 2.16-1
- blkid_known_fst...@blkid_1.0 2.16-1
- blkid_new_pr...@blkid_2.15 2.16-1
- blkid_parse_tag_str...@blkid_1.0 2.16-1
- blkid_parse_version_str...@blkid_1.0 2.16-1
- blkid_probe_...@blkid_1.0 2.16-1
- blkid_probe_all_...@blkid_1.0 2.16-1
- blkid_probe_filter_ty...@blkid_2.15 2.16-1
- blkid_probe_filter_us...@blkid_2.15 2.16-1
- blkid_probe_get_va...@blkid_2.15 2.16-1
- blkid_probe_has_va...@blkid_2.15 2.16-1
- blkid_probe_invert_fil...@blkid_2.15 2.16-1
- blkid_probe_lookup_va...@blkid_2.15 2.16-1
- blkid_probe_numof_val...@blkid_2.15 2.16-1
- blkid_probe_reset_fil...@blkid_2.15 2.16-1
- blkid_probe_set_dev...@blkid_2.15 2.16-1
- blkid_probe_set_requ...@blkid_2.15 2.16-1
- blkid_put_ca...@blkid_1.0 2.16-1
- blkid_reset_pr...@blkid_2.15 2.16-1
- blkid_safe_str...@blkid_2.15 2.16-1
- blkid_send_uev...@blkid_2.15 2.16-1
- blkid_tag_iterate_be...@blkid_1.0 2.16-1
- blkid_tag_iterate_...@blkid_1.0 2.16-1
- blkid_tag_n...@blkid_1.0 2.16-1
- blkid_ver...@blkid_1.0 2.16-1
+ blkid_...@blkid_1.0 2.16
+ blkid_2...@blkid_2.15 2.16
+ blkid_dev_devn...@blkid_1.0 2.16
+ blkid_dev_has_...@blkid_1.0 2.16
+ blkid_dev_iterate_be...@blkid_1.0 2.16
+ blkid_dev_iterate_...@blkid_1.0 2.16
+ blkid_dev_n...@blkid_1.0 2.16
+ blkid_dev_set_sea...@blkid_1.0 2.16
+ blkid_devno_to_devn...@blkid_1.0 2.16
+ blkid_do_pr...@blkid_2.15 2.16
+ blkid_do_safepr...@blkid_2.15 2.16
+ blkid_encode_str...@blkid_2.15 2.16
+ blkid_evaluate_...@blkid_2.15 2.16
+ blkid_find_dev_with_...@blkid_1.0 2.16
+ blkid_free_pr...@blkid_2.15 2.16
+ blkid_gc_ca...@blkid_1.0 2.16
+ blkid_get_ca...@blkid_1.0 2.16
+ blkid_get_...@blkid_1.0 2.16
+ blkid_get_dev_s...@blkid_1.0 2.16
+ blkid_get_devn...@blkid_1.0 2.16
+ blkid_get_library_vers...@blkid_1.0 2.16
+ blkid_get_tag_va...@blkid_1.0 2.16
+ blkid_known_fst...@blkid_1.0 2.16
+ blkid_new_pr...@blkid_2.15 2.16
+ blkid_parse_tag_str...@blkid_1.0 2.16
+ blkid_parse_version_str...@blkid_1.0 2.16
+ blkid_probe_...@blkid_1.0 2.16
+ blkid_probe_all_...@blkid_1.0 2.16
+ blkid_probe_filter_ty...@blkid_2.15 2.16
+ blkid_probe_filter_us...@blkid_2.15 2.16
+ blkid_probe_get_va...@blkid_2.15 2.16
+ blkid_probe_has_va...@blkid_2.15 2.16
+ blkid_probe_invert_fil...@blkid_2.15 2.16
+ blkid_probe_lookup_va...@blkid_2.15 2.16
+ blkid_probe_numof_val...@blkid_2.15 2.16
+ blkid_probe_reset_fil...@blkid_2.15 2.16
+ blkid_probe_set_dev...@blkid_2.15 2.16
+ blkid_probe_set_requ...@blkid_2.15 2.16
+ blkid_put_ca...@blkid_1.0 2.16
+ blkid_reset_pr...@blkid_2.15 2.16
+ blkid_safe_str...@blkid_2.15 2.16
+ blkid_send_uev...@blkid_2.15 2.16
+ blkid_tag_iterate_be...@blkid_1.0 2.16
+ blkid_tag_iterate_...@blkid_1.0 2.16
+ blkid_tag_n...@blkid_1.0 2.16
+ blkid_ver...@blkid_1.0 2.16
diff -u util-linux-2.16/debian/control util-linux-2.16/debian/control
--- util-linux-2.16/debian/control
+++ util-linux-2.16/debian/control
@@ -39,7 +39,7 @@
messages in other languages than English.
Package: mount
-Architecture: alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 sh4 s390 sparc sparc64
+Architecture: alpha amd64 arm armeb armel avr32 hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 sh4 s390 sparc sparc64
Essential: yes
Section: admin
Pre-Depends: ${shlibs:Depends}
@@ -60,7 +60,7 @@
The remaining standard BSD utilities are provided by bsdmainutils.
Package: fdisk-udeb
-Architecture: alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r mips mipsel powerpc ppc64 hurd-i386 sh4 sparc s390
+Architecture: alpha amd64 arm armeb armel avr32 hppa i386 ia64 lpia m32r mips mipsel powerpc ppc64 hurd-i386 sh4 sparc s390
Priority: extra
Section: debian-installer
Depends: ${shlibs:Depends}
@@ -69,7 +69,7 @@
Description: Manually partition a hard drive (fdisk)
Package: cfdisk-udeb
-Architecture: alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r mips mipsel powerpc ppc64 hurd-i386 sh4 s390
+Architecture: alpha amd64 arm armeb armel avr32 hppa i386 ia64 lpia m32r mips mipsel powerpc ppc64 hurd-i386 sh4 s390
Priority: extra
Section: debian-installer
Depends: ${shlibs:Depends}
reverted:
--- util-linux-2.16/debian/shlibs.local
+++ util-linux-2.16.orig/debian/shlibs.local
@@ -1,4 +0,0 @@
-libblkid 1 libblkid1 (>=1.37-1)
-udeb: libblkid 1 libblkid1-udeb
-libuuid 1 libuuid1 (> 1.40.3-1)
-udeb: libuuid 1 libuuid1-udeb
diff -u util-linux-2.16/debian/rules util-linux-2.16/debian/rules
--- util-linux-2.16/debian/rules
+++ util-linux-2.16/debian/rules
@@ -90,6 +90,10 @@
rm -f debian/bsdutils/usr/bin/col* debian/bsdutils/usr/share/man/man1/col*.1
rm -f debian/bsdutils/usr/bin/ul debian/bsdutils/usr/share/man/man1/ul*.1
rm -f debian/bsdutils/usr/bin/cal debian/bsdutils/usr/share/man/man1/cal.1
+ # remove *.la files and empty directories which do not belong into util-linux
+ rm -f debian/util-linux/usr/lib/*.la
+ rm -rf debian/util-linux/usr/include
+ rm -rf debian/util-linux/usr/lib/pkgconfig
# perl gets to do rename, not us.
mv debian/util-linux/usr/bin/rename debian/util-linux/usr/bin/rename.ul
mv debian/util-linux/usr/share/man/man1/rename.1 debian/util-linux/usr/share/man/man1/rename.ul.1
@@ -124,15 +128,6 @@
install -m 644 debian/libuuid.copyright debian/libuuid1/usr/share/doc/libuuid1/copyright
install -m 644 debian/libuuid.copyright debian/uuid-dev/usr/share/doc/uuid-dev/copyright
install -m 644 debian/libuuid.copyright debian/uuid-runtime/usr/share/doc/uuid-runtime/copyright
- # dpkg symbol handling
- for lib in libblkid1 libuuid1; \
- do \
- echo "Generating symbols for $$lib..."; \
- dpkg-gensymbols -p$$lib -Pdebian/$$lib > debian/$$lib.tmp-patch; \
- cat debian/$$lib.tmp-patch; \
- patch debian/$$lib.symbols < debian/$$lib.tmp-patch; \
- rm debian/$$lib.tmp-patch; \
- done
#
cd debian; if [ -f util-linux/sbin/fdisk ]; then \
ln util-linux/sbin/*fdisk fdisk-udeb/usr/sbin/; \
diff -u util-linux-2.16/debian/changelog util-linux-2.16/debian/changelog
--- util-linux-2.16/debian/changelog
+++ util-linux-2.16/debian/changelog
@@ -1,3 +1,30 @@
+util-linux (2.16-2.1) unstable; urgency=low
+
+ [ Aurelien Jarno ]
+ * Non-maintainer upload.
+ * Upload to unstable.
+ * Don't ship *.la files.
+ * Add avr32 to debian/control (closes: bug#528518).
+
+ [ Michael Biebl ]
+ * Remove the outdated debian/shlibs.local file.
+ * Remove the auto-update of symbols files from debian/rules.
+ * Remove symbols from the debian/libuuid1.symbols files which were never
+ part of the public ABI, like uuid_pack/uuid_unpack and were falsely
+ copied over from e2fsprogs.
+ * Strip the Debian revision in the symbols files.
+ * Create a shlibs file for libblkid1 and libuuid1 and bump it to >= 2.16 to
+ ensure correct udeb shlibs dependencies.
+ (closes: bug#539100, bug#538940).
+ * Remove *.la files and empty /usr/include and /usr/lib/pkgconfig
+ directories from the util-linux package.
+
+ [ Cyril Brulebois ]
+ * Only check for ENOMEDIUM when ENOMEDIUM is defined. Fixes build on
+ GNU/kFreeBSD. (closes: bug#539054).
+
+ -- Aurelien Jarno <aure...@debian.org> Wed, 05 Aug 2009 21:20:07 +0000
+
util-linux (2.16-2) experimental; urgency=low
[John Keeping]
diff -u util-linux-2.16/debian/libblkid1.files util-linux-2.16/debian/libblkid1.files
--- util-linux-2.16/debian/libblkid1.files
+++ util-linux-2.16/debian/libblkid1.files
@@ -1 +1 @@
-lib/libblkid*
+lib/libblkid*.so.*
diff -u util-linux-2.16/debian/libuuid1.files util-linux-2.16/debian/libuuid1.files
--- util-linux-2.16/debian/libuuid1.files
+++ util-linux-2.16/debian/libuuid1.files
@@ -1 +1 @@
-lib/libuuid*
+lib/libuuid*.so.*
diff -u util-linux-2.16/debian/libuuid1.symbols util-linux-2.16/debian/libuuid1.symbols
--- util-linux-2.16/debian/libuuid1.symbols
+++ util-linux-2.16/debian/libuuid1.symbols
@@ -2,19 +2,17 @@
- uuid_...@uuid_1.0 2.16-1
- uuid__generate_ran...@uuid_1.0 2.16-1
- uuid__generate_t...@uuid_1.0 2.16-1
- uuid_cl...@uuid_1.0 2.16-1
- uuid_comp...@uuid_1.0 2.16-1
- uuid_c...@uuid_1.0 2.16-1
- uuid_gener...@uuid_1.0 2.16-1
- uuid_generate_ran...@uuid_1.0 2.16-1
- uuid_generate_t...@uuid_1.0 2.16-1
- uuid_is_n...@uuid_1.0 2.16-1
- uuid_p...@uuid_1.0 2.16-1
- uuid_pa...@uuid_1.0 2.16-1
- uuid_t...@uuid_1.0 2.16-1
- uuid_t...@uuid_1.0 2.16-1
- uuid_unp...@uuid_1.0 2.16-1
- uuid_unpa...@uuid_1.0 2.16-1
- uuid_unparse_lo...@uuid_1.0 2.16-1
- uuid_unparse_up...@uuid_1.0 2.16-1
- uuid_vari...@uuid_1.0 2.16-1
+ uuid_...@uuid_1.0 2.16
+ uuid__generate_ran...@uuid_1.0 2.16
+ uuid__generate_t...@uuid_1.0 2.16
+ uuid_cl...@uuid_1.0 2.16
+ uuid_comp...@uuid_1.0 2.16
+ uuid_c...@uuid_1.0 2.16
+ uuid_gener...@uuid_1.0 2.16
+ uuid_generate_ran...@uuid_1.0 2.16
+ uuid_generate_t...@uuid_1.0 2.16
+ uuid_is_n...@uuid_1.0 2.16
+ uuid_pa...@uuid_1.0 2.16
+ uuid_t...@uuid_1.0 2.16
+ uuid_t...@uuid_1.0 2.16
+ uuid_unpa...@uuid_1.0 2.16
+ uuid_unparse_lo...@uuid_1.0 2.16
+ uuid_unparse_up...@uuid_1.0 2.16
+ uuid_vari...@uuid_1.0 2.16
diff -u util-linux-2.16/debian/libblkid-dev.files util-linux-2.16/debian/libblkid-dev.files
--- util-linux-2.16/debian/libblkid-dev.files
+++ util-linux-2.16/debian/libblkid-dev.files
@@ -1,4 +1,5 @@
-usr/lib/libblkid*
+usr/lib/libblkid.so
+usr/lib/libblkid.a
usr/include/blkid
usr/share/man/man3/libblkid.3
usr/lib/pkgconfig/blkid.pc
diff -u util-linux-2.16/debian/uuid-dev.files util-linux-2.16/debian/uuid-dev.files
--- util-linux-2.16/debian/uuid-dev.files
+++ util-linux-2.16/debian/uuid-dev.files
@@ -1,4 +1,5 @@
-usr/lib/libuuid.*
+usr/lib/libuuid.so
+usr/lib/libuuid.a
usr/include/uuid
usr/share/man/man3/uuid*
usr/lib/pkgconfig/uuid.pc
only in patch2:
unchanged:
--- util-linux-2.16.orig/lib/fsprobe.c
+++ util-linux-2.16/lib/fsprobe.c
@@ -31,8 +31,13 @@
int fd = open(devname, O_RDONLY);
if (fd >= 0)
return fd;
+#ifdef ENOMEDIUM
+ /* ENOMEDIUM is Linux-only */
if (errno != ENOMEDIUM)
break;
+#else
+ break;
+#endif
if (retries >= CRDOM_NOMEDIUM_RETRIES)
break;
++retries;
only in patch2:
unchanged:
--- util-linux-2.16.orig/debian/libuuid1.shlibs
+++ util-linux-2.16/debian/libuuid1.shlibs
@@ -0,0 +1,2 @@
+libuuid 1 libuuid1 (>= 2.16)
+udeb: libuuid 1 libuuid1-udeb (>= 2.16)
only in patch2:
unchanged:
--- util-linux-2.16.orig/debian/libblkid1.shlibs
+++ util-linux-2.16/debian/libblkid1.shlibs
@@ -0,0 +1,2 @@
+libblkid 1 libblkid1 (>= 2.16)
+udeb: libblkid 1 libblkid1-udeb (>= 2.16)
