[SCM] analitza packaging branch, kubuntu_vivid_archive, updated. debian/4.14.0-1-11-g0c107fe

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 0c107fead66440a0a568d095d6c04246ed95e816
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Thu Dec 18 13:24:19 2014 +0100

    NOCI
---
 debian/changelog                            |  6 ++++++
 debian/patches/series                       |  1 -
 debian/patches/upstream_bump-soversion.diff | 11 -----------
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0a6aa20..e85b825 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+analitza (4:14.12.0-0ubuntu1) vivid; urgency=medium
+
+  * New upstream release
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 18 Dec 2014 13:06:59 +0100
+
 analitza (4:14.11.97-0ubuntu4) vivid; urgency=medium
 
   * Update .symbols file for armhf
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 801dfde..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-upstream_bump-soversion.diff
diff --git a/debian/patches/upstream_bump-soversion.diff b/debian/patches/upstream_bump-soversion.diff
deleted file mode 100644
index ff82dd0..0000000
--- a/debian/patches/upstream_bump-soversion.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt	2014-11-13 02:56:51.000000000 +0100
-+++ b/CMakeLists.txt	2014-12-04 13:50:54.488651450 +0100
-@@ -25,7 +25,7 @@
- ecm_create_qm_loader(analitza_QM_LOADER analitza_qt)
- set(ANALITZA_INCLUDE_INSTALL_DIR "${INCLUDE_INSTALL_DIR}/Analitza5")
- 
--ecm_setup_version(5.0.0 VARIABLE_PREFIX ANALITZA
-+ecm_setup_version(6.0.0 VARIABLE_PREFIX ANALITZA
-                         VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/analitza_version.h"
-                         PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/Analitza5ConfigVersion.cmake")
- 

-- 
analitza packaging