[Pkg-xfce-commits] r7116 - in desktop/trunk/libxfce4util/debian: . patches

[Yves-Alexis Perez]

Author: corsac
Date: 2012-07-22 16:00:49 +0000 (Sun, 22 Jul 2012)
New Revision: 7116

Added:
   desktop/trunk/libxfce4util/debian/patches/02_fix-abicheck.sh.patch
Modified:
   desktop/trunk/libxfce4util/debian/changelog
   desktop/trunk/libxfce4util/debian/patches/series
Log:
* debian/patches:
  - 02_fix-abicheck.sh.patch added, fix FTBFS on ppc64.

Modified: desktop/trunk/libxfce4util/debian/changelog
===================================================================
--- desktop/trunk/libxfce4util/debian/changelog	2012-07-22 15:44:08 UTC (rev 7115)
+++ desktop/trunk/libxfce4util/debian/changelog	2012-07-22 16:00:49 UTC (rev 7116)
@@ -1,7 +1,12 @@
 libxfce4util (4.8.2-2) UNRELEASED; urgency=low
 
+  [ Lionel Le Folgoc ]
   * debian/patches: add missing DEP3 headers.
 
+  [ Yves-Alexis Perez ]
+  * debian/patches:
+    - 02_fix-abicheck.sh.patch added, fix FTBFS on ppc64.
+
  -- Lionel Le Folgoc <mrpouit at gmail.com>  Mon, 20 Feb 2012 21:42:16 +0100
 
 libxfce4util (4.8.2-1) unstable; urgency=low

Added: desktop/trunk/libxfce4util/debian/patches/02_fix-abicheck.sh.patch
===================================================================
--- desktop/trunk/libxfce4util/debian/patches/02_fix-abicheck.sh.patch	                        (rev 0)
+++ desktop/trunk/libxfce4util/debian/patches/02_fix-abicheck.sh.patch	2012-07-22 16:00:49 UTC (rev 7116)
@@ -0,0 +1,16 @@
+Description: fix abicheck.sh for ppc64
+Author: Aurelien Jarno <aurel32 at debian.org>
+Bug: https://bugzilla.xfce.org/show_bug.cgi?id=9146
+Bug-Debian: http://bugs.debian.org/682414
+
+Index: libxfce4util-4.8.2/libxfce4util/abicheck.sh
+===================================================================
+--- libxfce4util-4.8.2.orig/libxfce4util/abicheck.sh	2011-09-12 20:45:56.000000000 +0200
++++ libxfce4util-4.8.2/libxfce4util/abicheck.sh	2012-07-22 17:56:01.110884435 +0200
+@@ -20,5 +20,5 @@
+ #
+ 
+ cpp -P -DINCLUDE_INTERNAL_SYMBOLS -DINCLUDE_VARIABLES -DALL_FILES ${srcdir:-.}/libxfce4util.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE//' | sort > expected-abi
+-nm -D .libs/libxfce4util.so | grep " T\|R\|G " | cut -d ' ' -f 3 | grep -v '^_.*' | grep -v '^ *$' | sort > actual-abi
++nm -D .libs/libxfce4util.so | grep " T\|R\|G\|D " | cut -d ' ' -f 3 | grep -v '^_.*' | grep -v '^ *$' | sort > actual-abi
+ diff -u expected-abi actual-abi && rm expected-abi actual-abi

Modified: desktop/trunk/libxfce4util/debian/patches/series
===================================================================
--- desktop/trunk/libxfce4util/debian/patches/series	2012-07-22 15:44:08 UTC (rev 7115)
+++ desktop/trunk/libxfce4util/debian/patches/series	2012-07-22 16:00:49 UTC (rev 7116)
@@ -1 +1,2 @@
 01_add-desktop-base-in-config-dirs.patch
+02_fix-abicheck.sh.patch