[SCM] extra-cmake-modules packaging branch, kubuntu_unstable, updated. debian/1.0.0-1-13-g4bd1827

[Kubuntu CI (Harald Sitter)]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/extra-cmake-modules.git;a=commitdiff;h=4bd1827

The following commit has been merged in the kubuntu_unstable branch:
commit 4bd1827a429be17a9b32d4a85e5793b1ca35966b
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Fri Nov 7 16:09:53 2014 +0100

     New upstream release
    
    * New upstream release
    * Fix changelog.
---
 debian/.gitattributes | 1 -
 debian/changelog      | 7 ++++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/.gitattributes b/debian/.gitattributes
deleted file mode 100644
index 6a03163..0000000
--- a/debian/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-changelog merge=dpkg-mergechangelogs
diff --git a/debian/changelog b/debian/changelog
index 9db683f..49161ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-extra-cmake-modules (1.4.0-0ubuntu1~unbuntu15.04~ppa1) vivid; urgency=medium
+extra-cmake-modules (1.4.0-0ubuntu1) vivid; urgency=medium
 
-  * New upstream release. 
+  * New upstream release
+  * Fix changelog.
 
- -- Scarlett Clark <sgclark at kubuntu.org>  Tue, 04 Nov 2014 19:45:08 +0000
+ -- Scarlett Clark <sgclark at kubuntu.org>  Tue, 04 Nov 2014 19:49:09 +0000
 
 extra-cmake-modules (1.3.0-0ubuntu1) utopic; urgency=medium
 

-- 
extra-cmake-modules packaging