[SCM] KDE Web Development module packaging branch, master, updated. debian/4.11.3-1-4-gbcb78df

Maximiliano Curia maxy at moszumanska.debian.org
Wed Jan 29 16:30:28 UTC 2014


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdewebdev.git;a=commitdiff;h=bcb78df

The following commit has been merged in the master branch:
commit bcb78df4c02b1a42e4e53582e5ea40922b379d7d
Author: Maximiliano Curia <maxy at debian.org>
Date:   Wed Jan 29 17:16:03 2014 +0100

    wrap-and-sort
---
 debian/control   | 34 ++++++++++++++++++++--------------
 debian/copyright | 20 ++++++++++----------
 2 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/debian/control b/debian/control
index 45726bd..c5bc2b9 100644
--- a/debian/control
+++ b/debian/control
@@ -6,11 +6,16 @@ Uploaders: Sune Vuorela <sune at debian.org>,
            Modestas Vainius <modax at debian.org>,
            Eshat Cakar <info at eshat.de>,
            Maximiliano Curia <maxy at debian.org>
-Build-Depends: kde-sc-dev-latest (>= 4:4.11),
- cmake, debhelper (>= 9), pkg-kde-tools (>= 0.12),
- kdepimlibs5-dev (>= 4:4.11),
- nepomuk-core-dev (>= 4:4.11),
- libtidy-dev, zlib1g-dev, libboost-dev, libxslt-dev
+Build-Depends: cmake,
+               debhelper (>= 9),
+               kde-sc-dev-latest (>= 4:4.11),
+               kdepimlibs5-dev (>= 4:4.11),
+               libboost-dev,
+               libtidy-dev,
+               libxslt-dev,
+               nepomuk-core-dev (>= 4:4.11),
+               pkg-kde-tools (>= 0.12),
+               zlib1g-dev
 Standards-Version: 3.9.5
 Homepage: http://kdewebdev.org/
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/kdewebdev.git
@@ -19,10 +24,11 @@ Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/kdewebdev.git
 Package: kdewebdev
 Architecture: all
 Section: kde
-Depends: ${misc:Depends}, kfilereplace (>= ${source:Version}),
- kimagemapeditor (>= ${source:Version}),
- klinkstatus (>= ${source:Version}),
- kommander (>= ${source:Version})
+Depends: kfilereplace (>= ${source:Version}),
+         kimagemapeditor (>= ${source:Version}),
+         klinkstatus (>= ${source:Version}),
+         kommander (>= ${source:Version}),
+         ${misc:Depends}
 Description: web development apps from the official KDE release
  This metapackage includes a collection of web development applications
  provided with the official release of KDE.
@@ -30,7 +36,7 @@ Description: web development apps from the official KDE release
 Package: kfilereplace
 Architecture: any
 Section: kde
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: batch search-and-replace component
  KFileReplace is an embedded component for KDE that acts as a batch
  search-and-replace tool. It allows you to replace one expression with
@@ -41,7 +47,7 @@ Description: batch search-and-replace component
 Package: kimagemapeditor
 Architecture: any
 Section: editors
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: HTML image map editor
  KImageMapEditor is a tool that allows you to edit image maps in HTML
  files. As well as providing a standalone application, KImageMapEditor
@@ -52,7 +58,7 @@ Description: HTML image map editor
 Package: klinkstatus
 Architecture: any
 Section: web
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: khelpcenter4
 Description: web link validity checker
  KLinkStatus is KDE's web link validity checker. It allows you to
@@ -67,7 +73,7 @@ Description: web link validity checker
 Package: kommander
 Architecture: any
 Section: devel
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Replaces: kommander-dev
 Description: visual dialog builder and executor tool
  Kommander is a visual dialog building tool whose primary objective is
@@ -93,7 +99,7 @@ Description: visual dialog builder and executor tool
 Package: kdewebdev-dbg
 Section: debug
 Architecture: any
-Depends: ${misc:Depends}, kde-runtime-dbg
+Depends: kde-runtime-dbg, ${misc:Depends}
 Suggests: kdewebdev (= ${source:Version})
 Priority: extra
 Description: debugging symbols for the KDE web development module
diff --git a/debian/copyright b/debian/copyright
index cd134c1..f052b3b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,7 +7,7 @@ Upstream Authors and copyright holders:
 
     © 2004-2008 Paulo Moura Guedes <moura at kdewebdev.org>
     © 2000, 2003-2006 Michal Rudolf <mrudolf at kdewebdev.org>
-    © 2001-2002, 2004, 2006, 2008 Keith Isdale <keith at kdewebdev.org> 
+    © 2001-2002, 2004, 2006, 2008 Keith Isdale <keith at kdewebdev.org>
     © 2000-2002 Trolltech AS.
     © 2002-2004 Marc Britton <consume at optusnet.com.au>
     © 2004, 2008 Eric Laffoon <sequitur at kde.org> <eric at kdewebdev.org>
@@ -23,22 +23,22 @@ Upstream Authors and copyright holders:
 
 License:
 
-Files under cmake/ are referencing a cmake scripts license file, unfortunately 
+Files under cmake/ are referencing a cmake scripts license file, unfortunately
 not in the tarball. It is common for all kde modules and has the following content:
 
 
     | Redistribution and use in source and binary forms, with or without
     | modification, are permitted provided that the following conditions
     | are met:
-    | 
+    |
     | 1. Redistributions of source code must retain the copyright
     |    notice, this list of conditions and the following disclaimer.
     | 2. Redistributions in binary form must reproduce the copyright
     |    notice, this list of conditions and the following disclaimer in the
     |    documentation and/or other materials provided with the distribution.
-    | 3. The name of the author may not be used to endorse or promote products 
+    | 3. The name of the author may not be used to endorse or promote products
     |    derived from this software without specific prior written permission.
-    | 
+    |
     | THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
     | IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
     | OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
@@ -64,7 +64,7 @@ These files are under the GNU Free Documentation License v1.2
     The full text of the GNU Free Documentation License is available on
     Debian systems in /usr/share/common-licenses/GFDL-1.2
 
-    As well, all the Manpages.dox included are under this license, unless 
+    As well, all the Manpages.dox included are under this license, unless
     specified otherwise.
 
 
@@ -90,15 +90,15 @@ These files are under the LGPL v2.
 
 Files under templates/
 
-These files are under the GPL v2 
+These files are under the GPL v2
 
 
-On Debian systems, the complete text of the GNU General Public License 
+On Debian systems, the complete text of the GNU General Public License
 version 2 can be found in /usr/share/common-licenses/GPL-2
 
-On Debian systems, the complete text of the GNU Library General Public 
+On Debian systems, the complete text of the GNU Library General Public
 License version 2 can be found in /usr/share/common-licenses/LGPL-2
 
 
-The Debian packaging is Copyright (C) 2007-2009 by Debian Qt/KDE Maintainers 
+The Debian packaging is Copyright (C) 2007-2009 by Debian Qt/KDE Maintainers
 and is licensed under the GPL, see `/usr/share/common-licenses/GPL'.

-- 
KDE Web Development module packaging



More information about the pkg-kde-commits mailing list