[SCM] drc/master: Update copyright and licensing information in debian/copyright.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Fri Oct 12 08:47:50 UTC 2012


The following commit has been merged in the master branch:
commit aaa8f5d6310c677d7f06cdba0e6c5c64a73be23a
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Oct 12 09:31:18 2012 +0100

    Update copyright and licensing information in debian/copyright.

diff --git a/debian/copyright b/debian/copyright
index 463ff7b..46f911b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -16,6 +16,14 @@ Copyright:
  1996-2000 Gerard Jungman
 License: GPL-2+
 
+Files: source/MLeaks/*
+Copyright: 2004-2008 Wu Yongwei <adah at users dot sourceforge dot net>
+License: Zlib
+
+Files: source/minlni/*
+Copyright: 2008-2012 CompuPhase
+License: Apache-2.0
+
 Files: source/getopt/getopt1.c
  source/getopt/getopt.c
  source/getopt/getopt.h
@@ -42,7 +50,8 @@ 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
+ .
+ You should have received a copy of the GNU General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  .
  On Debian systems, the complete text of the GNU General
@@ -58,12 +67,49 @@ License: LGPL-2+
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Library General Public License for more details.
-Comment:
- On Debian systems, the complete text of the GNU Library General Public
- License can be found in `/usr/share/common-licenses/LGPL-2'.
  .
  You should have received a copy of the GNU Library General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU Library General Public
+ License can be found in `/usr/share/common-licenses/LGPL-2'.
+
+License: Zlib
+ This software is provided 'as-is', without any express or implied
+ warranty.  In no event will the authors be held liable for any
+ damages arising from the use of this software.
+ .
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute
+ it freely, subject to the following restrictions:
+ .
+ 1. The origin of this software must not be misrepresented; you must
+    not claim that you wrote the original software.  If you use this
+    software in a product, an acknowledgement in the product
+    documentation would be appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must
+    not be misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source
+    distribution.
+
+License: Apache-2.0
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+ .
+      http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ .
+ On Debian systems, the full text of the Apache Software License version 2 can
+ be found in the file `/usr/share/common-licenses/Apache-2.0'.
 
 License: other-1
  You may  use, copy, modify  and  distribute  this code  for any

-- 
drc packaging



More information about the pkg-multimedia-commits mailing list