[SCM] kalgebra packaging branch, kubuntu_vivid_archive, updated. debian/4.14.2-1-9-gabfa9c1

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 171239a49563b6dc8fed96ae08f45ae34bacb857
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Fri Dec 5 16:34:55 2014 +0100

    update to 14.11.97
---
 debian/.gitattributes                   |  1 -
 debian/changelog                        | 10 +++-------
 debian/kalgebra.lintian-overrides       |  2 --
 debian/kalgebramobile.lintian-overrides |  1 -
 debian/source/local-options             |  1 -
 5 files changed, 3 insertions(+), 12 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 9b33cfe..35f2671 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,11 @@
-kalgebra (4:14.11.97-0ubuntu1) UNRELEASED; urgency=medium
+kalgebra (4:14.11.97-0ubuntu1~ubuntu15.04~ppa4) vivid; urgency=medium
 
-  [ Jonathan Riddell ]
   * New upstream release
   * Update build-deps for Qt 5 port
   * in debian/rules to pkg-kde version 3
+  * PPA build
 
-  [ Harald Sitter ]
-  * Lintian override missing manpages as those ought to be written upstream
-    or not at all.
-
- -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 04 Dec 2014 14:44:04 +0100
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 04 Dec 2014 18:41:41 +0100
 
 kalgebra (4:4.14.2-1) unstable; urgency=medium
 
diff --git a/debian/kalgebra.lintian-overrides b/debian/kalgebra.lintian-overrides
deleted file mode 100644
index 33fe046..0000000
--- a/debian/kalgebra.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-kalgebra: binary-without-manpage usr/bin/calgebra
-kalgebra: binary-without-manpage usr/bin/kalgebra
diff --git a/debian/kalgebramobile.lintian-overrides b/debian/kalgebramobile.lintian-overrides
deleted file mode 100644
index 2233628..0000000
--- a/debian/kalgebramobile.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-kalgebramobile: binary-without-manpage usr/bin/kalgebramobile
diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644
index 2ee6f0f..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1 +0,0 @@
-abort-on-upstream-changes

-- 
kalgebra packaging