[SCM] okteta packaging branch, kubuntu_vivid_archive, updated. debian/4.14.2-1-3-g3aaa7bd

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 3aaa7bde19d7629bcc4bfe44c965e50320d55e68
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Thu Dec 18 19:28:55 2014 +0100

     Update .symbols files
    
    * Update .symbols files
    * Add back change in debian/rules, work around a link failure
      when built with -O3 on ppc64el.
---
 debian/changelog              | 8 ++++++++
 debian/libkasten3gui3.symbols | 8 ++++----
 debian/rules                  | 7 +++++++
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b701ba8..47dbbb1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+okteta (4:14.12.0-0ubuntu3) vivid; urgency=medium
+
+  * Update .symbols files
+  * Add back change in debian/rules, work around a link failure
+    when built with -O3 on ppc64el.
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 18 Dec 2014 19:28:06 +0100
+
 okteta (4:14.12.0-0ubuntu2) vivid; urgency=medium
 
   * Update .symbols files
diff --git a/debian/libkasten3gui3.symbols b/debian/libkasten3gui3.symbols
index 1fa7165..568a1ed 100644
--- a/debian/libkasten3gui3.symbols
+++ b/debian/libkasten3gui3.symbols
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 4:14.12.0 amd64
+# SymbolsHelper-Confirmed: 4:14.12.0 amd64 arm64 armhf i386 powerpc ppc64el
 libkasten3gui.so.3 libkasten3gui3 #MINVER#
  ABI_3_0 at ABI_3_0 4:14.12.0
  _ZN6Kasten11ShellWindow11qt_metacallEN11QMetaObject4CallEiPPv at ABI_3_0 4:14.12.0
@@ -415,7 +415,7 @@ libkasten3gui.so.3 libkasten3gui3 #MINVER#
  _ZTVN6Kasten17AbstractLinePopupE at ABI_3_0 4:14.12.0
  _ZTVN6Kasten18AbstractControllerE at ABI_3_0 4:14.12.0
  _ZTVN6Kasten18AbstractToolWidgetE at ABI_3_0 4:14.12.0
- _ZTVN6Kasten19AbstractViewFactoryE at ABI_3_0 4:14.12.0
+ (arch=!armhf)_ZTVN6Kasten19AbstractViewFactoryE at ABI_3_0 4:14.12.0
  _ZTVN6Kasten20AbstractGroupedViewsE at ABI_3_0 4:14.12.0
  _ZTVN6Kasten21AbstractSelectionViewE at ABI_3_0 4:14.12.0
  _ZTVN6Kasten21ModelCodecViewManagerE at ABI_3_0 4:14.12.0
@@ -431,8 +431,8 @@ libkasten3gui.so.3 libkasten3gui3 #MINVER#
  _ZTVN6Kasten38AbstractModelStreamEncoderConfigEditorE at ABI_3_0 4:14.12.0
  _ZTVN6Kasten40AbstractModelExporterConfigEditorFactoryE at ABI_3_0 4:14.12.0
  _ZTVN6Kasten42ModelEncoderFileSystemExporterConfigEditorE at ABI_3_0 4:14.12.0
- _ZTVN6Kasten45AbstractModelDataGeneratorConfigEditorFactoryE at ABI_3_0 4:14.12.0
- _ZTVN6Kasten45AbstractModelStreamEncoderConfigEditorFactoryE at ABI_3_0 4:14.12.0
+ (arch=!armhf)_ZTVN6Kasten45AbstractModelDataGeneratorConfigEditorFactoryE at ABI_3_0 4:14.12.0
+ (arch=!armhf)_ZTVN6Kasten45AbstractModelStreamEncoderConfigEditorFactoryE at ABI_3_0 4:14.12.0
  _ZTVN6Kasten49ModelEncoderFileSystemExporterConfigEditorFactoryE at ABI_3_0 4:14.12.0
  _ZTVN6Kasten9DummyViewE at ABI_3_0 4:14.12.0
  _ZTVN6Kasten9StatusBarE at ABI_3_0 4:14.12.0
diff --git a/debian/rules b/debian/rules
index ee77a19..4f24e8e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,12 @@
 #!/usr/bin/make -f
 
+ifeq ($(DEB_HOST_ARCH),ppc64el)
+export DEB_CFLAGS_MAINT_STRIP = -O3
+export DEB_CXXFLAGS_MAINT_STRIP = -O3
+export DEB_CFLAGS_MAINT_APPEND = -O2
+export DEB_CXXFLAGS_MAINT_APPEND = -O2
+endif
+
 dh = --with sodeps
 
 include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk

-- 
okteta packaging