[SCM] rtmpdump packaging branch, master, updated. debian/2.2e-1-2-g961c8f6

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit fd41f32632da4c92ebb1f4e09745056f6db68560
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Jun 3 20:52:34 2010 +0200

    update debian/copyright after consulting upstream

diff --git a/debian/copyright b/debian/copyright
index 099e68f..3c8b549 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,13 +6,13 @@ It was downloaded from http://rtmpdump.mplayerhq.hu/
 
 Upstream Authors and Copyright:
 
-RTMP Dump v2.2d
+RTMP Dump
 (C) 2009 Andrej Stepanchuk
 (C) 2009-2010 Howard Chu
 (C) 2010 2a665470ced7adb7156fcef47f8199a6371c117b8a79e399a2771e0b36384090
 
 
-License:
+License of the programs in the rtmpdump package:
 
     rtmpdump - small dumper for media content streamed over the RTMP protocol
     Copyright (C) 2009 Andrej Stepanchuk
@@ -32,13 +32,42 @@ License:
     with this program; if not, write to the Free Software Foundation, Inc.,
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-On Debian GNU/Linux systems, the complete text of the GNU General Public
-License can be found in `/usr/share/common-licenses/GPL' and the text of the
-GNU Lesser General Public License is in `/usr/share/common-licenses/LGPL'.
+
+License of the librtmp library (included in the librtmp-dev package and in the
+librmtp/ subdirectory in the  source tree):
+
+        Copyright (C) 2005-2008 Team XBMC
+        http://www.xbmc.org
+        Copyright (C) 2008-2009 Andrej Stepanchuk
+        Copyright (C) 2009-2010 Howard Chu
+
+
+    librtmp is free software; you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as
+    published by the Free Software Foundation; either version 2.1,
+    or (at your option) any later version.
+    
+    librtmp 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 Lesser General Public License
+    along with librtmp see the file COPYING.  If not, write to
+    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+    http://www.gnu.org/copyleft/lgpl.html
+
 
 The Debian packaging is:
 
     Copyright (C) 2010 Reinhard Tartler <siretart at tauware.de>
 
-and is licensed under the the same license as the original work.
+and is licensed under the GNU Lesser General Public License.
+
+
+On Debian GNU/Linux systems, the complete text of the GNU General Public
+License can be found in `/usr/share/common-licenses/GPL-2' and the text of the
+GNU Lesser General Public License is in `/usr/share/common-licenses/LGPL-2.1'.
+
+
 

-- 
rtmpdump packaging