[Pkg-voip-commits] r1582 - in opal/branches/sarge/debian: . patches

[Kilian Krause]

Author: kilian
Date: 2006-04-15 22:28:25 +0000 (Sat, 15 Apr 2006)
New Revision: 1582

Added:
   opal/branches/sarge/debian/patches/remove_ilbc.dpatch
Modified:
   opal/branches/sarge/debian/changelog
   opal/branches/sarge/debian/patches/00list
Log:
sync back trunk to sarge backports


Modified: opal/branches/sarge/debian/changelog
===================================================================
--- opal/branches/sarge/debian/changelog	2006-04-15 22:01:47 UTC (rev 1581)
+++ opal/branches/sarge/debian/changelog	2006-04-15 22:28:25 UTC (rev 1582)
@@ -1,10 +1,25 @@
-opal (2.2.1-2) UNRELEASED; urgency=low
+opal (2.2.1.dfsg-1) UNRELEASED; urgency=low
 
+  [ Kilian Krause ]
   * NOT RELEASED YET
   * debian/control: No need to have debug symbols depend on -dev.
 
- -- Kilian Krause <kilian at debian.org>  Wed, 22 Mar 2006 08:36:21 +0100
+  [ Jose Carlos Garcia Sogo ]
+  * debian/copyright: state different copyrights and licenses for:
+     + src/codec/speex: BSD like license
+     + src/codec/g726: special unrestricted license from Sun
+     + src/codec/gsm: list copyright holders and license terms
+     + src/codec/iLBC: removed from upstream source. Non DFSG-compliant
+     license. (GIPS Royalty Free License)
 
+  * debian/rules:
+     + check that iLBC code has been removed. It also includes an RFC.
+  
+  * debian/patches:
+     + remove_ilbc: new. Removes any reference to iLBC code in Makefile.in
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org>  Sat, 15 Apr 2006 23:56:45 +0200
+
 opal (2.2.1-1) unstable; urgency=low
 
   * New upstream release (Phobos_release1 tag) to hotfix retransmission of

Modified: opal/branches/sarge/debian/patches/00list
===================================================================
--- opal/branches/sarge/debian/patches/00list	2006-04-15 22:01:47 UTC (rev 1581)
+++ opal/branches/sarge/debian/patches/00list	2006-04-15 22:28:25 UTC (rev 1582)
@@ -1 +1,2 @@
 libname
+remove_ilbc

Added: opal/branches/sarge/debian/patches/remove_ilbc.dpatch
===================================================================
--- opal/branches/sarge/debian/patches/remove_ilbc.dpatch	2006-04-15 22:01:47 UTC (rev 1581)
+++ opal/branches/sarge/debian/patches/remove_ilbc.dpatch	2006-04-15 22:28:25 UTC (rev 1582)
@@ -0,0 +1,76 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## remove_ilbc.dpatch by Jose Carlos Garcia Sogo <jsogo at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad opal~/Makefile.in opal/Makefile.in
+--- opal~/Makefile.in	2006-04-09 12:24:00.000000000 +0200
++++ opal/Makefile.in	2006-04-15 23:55:53.000000000 +0200
+@@ -579,65 +579,6 @@
+ endif # OPAL_SYSTEM_SPEEX
+ 
+ 
+-# iLBC
+-
+-ILBC_DIR 	= $(OPAL_SRCDIR)/codec/iLBC
+-
+-VPATH_C		+= $(ILBC_DIR)
+-VPATH_CXX	+= $(ILBC_DIR)
+-
+-HEADER_FILES	+= $(OPAL_INCDIR)/codec/ilbccodec.h
+-SOURCES	+= $(OPAL_SRCDIR)/codec/ilbccodec.cxx
+-
+-HEADER_FILES	+= $(ILBC_DIR)/iLBC_define.h
+-HEADER_FILES	+= $(ILBC_DIR)/iLBC_decode.h
+-SOURCES		+= $(ILBC_DIR)/iLBC_decode.c
+-HEADER_FILES	+= $(ILBC_DIR)/iLBC_encode.h
+-SOURCES		+= $(ILBC_DIR)/iLBC_encode.c
+-HEADER_FILES	+= $(ILBC_DIR)/FrameClassify.h
+-SOURCES		+= $(ILBC_DIR)/FrameClassify.c
+-HEADER_FILES	+= $(ILBC_DIR)/LPCdecode.h
+-SOURCES		+= $(ILBC_DIR)/LPCdecode.c
+-HEADER_FILES	+= $(ILBC_DIR)/LPCencode.h
+-SOURCES		+= $(ILBC_DIR)/LPCencode.c
+-HEADER_FILES	+= $(ILBC_DIR)/StateConstructW.h
+-SOURCES		+= $(ILBC_DIR)/StateConstructW.c
+-HEADER_FILES	+= $(ILBC_DIR)/StateSearchW.h
+-SOURCES		+= $(ILBC_DIR)/StateSearchW.c
+-HEADER_FILES	+= $(ILBC_DIR)/anaFilter.h
+-SOURCES		+= $(ILBC_DIR)/anaFilter.c
+-HEADER_FILES	+= $(ILBC_DIR)/constants.h
+-SOURCES		+= $(ILBC_DIR)/constants.c
+-HEADER_FILES	+= $(ILBC_DIR)/createCB.h
+-SOURCES		+= $(ILBC_DIR)/createCB.c
+-HEADER_FILES	+= $(ILBC_DIR)/doCPLC.h
+-SOURCES		+= $(ILBC_DIR)/doCPLC.c
+-HEADER_FILES	+= $(ILBC_DIR)/enhancer.h
+-SOURCES		+= $(ILBC_DIR)/enhancer.c
+-HEADER_FILES	+= $(ILBC_DIR)/filter.h
+-SOURCES		+= $(ILBC_DIR)/filter.c
+-HEADER_FILES	+= $(ILBC_DIR)/gainquant.h
+-SOURCES		+= $(ILBC_DIR)/gainquant.c
+-HEADER_FILES	+= $(ILBC_DIR)/getCBvec.h
+-SOURCES		+= $(ILBC_DIR)/getCBvec.c
+-HEADER_FILES	+= $(ILBC_DIR)/helpfun.h
+-SOURCES		+= $(ILBC_DIR)/helpfun.c
+-HEADER_FILES	+= $(ILBC_DIR)/hpInput.h
+-SOURCES		+= $(ILBC_DIR)/hpInput.c
+-HEADER_FILES	+= $(ILBC_DIR)/hpOutput.h
+-SOURCES		+= $(ILBC_DIR)/hpOutput.c
+-HEADER_FILES	+= $(ILBC_DIR)/iCBConstruct.h
+-SOURCES		+= $(ILBC_DIR)/iCBConstruct.c
+-HEADER_FILES	+= $(ILBC_DIR)/iCBSearch.h
+-SOURCES		+= $(ILBC_DIR)/iCBSearch.c
+-HEADER_FILES	+= $(ILBC_DIR)/lsf.h
+-SOURCES		+= $(ILBC_DIR)/lsf.c
+-HEADER_FILES	+= $(ILBC_DIR)/packing.h
+-SOURCES		+= $(ILBC_DIR)/packing.c
+-HEADER_FILES	+= $(ILBC_DIR)/syntFilter.h
+-SOURCES		+= $(ILBC_DIR)/syntFilter.c
+-
+-
+ VIC_DIR = $(OPAL_SRCDIR)/codec/vic
+ 
+ SOURCES += $(OPAL_SRCDIR)/codec/h261codec.c \


Property changes on: opal/branches/sarge/debian/patches/remove_ilbc.dpatch
___________________________________________________________________
Name: svn:executable
   + *