rev 10526 - in branches/kde4/packages/kdebase/debian: . patches

Fathi Boudra fabo at alioth.debian.org
Sat May 10 10:29:57 UTC 2008


Author: fabo
Date: 2008-05-10 10:29:57 +0000 (Sat, 10 May 2008)
New Revision: 10526

Modified:
   branches/kde4/packages/kdebase/debian/changelog
   branches/kde4/packages/kdebase/debian/control
   branches/kde4/packages/kdebase/debian/patches/97_fix_target_link_libraries.diff
Log:
Update for 4.0.73 snapshot. Near nothing to do: refresh and bump.


Modified: branches/kde4/packages/kdebase/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase/debian/changelog	2008-05-10 10:25:27 UTC (rev 10525)
+++ branches/kde4/packages/kdebase/debian/changelog	2008-05-10 10:29:57 UTC (rev 10526)
@@ -1,12 +1,11 @@
-kdebase (4:4.0.72+svn804272-1~pre1) UNRELEASED; urgency=low
+kdebase (4:4.0.73-1) UNRELEASED; urgency=low
 
-  * New upstream development snapshot:
-    - The latest upstream commit is r804272 by dfaure
-    - Date: Mon, 05 May 2008 17:20:39 -0000
+  * New upstream development snapshot.
+
   * Corrections to *.install files:
     - libkonq5.install: 1 file(s) removed;
     - libkonq5-dev.install: 1 file(s) removed;
-  
+
   +++ Changes by Modestas Vainius:
 
   * Resync 97_ patch.

Modified: branches/kde4/packages/kdebase/debian/control
===================================================================
--- branches/kde4/packages/kdebase/debian/control	2008-05-10 10:25:27 UTC (rev 10525)
+++ branches/kde4/packages/kdebase/debian/control	2008-05-10 10:29:57 UTC (rev 10526)
@@ -4,7 +4,7 @@
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>, Armin Berres <trigger+debian at space-based.de>, Modestas Vainius <modestas at vainius.eu>, Matthew Rosewarne <mrosewarne at inoutbox.com>
 Build-Depends: cdbs (>= 0.4.51), debhelper (>= 6), quilt, cmake,
- kdepimlibs5-dev (>= 4:4.0.72), libphonon-dev (>= 4:4.0.72),
+ kdepimlibs5-dev (>= 4:4.0.73), libphonon-dev (>= 4:4.0.73),
  libqimageblitz-dev (>= 1:0.0.4-2), libsmbclient-dev, libusb-dev, libxkbfile-dev,
  libraw1394-dev, libstreamanalyzer-dev, libxrender-dev, zlib1g-dev, libglu1-mesa-dev,
  libpci-dev, libxt-dev, pkg-config
@@ -85,7 +85,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, dolphin (= ${binary:Version}),
  konqueror (= ${binary:Version}), libkonq5-dev (= ${binary:Version}),
- kdepimlibs5-dev (>= 4:4.0.72), libphonon-dev (>= 4:4.0.72),
+ kdepimlibs5-dev (>= 4:4.0.73), libphonon-dev (>= 4:4.0.73),
  libqimageblitz-dev (>=1:0.0.4-2), libsmbclient-dev, libusb-dev, libxkbfile-dev, libraw1394-dev
 Description: development files for the KDE 4 base module
  This package contains development files for building software that uses
@@ -202,7 +202,7 @@
 Package: libkonq5-dev
 Section: libdevel
 Architecture: any
-Depends: libkonq5 (= ${binary:Version}), kdelibs5-dev (>= 4:4.0.72)
+Depends: libkonq5 (= ${binary:Version}), kdelibs5-dev (>= 4:4.0.73)
 Description: development files for the Konqueror libraries
  This package contains development files for building software that uses the
  Konqueror libraries.

Modified: branches/kde4/packages/kdebase/debian/patches/97_fix_target_link_libraries.diff
===================================================================
--- branches/kde4/packages/kdebase/debian/patches/97_fix_target_link_libraries.diff	2008-05-10 10:25:27 UTC (rev 10525)
+++ branches/kde4/packages/kdebase/debian/patches/97_fix_target_link_libraries.diff	2008-05-10 10:29:57 UTC (rev 10526)
@@ -28,7 +28,7 @@
  
 --- a/apps/lib/konq/CMakeLists.txt
 +++ b/apps/lib/konq/CMakeLists.txt
-@@ -23,7 +23,7 @@
+@@ -20,7 +20,7 @@
  
  kde4_add_library(konq SHARED ${konq_LIB_SRCS})
  
@@ -175,7 +175,7 @@
  endif(X11_Xrender_FOUND)
 --- a/apps/nsplugins/CMakeLists.txt
 +++ b/apps/nsplugins/CMakeLists.txt
-@@ -26,7 +26,7 @@
+@@ -25,7 +25,7 @@
  
    kde4_add_plugin(libnsplugin ${nsplugins_PART_SRCS})
  
@@ -186,12 +186,10 @@
  
 --- a/apps/dolphin/src/CMakeLists.txt
 +++ b/apps/dolphin/src/CMakeLists.txt
-@@ -52,7 +52,13 @@
- 
+@@ -58,6 +58,12 @@
  configure_file(config-nepomuk.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-nepomuk.h )
  
--target_link_libraries(dolphinprivate ${KDE4_KFILE_LIBS} konq ${QIMAGEBLITZ_LIBRARIES})
-+target_link_libraries(dolphinprivate ${KDE4_KFILE_LIBS} konq ${QIMAGEBLITZ_LIBRARIES})
+ target_link_libraries(dolphinprivate ${KDE4_KFILE_LIBS} konq ${QIMAGEBLITZ_LIBRARIES})
 +if (X11_FOUND)
 +  target_link_libraries(dolphinprivate ${X11_X11_LIB})
 +endif (X11_FOUND)




More information about the pkg-kde-commits mailing list