rev 17689 - in trunk/packages/kdelibs/debian: . patches
Fathi Boudra
fabo at alioth.debian.org
Mon Apr 19 12:08:55 UTC 2010
Author: fabo
Date: 2010-04-19 12:08:53 +0000 (Mon, 19 Apr 2010)
New Revision: 17689
Modified:
trunk/packages/kdelibs/debian/changelog
trunk/packages/kdelibs/debian/patches/08_add_debian_build_type.diff
trunk/packages/kdelibs/debian/patches/09_disable_usr_lib_install_rpath.diff
trunk/packages/kdelibs/debian/patches/10_make_libkdeinit4_private.diff
trunk/packages/kdelibs/debian/patches/11_default_kde4_xdg_menu_prefix.diff
trunk/packages/kdelibs/debian/patches/13_qt4_designer_plugins_path.diff
trunk/packages/kdelibs/debian/patches/14_hardcode_ptm_device.diff
trunk/packages/kdelibs/debian/patches/15_kfreebsd_support.diff
trunk/packages/kdelibs/debian/patches/17_findservicebydesktoppath_try_realfilepath.diff
trunk/packages/kdelibs/debian/patches/20_use_dejavu_as_default_font.diff
trunk/packages/kdelibs/debian/patches/22_hack_in_etc_kde4_in_kstandarddirs.diff
trunk/packages/kdelibs/debian/patches/23_solid_no_double_build.diff
trunk/packages/kdelibs/debian/patches/25_ld_exclude_libs_qtuitools.diff
trunk/packages/kdelibs/debian/patches/28_find_kde3_html_documentation.diff
Log:
Upload to unstable
Modified: trunk/packages/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog 2010-04-19 12:07:09 UTC (rev 17688)
+++ trunk/packages/kdelibs/debian/changelog 2010-04-19 12:08:53 UTC (rev 17689)
@@ -1,3 +1,9 @@
+kde4libs (4:4.4.2-2) unstable; urgency=low
+
+ * Upload to unstable.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Mon, 19 Apr 2010 15:05:11 +0300
+
kde4libs (4:4.4.2-1) experimental; urgency=low
* New upstream release.
Modified: trunk/packages/kdelibs/debian/patches/08_add_debian_build_type.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/08_add_debian_build_type.diff 2010-04-19 12:07:09 UTC (rev 17688)
+++ trunk/packages/kdelibs/debian/patches/08_add_debian_build_type.diff 2010-04-19 12:08:53 UTC (rev 17689)
@@ -9,7 +9,7 @@
--- a/cmake/modules/FindKDE4Internal.cmake
+++ b/cmake/modules/FindKDE4Internal.cmake
-@@ -1076,11 +1076,13 @@
+@@ -1076,11 +1076,13 @@ if (CMAKE_COMPILER_IS_GNUCXX)
set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline")
set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline")
set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
Modified: trunk/packages/kdelibs/debian/patches/09_disable_usr_lib_install_rpath.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/09_disable_usr_lib_install_rpath.diff 2010-04-19 12:07:09 UTC (rev 17688)
+++ trunk/packages/kdelibs/debian/patches/09_disable_usr_lib_install_rpath.diff 2010-04-19 12:08:53 UTC (rev 17689)
@@ -6,7 +6,7 @@
--- a/cmake/modules/FindKDE4Internal.cmake
+++ b/cmake/modules/FindKDE4Internal.cmake
-@@ -943,11 +943,9 @@
+@@ -943,11 +943,9 @@ if (UNIX)
if (APPLE)
set(CMAKE_INSTALL_NAME_DIR ${LIB_INSTALL_DIR})
else (APPLE)
@@ -21,7 +21,7 @@
--- a/kdewidgets/CMakeLists.txt
+++ b/kdewidgets/CMakeLists.txt
-@@ -51,7 +51,6 @@
+@@ -51,7 +51,6 @@ if(NOT WIN32)
INSTALL_RPATH_USE_LINK_PATH TRUE
SKIP_BUILD_RPATH TRUE
BUILD_WITH_INSTALL_RPATH TRUE
@@ -29,7 +29,7 @@
)
endif(NOT WIN32)
-@@ -86,7 +85,6 @@
+@@ -86,7 +85,6 @@ if (QT_QT3SUPPORT_FOUND)
INSTALL_RPATH_USE_LINK_PATH TRUE
SKIP_BUILD_RPATH TRUE
BUILD_WITH_INSTALL_RPATH TRUE
Modified: trunk/packages/kdelibs/debian/patches/10_make_libkdeinit4_private.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/10_make_libkdeinit4_private.diff 2010-04-19 12:07:09 UTC (rev 17688)
+++ trunk/packages/kdelibs/debian/patches/10_make_libkdeinit4_private.diff 2010-04-19 12:08:53 UTC (rev 17689)
@@ -16,7 +16,7 @@
--- a/CreateKDELibsDependenciesFile.cmake
+++ b/CreateKDELibsDependenciesFile.cmake
-@@ -31,6 +31,7 @@
+@@ -31,6 +31,7 @@ endmacro(MAKE_INSTALL_PATH_ABSOLUTE out
set(KDE4_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}")
make_install_path_absolute(KDE4_LIB_INSTALL_DIR ${LIB_INSTALL_DIR})
make_install_path_absolute(KDE4_LIBEXEC_INSTALL_DIR ${LIBEXEC_INSTALL_DIR})
@@ -24,7 +24,7 @@
make_install_path_absolute(KDE4_INCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_DIR})
make_install_path_absolute(KDE4_BIN_INSTALL_DIR ${BIN_INSTALL_DIR})
make_install_path_absolute(KDE4_SBIN_INSTALL_DIR ${SBIN_INSTALL_DIR})
-@@ -63,6 +64,7 @@
+@@ -63,6 +64,7 @@ endif (NOT KDE4_INSTALL_DIR)
set(KDE4_LIB_INSTALL_DIR \"${KDE4_LIB_INSTALL_DIR}\")
set(KDE4_LIBEXEC_INSTALL_DIR \"${KDE4_LIBEXEC_INSTALL_DIR}\")
@@ -34,7 +34,7 @@
set(KDE4_SBIN_INSTALL_DIR \"${KDE4_SBIN_INSTALL_DIR}\")
--- a/cmake/modules/FindKDE4Internal.cmake
+++ b/cmake/modules/FindKDE4Internal.cmake
-@@ -771,6 +771,7 @@
+@@ -771,6 +771,7 @@ else (WIN32)
_set_fancy(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" "The subdirectory to the header prefix")
_set_fancy(PLUGIN_INSTALL_DIR "${LIB_INSTALL_DIR}/kde4" "The subdirectory relative to the install prefix where plugins will be installed (default is ${LIB_INSTALL_DIR}/kde4)")
@@ -44,7 +44,7 @@
_set_fancy(HTML_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/doc/HTML" "The HTML install dir for documentation")
--- a/cmake/modules/KDE4Macros.cmake
+++ b/cmake/modules/KDE4Macros.cmake
-@@ -758,6 +758,14 @@
+@@ -758,6 +758,14 @@ macro (KDE4_ADD_KDEINIT_EXECUTABLE _targ
set_target_properties(kdeinit_${_target_NAME} PROPERTIES OUTPUT_NAME kdeinit4_${_target_NAME})
kde4_add_executable(${_target_NAME} "${_nogui}" ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp)
@@ -61,7 +61,7 @@
--- a/kinit/CMakeLists.txt
+++ b/kinit/CMakeLists.txt
-@@ -54,6 +54,14 @@
+@@ -54,6 +54,14 @@ endif(Q_WS_X11)
install(TARGETS kdeinit4 ${INSTALL_TARGETS_DEFAULT_ARGS} )
Modified: trunk/packages/kdelibs/debian/patches/11_default_kde4_xdg_menu_prefix.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/11_default_kde4_xdg_menu_prefix.diff 2010-04-19 12:07:09 UTC (rev 17688)
+++ trunk/packages/kdelibs/debian/patches/11_default_kde4_xdg_menu_prefix.diff 2010-04-19 12:08:53 UTC (rev 17689)
@@ -5,7 +5,7 @@
--- a/kded/CMakeLists.txt
+++ b/kded/CMakeLists.txt
-@@ -75,7 +75,7 @@
+@@ -75,7 +75,7 @@ install(TARGETS kdontchangethehostname D
if (WIN32)
install( FILES applications.menu DESTINATION ${SHARE_INSTALL_PREFIX}/xdg/menus )
else (WIN32)
@@ -16,7 +16,7 @@
install( FILES kded.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update )
--- a/kded/vfolder_menu.cpp
+++ b/kded/vfolder_menu.cpp
-@@ -772,8 +772,10 @@
+@@ -772,8 +772,10 @@ VFolderMenu::locateMenuFile(const QStrin
QString result;
QString xdgMenuPrefix = QString::fromLocal8Bit(qgetenv("XDG_MENU_PREFIX"));
@@ -29,7 +29,7 @@
QFileInfo fileInfo(fileName);
QString fileNameOnly = fileInfo.fileName();
-@@ -783,7 +785,6 @@
+@@ -783,7 +785,6 @@ VFolderMenu::locateMenuFile(const QStrin
QString baseName = QDir::cleanPath(m_docInfo.baseDir +
fileInfo.path() + '/' + fileNameOnly);
result = KStandardDirs::locate("xdgconf-menu", baseName);
Modified: trunk/packages/kdelibs/debian/patches/13_qt4_designer_plugins_path.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/13_qt4_designer_plugins_path.diff 2010-04-19 12:07:09 UTC (rev 17688)
+++ trunk/packages/kdelibs/debian/patches/13_qt4_designer_plugins_path.diff 2010-04-19 12:08:53 UTC (rev 17689)
@@ -1,6 +1,6 @@
--- a/kdewidgets/CMakeLists.txt
+++ b/kdewidgets/CMakeLists.txt
-@@ -54,7 +54,7 @@
+@@ -54,7 +54,7 @@ if(NOT WIN32)
)
endif(NOT WIN32)
@@ -9,7 +9,7 @@
if (QT_QT3SUPPORT_FOUND)
-@@ -88,7 +88,7 @@
+@@ -88,7 +88,7 @@ if (QT_QT3SUPPORT_FOUND)
)
endif(NOT WIN32)
Modified: trunk/packages/kdelibs/debian/patches/14_hardcode_ptm_device.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/14_hardcode_ptm_device.diff 2010-04-19 12:07:09 UTC (rev 17688)
+++ trunk/packages/kdelibs/debian/patches/14_hardcode_ptm_device.diff 2010-04-19 12:08:53 UTC (rev 17689)
@@ -6,7 +6,7 @@
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
-@@ -202,13 +202,7 @@
+@@ -202,13 +202,7 @@ if (UNIX)
set(HAVE_OPENPTY)
EXECUTE_PROCESS(
Modified: trunk/packages/kdelibs/debian/patches/15_kfreebsd_support.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/15_kfreebsd_support.diff 2010-04-19 12:07:09 UTC (rev 17688)
+++ trunk/packages/kdelibs/debian/patches/15_kfreebsd_support.diff 2010-04-19 12:08:53 UTC (rev 17689)
@@ -12,7 +12,7 @@
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
-@@ -164,11 +164,11 @@
+@@ -164,11 +164,11 @@ if (UNIX)
set(UTIL_LIBRARY util)
endif (login_in_libutil)
endif (NOT login_in_libc)
@@ -29,7 +29,7 @@
if (login_in_libutil)
--- a/kio/kfile/kpropertiesdialog.cpp
+++ b/kio/kfile/kpropertiesdialog.cpp
-@@ -1912,7 +1912,15 @@
+@@ -1912,7 +1912,15 @@ static bool fileSystemSupportsACL( const
fileSystemSupportsACLs = ( statfs( path.data(), &buf ) == 0 ) && ( buf.f_flags & MNT_ACLS );
#else
fileSystemSupportsACLs =
@@ -48,7 +48,7 @@
}
--- a/kioslave/file/file.cpp
+++ b/kioslave/file/file.cpp
-@@ -324,8 +324,10 @@
+@@ -324,8 +324,10 @@ void FileProtocol::get( const KUrl& url
}
#ifdef HAVE_FADVISE
@@ -61,7 +61,7 @@
// This is mandatory in all slaves (for KRun/BrowserRun to work)
--- a/kioslave/file/file_unix.cpp
+++ b/kioslave/file/file_unix.cpp
-@@ -146,8 +146,10 @@
+@@ -146,8 +146,10 @@ void FileProtocol::copy( const KUrl &src
}
#ifdef HAVE_FADVISE
@@ -72,7 +72,7 @@
// WABA: Make sure that we keep writing permissions ourselves,
// otherwise we can be in for a surprise on NFS.
mode_t initialMode;
-@@ -169,8 +171,10 @@
+@@ -169,8 +171,10 @@ void FileProtocol::copy( const KUrl &src
}
#ifdef HAVE_FADVISE
@@ -85,7 +85,7 @@
acl = acl_get_fd(src_fd);
--- a/kpty/kpty.cpp
+++ b/kpty/kpty.cpp
-@@ -107,24 +107,24 @@
+@@ -107,24 +107,24 @@ extern "C" {
# define _NEW_TTY_CTRL
#endif
Modified: trunk/packages/kdelibs/debian/patches/17_findservicebydesktoppath_try_realfilepath.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/17_findservicebydesktoppath_try_realfilepath.diff 2010-04-19 12:07:09 UTC (rev 17688)
+++ trunk/packages/kdelibs/debian/patches/17_findservicebydesktoppath_try_realfilepath.diff 2010-04-19 12:08:53 UTC (rev 17689)
@@ -3,7 +3,7 @@
path is a symlink.
--- a/kdecore/services/kservicefactory.cpp
+++ b/kdecore/services/kservicefactory.cpp
-@@ -124,22 +124,16 @@
+@@ -124,22 +124,16 @@ KService::Ptr KServiceFactory::findServi
return newService;
}
@@ -28,7 +28,7 @@
}
// Check whether the dictionary was right
// It's ok that it's wrong, for the case where we're looking up an unknown service,
-@@ -150,6 +144,27 @@
+@@ -150,6 +144,27 @@ KService::Ptr KServiceFactory::findServi
}
return newService;
}
@@ -58,7 +58,7 @@
{
--- a/kdecore/services/kservicefactory.h
+++ b/kdecore/services/kservicefactory.h
-@@ -121,6 +121,8 @@
+@@ -121,6 +121,8 @@ protected:
virtual void virtual_hook( int id, void* data );
private:
class KServiceFactoryPrivate* d;
Modified: trunk/packages/kdelibs/debian/patches/20_use_dejavu_as_default_font.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/20_use_dejavu_as_default_font.diff 2010-04-19 12:07:09 UTC (rev 17688)
+++ trunk/packages/kdelibs/debian/patches/20_use_dejavu_as_default_font.diff 2010-04-19 12:08:53 UTC (rev 17689)
@@ -6,7 +6,7 @@
--- a/kdeui/kernel/kglobalsettings.cpp
+++ b/kdeui/kernel/kglobalsettings.cpp
-@@ -381,7 +381,7 @@
+@@ -381,7 +381,7 @@ struct KFontData
// NOTE: keep in sync with kdebase/workspace/kcontrol/fonts/fonts.cpp
static const char GeneralId[] = "General";
@@ -15,7 +15,7 @@
#ifdef Q_WS_MAC
static const char DefaultMacFont[] = "Lucida Grande";
#endif
-@@ -395,7 +395,7 @@
+@@ -395,7 +395,7 @@ static const KFontData DefaultFontData[K
{ GeneralId, "menuFont", DefaultMacFont, 13, -1, QFont::SansSerif },
#else
{ GeneralId, "font", DefaultFont, 9, -1, QFont::SansSerif },
Modified: trunk/packages/kdelibs/debian/patches/22_hack_in_etc_kde4_in_kstandarddirs.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/22_hack_in_etc_kde4_in_kstandarddirs.diff 2010-04-19 12:07:09 UTC (rev 17688)
+++ trunk/packages/kdelibs/debian/patches/22_hack_in_etc_kde4_in_kstandarddirs.diff 2010-04-19 12:08:53 UTC (rev 17689)
@@ -12,7 +12,7 @@
--- a/kdecore/kernel/kstandarddirs.cpp
+++ b/kdecore/kernel/kstandarddirs.cpp
-@@ -1124,6 +1124,10 @@
+@@ -1124,6 +1124,10 @@ QStringList KStandardDirs::KStandardDirs
if ((local || testdir.exists()) && !candidates.contains(path))
candidates.append(path);
}
Modified: trunk/packages/kdelibs/debian/patches/23_solid_no_double_build.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/23_solid_no_double_build.diff 2010-04-19 12:07:09 UTC (rev 17688)
+++ trunk/packages/kdelibs/debian/patches/23_solid_no_double_build.diff 2010-04-19 12:08:53 UTC (rev 17689)
@@ -4,7 +4,7 @@
--- a/solid/solid/CMakeLists.txt
+++ b/solid/solid/CMakeLists.txt
-@@ -235,7 +235,14 @@
+@@ -235,7 +235,14 @@ install(FILES org.freedesktop.PowerManag
install(FILES org.freedesktop.PowerManagement.Inhibit.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
########### static lib for tests ###############
Modified: trunk/packages/kdelibs/debian/patches/25_ld_exclude_libs_qtuitools.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/25_ld_exclude_libs_qtuitools.diff 2010-04-19 12:07:09 UTC (rev 17688)
+++ trunk/packages/kdelibs/debian/patches/25_ld_exclude_libs_qtuitools.diff 2010-04-19 12:08:53 UTC (rev 17689)
@@ -5,7 +5,7 @@
--- a/plasma/CMakeLists.txt
+++ b/plasma/CMakeLists.txt
-@@ -212,6 +212,9 @@
+@@ -212,6 +212,9 @@ target_link_libraries(plasma ${KDE4_KIO_
${QT_QTUITOOLS_LIBRARY} ${QT_QTWEBKIT_LIBRARY}
kdnssd threadweaver ${KDE4_SOLID_LIBS} )
@@ -17,7 +17,7 @@
endif(QCA2_FOUND)
--- a/kjsembed/kjsembed/CMakeLists.txt
+++ b/kjsembed/kjsembed/CMakeLists.txt
-@@ -71,7 +71,8 @@
+@@ -71,7 +71,8 @@ target_link_libraries(${KJSEMBEDLIBNAME}
set_target_properties(${KJSEMBEDLIBNAME} PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
install(TARGETS ${KJSEMBEDLIBNAME} EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
Modified: trunk/packages/kdelibs/debian/patches/28_find_kde3_html_documentation.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/28_find_kde3_html_documentation.diff 2010-04-19 12:07:09 UTC (rev 17688)
+++ trunk/packages/kdelibs/debian/patches/28_find_kde3_html_documentation.diff 2010-04-19 12:08:53 UTC (rev 17689)
@@ -1,6 +1,6 @@
--- a/kdecore/kernel/kstandarddirs.cpp
+++ b/kdecore/kernel/kstandarddirs.cpp
-@@ -1796,6 +1796,9 @@
+@@ -1796,6 +1796,9 @@ void KStandardDirs::addKDEDefaults()
addResourceType("autostart", "xdgconf-autostart", "/"); // merge them, start with xdg autostart
addResourceType("autostart", NULL, "share/autostart"); // KDE ones are higher priority
More information about the pkg-kde-commits
mailing list