[SCM] xvidcore/master: Upstream updated their autoconf stuff, so we drop ours.

fabian-guest at users.alioth.debian.org fabian-guest at users.alioth.debian.org
Mon Mar 28 07:55:55 UTC 2011


The following commit has been merged in the master branch:
commit 502a0246e2ac002b7fe6c8aa764796a06c1730de
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Mon Mar 28 09:50:26 2011 +0200

    Upstream updated their autoconf stuff, so we drop ours.

diff --git a/debian/control b/debian/control
index e15c02c..4171d22 100644
--- a/debian/control
+++ b/debian/control
@@ -7,8 +7,6 @@ Uploaders: Loïc Martin <loic.martin3 at gmail.com>,
            Fabian Greffrath <fabian+debian at greffrath.com>,
            Andres Mejia <mcitadel at gmail.com>
 Build-Depends: debhelper (>= 7.3~),
-               autoconf,
-               autotools-dev (>= 20100122.1~),
                nasm (>= 2.0) [i386 amd64]
 Standards-Version: 3.9.1
 Homepage: http://www.xvid.org/
diff --git a/debian/rules b/debian/rules
index ccd385b..f30b58b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,17 +5,8 @@
 CFLAGS = $(or $(DEB_CFLAGS),)
 
 %:
-	dh $@ --sourcedirectory=build/generic \
-		--with autotools_dev
+	dh $@ --sourcedirectory=build/generic
 
 override_dh_auto_clean:
-	[ ! -f build/generic/configure.xvid ] || \
-	mv build/generic/configure.xvid build/generic/configure
 	touch build/generic/platform.inc
 	dh_auto_clean
-
-override_dh_auto_configure:
-	[ -f build/generic/configure.xvid ] || \
-	mv build/generic/configure build/generic/configure.xvid
-	cd build/generic && autoconf
-	dh_auto_configure

-- 
xvidcore packaging



More information about the pkg-multimedia-commits mailing list