[SCM] KDE Base Applications module packaging branch, master, updated. debian/4.11.3-1-3-g05fb60a
Lisandro Damián Nicanor Pérez
lisandro at moszumanska.debian.org
Mon Jan 20 16:04:01 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde-baseapps.git;a=commitdiff;h=05fb60a
The following commit has been merged in the master branch:
commit 05fb60ab450e7627b410d6e3c2efcdef95bea611
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date: Mon Jan 20 13:03:29 2014 -0300
No-op wrap-and-sort.
---
debian/control | 108 ++++++++++++++++++++++++++++++++++---------------------
debian/copyright | 50 +++++++++++++-------------
2 files changed, 93 insertions(+), 65 deletions(-)
diff --git a/debian/control b/debian/control
index de5de89..d2d6d43 100644
--- a/debian/control
+++ b/debian/control
@@ -9,16 +9,26 @@ Uploaders: Sune Vuorela <sune at debian.org>,
Eshat Cakar <info at eshat.de>,
Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>,
Maximiliano Curia <maxy at debian.org>
-Build-Depends: kde-sc-dev-latest (>= 4:4.11),
- cmake, debhelper (>= 9), pkg-kde-tools (>= 0.12), libdlrestrictions-dev (>= 0.14),
- kdelibs5-dev (>= 4:4.11), libkactivities-dev (>= 4:4.11),
- nepomuk-core-dev (>= 4:4.11), libnepomukwidgets-dev (>= 4:4.11),
- libphonon-dev (>= 4:4.3.0),
- libqimageblitz-dev (>= 1:0.0.4-2), libxkbfile-dev,
- libstreamanalyzer-dev (>= 0.6.3),
- libxrender-dev, zlib1g-dev,
- libxt-dev, pkg-config, libglib2.0-dev, shared-desktop-ontologies (>= 0.8),
- libtidy-dev
+Build-Depends: cmake,
+ debhelper (>= 9),
+ kde-sc-dev-latest (>= 4:4.11),
+ kdelibs5-dev (>= 4:4.11),
+ libdlrestrictions-dev (>= 0.14),
+ libglib2.0-dev,
+ libkactivities-dev (>= 4:4.11),
+ libnepomukwidgets-dev (>= 4:4.11),
+ libphonon-dev (>= 4:4.3.0),
+ libqimageblitz-dev (>= 1:0.0.4-2),
+ libstreamanalyzer-dev (>= 0.6.3),
+ libtidy-dev,
+ libxkbfile-dev,
+ libxrender-dev,
+ libxt-dev,
+ nepomuk-core-dev (>= 4:4.11),
+ pkg-config,
+ pkg-kde-tools (>= 0.12),
+ shared-desktop-ontologies (>= 0.8),
+ zlib1g-dev
Standards-Version: 3.9.4
Homepage: http://www.kde.org/
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-sc/kde-baseapps.git
@@ -26,15 +36,15 @@ Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/kde-baseapps.git
Package: kde-baseapps
Architecture: all
-Depends: ${misc:Depends},
- dolphin (>= ${source:Version}),
- kde-baseapps-bin (>= ${source:Version}),
- kdepasswd (>= ${source:Version}),
- kfind (>= ${source:Version}),
- konqueror (>= ${source:Version}),
- konsole,
- kwrite,
- plasma-widget-folderview (>= ${source:Version})
+Depends: dolphin (>= ${source:Version}),
+ kde-baseapps-bin (>= ${source:Version}),
+ kdepasswd (>= ${source:Version}),
+ kfind (>= ${source:Version}),
+ konqueror (>= ${source:Version}),
+ konsole,
+ kwrite,
+ plasma-widget-folderview (>= ${source:Version}),
+ ${misc:Depends}
Recommends: konqueror-nsplugins (>= ${source:Version})
Breaks: kdebase-apps (<< 4:4.7.2)
Replaces: kdebase-apps (<< 4:4.7.2)
@@ -60,7 +70,7 @@ Description: Transitional package for kde-baseapps
Package: dolphin
Section: utils
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Recommends: ruby
Suggests: kdesdk-dolphin-plugins
Description: file manager
@@ -80,8 +90,10 @@ Description: file manager
Package: kde-baseapps-bin
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, kde-baseapps-data (= ${source:Version})
-Breaks: kdesktop, kcontrol, kdebase-bin (<< 4:4.7.2)
+Depends: kde-baseapps-data (= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Breaks: kcontrol, kdebase-bin (<< 4:4.7.2), kdesktop
Replaces: kdebase-bin (<< 4:4.7.2)
Description: core binaries for the KDE base applications
This package contains miscellaneous programs needed by other KDE
@@ -93,7 +105,7 @@ Package: kdebase-bin
Section: oldlibs
Priority: extra
Architecture: all
-Depends: ${misc:Depends}, kde-baseapps-bin
+Depends: kde-baseapps-bin, ${misc:Depends}
Description: Transitional package for new kde-baseapps
This transitional package can be safely removed after installation.
@@ -111,7 +123,9 @@ Description: shared data files for the KDE base applications
Package: kdepasswd
Section: utils
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, kde-baseapps-data (= ${source:Version})
+Depends: kde-baseapps-data (= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
Description: graphical password changing utility
kdepasswd allows users to change their password, user icon, and other
information. A variety of user icons are included.
@@ -121,7 +135,7 @@ Description: graphical password changing utility
Package: kfind
Section: utils
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: file search utility
KFind can be used to find files and directories on your system.
.
@@ -131,12 +145,18 @@ Package: konqueror
Section: web
Architecture: any
Provides: info-browser, man-browser, www-browser
-Depends: ${shlibs:Depends}, ${misc:Depends}, kde-baseapps-data (= ${source:Version}),
- kde-baseapps-bin (= ${binary:Version}), install-info
+Depends: install-info,
+ kde-baseapps-bin (= ${binary:Version}),
+ kde-baseapps-data (= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
Suggests: konq-plugins (>= 4:4.1~)
-Recommends: kpart-webkit, konqueror-nsplugins (= ${binary:Version}), dolphin, kfind
-Breaks: kdebase-data (<< 4:4.7.2), kde-baseapps-data (<< 4:4.8.4)
-Replaces: kdebase-data (<< 4:4.7.2), kde-baseapps-data (<< 4:4.8.4)
+Recommends: dolphin,
+ kfind,
+ konqueror-nsplugins (= ${binary:Version}),
+ kpart-webkit
+Breaks: kde-baseapps-data (<< 4:4.8.4), kdebase-data (<< 4:4.7.2)
+Replaces: kde-baseapps-data (<< 4:4.8.4), kdebase-data (<< 4:4.7.2)
Description: advanced file manager, web browser and document viewer
Konqueror is the KDE web browser and advanced file manager.
.
@@ -155,7 +175,7 @@ Description: advanced file manager, web browser and document viewer
Package: konqueror-nsplugins
Section: web
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Breaks: gtk-qt-engine (<< 1:1.0)
Description: Netscape plugin support for Konqueror
Konqueror is the KDE web browser and advanced file manager.
@@ -167,8 +187,11 @@ Description: Netscape plugin support for Konqueror
Package: konq-plugins
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, konqueror (>= 4:4.1.0),
- python, libjpeg-progs
+Depends: konqueror (>= 4:4.1.0),
+ libjpeg-progs,
+ python,
+ ${misc:Depends},
+ ${shlibs:Depends}
Enhances: konqueror
Recommends: imagemagick
Description: plugins for Konqueror, the KDE file/web/document browser
@@ -233,7 +256,9 @@ Package: libkonq5abi1
Section: libs
Architecture: any
X-Debian-ABI: 1
-Depends: ${shlibs:Depends}, ${misc:Depends}, libkonq-common (>= ${binary:Version})
+Depends: libkonq-common (>= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
Description: core libraries for Konqueror
This package contains libraries used by several KDE 4 applications,
particularly Konqueror.
@@ -243,7 +268,7 @@ Description: core libraries for Konqueror
Package: libkonq-common
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libkonq5-templates
+Depends: libkonq5-templates, ${misc:Depends}, ${shlibs:Depends}
Replaces: libkonq5 (<< 4:4.4.5-3)
Breaks: libkonq5 (<< 4:4.4.5-3)
Description: core Konqueror library - support files
@@ -267,7 +292,9 @@ Description: data files for the Konqueror libraries
Package: libkonq5-dev
Section: libdevel
Architecture: any
-Depends: libkonq5abi1 (= ${binary:Version}), ${sameVersionDep:kdelibs5-dev:libkonq5abi1}, ${misc:Depends}
+Depends: libkonq5abi1 (= ${binary:Version}),
+ ${misc:Depends},
+ ${sameVersionDep:kdelibs5-dev:libkonq5abi1}
Description: development files for the Konqueror libraries
This package contains development files for building software that uses the
Konqueror libraries.
@@ -278,7 +305,7 @@ Package: libkonqsidebarplugin4a
Section: libs
Architecture: any
X-Debian-ABI: 0
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: konqueror sidebar plugin library
This package contains base library for Konqueror sidebar plugins.
.
@@ -288,7 +315,8 @@ Package: libkonqsidebarplugin-dev
Section: libdevel
Architecture: any
Depends: libkonqsidebarplugin4a (= ${binary:Version}),
- ${sameVersionDep:kdelibs5-dev:libkonqsidebarplugin4a}, ${misc:Depends}
+ ${misc:Depends},
+ ${sameVersionDep:kdelibs5-dev:libkonqsidebarplugin4a}
Description: konqueror sidebar plugin library development files
This package contains development headers for the Konqueror sidebar plugin
library.
@@ -297,7 +325,7 @@ Description: konqueror sidebar plugin library development files
Package: plasma-widget-folderview
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: plasma widget showing the content of a folder
This package contains the Folder View Plasma widget which is capable of
displaying and managing contents of any KDE supported location. It can be used
@@ -311,7 +339,7 @@ Package: kde-baseapps-dbg
Section: debug
Architecture: any
Priority: extra
-Depends: ${misc:Depends}, kde-runtime-dbg, konsole-dbg, kate-dbg
+Depends: kate-dbg, kde-runtime-dbg, konsole-dbg, ${misc:Depends}
Suggests: kde-baseapps (= ${source:Version})
Breaks: kdebase-dbg (<< 4:4.7.2)
Replaces: kdebase-dbg (<< 4:4.7.2)
diff --git a/debian/copyright b/debian/copyright
index 8ddfd64..37715d0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -79,28 +79,28 @@ Copyright (C) 1989, 1991, 2000, 2001, 2002 Free Software Foundation, Inc
Copyright (C) 19yy name of author
Copyright (C) 19yy <name of author>
Copyright (c) 2003 Thiago Macieira <thiago.macieira at kdemail.net>
-Copyright (C) 2006-2009 by Peter Penz <peter.penz at gmx.at>
-Copyright (C) 2006 by Aaron J. Seigo (<aseigo at kde.org>)
-Copyright (C) 2006 by Cvetoslav Ludmiloff <ludmiloff at gmail.com>
-Copyright (C) 2006 by Dominic Battre <dominic at battre.de>
-Copyright (C) 2006 by Gregor Kališnik <gregor at podnapisi.net>
-Copyright (C) 2006 by Holger 'zecke' Freyther <freyther at kde.org>
-Copyright (C) 2006 by Martin Pool <mbp at canonical.com>
-Copyright (C) 2006 by Stefan Monov <logixoul at gmail.com>
-Copyright (C) 2007, 2008 by David Faure <faure at kde.org>
-Copyright (C) 2007 by Rafael Fernández López <ereslibre at kde.org>
+Copyright (C) 2006-2009 by Peter Penz <peter.penz at gmx.at>
+Copyright (C) 2006 by Aaron J. Seigo (<aseigo at kde.org>)
+Copyright (C) 2006 by Cvetoslav Ludmiloff <ludmiloff at gmail.com>
+Copyright (C) 2006 by Dominic Battre <dominic at battre.de>
+Copyright (C) 2006 by Gregor Kališnik <gregor at podnapisi.net>
+Copyright (C) 2006 by Holger 'zecke' Freyther <freyther at kde.org>
+Copyright (C) 2006 by Martin Pool <mbp at canonical.com>
+Copyright (C) 2006 by Stefan Monov <logixoul at gmail.com>
+Copyright (C) 2007, 2008 by David Faure <faure at kde.org>
+Copyright (C) 2007 by Rafael Fernández López <ereslibre at kde.org>
Copyright (C) 2007 Matthias Kretz <kretz at kde.org>
Copyright (C) 2007 Montel Laurent <montel at kde.org>
-Copyright (C) 2008 by Fredrik Höglund <fredrik at kde.org>
-Copyright (C) 2008 by <haraldhv (at) stud.ntnu.no>
-Copyright (C) 2008 by Konstantin Heil <konst.heil at stud.uni-heidelberg.de>
-Copyright (C) 2008, 2009 by Sebastian Trueg <trueg at kde.org>
-Copyright (C) 2008 by Simon St James <kdedevel at etotheipiplusone.com>
-Copyright (C) 2009 by Adam Kidder <thekidder at gmail.com>
-Copyright (C) 2009 by Frank Reininghaus (frank78ac at googlemail.com)
-Copyright (C) 2009 by Matthias Fuchs <mat69 at gmx.net>
-Copyright (C) 2009 by Rahman Duran <rahman.duran at gmail.com>
-Copyright (C) 2009 by Shaun Reich shaun.reich at kdemail.net
+Copyright (C) 2008 by Fredrik Höglund <fredrik at kde.org>
+Copyright (C) 2008 by <haraldhv (at) stud.ntnu.no>
+Copyright (C) 2008 by Konstantin Heil <konst.heil at stud.uni-heidelberg.de>
+Copyright (C) 2008, 2009 by Sebastian Trueg <trueg at kde.org>
+Copyright (C) 2008 by Simon St James <kdedevel at etotheipiplusone.com>
+Copyright (C) 2009 by Adam Kidder <thekidder at gmail.com>
+Copyright (C) 2009 by Frank Reininghaus (frank78ac at googlemail.com)
+Copyright (C) 2009 by Matthias Fuchs <mat69 at gmx.net>
+Copyright (C) 2009 by Rahman Duran <rahman.duran at gmail.com>
+Copyright (C) 2009 by Shaun Reich shaun.reich at kdemail.net
Copyright (C) 2009 Nokia Corporation
Copyright (c) YEAR YOUR NAME
@@ -160,7 +160,7 @@ kdepasswd/
------
Copyright 2003 Braden MacDonald <bradenm_k at shaw.ca>
-Copyright 2003 Ravikiran Rajagopal <ravi at ee.eng.ohio-state.edu>
+Copyright 2003 Ravikiran Rajagopal <ravi at ee.eng.ohio-state.edu>
Copyright (C) 1999,2000 Geert Jansen <jansen at kde.org
Copyright (C) 2004 Frans Englich <frans.englich at telia.com
@@ -342,14 +342,14 @@ Copyright 2008 Pino Toscano <pino at kde.org>
Copyright (C) 1991, 1992 Free Software Foundation, Inc
Copyright (c) 1994, 1995 by Mike Romberg ( romberg at fsl.noaa.gov )
Copyright (C) 1999-2002 Brian Pau
-Copyright (C) 1999, Gary Meyer <gary at meyer.net>
+Copyright (C) 1999, Gary Meyer <gary at meyer.net>
Copyright (c) 1999, 2001 Matthias Hoelzer-Kluepfel <hoelzer at kde.org>
Copyright (c) 2000,2001 Matthias Elter <elter at kde.org>
Copyright (c) 2003 Benjamin Reed <ranger at befunk.com>
Copyright (c) 2003 Frauke Oster <frauke.oster at t-online.de>
Copyright (C) 2004 Ilya Korniyko <k_ilya at ukr.net>
Copyright (C) 2008 Ivo Anjo <knuckles at gmail.com>
-Copyright (C) 2008 Nicolas Ternisien <nicolas.ternisien at gmail.com>
+Copyright (C) 2008 Nicolas Ternisien <nicolas.ternisien at gmail.com>
License for all components is:
--
@@ -619,7 +619,7 @@ Copyright 2005 by Maksim Orlovich <maksim at kde.org>
Copyright 2006-2008 by Robert Knight <robertknight at gmail.com>
Copyright 2009 by Thomas Dreibholz <dreibh at iem.uni-due.de>
Copyright (C) 1989, 1991 Free Software Foundation, Inc
-Copyright (c) 1998 by Lars Doelle <lars.doelle at on-line.de>
+Copyright (c) 1998 by Lars Doelle <lars.doelle at on-line.de>
Copyright (C) 19yy name of author
Copyright (C) 2009 Patrick Spendrin <ps_ml at gmx.de>
@@ -711,7 +711,7 @@ Copyright (C) 2001 Malte Starostik <malte at kde.org>
Copyright (c) 1998-2009 David Faure <faure at kde.org>
Copyright (C) 2000-2001 Simon Hausmann <hausmann at kde.org>
Copyright 2000,2001 Carsten Pfeiffer <pfeiffer at kde.org>
-Copyright (C) 2008, 2009 by Peter Penz <peter.penz at gmx.at>
+Copyright (C) 2008, 2009 by Peter Penz <peter.penz at gmx.at>
Copyright 2009 Harald Hvaal <haraldhv at stud.ntnu.no>
Copyright (C) 2008 by George Goldberg <grundleborg at googlemail.com>
Copyright 2001-2002 Alexander Neundorf <neundorf at kde.org>
--
KDE Base Applications module packaging
More information about the pkg-kde-commits
mailing list