[SCM] okteta packaging branch, kubuntu_vivid_archive, updated. debian/4.14.2-1-32-g40d65b2

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 40d65b23b96869702f32af560da2f9abaa16ed84
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Thu Apr 16 00:52:20 2015 +0200

    releasing package okteta version 4:14.12.3-0ubuntu4
---
 debian/.gitattributes                                              | 1 -
 debian/changelog                                                   | 7 +++++++
 ...n3controllers3.symbols => libkasten3controllers3.symbols.amd64} | 0
 debian/{libkasten3core3.symbols => libkasten3core3.symbols.amd64}  | 0
 debian/{libkasten3gui3.symbols => libkasten3gui3.symbols.amd64}    | 0
 ...ollers1.symbols => libkasten3okteta1controllers1.symbols.amd64} | 0
 ...n3okteta1core1.symbols => libkasten3okteta1core1.symbols.amd64} | 0
 ...ten3okteta1gui1.symbols => libkasten3okteta1gui1.symbols.amd64} | 0
 debian/{libokteta2core2.symbols => libokteta2core2.symbols.amd64}  | 0
 debian/{libokteta2gui2.symbols => libokteta2gui2.symbols.amd64}    | 0
 debian/source/local-options                                        | 1 -
 11 files changed, 7 insertions(+), 2 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 e3f5fb3..990a54c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+okteta (4:14.12.3-0ubuntu4) vivid; urgency=medium
+
+  * Move symbols files to amd64 only, I can't work out the other arches
+    alas
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 15 Apr 2015 23:11:10 +0200
+
 okteta (4:14.12.3-0ubuntu3) vivid; urgency=medium
 
   * Update symbols file
diff --git a/debian/libkasten3controllers3.symbols b/debian/libkasten3controllers3.symbols.amd64
similarity index 100%
rename from debian/libkasten3controllers3.symbols
rename to debian/libkasten3controllers3.symbols.amd64
diff --git a/debian/libkasten3core3.symbols b/debian/libkasten3core3.symbols.amd64
similarity index 100%
rename from debian/libkasten3core3.symbols
rename to debian/libkasten3core3.symbols.amd64
diff --git a/debian/libkasten3gui3.symbols b/debian/libkasten3gui3.symbols.amd64
similarity index 100%
rename from debian/libkasten3gui3.symbols
rename to debian/libkasten3gui3.symbols.amd64
diff --git a/debian/libkasten3okteta1controllers1.symbols b/debian/libkasten3okteta1controllers1.symbols.amd64
similarity index 100%
rename from debian/libkasten3okteta1controllers1.symbols
rename to debian/libkasten3okteta1controllers1.symbols.amd64
diff --git a/debian/libkasten3okteta1core1.symbols b/debian/libkasten3okteta1core1.symbols.amd64
similarity index 100%
rename from debian/libkasten3okteta1core1.symbols
rename to debian/libkasten3okteta1core1.symbols.amd64
diff --git a/debian/libkasten3okteta1gui1.symbols b/debian/libkasten3okteta1gui1.symbols.amd64
similarity index 100%
rename from debian/libkasten3okteta1gui1.symbols
rename to debian/libkasten3okteta1gui1.symbols.amd64
diff --git a/debian/libokteta2core2.symbols b/debian/libokteta2core2.symbols.amd64
similarity index 100%
rename from debian/libokteta2core2.symbols
rename to debian/libokteta2core2.symbols.amd64
diff --git a/debian/libokteta2gui2.symbols b/debian/libokteta2gui2.symbols.amd64
similarity index 100%
rename from debian/libokteta2gui2.symbols
rename to debian/libokteta2gui2.symbols.amd64
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

-- 
okteta packaging