[SCM] "Network Management" Plasma widget Debian packaging branch, experimental, updated. debian/0.1+git20110727.96f5505-1-14-g50b7081

[Michael Biebl]

The following commit has been merged in the experimental branch:
commit 1376f5153f37359c3cff1197c513476b5b68425e
Author: Michael Biebl <biebl at debian.org>
Date:   Tue Sep 6 22:47:58 2011 +0200

    Remove debian/patches/01-no-x11-libs.patch, merged upstream.
---
 debian/changelog                    |    1 +
 debian/patches/01-no-x11-libs.patch |   13 -------------
 debian/patches/series               |    1 -
 3 files changed, 1 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 693409a..e695175 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ networkmanagement (0.9~git20110904.06145dc-1) UNRELEASED; urgency=low
 
   * New upstream Git snapshot 06145dcffeb34cb68f7ff098db8cf590d63fa52e from
     the nm09 branch.
+  * Remove debian/patches/01-no-x11-libs.patch, merged upstream.
 
  -- Michael Biebl <biebl at debian.org>  Tue, 06 Sep 2011 22:46:29 +0200
 
diff --git a/debian/patches/01-no-x11-libs.patch b/debian/patches/01-no-x11-libs.patch
deleted file mode 100644
index 87f5994..0000000
--- a/debian/patches/01-no-x11-libs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/solidcontrolfuture/libs/solid/control/CMakeLists.txt b/solidcontrolfuture/libs/solid/control/CMakeLists.txt
-index 9857438..b6bf64e 100644
---- a/solidcontrolfuture/libs/solid/control/CMakeLists.txt
-+++ b/solidcontrolfuture/libs/solid/control/CMakeLists.txt
-@@ -26,7 +26,7 @@ qt4_add_dbus_interface(solidcontrolnm09_LIB_SRCS org.kde.Solid.Networking.xml or
- 
- kde4_add_library(solidcontrolnm09 SHARED ${solidcontrolnm09_LIB_SRCS})
- 
--target_link_libraries(solidcontrolnm09 ${KDE4_KDECORE_LIBS} ${KDE4_SOLID_LIBS} ${QT_QTNETWORK_LIBRARY} solidcontrolnm09ifaces ${X11_Xrandr_LIB} ${X11_X11_LIB} ${QT_QTGUI_LIBRARY} )
-+target_link_libraries(solidcontrolnm09 ${KDE4_KDECORE_LIBS} ${KDE4_SOLID_LIBS} ${QT_QTNETWORK_LIBRARY} solidcontrolnm09ifaces ${QT_QTGUI_LIBRARY} )
- 
- set_target_properties(solidcontrolnm09 PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
- install(TARGETS solidcontrolnm09 EXPORT kdeworkspaceLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
diff --git a/debian/patches/series b/debian/patches/series
index 621bb7a..35eaf72 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 # patches for plasma-widget-networkmanagement
-01-no-x11-libs.patch

-- 
"Network Management" Plasma widget Debian packaging