[SCM] ardour/master: Fixes conflict between ardour and ardour-data (Closes: #834488)

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

The following commit has been merged in the master branch:
commit 7d85cfe4373adc8f1bf046d41e36c74a2af645e2
Author: Kaj Ailomaa <zequence at mousike.me>
Date:   Thu Aug 18 19:31:57 2016 +0200

    Fixes conflict between ardour and ardour-data (Closes: #834488)

diff --git a/debian/ardour.install b/debian/ardour.install
index b2f3b2c..5844dfb 100644
--- a/debian/ardour.install
+++ b/debian/ardour.install
@@ -1,4 +1,5 @@
 debian/tmp/etc/*
-debian/tmp/usr/*
+debian/tmp/usr/bin/*
+debian/tmp/usr/lib/*
 debian/*.svg usr/share/pixmaps
 debian/ardour.desktop usr/share/applications
diff --git a/debian/changelog b/debian/changelog
index 5b35642..2894a94 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ardour (1:5.0~dfsg-2) unstable; urgency=medium
+
+  * Fix conlict between ardour and ardour-data (Closes: #834488)
+
+ -- Kaj Ailomaa <zequence at mousike.me>  Thu, 18 Aug 2016 19:32:14 +0200
+
 ardour (1:5.0~dfsg-1) unstable; urgency=medium
 
   * Imported Upstream version 5.0~dfsg

-- 
ardour Debian packaging