[SCM] libva/master: Don't patch any Makefile.in if dh_autoreconf is used Thanks for the tip Sebastian!

[sten-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 833f1ff432601266f3480adf120e76756a6c3f8f
Author: Nicholas D Steeves <nsteeves at gmail.com>
Date:   Sun Jul 17 17:35:24 2016 -0400

    Don't patch any Makefile.in if dh_autoreconf is used
    Thanks for the tip Sebastian!

diff --git a/debian/changelog b/debian/changelog
index e97e733..26152a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,7 +10,7 @@ libva (1.7.1-2) UNRELEASED; urgency=medium
 
   [ Nicholas D Steeves ]
   * debian/patches/ignore-debian.upstream.patch: Remove debian.upstream
-    from Makefile.am and Makefile.in
+    from Makefile.am
 
  -- Nicholas D Steeves <nsteeves at gmail.com>  Sat, 16 Jul 2016 21:09:06 -0400
 
diff --git a/debian/patches/ignore-debian.upstream.patch b/debian/patches/ignore-debian.upstream.patch
index 5bd56fc..f9ef0b1 100644
--- a/debian/patches/ignore-debian.upstream.patch
+++ b/debian/patches/ignore-debian.upstream.patch
@@ -59,36 +59,3 @@ Index: libva/Makefile.am
 -	tar zxvf ../$(PACKAGE)-$(VERSION).tar.gz	&& \
 -	cd $(PACKAGE)-$(VERSION)			&& \
 -	$(MAKE) deb -f Makefile.am
-Index: libva/Makefile.in
-===================================================================
---- libva.orig/Makefile.in
-+++ libva/Makefile.in
-@@ -371,7 +371,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
- AUTOMAKE_OPTIONS = foreign
--SUBDIRS = va dummy_drv_video pkgconfig test debian.upstream doc
-+SUBDIRS = va dummy_drv_video pkgconfig test doc
- 
- # Extra clean files so that maintainer-clean removes *everything*
- MAINTAINERCLEANFILES = \
-@@ -861,19 +861,6 @@ uninstall-am:
- 	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
- 	uninstall-am
- 
--
--deb:
--	@[ -d debian ] || ln -s debian.upstream debian
--	dpkg-buildpackage -rfakeroot -uc -us
--
--deb.upstream: dist
--	-mkdir -p $(DEB_BUILDDIR)
--	cd $(DEB_BUILDDIR)				&& \
--	rm -rf $(PACKAGE)-$(VERSION)			&& \
--	tar zxvf ../$(PACKAGE)-$(VERSION).tar.gz	&& \
--	cd $(PACKAGE)-$(VERSION)			&& \
--	$(MAKE) deb -f Makefile.am
--
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:

-- 
libva packaging