[SCM] vdpau-video/master: Fix issue with debian.upstream/changelog being modified.

ceros-guest at users.alioth.debian.org ceros-guest at users.alioth.debian.org
Tue Mar 20 06:07:01 UTC 2012


The following commit has been merged in the master branch:
commit ca3b4aa0638533168039a38a53fbfb31f4f5096c
Author: Andres Mejia <amejia004 at gmail.com>
Date:   Tue Mar 20 01:57:37 2012 -0400

    Fix issue with debian.upstream/changelog being modified.

diff --git a/debian/rules b/debian/rules
index 0a858d4..260308e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,11 +6,17 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 	dh $@
 
 override_dh_auto_configure:
+	cp -f debian.upstream/changelog debian/debian.upstream-changelog
 	dh_auto_configure -- --enable-glx
 
 override_dh_auto_install:
 	dh_auto_install
 	rm $(CURDIR)/debian/vdpau-va-driver/usr/lib/$(DEB_HOST_MULTIARCH)/dri/*.la
 
+override_dh_clean:
+	test ! -f debian/debian.upstream-changelog || \
+		cp -f debian/debian.upstream-changelog debian.upstream/changelog
+	dh_clean debian/debian.upstream-changelog
+
 get-orig-source:
 	$(dir $_)vdpau-video-get-orig-source

-- 
vdpau-video packaging



More information about the pkg-multimedia-commits mailing list