[SCM] pd-osc/master: Use ISC~UC for the libOSC license; add GPL-2+
zmoelnig-guest at users.alioth.debian.org
zmoelnig-guest at users.alioth.debian.org
Thu Aug 4 15:30:21 UTC 2011
The following commit has been merged in the master branch:
commit 9df9e9bd24ef81f0478d622d6b3bd61ad8a32eb2
Author: IOhannes m zmölnig <zmoelnig at iem.at>
Date: Thu Aug 4 17:29:51 2011 +0200
Use ISC~UC for the libOSC license; add GPL-2+
use "Comment:" rather than "X-Comment:"
diff --git a/debian/copyright b/debian/copyright
index 02c4bd0..1e26bd1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,12 +10,29 @@ License: GPL-2+
Files: packOSC.c routeOSC.c
Copyright: 1992-2004, The Regents of the University of California (Regents)
2006-2011, Martin Peach
-License: BSD-like
+License: ISC~UC
Files: debian/*
Copyright: 2011, IOhannes m zmölnig <zmoelnig at iem.at>
License: GPL-3+
+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, 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.
+Comment:
+ On Debian systems, the complete text of the GNU General Public License
+ (GPL) version 2 can be found in '/usr/share/common-licenses/GPL-2'.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
License: GPL-3+
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
@@ -26,14 +43,14 @@ License: GPL-3+
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.
-X-Comment:
+Comment:
On Debian systems, the complete text of the GNU General Public License
(GPL) version 3 can be found in '/usr/share/common-licenses/GPL-3'.
.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-License: BSD-like
+License: ISC~UC
Permission to use, copy, modify, distribute, and distribute modified versions
of this software and its documentation without fee and without a signed
licensing agreement, is hereby granted, provided that the above copyright
--
pd-osc packaging
More information about the pkg-multimedia-commits
mailing list