[SCM] dvbcut/master: Use dh-autoreconf to run autoreconf before configuring the package.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 23c25addf6ed0a91a338c2c66e08360eaa29996d
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Apr 25 01:20:16 2012 +0200

    Use dh-autoreconf to run autoreconf before configuring the package.

diff --git a/debian/control b/debian/control
index 4e84b04..fe67426 100644
--- a/debian/control
+++ b/debian/control
@@ -6,9 +6,8 @@ Uploaders:
  Reinhard Tartler <siretart at tauware.de>,
  Fabrice Coutadeur <coutadeurf at gmail.com>
 Build-Depends:
- autoconf,
- autotools-dev,
  debhelper (>= 7.0.50~),
+ dh-autoreconf,
  liba52-0.7.4-dev,
  libao-dev,
  libavcodec-dev (>> 4:0.7~),
diff --git a/debian/rules b/debian/rules
index d4857a0..b38e375 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,19 +10,16 @@ CFLAGS := $(shell dpkg-buildflags --get CFLAGS)
 CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS)
 
 %:
-	dh $@
+	dh $@ --buildsystem=autoconf --with=autoreconf
 
 override_dh_auto_configure:
-	autoconf
-	cp -f /usr/share/misc/config.sub config.sub
-	cp -f /usr/share/misc/config.guess config.guess
-	dh_auto_configure --buildsystem=autoconf -- --with-ffmpeg=/usr
+	dh_auto_configure -- --with-ffmpeg=/usr
 
 override_dh_auto_clean:
 	rm -rf ffmpeg.src
 	rm -rf ffmpeg-patches
 	[ ! -f makefile ] || make -f makefile distclean
-	dh_clean config.sub config.guess bin/dvbcut configure dvbcut.desktop src/Makefile src/dvbcut src/qrc_icons.cpp
+	dh_clean bin/dvbcut dvbcut.desktop src/Makefile src/dvbcut src/qrc_icons.cpp
 	dh_auto_clean
 
 override_dh_auto_install:
diff --git a/debian/source/options b/debian/source/options
deleted file mode 100644
index aef38b9..0000000
--- a/debian/source/options
+++ /dev/null
@@ -1,2 +0,0 @@
-# Don't store changes on autogenerated files
-extend-diff-ignore = "(^|/)(config\.sub|config\.guess)$"

-- 
dvbcut packaging