rev 15808 - in trunk/packages/kdelibs/debian: . patches

Modestas Vainius modax-guest at alioth.debian.org
Sat Aug 29 08:13:06 UTC 2009


Author: modax-guest
Date: 2009-08-29 08:13:06 +0000 (Sat, 29 Aug 2009)
New Revision: 15808

Removed:
   trunk/packages/kdelibs/debian/patches/01_r1012564.diff
Modified:
   trunk/packages/kdelibs/debian/changelog
   trunk/packages/kdelibs/debian/patches/08_add_debian_build_type.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/16_debian_menu.diff
   trunk/packages/kdelibs/debian/patches/17_findservicebydesktoppath_try_realfilepath.diff
   trunk/packages/kdelibs/debian/patches/19_findqt4_optional_x11_pthread.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/series
Log:
* Remove 01_r1012564.diff patch, merged upstream. 
* Refresh patches.

Modified: trunk/packages/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog	2009-08-29 08:09:02 UTC (rev 15807)
+++ trunk/packages/kdelibs/debian/changelog	2009-08-29 08:13:06 UTC (rev 15808)
@@ -1,4 +1,4 @@
-kde4libs (4:4.3.1-1) UNRELEASED; urgency=low
+kde4libs (4:4.3.1-0r1) UNRELEASED; urgency=low
 
   * New upstream release.
 
@@ -6,8 +6,13 @@
 
   * Add libutempter-dev build dependency. Used by kpty.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 29 Aug 2009 09:23:59 +0200
+  +++ Changes by Modestas Vainius:
 
+  * Remove 01_r1012564.diff patch, merged upstream. 
+  * Refresh patches.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 29 Aug 2009 10:28:49 +0300
+
 kde4libs (4:4.3.0-2) unstable; urgency=medium
 
   * Add patch: 01_r1012564.diff: Fixes a data loss with KIO.

Modified: trunk/packages/kdelibs/debian/patches/08_add_debian_build_type.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/08_add_debian_build_type.diff	2009-08-29 08:09:02 UTC (rev 15807)
+++ trunk/packages/kdelibs/debian/patches/08_add_debian_build_type.diff	2009-08-29 08:13:06 UTC (rev 15808)
@@ -5,7 +5,7 @@
 icons.
 --- a/cmake/modules/FindKDE4Internal.cmake
 +++ b/cmake/modules/FindKDE4Internal.cmake
-@@ -1010,11 +1010,13 @@ if (CMAKE_COMPILER_IS_GNUCXX)
+@@ -1010,11 +1010,13 @@
     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/11_default_kde4_xdg_menu_prefix.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/11_default_kde4_xdg_menu_prefix.diff	2009-08-29 08:09:02 UTC (rev 15807)
+++ trunk/packages/kdelibs/debian/patches/11_default_kde4_xdg_menu_prefix.diff	2009-08-29 08:13:06 UTC (rev 15808)
@@ -1,6 +1,6 @@
 --- a/kded/CMakeLists.txt
 +++ b/kded/CMakeLists.txt
-@@ -69,7 +69,7 @@ install(TARGETS kdontchangethehostname D
+@@ -69,7 +69,7 @@
  if (WIN32)
  install( FILES applications.menu  DESTINATION  ${SHARE_INSTALL_PREFIX}/xdg/menus )
  else (WIN32)
@@ -11,7 +11,7 @@
  install( FILES kded.upd           DESTINATION  ${DATA_INSTALL_DIR}/kconf_update )
 --- a/kded/vfolder_menu.cpp
 +++ b/kded/vfolder_menu.cpp
-@@ -770,8 +770,10 @@ VFolderMenu::locateMenuFile(const QStrin
+@@ -770,8 +770,10 @@
     QString result;
  
     QString xdgMenuPrefix = QString::fromLocal8Bit(qgetenv("XDG_MENU_PREFIX"));
@@ -24,7 +24,7 @@
        QFileInfo fileInfo(fileName);
  
        QString fileNameOnly = fileInfo.fileName();
-@@ -781,7 +783,6 @@ VFolderMenu::locateMenuFile(const QStrin
+@@ -781,7 +783,6 @@
        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	2009-08-29 08:09:02 UTC (rev 15807)
+++ trunk/packages/kdelibs/debian/patches/13_qt4_designer_plugins_path.diff	2009-08-29 08:13:06 UTC (rev 15808)
@@ -1,6 +1,6 @@
 --- a/kdewidgets/CMakeLists.txt
 +++ b/kdewidgets/CMakeLists.txt
-@@ -55,7 +55,7 @@ if(NOT WIN32)
+@@ -55,7 +55,7 @@
                         )
  endif(NOT WIN32)
  

Modified: trunk/packages/kdelibs/debian/patches/14_hardcode_ptm_device.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/14_hardcode_ptm_device.diff	2009-08-29 08:09:02 UTC (rev 15807)
+++ trunk/packages/kdelibs/debian/patches/14_hardcode_ptm_device.diff	2009-08-29 08:13:06 UTC (rev 15808)
@@ -2,7 +2,7 @@
 Bypass build time check as /dev/ptmx is alsways present at runtime.
 --- a/ConfigureChecks.cmake
 +++ b/ConfigureChecks.cmake
-@@ -195,13 +195,7 @@ if (UNIX)
+@@ -195,13 +195,7 @@
      set(HAVE_OPENPTY)
  
      EXECUTE_PROCESS(

Modified: trunk/packages/kdelibs/debian/patches/15_kfreebsd_support.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/15_kfreebsd_support.diff	2009-08-29 08:09:02 UTC (rev 15807)
+++ trunk/packages/kdelibs/debian/patches/15_kfreebsd_support.diff	2009-08-29 08:13:06 UTC (rev 15808)
@@ -4,7 +4,7 @@
 cmake. 
 --- a/kpty/kpty.cpp
 +++ b/kpty/kpty.cpp
-@@ -107,24 +107,24 @@ extern "C" {
+@@ -107,24 +107,24 @@
  # define _NEW_TTY_CTRL
  #endif
  
@@ -43,7 +43,7 @@
  #include <kdebug.h>
 --- a/kio/kfile/kpropertiesdialog.cpp
 +++ b/kio/kfile/kpropertiesdialog.cpp
-@@ -1898,7 +1898,15 @@ static bool fileSystemSupportsACL( const
+@@ -1898,7 +1898,15 @@
      fileSystemSupportsACLs = ( statfs( path.data(), &buf ) == 0 ) && ( buf.f_flags & MNT_ACLS );
  #else
      fileSystemSupportsACLs =
@@ -62,7 +62,7 @@
  }
 --- a/ConfigureChecks.cmake
 +++ b/ConfigureChecks.cmake
-@@ -157,11 +157,11 @@ if (UNIX)
+@@ -157,11 +157,11 @@
          set(UTIL_LIBRARY util)
        endif (login_in_libutil)
      endif (NOT login_in_libc)
@@ -79,7 +79,7 @@
        if (login_in_libutil)
 --- a/kioslave/file/file.cpp
 +++ b/kioslave/file/file.cpp
-@@ -324,8 +324,10 @@ void FileProtocol::get( const KUrl& url 
+@@ -324,8 +324,10 @@
      }
  
  #ifdef HAVE_FADVISE
@@ -92,7 +92,7 @@
      // This is mandatory in all slaves (for KRun/BrowserRun to work)
 --- a/kioslave/file/file_unix.cpp
 +++ b/kioslave/file/file_unix.cpp
-@@ -133,8 +133,10 @@ void FileProtocol::copy( const KUrl &src
+@@ -133,8 +133,10 @@
      }
  
  #ifdef HAVE_FADVISE
@@ -103,7 +103,7 @@
      // WABA: Make sure that we keep writing permissions ourselves,
      // otherwise we can be in for a surprise on NFS.
      mode_t initialMode;
-@@ -156,8 +158,10 @@ void FileProtocol::copy( const KUrl &src
+@@ -156,8 +158,10 @@
      }
  
  #ifdef HAVE_FADVISE

Modified: trunk/packages/kdelibs/debian/patches/16_debian_menu.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/16_debian_menu.diff	2009-08-29 08:09:02 UTC (rev 15807)
+++ trunk/packages/kdelibs/debian/patches/16_debian_menu.diff	2009-08-29 08:13:06 UTC (rev 15808)
@@ -4,7 +4,7 @@
 
 --- a/kded/applications.menu
 +++ b/kded/applications.menu
-@@ -502,6 +502,13 @@
+@@ -437,5 +437,12 @@
  		</And>
  	</Include>
  	<DefaultMergeDirs/>
@@ -17,4 +17,3 @@
 +
  	<MergeFile>applications-kmenuedit.menu</MergeFile>
  </Menu>
- 

Modified: trunk/packages/kdelibs/debian/patches/17_findservicebydesktoppath_try_realfilepath.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/17_findservicebydesktoppath_try_realfilepath.diff	2009-08-29 08:09:02 UTC (rev 15807)
+++ trunk/packages/kdelibs/debian/patches/17_findservicebydesktoppath_try_realfilepath.diff	2009-08-29 08:13:06 UTC (rev 15808)
@@ -4,7 +4,7 @@
 
 --- a/kdecore/services/kservicefactory.cpp
 +++ b/kdecore/services/kservicefactory.cpp
-@@ -116,16 +116,10 @@ KService::Ptr KServiceFactory::findServi
+@@ -116,16 +116,10 @@
      return newService;
  }
  
@@ -22,7 +22,7 @@
          return KService::Ptr(); // Not found
      }
  
-@@ -142,6 +136,27 @@ KService::Ptr KServiceFactory::findServi
+@@ -142,6 +136,27 @@
      return newService;
  }
  
@@ -52,7 +52,7 @@
      if (!m_menuIdDict) return KService::Ptr(); // Error!
 --- a/kdecore/services/kservicefactory.h
 +++ b/kdecore/services/kservicefactory.h
-@@ -121,6 +121,8 @@ protected:
+@@ -121,6 +121,8 @@
      virtual void virtual_hook( int id, void* data );
  private:
      class KServiceFactoryPrivate* d;

Modified: trunk/packages/kdelibs/debian/patches/19_findqt4_optional_x11_pthread.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/19_findqt4_optional_x11_pthread.diff	2009-08-29 08:09:02 UTC (rev 15807)
+++ trunk/packages/kdelibs/debian/patches/19_findqt4_optional_x11_pthread.diff	2009-08-29 08:13:06 UTC (rev 15808)
@@ -2,7 +2,7 @@
 
 --- a/cmake/modules/FindQt4.cmake
 +++ b/cmake/modules/FindQt4.cmake
-@@ -1467,10 +1467,9 @@ IF (QT4_QMAKE_FOUND)
+@@ -1470,10 +1470,9 @@
    IF(UNIX)
      # on OS X X11 may not be required
      IF (Q_WS_X11)

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	2009-08-29 08:09:02 UTC (rev 15807)
+++ trunk/packages/kdelibs/debian/patches/20_use_dejavu_as_default_font.diff	2009-08-29 08:13:06 UTC (rev 15808)
@@ -1,7 +1,7 @@
 Use DejaVu Sans as default font and adjusts sizes accordingly.
 --- a/kdeui/kernel/kglobalsettings.cpp
 +++ b/kdeui/kernel/kglobalsettings.cpp
-@@ -373,7 +373,7 @@ struct KFontData
+@@ -373,7 +373,7 @@
  
  // NOTE: keep in sync with kdebase/workspace/kcontrol/fonts/fonts.cpp
  static const char GeneralId[] =      "General";
@@ -10,7 +10,7 @@
  #ifdef Q_WS_MAC
  static const char DefaultMacFont[] = "Lucida Grande";
  #endif
-@@ -386,13 +386,13 @@ static const KFontData DefaultFontData[K
+@@ -386,13 +386,13 @@
      { GeneralId, "toolBarFont", DefaultMacFont, 11, -1, QFont::SansSerif },
      { GeneralId, "menuFont",    DefaultMacFont, 13, -1, QFont::SansSerif },
  #else

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	2009-08-29 08:09:02 UTC (rev 15807)
+++ trunk/packages/kdelibs/debian/patches/22_hack_in_etc_kde4_in_kstandarddirs.diff	2009-08-29 08:13:06 UTC (rev 15808)
@@ -12,7 +12,7 @@
 
 --- a/kdecore/kernel/kstandarddirs.cpp
 +++ b/kdecore/kernel/kstandarddirs.cpp
-@@ -1124,6 +1124,10 @@ QStringList KStandardDirs::KStandardDirs
+@@ -1124,6 +1124,10 @@
                          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	2009-08-29 08:09:02 UTC (rev 15807)
+++ trunk/packages/kdelibs/debian/patches/23_solid_no_double_build.diff	2009-08-29 08:13:06 UTC (rev 15808)
@@ -1,6 +1,6 @@
 --- a/solid/solid/CMakeLists.txt
 +++ b/solid/solid/CMakeLists.txt
-@@ -220,7 +220,14 @@ install(FILES org.freedesktop.PowerManag
+@@ -220,7 +220,14 @@
  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	2009-08-29 08:09:02 UTC (rev 15807)
+++ trunk/packages/kdelibs/debian/patches/25_ld_exclude_libs_qtuitools.diff	2009-08-29 08:13:06 UTC (rev 15808)
@@ -2,7 +2,7 @@
 
 --- a/plasma/CMakeLists.txt
 +++ b/plasma/CMakeLists.txt
-@@ -156,6 +156,10 @@ kde4_add_library(plasma SHARED ${plasma_
+@@ -156,6 +156,10 @@
  target_link_libraries(plasma ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS} knewstuff2
                               ${QT_QTUITOOLS_LIBRARY} ${QT_QTWEBKIT_LIBRARY}
                               threadweaver ${KDE4_SOLID_LIBS} )

Modified: trunk/packages/kdelibs/debian/patches/series
===================================================================
--- trunk/packages/kdelibs/debian/patches/series	2009-08-29 08:09:02 UTC (rev 15807)
+++ trunk/packages/kdelibs/debian/patches/series	2009-08-29 08:13:06 UTC (rev 15808)
@@ -1,4 +1,3 @@
-01_r1012564.diff
 08_add_debian_build_type.diff
 11_default_kde4_xdg_menu_prefix.diff
 13_qt4_designer_plugins_path.diff




More information about the pkg-kde-commits mailing list