[SCM] Qt 4 Debian packaging branch, experimental-snapshots, updated. debian/4.6.2-5-2-gd3ee0a2

Fathi Boudra fabo at alioth.debian.org
Fri May 21 07:59:05 UTC 2010


The following commit has been merged in the experimental-snapshots branch:
commit 4b55c3df3040ce269a4e8cd368746e472d132aab
Author: Fathi Boudra <fabo at debian.org>
Date:   Mon May 17 15:23:25 2010 +0300

    Rename patch 52 to 98_alpha_ftbfs_wtf_platform_support.diff
    Use webkit mainstream definition for alpha platform.
---
 ...ff => 98_alpha_ftbfs_wtf_platform_support.diff} |    2 +-
 debian/patches/series                              |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/patches/52_wtf_platform_support_alpha.diff b/debian/patches/98_alpha_ftbfs_wtf_platform_support.diff
similarity index 96%
rename from debian/patches/52_wtf_platform_support_alpha.diff
rename to debian/patches/98_alpha_ftbfs_wtf_platform_support.diff
index b96adc6..ac9a9c8 100644
--- a/debian/patches/52_wtf_platform_support_alpha.diff
+++ b/debian/patches/98_alpha_ftbfs_wtf_platform_support.diff
@@ -13,7 +13,7 @@ Last-Update: 2010-04-19
  #endif
  
 +/* PLATFORM(ALPHA) */
-+#if defined(__alpha) || defined(__alpha__)
++#if defined(__alpha__)
 +#define WTF_PLATFORM_ALPHA 1
 +#endif
 +
diff --git a/debian/patches/series b/debian/patches/series
index af93b8c..6599108 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -36,7 +36,6 @@
 41_disable_opengl_visibility.diff
 50_kfreebsd_build_fix.diff
 51_kfreebsd_strnstr_build_fix.diff
-52_wtf_platform_support_alpha.diff
 70_hppa_ldcw_fix.diff
 71_hppa_unaligned_access_fix_458133.diff
 80_hurd_max_path.diff
@@ -48,3 +47,4 @@
 95_sparc_platform_definition.diff
 96_webkit_no_gc_sections.diff
 97_alpha_ftbfs_qatomic_alpha_h_types.diff
+98_alpha_ftbfs_wtf_platform_support.diff

-- 
Qt 4 Debian packaging



More information about the pkg-kde-commits mailing list