[SCM] dgedit/master: Revert "Merge upstream entries in d/copyright, as only years change"
viccuad-guest at users.alioth.debian.org
viccuad-guest at users.alioth.debian.org
Sat Nov 7 22:04:14 UTC 2015
The following commit has been merged in the master branch:
commit 07e2f6e7e8c1b8979aacf061f3f6d5956b6608d0
Author: viccuad <me at viccuad.me>
Date: Sat Nov 7 22:55:20 2015 +0100
Revert "Merge upstream entries in d/copyright, as only years change"
This reverts commit ae14494dda5264b1fcbd9d79f75f88e8656b0e93.
The specified entries in d/copyright reverted are correct, since those
files that have a GPL-2+ header.
I'm leaving the general "Files: *" with GPL-3 for the files without
headers, since the COPYING file lists the project license as GPL-3.
diff --git a/debian/copyright b/debian/copyright
index 18416e8..8f80373 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -26,6 +26,41 @@ License: GPL-3
version 3 can be found in the file /usr/share/common-licenses/GPL-3.
+Files:
+ src/canvaswidget.*
+ src/player.*
+ src/selection.*
+ src/selectioneditor.*
+ src/sleep.*
+ src/volumefader.*
+ src/zoomslider.*
+Copyright: 2014 Bent Bisballe Nyeng
+License: GPL-2+
+
+Files:
+ src/canvastool.*
+ src/canvastoollisten.*
+ src/canvastoolthreshold.*
+Copyright: 2011 Bent Bisballe Nyeng
+License: GPL-2+
+
+Files:
+ src/mipmap.*
+Copyright: 2010 Bent Bisballe Nyeng
+License: GPL-2+
+
+Files:
+ src/audioextractor.*
+ src/canvas.*
+ src/dgedit.*
+ src/filelist.*
+ src/itemeditor.*
+ src/mainwindow.*
+ src/samplesorter.*
+Copyright: 2009 Bent Bisballe Nyeng
+License: GPL-2+
+
+
Files: debian/*
Copyright: 2015 Víctor Cuadrado Juan <me at viccuad.me>
License: GPL-2+
--
dgedit packaging
More information about the pkg-multimedia-commits
mailing list