[SCM] kdenlive packaging branch, kubuntu_xenial_archive, updated. ubuntu/4%15.08.2-0ubuntu1-561-gb8d8ab5

[Scarlett Clark]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kdenlive.git;a=commitdiff;h=c9356a8

The following commit has been merged in the kubuntu_xenial_archive branch:
commit c9356a812004c7c61ae750c403ea8ce829b920c7
Author: the-me <the-me at f1c9c430-f51a-44e6-a298-6f72677f57b2>
Date:   Sat May 16 19:09:53 2009 +0000

    * Add upstreams README to kdenlive.docs.
    
    
    git-svn-id: https://svn.linux-dev.org/svn/pkg/kdenlive/trunk/debian@897 f1c9c430-f51a-44e6-a298-6f72677f57b2
---
 changelog     | 6 ++++--
 kdenlive.docs | 1 +
 rules         | 3 +--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/changelog b/changelog
index 071882f..bc1cc41 100644
--- a/changelog
+++ b/changelog
@@ -2,11 +2,13 @@ kdenlive (0.7.3-2) UNRELEASED; urgency=low
 
   * Link to the LGPL-2 instead of GPL-2 for src/regiongrabber.{cpp,h} in
     debian/copyright.
-  * Remove ccache build dependencie to avoid kdenlive FTBFSing on Debian
+  * Remove ccache build dependencie and do not override the default compiler in
+    debian/rules to the ccache g++ one to avoid kdenlive FTBFSing on Debian
     buildds.
     Closes: #528967
+  * Add upstreams README to kdenlive.docs.
 
- -- Patrick Matthäi <pmatthaei at debian.org>  Sat, 16 May 2009 21:02:07 +0200
+ -- Patrick Matthäi <pmatthaei at debian.org>  Sat, 16 May 2009 21:09:18 +0200
 
 kdenlive (0.7.3-1) unstable; urgency=low
 
diff --git a/kdenlive.docs b/kdenlive.docs
index e174728..bac4caa 100644
--- a/kdenlive.docs
+++ b/kdenlive.docs
@@ -1 +1,2 @@
 debian/README.Debian
+README
diff --git a/rules b/rules
index 4873a2a..43d7ca9 100755
--- a/rules
+++ b/rules
@@ -36,8 +36,7 @@ configure-stamp:
 	cp -r man build
 	cp -r plugins build
 	cd build && cmake . -DCMAKE_INSTALL_PREFIX=/usr \
-	-DCMAKE_C_FLAGS:STRING="$(CFLAGS)" -DCMAKE_CXX_COMPILER=/usr/lib/ccache/g++ \
-	-DCMAKE_SKIP_RPATH:BOOL=YES
+	-DCMAKE_C_FLAGS:STRING="$(CFLAGS)" -DCMAKE_SKIP_RPATH:BOOL=YES
 	touch $@
 
 build: build-stamp

-- 
kdenlive packaging