[Pkg-opt-media-team] [dvdisaster] 47/61: Update license to GPL-3.

[Takaki Taniguchi]

This is an automated email from the git hooks/post-receive script.

takaki pushed a commit to branch master
in repository dvdisaster.

commit 4f4b91805aa6923370c1051437ee38b2300bc154
Author: Carlos Maddela <e7appew at gmail.com>
Date:   Thu Jan 5 18:08:37 2017 +1100

    Update license to GPL-3.
---
 debian/copyright                          | 21 +++++++++++++++++++--
 debian/patches/24-show-gpl3-license.patch | 28 ++++++++++++++++++++++++++++
 debian/patches/series                     |  1 +
 3 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 3832e0f..fcdd4d0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,8 +4,8 @@ Upstream-Name: dvdisaster
 Source: http://dvdisaster.net/
 
 Files: *
-Copyright: 2004–2012, Carsten Gnörlich <carsten at dvdisaster.org>
-License: GPL-2+
+Copyright: 2004–2015, Carsten Gnörlich <carsten at dvdisaster.org>
+License: GPL-3+
 
 Files: debian/*
 Copyright: 2005–2009, Daniel Baumann <daniel at debian.org>
@@ -30,3 +30,20 @@ License: GPL-2+
  .
  On Debian systems, the complete text of the GNU General
  Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+License: GPL-3+
+ This program 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 3 of the License, or
+ (at your option) any later version.
+ .
+ This package 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 3 can be found in "/usr/share/common-licenses/GPL-3".
diff --git a/debian/patches/24-show-gpl3-license.patch b/debian/patches/24-show-gpl3-license.patch
new file mode 100644
index 0000000..4b8f2f4
--- /dev/null
+++ b/debian/patches/24-show-gpl3-license.patch
@@ -0,0 +1,28 @@
+From: Carlos Maddela <e7appew at gmail.com>
+Date: Thu, 5 Jan 2017 14:36:27 +1100
+Subject: Update help dialog to show GPL-3 license.
+
+Description: Update help dialog to show GPL-3 license.
+Author: Carlos Maddela <e7appew at gmail.com>
+Origin: vendor
+Forwarded: not-needed
+Last-Update: 2017-01-05
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ help-dialogs.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/help-dialogs.c b/help-dialogs.c
+index 6214429..5065e76 100644
+--- a/help-dialogs.c
++++ b/help-dialogs.c
+@@ -403,7 +403,7 @@ void ShowGPL()
+   ShowTextfile(_("windowtitle|GNU General Public License"), 
+ 	       _("<big>GNU General Public License</big>\n"
+ 		 "<i>The license terms of dvdisaster.</i>"),
+-	       "/usr/share/common-licenses/GPL-2", NULL, NULL);
++	       "/usr/share/common-licenses/GPL-3", NULL, NULL);
+ }
+ 
+ /*
diff --git a/debian/patches/series b/debian/patches/series
index ff52878..59fd218 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@
 20-display-changelog-credits-and-todo.patch
 22-fix-hurd-i386-ftbfs.patch
 23-add-bdrom-support.patch
+24-show-gpl3-license.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opt-media/dvdisaster.git