[SCM] libdvdnav/master: Remove dvdnav-config.

[bdrung at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit fee5e0c30dcea2efb381740f0df895173aed4de1
Author: Benjamin Drung <bdrung at debian.org>
Date:   Sat Jan 11 21:28:06 2014 +0100

    Remove dvdnav-config.
    
    It breaks multi-arch. Use the pkg-config file instead!

diff --git a/debian/libdvdnav-dev.install b/debian/libdvdnav-dev.install
index ab418d3..7272386 100644
--- a/debian/libdvdnav-dev.install
+++ b/debian/libdvdnav-dev.install
@@ -1,4 +1,3 @@
-usr/bin
 usr/include
 usr/lib/*/*.a
 usr/lib/*/*.so
diff --git a/debian/libdvdnav-dev.manpages b/debian/libdvdnav-dev.manpages
deleted file mode 100644
index 2fb19fb..0000000
--- a/debian/libdvdnav-dev.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/manpages/*
diff --git a/debian/manpages/dvdnav-config.1 b/debian/manpages/dvdnav-config.1
deleted file mode 100644
index 341bfb9..0000000
--- a/debian/manpages/dvdnav-config.1
+++ /dev/null
@@ -1,47 +0,0 @@
-.TH DVDNAV 1 "16 May 2002" Version 0.1.0
-.SH NAME
-dvdnav-config - script to get information about the installed version of libdvdnav
-.SH SYNOPSIS
-.B  dvdnav-config [\-\-prefix\fI[=DIR]\fP] [\-\-exec\-prefix\fI[=DIR]\fP] [\-\-version] [\-\-libs] [\-\-cflags]
-.SH DESCRIPTION
-.PP
-\fIdvdnav-config\fP is a tool that is used to configure to determine
-the compiler and linker flags that should be used to compile
-and link programs that use \fIlibdvdnav\fP. It is also used internally
-to the .m4 macros for GNU autoconf that are included with \fIlibdvdnav\fP.
-.
-.SH OPTIONS
-\fIdvdnav-config\fP accepts the following options:
-.TP 8
-.B  \-\-version
-Print the currently installed version of \fIlibdvdnav\fP on the standard output.
-.TP 8
-.B  \-\-libs
-Print the linker flags that are necessary to link a \fIlibdvdnav\fP program.
-.TP 8
-.B  \-\-cflags
-Print the compiler flags that are necessary to compile a \fIlibdvdnav\fP program.
-.TP 8
-.B  \-\-prefix=PREFIX
-If specified, use PREFIX instead of the installation prefix that \fIlibdvdnav\fP
-was built with when computing the output for the \-\-cflags and
-\-\-libs options. This option is also used for the exec prefix
-if \-\-exec\-prefix was not specified. This option must be specified
-before any \-\-libs or \-\-cflags options.
-.TP 8
-.B  \-\-exec\-prefix=PREFIX
-If specified, use PREFIX instead of the installation exec prefix that
-\fIlibdvdnav\fP was built with when computing the output for the \-\-cflags
-and \-\-libs options.  This option must be specified before any
-\-\-libs or \-\-cflags options.
-.SH COPYRIGHT
-Copyright \(co  1998 Owen Taylor
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation.
-
-This manual page was adapted by Philipp Matthias Hahn <pmhahn at debian.org>,
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/rules b/debian/rules
index 65ae931..c74722f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,6 +24,8 @@ override_dh_auto_install:
 	# Removing unused files
 	rm -f debian/tmp/usr/lib/*/*.la
 	rm -rf debian/tmp/usr/share/aclocal
+	# Remove dvdnav-config. It breaks multi-arch. Use the pkg-config file instead!
+	rm debian/tmp/usr/bin/dvdnav-config
 
 override_dh_install:
 	dh_install --fail-missing

-- 
libdvdnav packaging