[SCM] KDE Graphics module packaging branch, master, updated. debian/4.6.2-2

Modestas Vainius modax at alioth.debian.org
Mon May 2 00:55:37 UTC 2011


The following commit has been merged in the master branch:
commit e7b39466bfd3628978ee2110cd8640ad43adc4a4
Author: Modestas Vainius <modax at debian.org>
Date:   Mon May 2 03:20:32 2011 +0300

    Mark symbol which triggers FTBFS on gcc-4.4 arches as optional.
---
 debian/changelog           |    1 +
 debian/libkexiv2-9.symbols |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f5a36aa..d88eab6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 kdegraphics (4:4.6.2-2) UNRELEASED; urgency=low
 
   * Confirm symbol files on more debian arches.
+  * Mark symbol which triggers FTBFS on gcc-4.4 arches as optional.
 
  -- Modestas Vainius <modax at debian.org>  Mon, 02 May 2011 02:32:36 +0300
 
diff --git a/debian/libkexiv2-9.symbols b/debian/libkexiv2-9.symbols
index 60f7811..1e722e9 100644
--- a/debian/libkexiv2-9.symbols
+++ b/debian/libkexiv2-9.symbols
@@ -162,7 +162,7 @@ libkexiv2.so.9 libkexiv2-9 #MINVER#
  _ZN11KExiv2Iface6KExiv2D1Ev at Base 4:4.5.90
  _ZN11KExiv2Iface6KExiv2D2Ev at Base 4:4.5.90
  _ZN11KExiv2Iface6KExiv2aSERKS0_ at Base 4:4.5.90
- (arch=!ia64 !mips !s390 !sparc)_ZN5Exiv213toBasicStringIcA59_cEESbIT_St11char_traitsIS2_ESaIS2_EERKT0_ at Base 4:4.6.2
+ (optional=external|arch=!ia64 !mips !s390 !sparc)_ZN5Exiv213toBasicStringIcA59_cEESbIT_St11char_traitsIS2_ESaIS2_EERKT0_ at Base 4:4.6.2
  (optional=templinst|arch=!mips !s390 !sparc)_ZN5Exiv28toStringIjEESsRKT_ at Base 4:4.5.90
  (optional=templinst)_ZN5Exiv29ValueTypeIjE11setDataAreaEPKhl at Base 4:4.5.90
  (optional=templinst)_ZN5Exiv29ValueTypeIjE4readEPKhlNS_9ByteOrderE at Base 4:4.5.90

-- 
KDE Graphics module packaging



More information about the pkg-kde-commits mailing list