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

Ana Beatriz Guerrero López ana at alioth.debian.org
Sat May 31 11:04:13 UTC 2008


Author: ana
Date: 2008-05-31 11:04:13 +0000 (Sat, 31 May 2008)
New Revision: 10808

Removed:
   branches/kde4/packages/kdebase/debian/patches/01_r811027_konqcrash_on_rightclick.diff
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
   branches/kde4/packages/kdebase/debian/patches/series
Log:

  * Remove 01_r811027_konqcrash_on_rightclick.diff, merged upstream.
  * Add small update in 97_fix_target_link_libraries.diff.
  * Update build dependencies:
     - Bump kdepimlibs5-dev to (>= 4:4.0.81).
     - Change libphonon-dev to new versioning (>= 4:4.2~).




Modified: branches/kde4/packages/kdebase/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase/debian/changelog	2008-05-31 10:44:08 UTC (rev 10807)
+++ branches/kde4/packages/kdebase/debian/changelog	2008-05-31 11:04:13 UTC (rev 10808)
@@ -1,10 +1,20 @@
-kdebase (4:4.0.80-2) UNRELEASED; urgency=low
+kdebase (4:4.0.81+svn814614-1) UNRELEASED; urgency=low
 
+  * New upstream snapshot.
+
   +++ Changes by Modestas Vainius:
 
   * Bump kdepimlibs5-dev and libphonon-dev build depends to 4.0.80
     (Closes: #483116).
 
+  +++ Changes by Ana Beatriz Guerrero Lopez:
+
+  * Remove 01_r811027_konqcrash_on_rightclick.diff, merged upstream.
+  * Add small update in 97_fix_target_link_libraries.diff.
+  * Update build dependencies:
+    - Bump kdepimlibs5-dev to (>= 4:4.0.81).
+    - Change libphonon-dev to new versioning (>= 4:4.2~).
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 27 May 2008 12:04:47 +0300
 
 kdebase (4:4.0.80-1) experimental; urgency=low

Modified: branches/kde4/packages/kdebase/debian/control
===================================================================
--- branches/kde4/packages/kdebase/debian/control	2008-05-31 10:44:08 UTC (rev 10807)
+++ branches/kde4/packages/kdebase/debian/control	2008-05-31 11:04:13 UTC (rev 10808)
@@ -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 (>= 2.4.5),
- kdepimlibs5-dev (>= 4:4.0.80), libphonon-dev (>= 4:4.0.80),
+ kdepimlibs5-dev (>= 4:4.0.81), libphonon-dev (>= 4:4.2~),
  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

Deleted: branches/kde4/packages/kdebase/debian/patches/01_r811027_konqcrash_on_rightclick.diff

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-31 10:44:08 UTC (rev 10807)
+++ branches/kde4/packages/kdebase/debian/patches/97_fix_target_link_libraries.diff	2008-05-31 11:04:13 UTC (rev 10808)
@@ -98,8 +98,8 @@
  kde4_add_plugin(kcm_konqhtml ${kcm_konqhtml_PART_SRCS})
  
  
--target_link_libraries(kcm_konqhtml  ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KHTML_LIBS})
-+target_link_libraries(kcm_konqhtml  ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KHTML_LIBS} ${QT_QTDBUS_LIBRARY})
+-target_link_libraries(kcm_konqhtml ${KDE4_KHTML_LIBS})
++target_link_libraries(kcm_konqhtml ${KDE4_KHTML_LIBS} ${QT_QTDBUS_LIBRARY})
  
  install(TARGETS kcm_konqhtml  DESTINATION ${PLUGIN_INSTALL_DIR} )
  

Modified: branches/kde4/packages/kdebase/debian/patches/series
===================================================================
--- branches/kde4/packages/kdebase/debian/patches/series	2008-05-31 10:44:08 UTC (rev 10807)
+++ branches/kde4/packages/kdebase/debian/patches/series	2008-05-31 11:04:13 UTC (rev 10808)
@@ -1,2 +1 @@
-01_r811027_konqcrash_on_rightclick.diff
 97_fix_target_link_libraries.diff




More information about the pkg-kde-commits mailing list