Philip Muškovac has proposed merging lp:~yofel/kdenetwork/4.5.85a into lp:~kubuntu-members/kdenetwork/ubuntu.
Requested reviews: Kubuntu Members (kubuntu-members) 4.5.85a -- https://code.launchpad.net/~yofel/kdenetwork/4.5.85a/+merge/42962 Your team Kubuntu Members is requested to review the proposed merge of lp:~yofel/kdenetwork/4.5.85a into lp:~kubuntu-members/kdenetwork/ubuntu.
=== modified file 'debian/changelog' --- debian/changelog 2010-11-29 17:15:20 +0000 +++ debian/changelog 2010-12-07 16:04:11 +0000 @@ -1,3 +1,12 @@ +kdenetwork (4:4.5.85a-0ubuntu1) natty; urgency=low + + * New upstream beta release + * Add upstream svn r1203717 as kubuntu_07_krdc_vnc_detection.diff + so krdc vnc components get built. + * Add libkonq5-dev and kdebase-workspace-dev to build depends + + -- Philip Muskovac <[email protected]> Mon, 06 Dec 2010 23:41:14 +0100 + kdenetwork (4:4.5.80-0ubuntu1) natty; urgency=low * New upstream beta release === modified file 'debian/control' --- debian/control 2010-10-22 02:57:48 +0000 +++ debian/control 2010-12-07 16:04:11 +0000 @@ -18,7 +18,7 @@ libstreamanalyzer-dev, libgadu-dev, libmediastreamer-dev, libtelepathy-qt4-dev, libv4l-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], shared-desktop-ontologies, libgpgme11-dev, libexpat1-dev, libgif-dev, - libktorrent-dev + libktorrent-dev, libkonq5-dev, kdebase-workspace-dev Build-Conflicts: libmediastreamer-dev (= 3.3.0-1) [amd64] Standards-Version: 3.8.4 Homepage: http://www.kde.org/ === added file 'debian/patches/kubuntu_07_krdc_vnc_detection.diff' --- debian/patches/kubuntu_07_krdc_vnc_detection.diff 1970-01-01 00:00:00 +0000 +++ debian/patches/kubuntu_07_krdc_vnc_detection.diff 2010-12-07 16:04:11 +0000 @@ -0,0 +1,24 @@ +Index: kdenetwork-4.5.85/krdc/CMakeLists.txt +=================================================================== +--- kdenetwork-4.5.85.orig/krdc/CMakeLists.txt 2010-12-05 12:13:56.518658206 +0100 ++++ kdenetwork-4.5.85/krdc/CMakeLists.txt 2010-12-05 12:14:20.007457615 +0100 +@@ -27,9 +27,6 @@ + add_definitions(${QT_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS} ${KDE4_DEFINITIONS}) + include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES}) + +- macro_optional_find_package(LibVNCServer) +- macro_log_feature(LIBVNCSERVER_FOUND "libvncserver" "VNC Server library" "http://libvncserver.sourceforge.net/"; FALSE "0.9" "Needed to build Krfb and VNC support in Krdc") +- + # NX support is not ready for KDE 4.2; disabled (uwolfer) + # macro_optional_find_package(LibNXCL) + # macro_log_feature(LIBNXCL_FOUND "libnxcl" "NX X compression client library" "http://svn.berlios.de/svnroot/repos/freenx/trunk/freenx-client/nxcl/"; FALSE "1.0" "Needed to build Krdc with NX support") +@@ -48,6 +45,9 @@ + + endif(NOT INSIDE_KDENETWORK) + ++macro_optional_find_package(LibVNCServer) ++macro_log_feature(LIBVNCSERVER_FOUND "libvncserver" "VNC Server library" "http://libvncserver.sourceforge.net/"; FALSE "0.9" "Needed to build Krfb and VNC support in Krdc") ++ + include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/core/ === modified file 'debian/patches/series' --- debian/patches/series 2010-11-26 13:17:46 +0000 +++ debian/patches/series 2010-12-07 16:04:11 +0000 @@ -2,3 +2,4 @@ kubuntu_03_no_mediastreamer_in_wlm.diff kubuntu_04_googletalk_no_errormsg_and_knh_support.patch kubuntu_06_libktorrent.diff +kubuntu_07_krdc_vnc_detection.diff
-- kubuntu-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel
