[SCM] gmerlin-encoders/master: added copyrights

[zmoelnig-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit c6ef7a3990448dcf50f5e25bb3312646e5d6bfe4
Author: IOhannes m zmölnig <zmoelnig at iem.at>
Date:   Fri Jan 14 22:45:57 2011 +0100

    added copyrights

diff --git a/debian/copyright b/debian/copyright
index 899b382..a94561f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -27,3 +27,58 @@ Files: debian/*
 Copyright: 2011, IOhannes m zmölnig <zmoelnig at iem.at>
 License: GPL-2+
 
+License: GPL-2+
+ 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 2 of the License, or
+ (at your option) any later version.
+
+ This program 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, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+Comment: 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 program 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 <http://www.gnu.org/licenses/>.
+Comment: On Debian systems, the complete text of the GNU General Public
+  License version 3 can be found in "/usr/share/common-licenses/GPL-3".
+
+License: other-GAP
+ This file is free software; the Free Software Foundation gives
+ unlimited permission to copy and/or distribute it, with or without
+ modifications, as long as this notice is preserved.
+ .
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.
+ .
+ Some files differ from above by replacing "This file" with "This
+ Makefile.in".
+
+License: other-GAP-gettext
+ This file may be copied and used freely without restrictions.  It may
+ be used in projects which are not available under a GNU Public License,
+ but which still want to provide support for the GNU gettext
+ functionality.
+
+
+
+

-- 
gmerlin-encoders packaging