Merge ~gsilvapt/kubuntu-packaging/+git/peruse:kubuntu_artful_archive into ~kubuntu-packagers/kubuntu-packaging/+git/peruse:kubuntu_artful_archive

[Gustavo Silva]

Ammends for debian/copyright.

[Clive Johnston (clivejo)]

The patch should be modifying the source code, src/qtquick/PropertyContainer.cpp and src/qtquick/PropertyContainer.h to bring them in line with the project copyright statement.

https://cgit.kde.org/peruse.git/commit/?id=76f472108c5464efc3ba20f8f4e896a53eb6518c

[Clive Johnston (clivejo)]

I personally do not like the idea of patching the source on this and would prefer a git snapshot solution

Unmerged commits

d9fca81... by Gustavo Silva on 2017-08-28

Patch to ammend copyright file

841be0a... by Gustavo Silva on 2017-08-28

Patch to ammend copyright file

diff --git a/debian/copyright b/debian/copyright
index 6ec8e9a..597641e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,18 +5,18 @@ Source: https://quickgit.kde.org/?p=peruse.git
 Files: *
 Copyright: 2015, 2016, Dan Leinir Turthra Jensen <[e-mail]>
 License: GPL-2+
- This package 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 package is distributed in the hope that it will be useful,
+ 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
+ version 2.1 of the License, or (at your option) version 3, or any
+ later version accepted by the membership of KDE e.V. (or its
+ successor approved by the membership of KDE e.V.), which shall
+ act as a proxy defined in Section 6 of version 3 of the license.
+ 
+ This library 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, see <https://www.gnu.org/licenses/>
- .
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+
+ 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/>.
diff --git a/debian/patches/modifying-copyright.diff b/debian/patches/modifying-copyright.diff
new file mode 100644
index 0000000..4b6ec3d
--- /dev/null
+++ b/debian/patches/modifying-copyright.diff
@@ -0,0 +1,47 @@
+Description: Modifying copyright
+ Changes in the copyright file to allow package to be published in Kubuntu 
+ Artful.
+Author: <Gustavo Silva, [e-mail]> 
+Origin: git://anongit.kde.org/peruse.git 
+Bug: https://bugs.launchpad.net/ubuntu/+bug/1663675
+Applied-Upstream: https://cgit.kde.org/peruse.git/commit/?id=76f472108c5464efc3ba20f8f4e896a53eb6518c 
+Last-Update: 2017-08-28 
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: peruse/debian/copyright
+===================================================================
+--- peruse.orig/debian/copyright	2017-08-28 23:36:16.624632176 +0100
++++ peruse/debian/copyright	2017-08-28 23:39:45.224270607 +0100
+@@ -5,18 +5,18 @@
+ Files: *
+ Copyright: 2015, 2016, Dan Leinir Turthra Jensen <[e-mail]>
+ License: GPL-2+
+- This package 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 package is distributed in the hope that it will be useful,
++ 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
++ version 2.1 of the License, or (at your option) version 3, or any
++ later version accepted by the membership of KDE e.V. (or its
++ successor approved by the membership of KDE e.V.), which shall
++ act as a proxy defined in Section 6 of version 3 of the license.
++ 
++ This library 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, see <https://www.gnu.org/licenses/>
+- .
+- On Debian systems, the complete text of the GNU General
+- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ Lesser General Public License for more details.
++
++ 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/>.
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c423de1
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+modifying-copyright.diff