wrap-and-sort madness
Scarlett Clark
sgclark at kubuntu.org
Wed Sep 17 13:11:42 UTC 2014
[06:05:39] <apachelogger> sgclark: write a mail to kubuntu-devel about that
please
The control file was completely obliterated by wrap-and-sort.
(plasma5)scarlett at scarlett-Lappy:~/Work/bzr-
source/FRAMEWORKS/kdelibs4support$ bzr diff
=== modified file 'debian/changelog'
--- debian/changelog 2014-09-12 12:56:18 +0000
+++ debian/changelog 2014-09-17 12:51:49 +0000
@@ -1,8 +1,13 @@
kdelibs4support (5.2.0-0ubuntu1) UNRELEASED; urgency=medium
+ [ Jonathan Riddell ]
* New upstream release
* Use pkg-kde-tools version 3 scripts
+ [ Scarlett Clark ]
+ * Cleanup copyright + move copyright extra details to comment to silence
+ space-in-std-shortname-in-dep5-copyright lintian error.
+
-- Jonathan Riddell <jriddell at ubuntu.com> Thu, 11 Sep 2014 20:34:59
+0000
kdelibs4support (5.1.0-0ubuntu3) utopic; urgency=medium
=== modified file 'debian/control'
--- debian/control 2014-09-12 12:56:18 +0000
+++ debian/control 2014-09-17 12:51:06 +0000
@@ -7,8 +7,8 @@
debhelper (>= 9.0.0),
extra-cmake-modules (>= 1.2.0),
kdoctools-dev (>= 5.2.0),
+ kgendesignerplugin (>= 5.2.0),
kio-dev (>= 5.2.0),
- kgendesignerplugin (>= 5.2.0),
libecm-dev,
libintl-perl,
libkf5archive-dev (>= 5.2.0),
@@ -62,29 +62,11 @@
Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging-next/kdelibs4support
Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging-next/kdelibs4support
-Package: libkf5kdelibs4support-dev
+Package: libkf5kdelibs4support5-bin
Section: libdevel
Architecture: any
-Depends: libkf5kdelibs4support5 (= ${binary:Version}),
- libkf5kdelibs4support5-bin (= ${binary:Version}), ${misc:Depends},
- libkf5auth-dev,
- libkf5configwidgets-dev,
- libkf5coreaddons-dev,
- libkf5crash-dev,
- kgendesignerplugin,
- kdoctools-dev,
- libkf5emoticons-dev,
- libkf5guiaddons-dev,
- libkf5iconthemes-dev,
- libkf5itemmodels-dev,
- kinit-dev,
- libkf5notifications-dev,
- libkf5parts-dev,
- libkf5textwidgets-dev,
- libkf5unitconversion-dev,
- libkf5windowsystem-dev,
- qtbase5-dev
-Description: development files for kde4support
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Porting aid from KDELibs4.
This framework provides code and utilities to ease
the transition from kdelibs 4 to KDE Frameworks 5.
This includes CMake macros and C++ classes whose
@@ -96,73 +78,10 @@
the notes at <http://community.kde.org/Frameworks/Porting_Notes>
should help with this.
.
- Note that some of the classes in this framework, especially
- KStandardDirs, may not work correctly unless any libraries
- and other software using the KDE4 Support framework are
- installed to the same location as KDE4Support, although
- it may be sufficient to set the KDEDIRS environment
- variable correctly.
- .
- Contains development files for kde4support.
-
-Package: libkf5kdelibs4support5
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+ This package contains binaries and plugins from kdelibs4support.
Recommends: libkf5kdelibs4support5-bin (= ${binary:Version})
-Description: Porting aid from KDELibs4.
- This framework provides code and utilities to ease
- the transition from kdelibs 4 to KDE Frameworks 5.
- This includes CMake macros and C++ classes whose
- functionality has been replaced by code in CMake,
- Qt and other frameworks.
- .
- Code should aim to port away from this framework eventually.
- The API documentation of the classes in this framework and
- the notes at <http://community.kde.org/Frameworks/Porting_Notes>
- should help with this.
- .
- Note that some of the classes in this framework, especially
- KStandardDirs, may not work correctly unless any libraries
- and other software using the KDE4 Support framework are
- installed to the same location as KDE4Support, although
- it may be sufficient to set the KDEDIRS environment
- variable correctly.
-
-Package: libkf5kdelibs4support-data
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
Breaks: libkf5kdelibs4support5-data
Replaces: libkf5kdelibs4support5-data
-Description: Porting aid from KDELibs4.
- This framework provides code and utilities to ease
- the transition from kdelibs 4 to KDE Frameworks 5.
- This includes CMake macros and C++ classes whose
- functionality has been replaced by code in CMake,
- Qt and other frameworks.
- .
- Code should aim to port away from this framework eventually.
- The API documentation of the classes in this framework and
- the notes at <http://community.kde.org/Frameworks/Porting_Notes>
- should help with this.
- .
- This package contains the data files used by kdelibs4support.
-
-Package: libkf5kdelibs4support5-bin
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Porting aid from KDELibs4.
- This framework provides code and utilities to ease
- the transition from kdelibs 4 to KDE Frameworks 5.
- This includes CMake macros and C++ classes whose
- functionality has been replaced by code in CMake,
- Qt and other frameworks.
- .
- Code should aim to port away from this framework eventually.
- The API documentation of the classes in this framework and
- the notes at <http://community.kde.org/Frameworks/Porting_Notes>
- should help with this.
- .
- This package contains binaries and plugins from kdelibs4support.
Package: libkf5kdelibs4support5-dbg
Section: debug
=== modified file 'debian/copyright'
--- debian/copyright 2014-06-02 18:55:47 +0000
+++ debian/copyright 2014-09-17 12:54:39 +0000
@@ -1,6 +1,6 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: kde4support
-Source: https://projects.kde.org/projects/frameworks/kde4support
+Upstream-Name: kdelibs4support
+Source: https://projects.kde.org/projects/frameworks/kdelibs4support
Files: *
debian/*
@@ -190,7 +190,7 @@
cmake/modules/ECMQt4To5Porting.cmake
Copyright: 2005 Frerich Raabe <raabe at kde.org>
2005-2011 Kitware, Inc.
-License: BSD 2 clause
+License: BSD-2-clause
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
@@ -441,7 +441,7 @@
Files: autotests/klocaletimeformattest.cpp
autotests/klocaletimeformattest.h
Copyright: 2009 Michael Leupold <lemma at confuego.org>
-License: LGPL-2.1+ accepted by the membership of KDE e.V.
+License: LGPL-2.1+
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
@@ -457,6 +457,7 @@
.
You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see
<http://www.gnu.org/licenses/>.
+Comment: or any later version accepted by the membership of KDE e.V.
Files: src/kdecore/k3bufferedsocket.cpp
src/kdecore/k3bufferedsocket.h
=== modified file 'debian/libkf5kdelibs4support5-bin.install'
--- debian/libkf5kdelibs4support5-bin.install 2014-07-03 21:13:25 +0000
+++ debian/libkf5kdelibs4support5-bin.install 2014-09-17 12:51:06 +0000
@@ -4,5 +4,5 @@
usr/lib/*/libexec/kf5/fileshareset
usr/lib/*/qt5/plugins/designer/kf5deprecatedwidgets.so
usr/lib/*/qt5/plugins/kcm_ssl.so
+usr/lib/*/qt5/plugins/kf5/kded/networkstatus.so
usr/lib/*/qt5/plugins/kf5/kio/metainfo.so
-usr/lib/*/qt5/plugins/kf5/kded/networkstatus.so
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: This is a digitally signed message part.
URL: <https://lists.ubuntu.com/archives/kubuntu-devel/attachments/20140917/2fec6a76/attachment.pgp>
More information about the kubuntu-devel
mailing list