[SCM] jcgui/master: Update debian/copyright.
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Tue Jan 10 12:38:48 UTC 2012
The following commit has been merged in the master branch:
commit 716961d5055971512573dde9b84ba23b9227809a
Author: Alessio Treglia <alessio at debian.org>
Date: Tue Jan 10 13:13:34 2012 +0100
Update debian/copyright.
diff --git a/debian/copyright b/debian/copyright
index fcdfe3a..91b6a5b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,8 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=162
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=202
Upstream-Name: Jcgui
Upstream-Contact: Hermann Meyer <brummer- at web.de>
Source: http://sourceforge.net/projects/jcgui/files/
-Copyright:
+Copyright:
2009 Hermann Meyer <brummer- at web.de>
2009 James Warden
@@ -12,14 +12,15 @@ Copyright:
2009 James Warden
License: GPL-2+
-Files: ./debian/*
-Copyright: 2009-2011, Jaromír Mikeš <mira.mikes at seznam.cz>
- 2010-2011, Alessio Treglia <alessio at debian.org>
+Files: debian/*
+Copyright:
+ 2009-2011, Jaromír Mikeš <mira.mikes at seznam.cz>
+ 2010-2012, Alessio Treglia <alessio at debian.org>
License: GPL-2+
-Files: ./waf
+Files: waf wafadmin/*
Copyright: 2005-2008 Thomas Nagy
-License: BSD
+License: BSD-3-clause
License: GPL-2+
This package is free software; you can redistribute it and/or modify
@@ -31,14 +32,13 @@ License: GPL-2+
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: You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
.
- You should have received a copy of the GNU General Public License
- along with this package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Comment: On Debian systems, the complete text of the GNU General
+ On Debian systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL-2'.
-License: BSD
+License: BSD-3-clause
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
--
jcgui packaging
More information about the pkg-multimedia-commits
mailing list