[SCM] libdvdread/master: Remove dvdread-config.
bdrung at users.alioth.debian.org
bdrung at users.alioth.debian.org
Wed Jan 8 22:47:12 UTC 2014
The following commit has been merged in the master branch:
commit 0daf3781bc10e007ada8795e422ccf8471634836
Author: Benjamin Drung <bdrung at debian.org>
Date: Wed Jan 8 23:38:15 2014 +0100
Remove dvdread-config.
It breaks multi-arch. Use the pkg-config file instead!
Closes: #734440
diff --git a/debian/libdvdread-dev.install b/debian/libdvdread-dev.install
index 77e5e1d..7272386 100644
--- a/debian/libdvdread-dev.install
+++ b/debian/libdvdread-dev.install
@@ -1,6 +1,4 @@
-usr/bin
usr/include
usr/lib/*/*.a
usr/lib/*/*.so
usr/lib/*/pkgconfig
-usr/share/man/man1/dvdread-config.1
diff --git a/debian/patches/series b/debian/patches/series
index 1d08197..6d362a2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,4 +5,3 @@
0005-hurd.patch
0006-descriptor.patch
0007-segfault.patch
-add-man-page.patch
diff --git a/debian/rules b/debian/rules
index 1775660..aeff7dc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,6 +17,8 @@ override_dh_auto_install:
# Removing unused files
rm -f debian/tmp/usr/lib/*/*.la
rm -rf debian/tmp/usr/share/aclocal
+ # Remove dvdread-config. It breaks multi-arch. Use the pkg-config file instead!
+ rm debian/tmp/usr/bin/dvdread-config
override_dh_install:
dh_install --fail-missing
--
libdvdread packaging
More information about the pkg-multimedia-commits
mailing list