[SCM] kalgebra packaging branch, kubuntu_vivid_archive, updated. debian/4.14.2-1-11-g6fb64ab

[Harald Sitter]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 6fb64ab82374d396a4b37eeb845506d433b95827
Author: Harald Sitter <sitter at kde.org>
Date:   Tue Dec 9 12:58:15 2014 +0100

    restore files removed in crap commit
    
    This partially reverts commit 171239a49563b6dc8fed96ae08f45ae34bacb857.
---
 debian/.gitattributes                   | 1 +
 debian/kalgebra.lintian-overrides       | 2 ++
 debian/kalgebramobile.lintian-overrides | 1 +
 debian/source/local-options             | 1 +
 4 files changed, 5 insertions(+)

diff --git a/debian/.gitattributes b/debian/.gitattributes
new file mode 100644
index 0000000..6a03163
--- /dev/null
+++ b/debian/.gitattributes
@@ -0,0 +1 @@
+changelog merge=dpkg-mergechangelogs
diff --git a/debian/kalgebra.lintian-overrides b/debian/kalgebra.lintian-overrides
new file mode 100644
index 0000000..33fe046
--- /dev/null
+++ b/debian/kalgebra.lintian-overrides
@@ -0,0 +1,2 @@
+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
new file mode 100644
index 0000000..2233628
--- /dev/null
+++ b/debian/kalgebramobile.lintian-overrides
@@ -0,0 +1 @@
+kalgebramobile: binary-without-manpage usr/bin/kalgebramobile
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..2ee6f0f
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1 @@
+abort-on-upstream-changes

-- 
kalgebra packaging