From b86224d11e6d5b09c2e2956a79e1f1bf7df38b91 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Wed, 4 Apr 2007 17:32:51 +0100 Subject: Always build .debs using internal ffmpeg (Debian ffmpeg versioning madness). --- debian/rules | 3 --- 1 file changed, 3 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index ef1347e49..9878e97fc 100755 --- a/debian/rules +++ b/debian/rules @@ -62,13 +62,10 @@ endif CONFIGURE_FLAGS := --prefix=/usr \ --mandir=\$${prefix}/share/man \ --with-external-libmad \ - --with-external-ffmpeg \ --with-external-a52dec \ --with-external-libdts \ --disable-cacatest \ $(DEB_BUILD_CONFIG_OPTIONS) \ - FFMPEG_CFLAGS="`pkg-config --cflags libavcodec`" \ - FFMPEG_LIBS="`pkg-config --libs libavcodec`" \ CFLAGS="$(CFLAGS)" configure: configure-stamp -- cgit v1.2.3 From 3a79edacfeff0b3f77107058315cac9d84df1fa3 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Wed, 4 Apr 2007 18:20:47 +0100 Subject: Fix a package build failure (documentation location renaming). --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 9878e97fc..8e4ca67fe 100755 --- a/debian/rules +++ b/debian/rules @@ -123,7 +123,7 @@ binary-arch: build install mkdir -p debian/tmp/usr/share/bug/libxine${major}/ cp debian/reportbug.presubj debian/tmp/usr/share/bug/libxine${major}/presubj # ugly hack, documentation should never have been in /u/s/d/xine/... - mv debian/tmp/usr/share/doc/xine debian/tmp/usr/share/doc/libxine${major} + mv debian/tmp/usr/share/doc/xine-lib debian/tmp/usr/share/doc/libxine${major} # build libxine${major} package by moving files from libxine-dev dh_install --autodest --sourcedir=debian/tmp --list-missing dh_installdocs -- cgit v1.2.3