[SCM] zeroconf-ioslave packaging branch, kubuntu_wily_archive, updated. 5da8d5edfe498da0903820725fe467251bd92e09

[Scarlett Clark]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/zeroconf-ioslave.git;a=commitdiff;h=5da8d5e

The following commit has been merged in the kubuntu_wily_archive branch:
commit 5da8d5edfe498da0903820725fe467251bd92e09
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri May 15 19:55:22 2015 -0700

    wrap-and-sort
---
 debian/changelog            |  5 +++--
 debian/control              | 12 +++++++-----
 debian/copyright            | 27 +++++++++++++--------------
 debian/kde-zeroconf.install |  6 +++---
 4 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ea6aea9..e2db7c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-zeroconf-ioslave (4:15.04.0-0ubuntu1) UNRELEASED; urgency=medium
+zeroconf-ioslave (4:15.04.1-0ubuntu1) UNRELEASED; urgency=medium
 
   * New upstream release
+  * wrap-and-sort 
 
- -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 15 Apr 2015 15:18:10 -0700
+ -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 13 May 2015 23:21:11 -0700
 
 zeroconf-ioslave (4:14.12.3-0ubuntu1) vivid; urgency=medium
 
diff --git a/debian/control b/debian/control
index 056c40a..ff75408 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,11 @@ Source: zeroconf-ioslave
 Section: kde
 Priority: optional
 Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Build-Depends: kde-sc-dev-latest (>= 4:4.10.2),
- cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.12),
- kdelibs5-dev
+Build-Depends: cmake,
+               debhelper (>= 7.3.16),
+               kde-sc-dev-latest (>= 4:4.10.2),
+               kdelibs5-dev,
+               pkg-kde-tools (>= 0.12)
 Standards-Version: 3.9.4
 Homepage: http://www.kde.org/
 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/kde-applications/zeroconf-ioslave.git/
@@ -13,7 +15,7 @@ Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/zerocon
 Package: kde-zeroconf
 Architecture: any
 Priority: extra
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: zeroconf plugins and kio slaves for KDE
  Zeroconf is an implementation of IPv4 link-local addresses (RFC3927)
  which can be used for ad-hoc networks.  Addresses are allocated from
@@ -27,7 +29,7 @@ Package: kde-zeroconf-dbg
 Section: debug
 Architecture: any
 Priority: extra
-Depends: ${misc:Depends}, kde-runtime-dbg, kde-zeroconf (= ${binary:Version})
+Depends: kde-runtime-dbg, kde-zeroconf (= ${binary:Version}), ${misc:Depends}
 Breaks: kdenetwork-dbg
 Replaces: kdenetwork-dbg
 Description: debug symbols for kde-zeroconf
diff --git a/debian/copyright b/debian/copyright
index 212f51d..857c0cd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,19 +9,19 @@ Copyright:
 
 License:
 ioslave/ is
-    This program is free software; you can redistribute it and/or modify  
-    it under the terms of the GNU General Public License as published by  
-    the Free Software Foundation; either version 2 of the License, or     
-    (at your option) any later version.                                   
-                                                                          
-    This program is distributed in the hope that it will be useful,       
-    but WITHOUT ANY WARRANTY; without even the implied warranty of        
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         
-    GNU General Public License for more details.                          
-                                                                          
-    You should have received a copy of the GNU General Public License     
-    along with this program; if not, write to the                         
-    Free Software Foundation, Inc.,                                       
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the
+    Free Software Foundation, Inc.,
     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 The full text of the GNU General Public License version 2 is available on
@@ -47,4 +47,3 @@ Debian systems in /usr/share/common-licenses/LGPL-2.
 
 The packaging is © 2013 Jonathan Riddell and
 is licensed under the GPL version 2 or later, see `/usr/share/common-licenses/GPL'.
-
diff --git a/debian/kde-zeroconf.install b/debian/kde-zeroconf.install
index 527ccda..bae8696 100644
--- a/debian/kde-zeroconf.install
+++ b/debian/kde-zeroconf.install
@@ -1,6 +1,6 @@
 usr/lib/kde4/kded_dnssdwatcher.so
 usr/lib/kde4/kio_zeroconf.so
-usr/share/kde4/services/zeroconf.protocol
-usr/share/kde4/services/kded/dnssdwatcher.desktop
-usr/share/kde4/apps/remoteview/zeroconf.desktop
 usr/share/dbus-1/interfaces/org.kde.kdnssd.xml
+usr/share/kde4/apps/remoteview/zeroconf.desktop
+usr/share/kde4/services/kded/dnssdwatcher.desktop
+usr/share/kde4/services/zeroconf.protocol

-- 
zeroconf-ioslave packaging