debian: use more specific library file names in *.files

This patch specifies libraries using a more specific glob that will pick
only the lib*.so.<version> file and will not match the lib*.so symlink
and the lib*.a archive/static library.

Signed-off-by: Filipe Brandenburger <filbranden@google.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

diff --git a/debian/e2fslibs-dev.files.in b/debian/e2fslibs-dev.files.in
index a1a66a6efeec74f0eaca2c09658618f3d52ded1f..b2cd6c9238eb1d52b693e986bceeb5aacd7b1e37 100644 (file)
--- a/debian/e2fslibs-dev.files.in
+++ b/debian/e2fslibs-dev.files.in
@@ -1,5 +1,7 @@
-usr/lib/*/*.so
-usr/lib/*/*.a
+usr/lib/*/libext2fs*.so
+usr/lib/*/libext2fs*.a
+usr/lib/*/libe2p*.so
+usr/lib/*/libe2p*.a
 usr/include/ext2fs
 usr/include/e2p
 usr/share/info/libext2fs.info*

diff --git a/debian/e2fslibs.files.in b/debian/e2fslibs.files.in
index 276b4b6696cf72920e3dad5b250dbb575219a5bb..11198f76101d513ac546a53681d409f5db077c11 100644 (file)
--- a/debian/e2fslibs.files.in
+++ b/debian/e2fslibs.files.in
@@ -1,2 +1,2 @@
-lib/*/libext2fs*
-lib/*/libe2p*
+lib/*/libext2fs*.so.*
+lib/*/libe2p*.so.*

diff --git a/debian/libblkid-dev.files.in b/debian/libblkid-dev.files.in
index 84dc3f2c3112136e04e3a61ca03e753b270168db..7b3da3681953d7c5b37a01ca0b4ffa62a87d6669 100644 (file)
--- a/debian/libblkid-dev.files.in
+++ b/debian/libblkid-dev.files.in
@@ -1,4 +1,4 @@
-usr/lib/*/libblkid*
+usr/lib/*/libblkid*.so.*
 usr/include/blkid
 usr/share/man/man3/libblkid.3
 usr/lib/*/pkgconfig/blkid.pc

diff --git a/debian/libblkid1.files.in b/debian/libblkid1.files.in
index 871d7be0b3248f7f1749d9404ba476173190db88..54ef86de24aa2c3d608b50079a3b406b4375a967 100644 (file)
--- a/debian/libblkid1.files.in
+++ b/debian/libblkid1.files.in
@@ -1 +1 @@
-lib/*/libblkid*
+lib/*/libblkid*.so.*

diff --git a/debian/libcomerr2.files.in b/debian/libcomerr2.files.in
index e4e5efc07efdd0a3df7811696e5e6894c02172d3..16b039ef3a60a23f7541c46adc4b210144a3727d 100644 (file)
--- a/debian/libcomerr2.files.in
+++ b/debian/libcomerr2.files.in
@@ -1 +1 @@
-lib/*/libcom_err*
+lib/*/libcom_err*.so.*

diff --git a/debian/libss2.files.in b/debian/libss2.files.in
index e5d8182b83228af5d735b777c58f10b30028f1f9..386e18542d5cf5e0acddc7e7464986376f3aab9d 100644 (file)
--- a/debian/libss2.files.in
+++ b/debian/libss2.files.in
@@ -1 +1 @@
-lib/*/libss*
+lib/*/libss*.so.*

diff --git a/debian/libuuid1.files.in b/debian/libuuid1.files.in
index 6dc05ce3e472599f63b0c8c88acce17911ea3adb..0761f3b8ca5939acb9414b98003c7f99e63403a3 100644 (file)
--- a/debian/libuuid1.files.in
+++ b/debian/libuuid1.files.in
@@ -1 +1 @@
-lib/*/libuuid*
+lib/*/libuuid*.so.*