[SCM] ktp-common-internals packaging branch, master, updated. debian/0.9.0-1-53-g158cd84

Sat Nov 7 05:27:28 UTC 2015

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kde-telepathy/ktp-common-internals.git;a=commitdiff;h=158cd84

The following commit has been merged in the master branch:
commit 158cd84f3db2e0bfd58a27873f6e273efc730783
Author: Diane Trout <diane at ghic.org>
Date:   Fri Nov 6 21:26:24 2015 -0800

    Indicate the patches were submitted.
    
    Describe it in the text, link to the reviewboard pages,
    update the patches to point to their commits.
---
 debian/changelog                                                    | 6 +++++-
 debian/patches/0001-Relicense-invalid-license-to-LGPL-2.1.patch     | 4 ++--
 debian/patches/0002-Relicense-invalid-license-to-LGPL-2.1.patch     | 4 ++--
 .../0003-Relicense-David-Edmundson-s-code-to-LGPL-2.1-to-matc.patch | 4 ++--
 .../0004-Add-GPLv2-COPYING-file-as-there-s-a-few-files-still-.patch | 4 ++--
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1b68ea3..1d5f15b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -39,11 +39,15 @@ ktp-common-internals (15.08.2-1) UNRELEASED; urgency=medium
   * Add dh_install --list-missing to make sure everything is installed.
   * Break/Replace libktpotrprivate8.
   * Add patches listed below to deal with various licensing issues.
-    These have all been submitted upstream.
+    These have all been submitted upstream/accepted upstream.
     - 0001-Relicense-invalid-license-to-LGPL-2.1.patch
     - 0002-Relicense-invalid-license-to-LGPL-2.1.patch
     - 0003-Relicense-David-Edmundson-s-code-to-LGPL-2.1-to-matc.patch
     - 0004-Add-GPLv2-COPYING-file-as-there-s-a-few-files-still-.patch
+    See:
+    https://git.reviewboard.kde.org/r/125780/
+    https://git.reviewboard.kde.org/r/125923/
+    https://git.reviewboard.kde.org/r/125925/
   * Update copyright file to match the above licensing fixes.
 
  -- Diane Trout <diane at debian.org>  Tue, 03 Nov 2015 21:23:43 -0800
diff --git a/debian/patches/0001-Relicense-invalid-license-to-LGPL-2.1.patch b/debian/patches/0001-Relicense-invalid-license-to-LGPL-2.1.patch
index 5a370ca..d854ce4 100644
--- a/debian/patches/0001-Relicense-invalid-license-to-LGPL-2.1.patch
+++ b/debian/patches/0001-Relicense-invalid-license-to-LGPL-2.1.patch
@@ -1,6 +1,6 @@
-From c94a5eb0c14ddfb3a14061308001ac7dd2c42931 Mon Sep 17 00:00:00 2001
-From: Diane Trout <diane at ghic.org>
+Author: Diane Trout <diane at ghic.org>
 Date: Sat, 24 Oct 2015 11:49:07 -0700
+Commit: http://quickgit.kde.org/?p=ktp-common-internals.git&a=commit&h=c94a5eb0c14ddfb3a14061308001ac7dd2c42931
 Subject: [PATCH 1/4] Relicense invalid license to LGPL 2.1+
 
 Scott Kitterman noticed the license for this code was
diff --git a/debian/patches/0002-Relicense-invalid-license-to-LGPL-2.1.patch b/debian/patches/0002-Relicense-invalid-license-to-LGPL-2.1.patch
index ba0bd98..ba34c34 100644
--- a/debian/patches/0002-Relicense-invalid-license-to-LGPL-2.1.patch
+++ b/debian/patches/0002-Relicense-invalid-license-to-LGPL-2.1.patch
@@ -1,6 +1,6 @@
-From 7458578617fb40271f64030bedf4678d25134758 Mon Sep 17 00:00:00 2001
-From: Diane Trout <diane at ghic.org>
+Author: Diane Trout <diane at ghic.org>
 Date: Mon, 2 Nov 2015 11:04:08 -0800
+Commit: http://quickgit.kde.org/?p=ktp-common-internals.git&a=commit&h=7458578617fb40271f64030bedf4678d25134758
 Subject: [PATCH 2/4] Relicense invalid license to LGPL 2.1+
 
 Scott Kitterman noticed the license for this code was
diff --git a/debian/patches/0003-Relicense-David-Edmundson-s-code-to-LGPL-2.1-to-matc.patch b/debian/patches/0003-Relicense-David-Edmundson-s-code-to-LGPL-2.1-to-matc.patch
index 1ee2007..55b8b42 100644
--- a/debian/patches/0003-Relicense-David-Edmundson-s-code-to-LGPL-2.1-to-matc.patch
+++ b/debian/patches/0003-Relicense-David-Edmundson-s-code-to-LGPL-2.1-to-matc.patch
@@ -1,6 +1,6 @@
-From 7b6e9ba30cabc2eca043e5c9714a769816babee4 Mon Sep 17 00:00:00 2001
-From: Diane Trout <diane at ghic.org>
+Author: Diane Trout <diane at ghic.org>
 Date: Mon, 2 Nov 2015 11:10:04 -0800
+Commit: http://quickgit.kde.org/?p=ktp-common-internals.git&a=commit&h=7b6e9ba30cabc2eca043e5c9714a769816babee4
 Subject: [PATCH 3/4] Relicense David Edmundson's code to LGPL-2.1 to match the
  rest of the project.
 
diff --git a/debian/patches/0004-Add-GPLv2-COPYING-file-as-there-s-a-few-files-still-.patch b/debian/patches/0004-Add-GPLv2-COPYING-file-as-there-s-a-few-files-still-.patch
index aa8d39a..4b78702 100644
--- a/debian/patches/0004-Add-GPLv2-COPYING-file-as-there-s-a-few-files-still-.patch
+++ b/debian/patches/0004-Add-GPLv2-COPYING-file-as-there-s-a-few-files-still-.patch
@@ -1,6 +1,6 @@
-From bbc0672da92620122d45e025cee3b04510502154 Mon Sep 17 00:00:00 2001
-From: Diane Trout <diane at ghic.org>
+Author: Diane Trout <diane at ghic.org>
 Date: Mon, 2 Nov 2015 11:38:55 -0800
+Commit: http://quickgit.kde.org/?p=ktp-common-internals.git&a=commit&h=bbc0672da92620122d45e025cee3b04510502154
 Subject: [PATCH 4/4] Add GPLv2+ COPYING file as there's a few files still
  licensed as GPL-2+
 MIME-Version: 1.0

-- 
ktp-common-internals packaging

