[Pkg-voip-commits] r6440 - in /libccrtp/trunk/debian: changelog copyright rules

[msp at alioth.debian.org]

Author: msp
Date: Sat Nov 15 05:44:47 2008
New Revision: 6440

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6440
Log:
Merge COPYING.addendum into debian/copyright

Modified:
    libccrtp/trunk/debian/changelog
    libccrtp/trunk/debian/copyright
    libccrtp/trunk/debian/rules

Modified: libccrtp/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/libccrtp/trunk/debian/changelog?rev=6440&op=diff
==============================================================================
--- libccrtp/trunk/debian/changelog (original)
+++ libccrtp/trunk/debian/changelog Sat Nov 15 05:44:47 2008
@@ -1,8 +1,9 @@
 libccrtp (1.6.2-1) UNRELEASED; urgency=low
 
   * (NOT RELEASED YET) New upstream release
-
- -- Mark Purcell <msp at debian.org>  Sat, 15 Nov 2008 16:40:24 +1100
+  * Merge COPYING.addendum into debian/copyright
+
+ -- Mark Purcell <msp at debian.org>  Sat, 15 Nov 2008 16:44:09 +1100
 
 libccrtp (1.6.1-3) UNRELEASED; urgency=low
 

Modified: libccrtp/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-voip/libccrtp/trunk/debian/copyright?rev=6440&op=diff
==============================================================================
--- libccrtp/trunk/debian/copyright (original)
+++ libccrtp/trunk/debian/copyright Sat Nov 15 05:44:47 2008
@@ -128,3 +128,26 @@
 w32/Makefile.am:# Copyright (C) 2002 Federico Montesino Pouzols <fedemp at suidzer0.org>
 w32/Makefile.in:# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 w32/Makefile.in:# Copyright (C) 2002 Federico Montesino Pouzols <fedemp at suidzer0.org>
+
+COPYING.addendum
+
+As a special exception, you may use this file as part of a free software
+library without restriction.  Specifically, if other files instantiate
+templates or use macros or inline functions from this file, or you compile
+this file and link it with other files to produce an executable, this
+file does not by itself cause the resulting executable to be covered by
+the GNU General Public License.  This exception does not however
+invalidate any other reasons why the executable file might be covered by
+the GNU General Public License.
+
+This exception applies only to the code released under the name GNU
+ccRTP.  If you copy code from other releases into a copy of GNU
+ccRTP, as the General Public License permits, the exception does
+not apply to the code that you add in this way.  To avoid misleading
+anyone as to the status of such modified files, you must delete
+this exception notice from them.
+
+If you write modifications of your own for GNU ccRTP, it is your choice
+whether to permit this exception to apply to your modifications.
+If you do not wish that, delete this exception notice.
+

Modified: libccrtp/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/libccrtp/trunk/debian/rules?rev=6440&op=diff
==============================================================================
--- libccrtp/trunk/debian/rules (original)
+++ libccrtp/trunk/debian/rules Sat Nov 15 05:44:47 2008
@@ -10,7 +10,8 @@
 clean::
 	rm -f doc/latex/* doc/html/* doc/man/man3/* doc/doxy
 
-DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp
+#lintian libccrtp-dev extra-license-file
+DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp --exclude=COPYING.addendum
 
 get-orig-source:
 	@@dh_testdir