[SCM] Qt 4 Debian packaging branch, master, updated. debian/4.6.2-5-12-g25e71eb
Fathi Boudra
fabo at alioth.debian.org
Tue Jun 8 13:37:30 UTC 2010
The following commit has been merged in the master branch:
commit 25e71ebfc87f18939dbfc51f407115bb6dd23e15
Author: Fathi Boudra <fabo at debian.org>
Date: Tue Jun 8 16:35:47 2010 +0300
enable patch 11 - needed for released tarball
---
debian/changelog | 1 -
debian/patches/series | 2 +-
2 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 751706b..320eb3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,7 +20,6 @@ qt4-x11 (4:4.6.3-1) unstable; urgency=low
- 0005_always_redraw_the_complete_control.diff - stolen upstream
- 0006_expand_indicator_would_not_be_displayed.diff - stolen upstream
* Remove Debian patches:
- - 11_build_translations.diff - disabled
- 97_alpha_ftbfs_qatomic_alpha_h_types.diff - merged upstream
- 98_alpha_ftbfs_wtf_platform_support.diff - merged upstream
* Refresh Debian patches:
diff --git a/debian/patches/series b/debian/patches/series
index b67900b..51b310e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,7 +18,7 @@
08_configure_quilt_compat.diff
09_qmake_lflags_as-needed.diff
10_config_tests_fixes.diff
-#11_build_translations.diff
+11_build_translations.diff
12_add_nostrip_for_debug_packages.diff
15_fix_qmake_makefile_generation.diff
16_hide_std_symbols_on_qtwebkit.diff
--
Qt 4 Debian packaging
More information about the pkg-kde-commits
mailing list