[SCM] libkdeedu packaging branch, master, updated. debian/4.11.5-1
Maximiliano Curia
maxy at moszumanska.debian.org
Sun Jan 26 19:27:57 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/libkdeedu.git;a=commitdiff;h=17b7771
The following commit has been merged in the master branch:
commit 17b77719daaa1a98d3e6f2082f9181d752c86fed
Author: Maximiliano Curia <maxy at debian.org>
Date: Sun Jan 26 18:41:56 2014 +0100
wrap-and-sort
---
debian/control | 27 +++++++++++++++------------
debian/copyright | 6 +++---
debian/libkdeedu-dev.install | 2 +-
3 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/debian/control b/debian/control
index 8e47731..035b9f2 100644
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,12 @@ Section: kde
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Maximiliano Curia <maxy at debian.org>
-Build-Depends: kde-sc-dev-latest (>= 4:4.11),
- cmake,
- debhelper (>= 9),
- pkg-kde-tools (>= 0.12),
- kdelibs5-dev (>= 4:4.11),
- libx11-dev
+Build-Depends: cmake,
+ debhelper (>= 9),
+ kde-sc-dev-latest (>= 4:4.11),
+ kdelibs5-dev (>= 4:4.11),
+ libx11-dev,
+ pkg-kde-tools (>= 0.12)
Standards-Version: 3.9.5
XS-Testsuite: autopkgtest
Homepage: http://edu.kde.org/
@@ -37,7 +37,9 @@ Description: KVTML files for KDE-Edu programs
Package: libkeduvocdocument4
Architecture: any
Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}, libkdeedu-data (>= ${source:Version})
+Depends: libkdeedu-data (>= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
Replaces: libkdeedu4 (<< 4:4.6.80)
Breaks: libkdeedu4 (<< 4:4.6.80)
Description: library for reading and writing vocabulary files
@@ -50,9 +52,11 @@ Description: library for reading and writing vocabulary files
Package: libkdeedu-dev
Architecture: any
Section: libdevel
-Depends: ${misc:Depends}, kdelibs5-dev (>= 4:4.0.82),
- libkeduvocdocument4 (= ${binary:Version}), kdeedu-kvtml-data (= ${source:Version}),
- libkdeedu-data (= ${source:Version})
+Depends: kdeedu-kvtml-data (= ${source:Version}),
+ kdelibs5-dev (>= 4:4.0.82),
+ libkdeedu-data (= ${source:Version}),
+ libkeduvocdocument4 (= ${binary:Version}),
+ ${misc:Depends}
Description: development files for the KDE educational libraries
This package contains development files for building software that uses the
KDE educational libraries.
@@ -63,7 +67,7 @@ Package: libkdeedu-dbg
Architecture: any
Section: debug
Priority: extra
-Depends: ${misc:Depends}, libkeduvocdocument4 (= ${binary:Version})
+Depends: libkeduvocdocument4 (= ${binary:Version}), ${misc:Depends}
Breaks: kdeedu-dbg (<< 4:4.6.80)
Replaces: kdeedu-dbg (<< 4:4.6.80)
Description: debugging symbols for the libkeduvocdocument library
@@ -71,4 +75,3 @@ Description: debugging symbols for the libkeduvocdocument library
binaries included in the libkeduvocdocument4 library.
.
This package is part of the KDE education module.
-
diff --git a/debian/copyright b/debian/copyright
index 688be06..cde3364 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -41,7 +41,7 @@ License: LGPL-2.1 or GPL-3
Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
package.
.
- GNU General Public License Usage
+ GNU General Public License Usage
Alternatively, this file may be used under the terms of the GNU
General Public License version 3.0 as published by the Free Software
Foundation and appearing in the file LICENSE.GPL included in the
@@ -73,7 +73,7 @@ License: GPL-2+
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
.
- On Debian systems, the full text of the GNU General Public License
+ On Debian systems, the full text of the GNU General Public License
version 2 can be found in the file
`/usr/share/common-licenses/GPL-2'.
@@ -107,7 +107,7 @@ License: BSD-3-clause
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
diff --git a/debian/libkdeedu-dev.install b/debian/libkdeedu-dev.install
index 0f1e22a..f1d6ad0 100644
--- a/debian/libkdeedu-dev.install
+++ b/debian/libkdeedu-dev.install
@@ -1,6 +1,6 @@
usr/include/libkdeedu/
-usr/lib/libkeduvocdocument.so
usr/lib/cmake/libkdeedu/LibKdeEduConfig.cmake
usr/lib/cmake/libkdeedu/LibKdeEduTargets-debian.cmake
usr/lib/cmake/libkdeedu/LibKdeEduTargets.cmake
+usr/lib/libkeduvocdocument.so
usr/lib/libqtmmlwidget.a
--
libkdeedu packaging
More information about the pkg-kde-commits
mailing list