[Pkg-voip-commits] r8622 - in /qutecom/trunk/debian: changelog copyright patches/series rules

[cavedon at alioth.debian.org]

Author: cavedon
Date: Mon Sep  6 02:38:46 2010
New Revision: 8622

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8622
Log:
* Remove Rekoo license file from package and insert its text in 
debian/copyright.
List google-breakpad-stats.patch in debian/pasters/series.


Modified:
    qutecom/trunk/debian/changelog
    qutecom/trunk/debian/copyright
    qutecom/trunk/debian/patches/series
    qutecom/trunk/debian/rules

Modified: qutecom/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/changelog?rev=8622&op=diff
==============================================================================
--- qutecom/trunk/debian/changelog (original)
+++ qutecom/trunk/debian/changelog Mon Sep  6 02:38:46 2010
@@ -14,8 +14,10 @@
     - purple-wait-init.patch
   * Include verbatim text of BSD license in copyright file.
   * Bump Standards-Version to 3.9.1.
-
- -- Ludovico Cavedon <cavedon at debian.org>  Tue, 31 Aug 2010 22:28:34 -0700
+  * Remove Rekoo license file from package and insert its text in
+    debian/copyright.
+
+ -- Ludovico Cavedon <cavedon at debian.org>  Sun, 05 Sep 2010 19:38:08 -0700
 
 qutecom (2.2~rc3.hg396~dfsg1-6) unstable; urgency=low
 

Modified: qutecom/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/copyright?rev=8622&op=diff
==============================================================================
--- qutecom/trunk/debian/copyright (original)
+++ qutecom/trunk/debian/copyright Mon Sep  6 02:38:46 2010
@@ -956,9 +956,39 @@
  These flag icons are available for free use for any purpose with no
  requirement for attribution. 
 
-- Debian packaging (debian)
-Copyright (C) 2007-2009 Ludovico Cavedon <ludovico.cavedon at gmail.com>
-Copyright (C) 2006-2009 Marco Nenciarini <mnencia at debian.org>
+Files: wengophone/resources/chat/renkoo*
+Copyright: 2007, Torrey Rice/Renkoo
+           2003-2004 Lawrence E. Rosen.
+License: BSD
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are met:
+    .
+	* Redistributions of source code must retain the above copyright notice,
+	  this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright
+	  notice, this list of conditions and the following disclaimer in the
+	  documentation and/or other materials provided with the distribution.
+	* Neither the name of the Torrey Rice and Renkoo nor the names of its
+	  contributors may be used to endorse or promote products derived from
+	  this software without specific prior written permission.
+    .
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+    AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+    ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+    LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+    CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+    POSSIBILITY OF SUCH DAMAGE.
+    .
+    Renkoo is a service mark of Renkoo, Inc.
+
+Files: debian/*
+Copyright: 2007-2010 Ludovico Cavedon <cavedon at debian.org>
+	   2006-2009 Marco Nenciarini <mnencia at debian.org>
 License: GPL-2+
  On Debian systems, the complete text of the GNU General Public License
  version 2 can be found in `/usr/share/common-licenses/GPL-2'.

Modified: qutecom/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/patches/series?rev=8622&op=diff
==============================================================================
--- qutecom/trunk/debian/patches/series (original)
+++ qutecom/trunk/debian/patches/series Mon Sep  6 02:38:46 2010
@@ -2,5 +2,6 @@
 cmake-noavformat.patch
 remove-extra-copying-file.patch
 cmake-force-fpic.patch
+google-breakpad-stat.patch
 #purple_perl_tcl_noload.patch
 #curl-openssl-mt-fix.patch

Modified: qutecom/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/qutecom/trunk/debian/rules?rev=8622&op=diff
==============================================================================
--- qutecom/trunk/debian/rules (original)
+++ qutecom/trunk/debian/rules Mon Sep  6 02:38:46 2010
@@ -43,6 +43,7 @@
 	mkdir -p $(DEB_DESTDIR)-data/usr/share/
 	mv $(DEB_DESTDIR)/usr/share/* $(DEB_DESTDIR)-data/usr/share/
 	mv $(DEB_DESTDIR)-data/usr/share/applications $(DEB_DESTDIR)/usr/share/
+	rm $(DEB_DESTDIR)/usr/share/qutecom/chat/Renkoo\ LICENSE.txt
 
 install/qutecom::
 	mkdir -p $(DEB_DESTDIR)/usr/share/qutecom