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

Modestas Vainius modax at alioth.debian.org
Sat Mar 20 11:46:03 UTC 2010 

Author: modax
Date: 2010-03-20 11:46:03 +0000 (Sat, 20 Mar 2010)
New Revision: 17464

Removed:
   trunk/packages/kdelibs/debian/patches/26_fixmanpage.diff
   trunk/packages/kdelibs/debian/patches/30_fix_attica_includes.diff
Modified:
   trunk/packages/kdelibs/debian/changelog
   trunk/packages/kdelibs/debian/patches/08_add_debian_build_type.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/14_hardcode_ptm_device.diff
   trunk/packages/kdelibs/debian/patches/15_kfreebsd_support.diff
   trunk/packages/kdelibs/debian/patches/20_use_dejavu_as_default_font.diff
   trunk/packages/kdelibs/debian/patches/23_solid_no_double_build.diff
   trunk/packages/kdelibs/debian/patches/28_find_kde3_html_documentation.diff
   trunk/packages/kdelibs/debian/patches/series
Log:
* New upstream release.
* Update patches:
  - drop 26_fixmanpage.diff - fixed upstream;
  - drop 0_fix_attica_includes.diff - merged upstream;
  - refresh other patches.

Modified: trunk/packages/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog	2010-03-18 20:08:27 UTC (rev 17463)
+++ trunk/packages/kdelibs/debian/changelog	2010-03-20 11:46:03 UTC (rev 17464)
@@ -1,3 +1,15 @@
+kde4libs (4:4.4.1+svn1105396-0rc1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+  [ Modestas Vainius ]
+  * Update patches:
+    - drop 26_fixmanpage.diff - fixed upstream;
+    - drop 0_fix_attica_includes.diff - merged upstream;
+    - refresh other patches.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 20 Mar 2010 13:44:59 +0200
+
 kde4libs (4:4.4.1-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-03-18 20:08:27 UTC (rev 17463)
+++ trunk/packages/kdelibs/debian/patches/08_add_debian_build_type.diff	2010-03-20 11:46:03 UTC (rev 17464)
@@ -9,7 +9,7 @@
 
 --- a/cmake/modules/FindKDE4Internal.cmake
 +++ b/cmake/modules/FindKDE4Internal.cmake
-@@ -1076,11 +1076,13 @@ if (CMAKE_COMPILER_IS_GNUCXX)
+@@ -1076,11 +1076,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/10_make_libkdeinit4_private.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/10_make_libkdeinit4_private.diff	2010-03-18 20:08:27 UTC (rev 17463)
+++ trunk/packages/kdelibs/debian/patches/10_make_libkdeinit4_private.diff	2010-03-20 11:46:03 UTC (rev 17464)
@@ -61,7 +61,7 @@
  
 --- a/kinit/CMakeLists.txt
 +++ b/kinit/CMakeLists.txt
-@@ -51,6 +51,14 @@
+@@ -54,6 +54,14 @@
  
  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-03-18 20:08:27 UTC (rev 17463)
+++ trunk/packages/kdelibs/debian/patches/11_default_kde4_xdg_menu_prefix.diff	2010-03-20 11:46:03 UTC (rev 17464)
@@ -5,7 +5,7 @@
 
 --- a/kded/CMakeLists.txt
 +++ b/kded/CMakeLists.txt
-@@ -69,7 +69,7 @@ install(TARGETS kdontchangethehostname D
+@@ -75,7 +75,7 @@
  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 @@ VFolderMenu::locateMenuFile(const QStrin
+@@ -772,8 +772,10 @@
     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 @@ VFolderMenu::locateMenuFile(const QStrin
+@@ -783,7 +785,6 @@
        QString baseName = QDir::cleanPath(m_docInfo.baseDir +
                                           fileInfo.path() + '/' + fileNameOnly);
        result = KStandardDirs::locate("xdgconf-menu", baseName);

Modified: trunk/packages/kdelibs/debian/patches/14_hardcode_ptm_device.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/14_hardcode_ptm_device.diff	2010-03-18 20:08:27 UTC (rev 17463)
+++ trunk/packages/kdelibs/debian/patches/14_hardcode_ptm_device.diff	2010-03-20 11:46:03 UTC (rev 17464)
@@ -6,7 +6,7 @@
 
 --- a/ConfigureChecks.cmake
 +++ b/ConfigureChecks.cmake
-@@ -202,13 +202,7 @@ if (UNIX)
+@@ -202,13 +202,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	2010-03-18 20:08:27 UTC (rev 17463)
+++ trunk/packages/kdelibs/debian/patches/15_kfreebsd_support.diff	2010-03-20 11:46:03 UTC (rev 17464)
@@ -12,7 +12,7 @@
 
 --- a/ConfigureChecks.cmake
 +++ b/ConfigureChecks.cmake
-@@ -164,11 +164,11 @@ if (UNIX)
+@@ -164,11 +164,11 @@
          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
-@@ -1896,7 +1896,15 @@ static bool fileSystemSupportsACL( const
+@@ -1912,7 +1912,15 @@
      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 @@ void FileProtocol::get( const KUrl& url 
+@@ -324,8 +324,10 @@
      }
  
  #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 @@ void FileProtocol::copy( const KUrl &src
+@@ -146,8 +146,10 @@
      }
  
  #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 @@ void FileProtocol::copy( const KUrl &src
+@@ -169,8 +171,10 @@
      }
  
  #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 @@ extern "C" {
+@@ -107,24 +107,24 @@
  # define _NEW_TTY_CTRL
  #endif
  

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-03-18 20:08:27 UTC (rev 17463)
+++ trunk/packages/kdelibs/debian/patches/20_use_dejavu_as_default_font.diff	2010-03-20 11:46:03 UTC (rev 17464)
@@ -6,7 +6,7 @@
 
 --- a/kdeui/kernel/kglobalsettings.cpp
 +++ b/kdeui/kernel/kglobalsettings.cpp
-@@ -381,7 +381,7 @@ struct KFontData
+@@ -381,7 +381,7 @@
  
  // 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 @@ static const KFontData DefaultFontData[K
+@@ -395,7 +395,7 @@
      { GeneralId, "menuFont",    DefaultMacFont, 13, -1, QFont::SansSerif },
  #else
      { GeneralId, "font",        DefaultFont, 9, -1, QFont::SansSerif },

Modified: trunk/packages/kdelibs/debian/patches/23_solid_no_double_build.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/23_solid_no_double_build.diff	2010-03-18 20:08:27 UTC (rev 17463)
+++ trunk/packages/kdelibs/debian/patches/23_solid_no_double_build.diff	2010-03-20 11:46:03 UTC (rev 17464)
@@ -4,7 +4,7 @@
 
 --- a/solid/solid/CMakeLists.txt
 +++ b/solid/solid/CMakeLists.txt
-@@ -235,7 +235,14 @@ install(FILES org.freedesktop.PowerManag
+@@ -235,7 +235,14 @@
  install(FILES org.freedesktop.PowerManagement.Inhibit.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
  
  ########### static lib for tests  ###############

Modified: trunk/packages/kdelibs/debian/patches/28_find_kde3_html_documentation.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/28_find_kde3_html_documentation.diff	2010-03-18 20:08:27 UTC (rev 17463)
+++ trunk/packages/kdelibs/debian/patches/28_find_kde3_html_documentation.diff	2010-03-20 11:46:03 UTC (rev 17464)
@@ -1,6 +1,6 @@
 --- a/kdecore/kernel/kstandarddirs.cpp
 +++ b/kdecore/kernel/kstandarddirs.cpp
-@@ -1769,6 +1769,9 @@ void KStandardDirs::addKDEDefaults()
+@@ -1796,6 +1796,9 @@
  
      addResourceType("autostart", "xdgconf-autostart", "/"); // merge them, start with xdg autostart
      addResourceType("autostart", NULL, "share/autostart"); // KDE ones are higher priority

Modified: trunk/packages/kdelibs/debian/patches/series
===================================================================
--- trunk/packages/kdelibs/debian/patches/series	2010-03-18 20:08:27 UTC (rev 17463)
+++ trunk/packages/kdelibs/debian/patches/series	2010-03-20 11:46:03 UTC (rev 17464)
@@ -12,8 +12,6 @@
 22_hack_in_etc_kde4_in_kstandarddirs.diff
 23_solid_no_double_build.diff
 25_ld_exclude_libs_qtuitools.diff
-26_fixmanpage.diff
 27_konsole_kfreebsd_fix.diff
 28_find_kde3_html_documentation.diff
 29_hurd_support.diff
-30_fix_attica_includes.diff

More information about the pkg-kde-commits mailing list