[SCM] KDE Base Workspace module packaging branch, kde4.5, updated. debian/4.4.5-3-29-g76de6e3

George Kiagiadakis gkiagia-guest at alioth.debian.org
Fri Aug 20 09:52:32 UTC 2010


The following commit has been merged in the kde4.5 branch:
commit 6c04ac2b0aef75a566beb43f096c7867b9f7d28b
Author: George Kiagiadakis <kiagiadakis.george at gmail.com>
Date:   Fri Aug 20 11:54:40 2010 +0300

    Drop patch 27_ld_exclude_libs_qtuitools.diff. Fixed upstream.
---
 debian/changelog                                 |    1 +
 debian/patches/27_ld_exclude_libs_qtuitools.diff |   18 ------------------
 debian/patches/series                            |    1 -
 3 files changed, 1 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a28693a..414de5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -49,6 +49,7 @@ kdebase-workspace (4:4.5.0-0r1) UNRELEASED; urgency=low
   * Re-work patch 11_kdm_X_path.diff.
   * Extend patch 21_kdm_doesnt_use_kstandarddirs.diff to also patch
     the new kdm kcm kauth helper.
+  * Drop patch 27_ld_exclude_libs_qtuitools.diff. Fixed upstream.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 31 Jul 2010 16:41:50 +0300
 
diff --git a/debian/patches/27_ld_exclude_libs_qtuitools.diff b/debian/patches/27_ld_exclude_libs_qtuitools.diff
deleted file mode 100644
index 0faeba2..0000000
--- a/debian/patches/27_ld_exclude_libs_qtuitools.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Author: Modestas Vainius <modax at debian.org>
-Description: do not export QtUiTools symbols in the libprocessui dynamic symbol table
-Forwarded: no
-Origin: vendor
-Last-Update: 2010-04-30
-
---- a/libs/ksysguard/processui/CMakeLists.txt
-+++ b/libs/ksysguard/processui/CMakeLists.txt
-@@ -22,6 +22,9 @@
- 
- kde4_add_library(processui SHARED ${processui_LIB_SRCS})
- 
-+# Do not export QtUiTools internal symbols
-+set_target_properties(processui PROPERTIES LINK_FLAGS_DEBIAN "-Wl,--exclude-libs -Wl,libQtUiTools.a")
-+
- if(X11_XRes_FOUND)
-   target_link_libraries(processui ${X11_XRes_LIB} ${X11_LIBRARIES})
-   include_directories(${X11_XRes_INCLUDE_PATH})
diff --git a/debian/patches/series b/debian/patches/series
index a4e5f97..a097932 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,5 +11,4 @@
 22_kdm_xreset_hook_framework.diff
 26_run_kaboom_when_starting_kde.diff
 97_fix_target_link_libraries.diff
-27_ld_exclude_libs_qtuitools.diff
 99_solid_network_use_ntrack.diff

-- 
KDE Base Workspace module packaging



More information about the pkg-kde-commits mailing list