[SCM] libva/master: v2 patch prevents "make all" from traversing debian.upstream. * Minimal changes to Makefile.am (modify SUBDIRS list) * Also update changelog.

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

The following commit has been merged in the master branch:
commit c3bf99f14f68e646e331a51e3e78624838f7a55b
Author: Nicholas D Steeves <nsteeves at gmail.com>
Date:   Sun Jul 17 18:30:49 2016 -0400

    v2 patch prevents "make all" from traversing debian.upstream.
      * Minimal changes to Makefile.am (modify SUBDIRS list)
      * Also update changelog.

diff --git a/debian/changelog b/debian/changelog
index 26152a5..cd1ddf6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,8 +9,8 @@ libva (1.7.1-2) UNRELEASED; urgency=medium
   * debian/clean: Remove obsolete files.
 
   [ Nicholas D Steeves ]
-  * debian/patches/ignore-debian.upstream.patch: Remove debian.upstream
-    from Makefile.am
+  * debian/patches/ignore-debian.upstream.patch: prevent "make all" from
+    traversing debian.upstream
 
  -- 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 f9ef0b1..9838c8f 100644
--- a/debian/patches/ignore-debian.upstream.patch
+++ b/debian/patches/ignore-debian.upstream.patch
@@ -43,19 +43,3 @@ Index: libva/Makefile.am
  
  # Extra clean files so that maintainer-clean removes *everything*
  MAINTAINERCLEANFILES = \
-@@ -33,15 +33,3 @@ MAINTAINERCLEANFILES = \
- 	Makefile.in missing
- 
- DEB_BUILDDIR = debian.build
--
--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

-- 
libva packaging