NMU

diff --git a/debian/changelog b/debian/changelog
index 75f14258e3d5947b2abb7232c1c44c33d799cf03..5f52ff247bf1b64efd19dd2ddc96705e0f64cac7 100644 (file)
--- a/debian/changelog
+++ b/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 <aurel32@debian.org>  Wed, 05 Aug 2009 21:20:07 +0000
+
 util-linux (2.16-2) experimental; urgency=low
 
   [John Keeping]

diff --git a/debian/control b/debian/control
index 0ead573e317295acb5481b88cea4130c7b7c689d..76a470945047d19a7875f862c995f2068cbf2502 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -39,7 +39,7 @@ Description: Locales files for util-linux
  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 @@ Description: Basic utilities from 4.4BSD-Lite
  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 @@ XB-Installer-Menu-Item: 99999
 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}

diff --git a/debian/libblkid-dev.files b/debian/libblkid-dev.files
index 31ec0f01067b6e1566afa0a3193702b66a5ac066..babd18e18e20d600d09ffd43765e73929c90d94e 100644 (file)
--- a/debian/libblkid-dev.files
+++ b/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 --git a/debian/libblkid1.files b/debian/libblkid1.files
index d2f1ccc20879a261f3f3c97a9ff73d60e470cc69..abab09ca0d768f14cfbc5a0cdc655bac105b5862 100644 (file)
--- a/debian/libblkid1.files
+++ b/debian/libblkid1.files
@@ -1 +1 @@
-lib/libblkid*
+lib/libblkid*.so.*

diff --git a/debian/libblkid1.shlibs b/debian/libblkid1.shlibs
new file mode 100644 (file)
index 0000000..2ea63c4
--- /dev/null
+++ b/debian/libblkid1.shlibs
@@ -0,0 +1,2 @@
+libblkid 1 libblkid1 (>= 2.16)
+udeb: libblkid 1 libblkid1-udeb (>= 2.16)

diff --git a/debian/libblkid1.symbols b/debian/libblkid1.symbols
index b0854dc5b0c4ac44bc20628064e4d4062dbda3ff..ec2f9bfcebc75ea8fddb31702e33101e936d6685 100644 (file)
--- a/debian/libblkid1.symbols
+++ b/debian/libblkid1.symbols
@@ -1,47 +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
+ BLKID_1.0@BLKID_1.0 2.16
+ BLKID_2.15@BLKID_2.15 2.16
+ blkid_dev_devname@BLKID_1.0 2.16
+ blkid_dev_has_tag@BLKID_1.0 2.16
+ blkid_dev_iterate_begin@BLKID_1.0 2.16
+ blkid_dev_iterate_end@BLKID_1.0 2.16
+ blkid_dev_next@BLKID_1.0 2.16
+ blkid_dev_set_search@BLKID_1.0 2.16
+ blkid_devno_to_devname@BLKID_1.0 2.16
+ blkid_do_probe@BLKID_2.15 2.16
+ blkid_do_safeprobe@BLKID_2.15 2.16
+ blkid_encode_string@BLKID_2.15 2.16
+ blkid_evaluate_tag@BLKID_2.15 2.16
+ blkid_find_dev_with_tag@BLKID_1.0 2.16
+ blkid_free_probe@BLKID_2.15 2.16
+ blkid_gc_cache@BLKID_1.0 2.16
+ blkid_get_cache@BLKID_1.0 2.16
+ blkid_get_dev@BLKID_1.0 2.16
+ blkid_get_dev_size@BLKID_1.0 2.16
+ blkid_get_devname@BLKID_1.0 2.16
+ blkid_get_library_version@BLKID_1.0 2.16
+ blkid_get_tag_value@BLKID_1.0 2.16
+ blkid_known_fstype@BLKID_1.0 2.16
+ blkid_new_probe@BLKID_2.15 2.16
+ blkid_parse_tag_string@BLKID_1.0 2.16
+ blkid_parse_version_string@BLKID_1.0 2.16
+ blkid_probe_all@BLKID_1.0 2.16
+ blkid_probe_all_new@BLKID_1.0 2.16
+ blkid_probe_filter_types@BLKID_2.15 2.16
+ blkid_probe_filter_usage@BLKID_2.15 2.16
+ blkid_probe_get_value@BLKID_2.15 2.16
+ blkid_probe_has_value@BLKID_2.15 2.16
+ blkid_probe_invert_filter@BLKID_2.15 2.16
+ blkid_probe_lookup_value@BLKID_2.15 2.16
+ blkid_probe_numof_values@BLKID_2.15 2.16
+ blkid_probe_reset_filter@BLKID_2.15 2.16
+ blkid_probe_set_device@BLKID_2.15 2.16
+ blkid_probe_set_request@BLKID_2.15 2.16
+ blkid_put_cache@BLKID_1.0 2.16
+ blkid_reset_probe@BLKID_2.15 2.16
+ blkid_safe_string@BLKID_2.15 2.16
+ blkid_send_uevent@BLKID_2.15 2.16
+ blkid_tag_iterate_begin@BLKID_1.0 2.16
+ blkid_tag_iterate_end@BLKID_1.0 2.16
+ blkid_tag_next@BLKID_1.0 2.16
+ blkid_verify@BLKID_1.0 2.16

diff --git a/debian/libuuid1.files b/debian/libuuid1.files
index da600dc8f360e61cd47838998fb2fa21944428ea..c983c755fc3d26352421bb099ea77947d4e1b14b 100644 (file)
--- a/debian/libuuid1.files
+++ b/debian/libuuid1.files
@@ -1 +1 @@
-lib/libuuid*
+lib/libuuid*.so.*

diff --git a/debian/libuuid1.shlibs b/debian/libuuid1.shlibs
new file mode 100644 (file)
index 0000000..4ba6a6a
--- /dev/null
+++ b/debian/libuuid1.shlibs
@@ -0,0 +1,2 @@
+libuuid 1 libuuid1 (>= 2.16)
+udeb: libuuid 1 libuuid1-udeb (>= 2.16)

diff --git a/debian/libuuid1.symbols b/debian/libuuid1.symbols
index 03f8a6162bb98c821a04f01b20dc8573c2feb15f..eeb947978f772a250cf70479d4ec3b0ee293bbce 100644 (file)
--- a/debian/libuuid1.symbols
+++ b/debian/libuuid1.symbols
@@ -1,20 +1,18 @@
 libuuid.so.1 libuuid1 #MINVER#
- UUID_1.0@UUID_1.0 2.16-1
- uuid__generate_random@UUID_1.0 2.16-1
- uuid__generate_time@UUID_1.0 2.16-1
- uuid_clear@UUID_1.0 2.16-1
- uuid_compare@UUID_1.0 2.16-1
- uuid_copy@UUID_1.0 2.16-1
- uuid_generate@UUID_1.0 2.16-1
- uuid_generate_random@UUID_1.0 2.16-1
- uuid_generate_time@UUID_1.0 2.16-1
- uuid_is_null@UUID_1.0 2.16-1
- uuid_pack@UUID_1.0 2.16-1
- uuid_parse@UUID_1.0 2.16-1
- uuid_time@UUID_1.0 2.16-1
- uuid_type@UUID_1.0 2.16-1
- uuid_unpack@UUID_1.0 2.16-1
- uuid_unparse@UUID_1.0 2.16-1
- uuid_unparse_lower@UUID_1.0 2.16-1
- uuid_unparse_upper@UUID_1.0 2.16-1
- uuid_variant@UUID_1.0 2.16-1
+ UUID_1.0@UUID_1.0 2.16
+ uuid__generate_random@UUID_1.0 2.16
+ uuid__generate_time@UUID_1.0 2.16
+ uuid_clear@UUID_1.0 2.16
+ uuid_compare@UUID_1.0 2.16
+ uuid_copy@UUID_1.0 2.16
+ uuid_generate@UUID_1.0 2.16
+ uuid_generate_random@UUID_1.0 2.16
+ uuid_generate_time@UUID_1.0 2.16
+ uuid_is_null@UUID_1.0 2.16
+ uuid_parse@UUID_1.0 2.16
+ uuid_time@UUID_1.0 2.16
+ uuid_type@UUID_1.0 2.16
+ uuid_unparse@UUID_1.0 2.16
+ uuid_unparse_lower@UUID_1.0 2.16
+ uuid_unparse_upper@UUID_1.0 2.16
+ uuid_variant@UUID_1.0 2.16

diff --git a/debian/rules b/debian/rules
index 05808bd1e9724878f771249661abdcf891e446f3..6e099eaf29133f8b57e4b7f58ddeb07ec99cf6d4 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -90,6 +90,10 @@ endif
        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 @@ endif
        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 --git a/debian/shlibs.local b/debian/shlibs.local
deleted file mode 100644 (file)
index fdebb4f..0000000
--- a/debian/shlibs.local
+++ /dev/null
@@ -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 --git a/debian/uuid-dev.files b/debian/uuid-dev.files
index 966eed367c6b06a50914e5174946d98b65bb502d..48ef580a79f0f39e8f05773134ff96c3514dcaa2 100644 (file)
--- a/debian/uuid-dev.files
+++ b/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

diff --git a/lib/fsprobe.c b/lib/fsprobe.c
index 04360dc838b4e681829b90d6555511c9f94e600d..2643c09a128c760b094c47c5a7f91394101539d2 100644 (file)
--- a/lib/fsprobe.c
+++ b/lib/fsprobe.c
@@ -36,7 +36,7 @@ open_device(const char *devname)
                if (errno != ENOMEDIUM)
                        break;
 #else
-               break
+               break;
 #endif
                if (retries >= CRDOM_NOMEDIUM_RETRIES)
                        break;