[Pkg-voip-commits] r1805 - ekiga/branches/sarge/debian opal/branches/sarge/debian pwlib/branches/sarge/debian

Kilian Krause kilian at costa.debian.org
Fri Jun 9 20:52:54 UTC 2006 

Author: kilian
Date: 2006-06-09 20:52:49 +0000 (Fri, 09 Jun 2006)
New Revision: 1805

Modified:
   ekiga/branches/sarge/debian/changelog
   ekiga/branches/sarge/debian/control
   ekiga/branches/sarge/debian/copyright
   opal/branches/sarge/debian/changelog
   opal/branches/sarge/debian/control
   opal/branches/sarge/debian/copyright
   opal/branches/sarge/debian/rules
   opal/branches/sarge/debian/watch
   pwlib/branches/sarge/debian/changelog
   pwlib/branches/sarge/debian/rules
   pwlib/branches/sarge/debian/watch
Log:
update sarge backports.


Modified: ekiga/branches/sarge/debian/changelog
===================================================================
--- ekiga/branches/sarge/debian/changelog	2006-06-09 20:37:51 UTC (rev 1804)
+++ ekiga/branches/sarge/debian/changelog	2006-06-09 20:52:49 UTC (rev 1805)
@@ -1,11 +1,28 @@
-ekiga (2.0.1-2) UNRELEASED; urgency=low
+ekiga (2.0.2-1) unstable; urgency=low
 
   * Sarge backport. Removed avahi-support. Provide gnomemeeting to satisfy
     gnome depends.
-  * NOT YET RELEASED
+  [ Kilian Krause ]
+  * New upstream release.
+  * Swap Maintainer and Uploader with Jose.
+
+  [ Jordi Mallach ]
+  * debian/control.in:
+    - remove all Recommends, as they duplicate the libpt modules listed
+      as alternatives in Depends.
+    - make the short description somewhat informative.
+  * debian/copyright: Add years to copyright statement.
+  * Rebuild against new e-d-s.
+  * Thanks to Joerg Jaspert for the suggestions.
+
+ -- Kilian Krause <kilian at debian.org>  Fri,  9 Jun 2006 20:38:57 +0000
+
+ekiga (2.0.1-2) unstable; urgency=low
+
   * Add yelp to Depends to make sure we can display the help even in non-GNOME
     environments.
-  * debian/rules: Add --disable-scrollkeeper to configure flags.
+  * debian/rules: Add --disable-scrollkeeper to configure flags to make sure
+    we don't include scrollkeeper generated files.
 
  -- Kilian Krause <kilian at debian.org>  Sun, 19 Mar 2006 22:33:43 +0100
 

Modified: ekiga/branches/sarge/debian/control
===================================================================
--- ekiga/branches/sarge/debian/control	2006-06-09 20:37:51 UTC (rev 1804)
+++ ekiga/branches/sarge/debian/control	2006-06-09 20:52:49 UTC (rev 1805)
@@ -2,15 +2,14 @@
 Section: gnome
 Priority: optional
 Maintainer: Kilian Krause <kilian at debian.org>
-Build-Depends: debhelper (>= 4.1.34), gettext, libgnome2-dev, libldap2-dev, libpt-dev (>= 1.10.0), libopal-dev (>= 2.2.1), libgconf2-dev, libgnomeui-dev, libsdl1.2-dev, dpatch, autotools-dev, scrollkeeper, automake1.7, intltool, libxml-parser-perl, evolution-data-server-dev, gnome-doc-utils, libxml2-utils, xsltproc
+Build-Depends: debhelper (>= 4.1.34), gettext, libgnome2-dev, libldap2-dev, libpt-dev (>= 1.10.1), libopal-dev (>= 2.2.2), libgconf2-dev, libgnomeui-dev, libsdl1.2-dev, dpatch, autotools-dev, scrollkeeper, automake1.7, intltool, libxml-parser-perl, evolution-data-server-dev, gnome-doc-utils, libxml2-utils, xsltproc
 Standards-Version: 3.6.2
 
 Package: ekiga
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libpt-plugins-alsa | libpt-plugins-oss, libpt-plugins-v4l | libpt-plugins-avc | libpt-plugins-dc | libpt-plugins-v4l2, evolution-data-server, yelp
-Recommends: libpt-plugins-alsa, libpt-plugins-oss, libpt-plugins-v4l, libpt-plugins-avc, libpt-plugins-dc, libpt-plugins-v4l2 
 Provides: gnomemeeting
-Description: Free Your Speech
+Description: H.323 and SIP compatible VOIP client 
  H.323 and SIP compatible videoconferencing and VOIP/IP-Telephony application
  that allows you to make audio and video calls to remote users with H.323
  hardware or software (such as Microsoft Netmeeting) as well as SIP endpoints. 

Modified: ekiga/branches/sarge/debian/copyright
===================================================================
--- ekiga/branches/sarge/debian/copyright	2006-06-09 20:37:51 UTC (rev 1804)
+++ ekiga/branches/sarge/debian/copyright	2006-06-09 20:52:49 UTC (rev 1805)
@@ -6,8 +6,10 @@
 Upstream Author:
 	Damien Sandras <dsandras at seconix.com>
 
+Copyright:
 
-Copyright: Damien Sandras
+  Ekiga is Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
+  2006 Damien Sandras.
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by

Modified: opal/branches/sarge/debian/changelog
===================================================================
--- opal/branches/sarge/debian/changelog	2006-06-09 20:37:51 UTC (rev 1804)
+++ opal/branches/sarge/debian/changelog	2006-06-09 20:52:49 UTC (rev 1805)
@@ -1,11 +1,26 @@
-opal (2.2.1.dfsg-2) UNRELEASED; urgency=low
+opal (2.2.2.dfsg-2) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+
+ -- Kilian Krause <kilian at debian.org>  Fri,  9 Jun 2006 20:37:41 +0000
+
+opal (2.2.2.dfsg-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Kilian Krause <kilian at debian.org>  Fri,  9 Jun 2006 19:46:19 +0000
+
+opal (2.2.1.dfsg-2) unstable; urgency=low
+
+  [ Kilian Krause ]
   * debian/rules: Use CURDIR rather than PWD to make sure we can build with
     sudo.
 
- -- Kilian Krause <kilian at debian.org>  Sun, 16 Apr 2006 22:53:05 +0000
+  [ Mark Purcell ]
+  * Update debian/watch for numerics & dfsg mangle
 
+ -- Kilian Krause <kilian at debian.org>  Sun,  7 May 2006 12:58:43 +0200
+
 opal (2.2.1.dfsg-1) unstable; urgency=low
 
   [ Kilian Krause ]

Modified: opal/branches/sarge/debian/control
===================================================================
--- opal/branches/sarge/debian/control	2006-06-09 20:37:51 UTC (rev 1804)
+++ opal/branches/sarge/debian/control	2006-06-09 20:52:49 UTC (rev 1805)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Kilian Krause <kilian at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Mark Purcell <msp at debian.org>, Santiago Garcia Mantinan <manty at debian.org>
-Build-Depends: debhelper (>=4.0.2), libpt-dbg (>=1.10.0), libpt-dev (>=1.10.0), g++ (>=2.95), dpatch (>=1.11), doxygen, autotools-dev
+Build-Depends: debhelper (>=4.0.2), libpt-dbg (>=1.10.1), libpt-dev (>=1.10.1), g++ (>=2.95), dpatch (>=1.11), doxygen, autotools-dev
 Build-Depends-Indep: doxygen
 Build-Conflicts: linux-kernel-headers (<< 2.5.999-test7-bk-14), libopenh323-dev, libopal-dev
 Standards-Version: 3.6.2

Modified: opal/branches/sarge/debian/copyright
===================================================================
--- opal/branches/sarge/debian/copyright	2006-06-09 20:37:51 UTC (rev 1804)
+++ opal/branches/sarge/debian/copyright	2006-06-09 20:52:49 UTC (rev 1805)
@@ -1,22 +1,20 @@
 This is the Debian GNU/Linux packaged version of OPAL.
 
 The author of this software is Equivalence Pty. Ltd.
+Some parts of the code have different authors, see below.
 
 Original packaging for Debian by
 	Kilian Krause <kk at verfaction.de>
 	(derived from openh323)
 
-
 The sources where downloaded from:
   http://www.voxgratia.org/downloads.html
 
-Copyright:
+This software is released under the terms of the MPL (Mozilla Public license), though
+there are some parts that are covered by other licenses and copyright (see below)
 
-This software is released under the terms of the MPL (Mozilla Public license).
-
                           MOZILLA PUBLIC LICENSE
                                 Version 1.0
-
                               ----------------
 
 1. Definitions.
@@ -372,3 +370,112 @@
      ______________________ are Copyright (C) ______
      _______________________. All Rights Reserved.
      Contributor(s): ______________________________________.''
+
+
+  + src/codec/gsm
+  ----------------
+Copyright 1992, 1993, 1994 by Jutta Degener and Carsten Bormann,
+Technische Universitaet Berlin
+
+Any use of this software is permitted provided that this notice is not
+removed and that neither the authors nor the Technische Universitaet Berlin
+are deemed to have made any representations as to the suitability of this
+software for any purpose nor are held responsible for any defects of
+this software.  THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
+
+As a matter of courtesy, the authors request to be informed about uses
+this software has found, about bugs in this software, and about any
+improvements that may be of general interest.
+
+Berlin, 28.11.1994
+Jutta Degener
+Carsten Bormann
+
+
+  + src/codec/speex
+  ------------------
+
+Copyright:
+ Jean-Marc Valin <jean-marc.valin at hermes.usherb.ca>
+   All the code except the following
+
+ David Rowe <david at voicetronix.com.au> via VoiceTronix
+   lsp.c lsp.h
+   Also ideas and feedback
+
+ John Francis Edwards:
+   wave_out.[ch], some #ifdefs for windows port and MSVC project files
+
+ Atsuhiko Yamanaka <ymnk at jcraft.com>:
+   Patch to speexenc.c to add Vorbis comment format
+
+ Radim Kolar <hsn at cybermail.net>:
+   Patch to speexenc.c for supporting more input formats
+
+Licence:
+
+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 Xiph.org Foundation 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 FOUNDATION 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.
+
+
+  + src/codec/g726
+  ----------------
+
+ This source code is a product of Sun Microsystems, Inc. and is provided
+ for unrestricted use.  Users may copy or modify this source code without
+ charge.
+
+ SUN SOURCE CODE IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING
+ THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
+ PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+
+ Sun source code is provided with no support and without any obligation on
+ the part of Sun Microsystems, Inc. to assist in its use, correction,
+ modification or enhancement.
+
+ SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
+ INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY THIS SOFTWARE
+ OR ANY PART THEREOF.
+
+ In no event will Sun Microsystems, Inc. be liable for any lost revenue
+ or profits or other special, indirect and consequential damages, even if
+ Sun has been advised of the possibility of such damages.
+
+ Sun Microsystems, Inc.
+ 2550 Garcia Avenue
+ Mountain View, California  94043
+
+
+  + src/codec/iLBC
+  ----------------
+Removed from sources, as it is not distributable due to its license.
+
+       iLBC Speech Coder ANSI-C Source Code
+
+       Copyright (C) The Internet Society (2004).
+       All Rights Reserved.
+

Modified: opal/branches/sarge/debian/rules
===================================================================
--- opal/branches/sarge/debian/rules	2006-06-09 20:37:51 UTC (rev 1804)
+++ opal/branches/sarge/debian/rules	2006-06-09 20:52:49 UTC (rev 1805)
@@ -4,7 +4,8 @@
 
 # Change this on API breakage
 export LIBOPALCOMPAT=2.2.0
-export LIBOPALCOMPAT2=2.1.3
+export LIBOPALCOMPAT2=2.2.1
+export LIBOPALCOMPAT3=2.1.3
 
 PACKAGE=libopal-$(LIBOPALCOMPAT)
 
@@ -30,10 +31,11 @@
 DEBVERSION:=$(shell head -n 1 debian/changelog \
 		    | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
 UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/.dfsg$$//')
+URLVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/.dfsg$$//' -e 's/\./_/g')
 
 FILENAME := opal_$(UPVERSION).dfsg.orig.tar.gz
 UPFILENAME := opal_$(UPVERSION).orig.tar.gz
-URL := http://www.voxgratia.org/releases/opal-v2_2_1-src-tar.gz
+URL := http://www.voxgratia.org/releases/opal-v$(URLVERSION)-src-tar.gz
 
 build: build-arch build-indep
 
@@ -132,6 +134,10 @@
 	ln -s libopal.so.$(SHLIBSVER) \
 		debian/$(PACKAGE)/usr/lib/libopal.so.$(LIBOPALCOMPAT2)
 endif
+ifneq ($(SHLIBSVER),$(LIBOPALCOMPAT3))
+	ln -s libopal.so.$(SHLIBSVER) \
+		debian/$(PACKAGE)/usr/lib/libopal.so.$(LIBOPALCOMPAT3)
+endif
 	$(MAKE) $(MAKE_BUILD_PARAM) INSTALL_DIR=$(CURDIR)/debian/simpleopal/usr -C samples/simple install
 #	clean simple to install it as a sample in the docs
 	$(MAKE) $(MAKE_BUILD_PARAM) -C samples/simple clean

Modified: opal/branches/sarge/debian/watch
===================================================================
--- opal/branches/sarge/debian/watch	2006-06-09 20:37:51 UTC (rev 1804)
+++ opal/branches/sarge/debian/watch	2006-06-09 20:52:49 UTC (rev 1805)
@@ -1,8 +1,4 @@
-# format version number, currently 2; this line is compulsory!
-version=2
+version=3
 
-# Line continuations are performed with \
-
-# This the format for an FTP site:
-# Full‐site‐with‐pattern  [Version  [Action]]
-http://www.voxgratia.org/releases/opal-v(.*)\.tar\.gz	debian	uupdate
+opts=dversionmangle=s/\.dfsg// \
+  http://www.voxgratia.org/releases/opal-v(\d+)_(\d+)_(\d+)-src-tar\.gz	debian	svn-upgrade

Modified: pwlib/branches/sarge/debian/changelog
===================================================================
--- pwlib/branches/sarge/debian/changelog	2006-06-09 20:37:51 UTC (rev 1804)
+++ pwlib/branches/sarge/debian/changelog	2006-06-09 20:52:49 UTC (rev 1805)
@@ -1,11 +1,21 @@
-pwlib (1.10.0-2) UNRELEASED; urgency=low
+pwlib (1.10.1.dfsg-2) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+
+ -- Kilian Krause <kilian at debian.org>  Fri,  9 Jun 2006 20:21:19 +0000
+
+pwlib (1.10.1.dfsg-1) unstable; urgency=low
+
+  [ Kilian Krause ]
+  * New upstream release. (Closes: #365177)
   * debian/rules: Use CURDIR rather than PWD to make sure we can build with
     sudo.
 
- -- Kilian Krause <kilian at debian.org>  Sun, 16 Apr 2006 22:51:10 +0000
+  [ Mark Purcell ]
+  * Update debian/watch for numerics
 
+ -- Kilian Krause <kilian at debian.org>  Fri,  9 Jun 2006 19:33:41 +0000
+
 pwlib (1.10.0-1) unstable; urgency=low
 
   * New upstream release (Phobos_release).

Modified: pwlib/branches/sarge/debian/rules
===================================================================
--- pwlib/branches/sarge/debian/rules	2006-06-09 20:37:51 UTC (rev 1804)
+++ pwlib/branches/sarge/debian/rules	2006-06-09 20:52:49 UTC (rev 1805)
@@ -4,6 +4,7 @@
 
 # Change this on API breakage
 export LIBPTCOMPAT=1.9.3
+export LIBPTCOMPAT2=1.10.0
 
 #PACKAGE=libpt-$(LIBPTCOMPAT)
 PACKAGE=libpt-1.10.0
@@ -40,6 +41,15 @@
 # symbols.
 LDFLAGS += -Wl,-z,def
 
+DEBVERSION:=$(shell head -n 1 debian/changelog \
+		    | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
+UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/.dfsg$$//')
+URLVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/.dfsg$$//' -e 's/\./_/g')
+
+FILENAME := pwlib_$(UPVERSION).dfsg.orig.tar.gz
+UPFILENAME := pwlib_$(UPVERSION).orig.tar.gz
+URL := http://www.voxgratia.org/releases/pwlib-v$(URLVERSION)-src-tar.gz
+
 include /usr/share/dpatch/dpatch.make
 
 
@@ -125,6 +135,10 @@
 	ln -s libpt.so.$(SHLIBSVER) \
 	    debian/$(PACKAGE)/usr/lib/libpt.so.$(LIBPTCOMPAT)
 endif
+ifneq ($(SHLIBSVER),$(LIBPTCOMPAT2))
+	ln -s libpt.so.$(SHLIBSVER) \
+	    debian/$(PACKAGE)/usr/lib/libpt.so.$(LIBPTCOMPAT2)
+endif
 
 #	libpt-dev
 	dh_movefiles -plibpt-dev --sourcedir=debian/$(PACKAGE) usr/lib/libpt.so
@@ -249,5 +263,24 @@
 	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-strip
 	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
 
+print-version:
+	@@echo "Debian version:          $(DEBVERSION)"
+	@@echo "Upstream version:        $(UPVERSION)"
+
+get-orig-source:
+	@@dh_testdir
+	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
+	@@echo Downloading $(UPFILENAME) from $(URL) ...
+	@@wget -N -nv -T10 -t3 -O ../tarballs/$(UPFILENAME) $(URL)
+	@@echo Repacking as DFSG-free...
+	@@mkdir -p ../tarballs/pwlib-$(UPVERSION).tmp/
+	@@cd ../tarballs/pwlib-$(UPVERSION).tmp ; \
+	tar xfz ../$(UPFILENAME) 
+	@@rm -f ../tarballs/pwlib-$(UPVERSION).tmp/pwlib*/samples/xmpptest/draft-ietf-*
+	@@cd ../tarballs/pwlib-$(UPVERSION).tmp ; \
+	tar cfz ../$(FILENAME) *
+	@@echo Cleaning up...
+	@@$(RM) -rf ../tarballs/pwlib-$(UPVERSION).tmp/
+
 binary: binary-arch binary-indep
 .PHONY: build clean clean-patched binary-indep binary-arch binary install install-indep install-arch

Modified: pwlib/branches/sarge/debian/watch
===================================================================
--- pwlib/branches/sarge/debian/watch	2006-06-09 20:37:51 UTC (rev 1804)
+++ pwlib/branches/sarge/debian/watch	2006-06-09 20:52:49 UTC (rev 1805)
@@ -1,8 +1,8 @@
 # format version number, currently 2; this line is compulsory!
-version=2
+version=3
 
 # Line continuations are performed with \
 
 # This the format for an FTP site:
 # Full‐site‐with‐pattern  [Version  [Action]]
-http://www.voxgratia.org/releases/pwlib-v(.*)\.tar\.gz	debian	uupdate
+http://www.voxgratia.org/releases/pwlib-v(\d+)_(\d+)_(\d+)-src-tar\.gz	debian	svn-upgrade

More information about the Pkg-voip-commits mailing list