rev 10437 - in branches/kde4/packages/kdelibs/debian: . patches
Modestas Vainius
modax-guest at alioth.debian.org
Thu May 1 16:55:18 UTC 2008
Author: modax-guest
Date: 2008-05-01 16:55:17 +0000 (Thu, 01 May 2008)
New Revision: 10437
Modified:
branches/kde4/packages/kdelibs/debian/changelog
branches/kde4/packages/kdelibs/debian/control
branches/kde4/packages/kdelibs/debian/patches/98_link_interface_libraries.diff
branches/kde4/packages/kdelibs/debian/patches/series
branches/kde4/packages/kdelibs/debian/rules
Log:
Enable ACL support. Fix link breakage.
99 patch disabled. Reenable for upload.
Modified: branches/kde4/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde4/packages/kdelibs/debian/changelog 2008-05-01 15:56:55 UTC (rev 10436)
+++ branches/kde4/packages/kdelibs/debian/changelog 2008-05-01 16:55:17 UTC (rev 10437)
@@ -1,3 +1,19 @@
+kde4libs (4:4.0.72+svn803012-1~pre1) UNRELEASED; urgency=low
+
+ * New upstream development snapshot:
+ - The latest upstream commit is r803012 by sebsauer
+ - Date: Thu, 01 May 2008 16:01:42 -0000
+
+ * 99 patch is disabled. Build is not for public usage.
+
+ +++ Changes by Modestas Vainius:
+
+ * Add libacl1-dev to build depends. Refresh 98 patch (kio_file build
+ failure).
+ * Allow to set UPSTREAMVERSION in the environment.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Thu, 01 May 2008 19:53:12 +0300
+
kde4libs (4:4.0.72-1) experimental; urgency=low
* New upstream snapshot. (r802761)
Modified: branches/kde4/packages/kdelibs/debian/control
===================================================================
--- branches/kde4/packages/kdelibs/debian/control 2008-05-01 15:56:55 UTC (rev 10436)
+++ branches/kde4/packages/kdelibs/debian/control 2008-05-01 16:55:17 UTC (rev 10437)
@@ -12,7 +12,7 @@
libxml2-dev, libxml2-utils, libxslt1-dev, libxtst-dev, libgif-dev,
libavahi-common-dev, libaspell-dev, libbz2-dev, libenchant-dev, libfam-dev,
libjasper-dev, libopenexr-dev, libpcre3-dev, libtiff4-dev, hspell, xsltproc,
- libglu1-mesa-dev, libenchant-dev
+ libglu1-mesa-dev, libenchant-dev, libacl1-dev
Standards-Version: 3.7.3
Homepage: http://www.kde.org/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/branches/kde4/packages/kdelibs
Modified: branches/kde4/packages/kdelibs/debian/patches/98_link_interface_libraries.diff
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/98_link_interface_libraries.diff 2008-05-01 15:56:55 UTC (rev 10436)
+++ branches/kde4/packages/kdelibs/debian/patches/98_link_interface_libraries.diff 2008-05-01 16:55:17 UTC (rev 10437)
@@ -1,5 +1,5 @@
---- kde4libs-4.0.72.orig/dnssd/CMakeLists.txt
-+++ kde4libs-4.0.72/dnssd/CMakeLists.txt
+--- kde4libs.orig/dnssd/CMakeLists.txt
++++ kde4libs/dnssd/CMakeLists.txt
@@ -59,8 +59,9 @@
if (HAVE_DNSSD)
target_link_libraries(kdnssd ${KDE4_KDEUI_LIBS} ${DNSSD_LIBRARIES} )
@@ -11,8 +11,8 @@
set_target_properties(kdnssd PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
install(TARGETS kdnssd ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
---- kde4libs-4.0.72.orig/interfaces/kimproxy/library/CMakeLists.txt
-+++ kde4libs-4.0.72/interfaces/kimproxy/library/CMakeLists.txt
+--- kde4libs.orig/interfaces/kimproxy/library/CMakeLists.txt
++++ kde4libs/interfaces/kimproxy/library/CMakeLists.txt
@@ -16,7 +16,7 @@
kde4_add_library(kimproxy SHARED ${kimproxy_LIB_SRCS})
@@ -22,8 +22,8 @@
set_target_properties(kimproxy PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
---- kde4libs-4.0.72.orig/interfaces/kmediaplayer/CMakeLists.txt
-+++ kde4libs-4.0.72/interfaces/kmediaplayer/CMakeLists.txt
+--- kde4libs.orig/interfaces/kmediaplayer/CMakeLists.txt
++++ kde4libs/interfaces/kmediaplayer/CMakeLists.txt
@@ -14,7 +14,7 @@
kde4_add_library(kmediaplayer SHARED ${kmediaplayer_LIB_SRCS})
@@ -33,8 +33,8 @@
set_target_properties(kmediaplayer PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
install(TARGETS kmediaplayer ${INSTALL_TARGETS_DEFAULT_ARGS})
---- kde4libs-4.0.72.orig/interfaces/ktexteditor/CMakeLists.txt
-+++ kde4libs-4.0.72/interfaces/ktexteditor/CMakeLists.txt
+--- kde4libs.orig/interfaces/ktexteditor/CMakeLists.txt
++++ kde4libs/interfaces/ktexteditor/CMakeLists.txt
@@ -25,6 +25,7 @@
kde4_add_library(ktexteditor SHARED ${ktexteditor_LIB_SRCS})
@@ -43,8 +43,8 @@
set_target_properties(ktexteditor PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
install(TARGETS ktexteditor ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
---- kde4libs-4.0.72.orig/kate/CMakeLists.txt
-+++ kde4libs-4.0.72/kate/CMakeLists.txt
+--- kde4libs.orig/kate/CMakeLists.txt
++++ kde4libs/kate/CMakeLists.txt
@@ -144,7 +144,7 @@
kde4_add_plugin(katepart ${katepart_PART_SRCS})
@@ -54,8 +54,8 @@
if(KDE4_ENABLE_FINAL)
macro_add_file_dependencies(${CMAKE_CURRENT_BINARY_DIR}/katepart_final_cpp.cpp )
---- kde4libs-4.0.72.orig/kde3support/CMakeLists.txt
-+++ kde4libs-4.0.72/kde3support/CMakeLists.txt
+--- kde4libs.orig/kde3support/CMakeLists.txt
++++ kde4libs/kde3support/CMakeLists.txt
@@ -78,7 +78,9 @@
kde4_add_library(kde3support SHARED ${kde3support_LIB_SRCS})
@@ -67,8 +67,8 @@
set_target_properties(kde3support PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
install(TARGETS kde3support ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
---- kde4libs-4.0.72.orig/kdecore/CMakeLists.txt
-+++ kde4libs-4.0.72/kdecore/CMakeLists.txt
+--- kde4libs.orig/kdecore/CMakeLists.txt
++++ kde4libs/kdecore/CMakeLists.txt
@@ -105,6 +105,7 @@
if (NOT HAVE_TRUNC)
target_link_libraries(kdefakes m )
@@ -85,8 +85,8 @@
set_target_properties(kdecore PROPERTIES VERSION ${KDE_NON_GENERIC_LIB_VERSION} SOVERSION ${KDE_NON_GENERIC_LIB_SOVERSION} )
install(TARGETS kdecore ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
---- kde4libs-4.0.72.orig/kded/CMakeLists.txt
-+++ kde4libs-4.0.72/kded/CMakeLists.txt
+--- kde4libs.orig/kded/CMakeLists.txt
++++ kde4libs/kded/CMakeLists.txt
@@ -13,7 +13,7 @@
kde4_add_kdeinit_executable(kded4 ${kded_KDEINIT_SRCS})
@@ -105,8 +105,8 @@
install(TARGETS kdeinit_kbuildsycoca4 ${INSTALL_TARGETS_DEFAULT_ARGS})
---- kde4libs-4.0.72.orig/kdesu/CMakeLists.txt
-+++ kde4libs-4.0.72/kdesu/CMakeLists.txt
+--- kde4libs.orig/kdesu/CMakeLists.txt
++++ kde4libs/kdesu/CMakeLists.txt
@@ -18,6 +18,7 @@
kde4_add_library(kdesu SHARED ${kdesu_LIB_SRCS})
@@ -115,8 +115,8 @@
if(KDESU_USE_SUDO_DEFAULT)
set_source_files_properties(su.cpp
---- kde4libs-4.0.72.orig/kdeui/CMakeLists.txt
-+++ kde4libs-4.0.72/kdeui/CMakeLists.txt
+--- kde4libs.orig/kdeui/CMakeLists.txt
++++ kde4libs/kdeui/CMakeLists.txt
@@ -280,7 +280,8 @@
kde4_add_library(kdeui SHARED ${kdeui_LIB_SRCS})
@@ -147,8 +147,8 @@
install( TARGETS kded_globalaccel DESTINATION ${PLUGIN_INSTALL_DIR} )
---- kde4libs-4.0.72.orig/kfile/CMakeLists.txt
-+++ kde4libs-4.0.72/kfile/CMakeLists.txt
+--- kde4libs.orig/kfile/CMakeLists.txt
++++ kde4libs/kfile/CMakeLists.txt
@@ -37,7 +37,9 @@
${ZLIB_LIBRARY}
${STRIGI_LIBRARIES}
@@ -159,8 +159,8 @@
set_target_properties(kfile PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
install(TARGETS kfile ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
---- kde4libs-4.0.72.orig/khtml/CMakeLists.txt
-+++ kde4libs-4.0.72/khtml/CMakeLists.txt
+--- kde4libs.orig/khtml/CMakeLists.txt
++++ kde4libs/khtml/CMakeLists.txt
@@ -297,7 +297,11 @@
kde4_add_library(khtml SHARED ${khtml_LIB_SRCS})
@@ -183,8 +183,8 @@
install(TARGETS khtmlpart DESTINATION ${PLUGIN_INSTALL_DIR} )
---- kde4libs-4.0.72.orig/khtml/java/CMakeLists.txt
-+++ kde4libs-4.0.72/khtml/java/CMakeLists.txt
+--- kde4libs.orig/khtml/java/CMakeLists.txt
++++ kde4libs/khtml/java/CMakeLists.txt
@@ -23,7 +23,7 @@
kde4_add_plugin(kjavaappletviewer ${kjavaappletviewer_PART_SRCS})
@@ -194,8 +194,8 @@
install(TARGETS kjavaappletviewer DESTINATION ${PLUGIN_INSTALL_DIR} )
---- kde4libs-4.0.72.orig/khtml/kmultipart/CMakeLists.txt
-+++ kde4libs-4.0.72/khtml/kmultipart/CMakeLists.txt
+--- kde4libs.orig/khtml/kmultipart/CMakeLists.txt
++++ kde4libs/khtml/kmultipart/CMakeLists.txt
@@ -9,7 +9,7 @@
kde4_add_plugin(kmultipart WITH_PREFIX ${kmultipart_PART_SRCS})
@@ -205,8 +205,8 @@
install(TARGETS kmultipart DESTINATION ${PLUGIN_INSTALL_DIR} )
---- kde4libs-4.0.72.orig/kinit/CMakeLists.txt
-+++ kde4libs-4.0.72/kinit/CMakeLists.txt
+--- kde4libs.orig/kinit/CMakeLists.txt
++++ kde4libs/kinit/CMakeLists.txt
@@ -132,7 +132,7 @@
kde4_add_kdeinit_executable( klauncher NOGUI ${klauncher_KDEINIT_SRCS})
set_target_properties(kdeinit_klauncher PROPERTIES DEFINE_SYMBOL MAKE_KLAUNCHER)
@@ -216,8 +216,8 @@
install(TARGETS kdeinit_klauncher ${INSTALL_TARGETS_DEFAULT_ARGS})
---- kde4libs-4.0.72.orig/kio/CMakeLists.txt
-+++ kde4libs-4.0.72/kio/CMakeLists.txt
+--- kde4libs.orig/kio/CMakeLists.txt
++++ kde4libs/kio/CMakeLists.txt
@@ -238,7 +238,10 @@
kde4_add_library(kio SHARED ${kio_LIB_SRCS})
@@ -230,8 +230,8 @@
set(SYS_INOTIFY_H_FOUND 0)
---- kde4libs-4.0.72.orig/kio/misc/kpac/CMakeLists.txt
-+++ kde4libs-4.0.72/kio/misc/kpac/CMakeLists.txt
+--- kde4libs.orig/kio/misc/kpac/CMakeLists.txt
++++ kde4libs/kio/misc/kpac/CMakeLists.txt
@@ -15,7 +15,7 @@
kde4_add_plugin(kded_proxyscout ${kded_proxyscout_PART_SRCS})
@@ -241,8 +241,8 @@
# this needs -lresolv e.g on Slackware, but not on FreeBSD
if (HAVE_RESOLV_LIBRARY)
---- kde4libs-4.0.72.orig/kio/misc/kssld/CMakeLists.txt
-+++ kde4libs-4.0.72/kio/misc/kssld/CMakeLists.txt
+--- kde4libs.orig/kio/misc/kssld/CMakeLists.txt
++++ kde4libs/kio/misc/kssld/CMakeLists.txt
@@ -6,7 +6,7 @@
kde4_add_plugin(kded_kssld ${kded_kssld_PART_SRCS})
@@ -252,8 +252,8 @@
install(TARGETS kded_kssld DESTINATION ${PLUGIN_INSTALL_DIR} )
---- kde4libs-4.0.72.orig/kio/misc/kwalletd/CMakeLists.txt
-+++ kde4libs-4.0.72/kio/misc/kwalletd/CMakeLists.txt
+--- kde4libs.orig/kio/misc/kwalletd/CMakeLists.txt
++++ kde4libs/kio/misc/kwalletd/CMakeLists.txt
@@ -22,7 +22,7 @@
kde4_add_plugin(kded_kwalletd ${kded_kwalletd_PART_SRCS})
@@ -263,8 +263,8 @@
install(TARGETS kded_kwalletd DESTINATION ${PLUGIN_INSTALL_DIR} )
---- kde4libs-4.0.72.orig/kioslave/ftp/CMakeLists.txt
-+++ kde4libs-4.0.72/kioslave/ftp/CMakeLists.txt
+--- kde4libs.orig/kioslave/ftp/CMakeLists.txt
++++ kde4libs/kioslave/ftp/CMakeLists.txt
@@ -13,7 +13,7 @@
kde4_add_plugin(kio_ftp ${kio_ftp_PART_SRCS})
@@ -274,8 +274,8 @@
install(TARGETS kio_ftp DESTINATION ${PLUGIN_INSTALL_DIR} )
---- kde4libs-4.0.72.orig/kioslave/http/CMakeLists.txt
-+++ kde4libs-4.0.72/kioslave/http/CMakeLists.txt
+--- kde4libs.orig/kioslave/http/CMakeLists.txt
++++ kde4libs/kioslave/http/CMakeLists.txt
@@ -37,7 +37,7 @@
kde4_add_kdeinit_executable( kio_http_cache_cleaner NOGUI ${kio_http_cache_cleaner_KDEINIT_SRCS})
@@ -294,8 +294,8 @@
if(GSSAPI_FOUND)
target_link_libraries(kio_http ${GSSAPI_LIBS} )
endif(GSSAPI_FOUND)
---- kde4libs-4.0.72.orig/kioslave/http/kcookiejar/CMakeLists.txt
-+++ kde4libs-4.0.72/kioslave/http/kcookiejar/CMakeLists.txt
+--- kde4libs.orig/kioslave/http/kcookiejar/CMakeLists.txt
++++ kde4libs/kioslave/http/kcookiejar/CMakeLists.txt
@@ -25,7 +25,7 @@
set_target_properties(kcookiejar4 PROPERTIES COMPILE_FLAGS "-include \"${CMAKE_CURRENT_SOURCE_DIR}/qdeclareqlistint_hack.h\"" )
endif(MSVC)
@@ -314,8 +314,8 @@
install(TARGETS kded_kcookiejar DESTINATION ${PLUGIN_INSTALL_DIR} )
---- kde4libs-4.0.72.orig/kjs/CMakeLists.txt
-+++ kde4libs-4.0.72/kjs/CMakeLists.txt
+--- kde4libs.orig/kjs/CMakeLists.txt
++++ kde4libs/kjs/CMakeLists.txt
@@ -167,6 +167,7 @@
if(UNIX)
@@ -324,8 +324,8 @@
endif(UNIX)
if(PCRE_FOUND)
---- kde4libs-4.0.72.orig/knewstuff/knewstuff2/CMakeLists.txt
-+++ kde4libs-4.0.72/knewstuff/knewstuff2/CMakeLists.txt
+--- kde4libs.orig/knewstuff/knewstuff2/CMakeLists.txt
++++ kde4libs/knewstuff/knewstuff2/CMakeLists.txt
@@ -53,7 +53,8 @@
kde4_add_library(knewstuff2 SHARED ${knewstuff2_core_SRCS} ${knewstuff2_dxs_SRCS} ${knewstuff2_ui_SRCS} ${knewstuff2_SRCS})
@@ -336,8 +336,8 @@
set_target_properties(knewstuff2 PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
install(TARGETS knewstuff2 ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
---- kde4libs-4.0.72.orig/knotify/config/CMakeLists.txt
-+++ kde4libs-4.0.72/knotify/config/CMakeLists.txt
+--- kde4libs.orig/knotify/config/CMakeLists.txt
++++ kde4libs/knotify/config/CMakeLists.txt
@@ -19,6 +19,7 @@
# Needs KIO for KUrlRequester
@@ -346,8 +346,8 @@
set_target_properties(knotifyconfig PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
install(TARGETS knotifyconfig ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
---- kde4libs-4.0.72.orig/kparts/CMakeLists.txt
-+++ kde4libs-4.0.72/kparts/CMakeLists.txt
+--- kde4libs.orig/kparts/CMakeLists.txt
++++ kde4libs/kparts/CMakeLists.txt
@@ -24,7 +24,8 @@
kde4_add_library(kparts SHARED ${kparts_LIB_SRCS})
@@ -358,8 +358,8 @@
set_target_properties(kparts PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
install(TARGETS kparts ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
---- kde4libs-4.0.72.orig/kpty/CMakeLists.txt
-+++ kde4libs-4.0.72/kpty/CMakeLists.txt
+--- kde4libs.orig/kpty/CMakeLists.txt
++++ kde4libs/kpty/CMakeLists.txt
@@ -12,6 +12,7 @@
kde4_add_library(kpty SHARED ${kpty_LIB_SRCS})
@@ -368,8 +368,8 @@
set_target_properties(kpty PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
install(TARGETS kpty ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
---- kde4libs-4.0.72.orig/kross/core/CMakeLists.txt
-+++ kde4libs-4.0.72/kross/core/CMakeLists.txt
+--- kde4libs.orig/kross/core/CMakeLists.txt
++++ kde4libs/kross/core/CMakeLists.txt
@@ -11,7 +11,8 @@
)
@@ -380,8 +380,8 @@
set_target_properties(krosscore PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
install(TARGETS krosscore ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
---- kde4libs-4.0.72.orig/kross/modules/CMakeLists.txt
-+++ kde4libs-4.0.72/kross/modules/CMakeLists.txt
+--- kde4libs.orig/kross/modules/CMakeLists.txt
++++ kde4libs/kross/modules/CMakeLists.txt
@@ -12,5 +12,5 @@
set(krossmoduleforms_SRCS form.cpp)
kde4_add_plugin(krossmoduleforms ${krossmoduleforms_SRCS})
@@ -389,8 +389,8 @@
-target_link_libraries(krossmoduleforms ${QT_QTUITOOLS_LIBRARY} ${QT_QTDESIGNER_LIBRARY} ${KDE4_KPARTS_LIBS} ${KDE4_KFILE_LIBS} krosscore krossui)
+target_link_libraries(krossmoduleforms ${QT_QTUITOOLS_LIBRARY} ${QT_QTDESIGNER_LIBRARY} ${QT_QTXML_LIBRARY} ${KDE4_KPARTS_LIBS} ${KDE4_KFILE_LIBS} krosscore)
install(TARGETS krossmoduleforms DESTINATION ${PLUGIN_INSTALL_DIR})
---- kde4libs-4.0.72.orig/kross/qts/CMakeLists.txt
-+++ kde4libs-4.0.72/kross/qts/CMakeLists.txt
+--- kde4libs.orig/kross/qts/CMakeLists.txt
++++ kde4libs/kross/qts/CMakeLists.txt
@@ -3,7 +3,7 @@
########### next target ###############
set(krossqtsplugin_LIB_SRCS plugin.cpp)
@@ -400,8 +400,8 @@
set_target_properties(krossqtsplugin PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
install(TARGETS krossqtsplugin DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/script)
---- kde4libs-4.0.72.orig/kross/ui/CMakeLists.txt
-+++ kde4libs-4.0.72/kross/ui/CMakeLists.txt
+--- kde4libs.orig/kross/ui/CMakeLists.txt
++++ kde4libs/kross/ui/CMakeLists.txt
@@ -14,7 +14,8 @@
)
@@ -412,8 +412,8 @@
set_target_properties(krossui PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
install(TARGETS krossui ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
---- kde4libs-4.0.72.orig/kutils/CMakeLists.txt
-+++ kde4libs-4.0.72/kutils/CMakeLists.txt
+--- kde4libs.orig/kutils/CMakeLists.txt
++++ kde4libs/kutils/CMakeLists.txt
@@ -30,7 +30,8 @@
kde4_add_library(kutils SHARED ${kutils_LIB_SRCS})
@@ -424,8 +424,8 @@
set_target_properties(kutils PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
install(TARGETS kutils ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
---- kde4libs-4.0.72.orig/phonon/libkaudiodevicelist/CMakeLists.txt
-+++ kde4libs-4.0.72/phonon/libkaudiodevicelist/CMakeLists.txt
+--- kde4libs.orig/phonon/libkaudiodevicelist/CMakeLists.txt
++++ kde4libs/phonon/libkaudiodevicelist/CMakeLists.txt
@@ -28,7 +28,8 @@
endif(ALSA_FOUND)
@@ -436,8 +436,8 @@
set_target_properties(kaudiodevicelist PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
---- kde4libs-4.0.72.orig/solid/solid/CMakeLists.txt
-+++ kde4libs-4.0.72/solid/solid/CMakeLists.txt
+--- kde4libs.orig/solid/solid/CMakeLists.txt
++++ kde4libs/solid/solid/CMakeLists.txt
@@ -181,6 +181,7 @@
kde4_add_library(solid SHARED ${solid_LIB_SRCS})
@@ -446,8 +446,8 @@
set_target_properties(solid PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
install(TARGETS solid ${KDELIBS_EXPORT} ${INSTALL_TARGETS_DEFAULT_ARGS})
---- kde4libs-4.0.72.orig/sonnet/plugins/hspell/CMakeLists.txt
-+++ kde4libs-4.0.72/sonnet/plugins/hspell/CMakeLists.txt
+--- kde4libs.orig/sonnet/plugins/hspell/CMakeLists.txt
++++ kde4libs/sonnet/plugins/hspell/CMakeLists.txt
@@ -9,7 +9,7 @@
kde4_add_plugin(kspell_hspell ${kspell_hspell_PART_SRCS})
@@ -457,8 +457,8 @@
install(TARGETS kspell_hspell DESTINATION ${PLUGIN_INSTALL_DIR} )
---- kde4libs-4.0.72.orig/kjsembed/kjsembed/CMakeLists.txt
-+++ kde4libs-4.0.72/kjsembed/kjsembed/CMakeLists.txt
+--- kde4libs.orig/kjsembed/kjsembed/CMakeLists.txt
++++ kde4libs/kjsembed/kjsembed/CMakeLists.txt
@@ -69,6 +69,7 @@
kde4_add_library(${KJSEMBEDLIBNAME} SHARED ${kjsembed_LIB_SRCS})
@@ -467,3 +467,16 @@
set_target_properties(${KJSEMBEDLIBNAME} PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
install(TARGETS ${KJSEMBEDLIBNAME} ${INSTALL_TARGETS_DEFAULT_ARGS})
+--- kde4libs.orig/kioslave/file/CMakeLists.txt
++++ kde4libs/kioslave/file/CMakeLists.txt
+@@ -20,6 +20,10 @@
+ target_link_libraries(kio_file -lvolmgt)
+ endif (HAVE_VOLMGT AND CMAKE_SYSTEM_NAME MATCHES SunOS)
+
++if (ACL_FOUND)
++ target_link_libraries(kio_file ${ACL_LIBS})
++endif (ACL_FOUND)
++
+ install(TARGETS kio_file DESTINATION ${PLUGIN_INSTALL_DIR} )
+
+
Modified: branches/kde4/packages/kdelibs/debian/patches/series
===================================================================
--- branches/kde4/packages/kdelibs/debian/patches/series 2008-05-01 15:56:55 UTC (rev 10436)
+++ branches/kde4/packages/kdelibs/debian/patches/series 2008-05-01 16:55:17 UTC (rev 10437)
@@ -11,4 +11,4 @@
19_findqt4_optional_x11_pthread.diff
97_use_imported_targets_with_cmake26.diff
98_link_interface_libraries.diff
-99_more_implicit_link_libs.diff
+#99_more_implicit_link_libs.diff
Modified: branches/kde4/packages/kdelibs/debian/rules
===================================================================
--- branches/kde4/packages/kdelibs/debian/rules 2008-05-01 15:56:55 UTC (rev 10436)
+++ branches/kde4/packages/kdelibs/debian/rules 2008-05-01 16:55:17 UTC (rev 10437)
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
-UPSTREAMVERSION := $(shell dpkg-parsechangelog | grep '^Version: ' | sed 's/^Version: \(.*\)-.*/\1/')
+UPSTREAMVERSION ?= $(shell dpkg-parsechangelog | grep '^Version: ' | sed 's/^Version: \(.*\)-.*/\1/')
RUNTIME_DEPS := kdebase-runtime (>= 4:4.0.66)
DEB_DBG_PACKAGE_kdelibs5 := kdelibs5-dbg
@@ -15,4 +15,3 @@
DEB_DH_SHLIBDEPS_ARGS_ALL := -- -xkdebase-runtime
include debian/cdbs/kde.mk
-
More information about the pkg-kde-commits
mailing list