[SCM] networkmanager-qt packaging branch, kubuntu_wily_archive, updated. debian/5.11.0-1-21-gc5cf818
Scarlett Clark
sgclark-guest at moszumanska.debian.org
Sat Jul 11 14:54:19 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/networkmanager-qt.git;a=commitdiff;h=ac6ed12
The following commit has been merged in the kubuntu_wily_archive branch:
commit ac6ed127309c394df91fd55acd0f0f52efffddbd
Author: Rohan Garg <rohan at garg.io>
Date: Wed Jul 1 02:02:18 2015 +0200
Fix merge headers from last run
---
debian/control | 5 -----
1 file changed, 5 deletions(-)
diff --git a/debian/control b/debian/control
index a42225b..a73761e 100644
--- a/debian/control
+++ b/debian/control
@@ -5,13 +5,8 @@ Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Maximiliano Curia <maxy at debian.org>
Build-Depends: cmake (>= 2.8.12),
debhelper (>= 9),
-<<<<<<< HEAD
- extra-cmake-modules (>= 5.10.0),
- libnm-glib-dev (>= 0.9.10.0),
-=======
extra-cmake-modules (>= 5.11.0~),
libnm-dev (>= 0.9.10.0),
->>>>>>> master
libnm-util-dev (>= 0.9.10.0),
network-manager-dev (>= 0.9.8.4),
pkg-config,
--
networkmanager-qt packaging
More information about the pkg-kde-commits
mailing list