[Pkg-voip-commits] r1452 - in linphone: . trunk trunk/debian
trunk/debian/patches upstream
Samuel Mimram
smimram at costa.debian.org
Wed Mar 15 22:54:17 UTC 2006
Author: smimram
Date: 2006-03-15 22:52:50 +0000 (Wed, 15 Mar 2006)
New Revision: 1452
Added:
linphone/tags/
linphone/trunk/
linphone/trunk/debian/
linphone/trunk/debian/README.Debian
linphone/trunk/debian/TODO.Debian
linphone/trunk/debian/changelog
linphone/trunk/debian/compat
linphone/trunk/debian/control
linphone/trunk/debian/copyright
linphone/trunk/debian/cv_addr_book.pl
linphone/trunk/debian/liblinphone1-dev.dirs
linphone/trunk/debian/liblinphone1-dev.install
linphone/trunk/debian/liblinphone1.dirs
linphone/trunk/debian/liblinphone1.install
linphone/trunk/debian/liblinphone1.shlibs
linphone/trunk/debian/libortp4-dev.dirs
linphone/trunk/debian/libortp4-dev.install
linphone/trunk/debian/libortp4.dirs
linphone/trunk/debian/libortp4.docs
linphone/trunk/debian/libortp4.install
linphone/trunk/debian/linphone-common.dirs
linphone/trunk/debian/linphone-common.install
linphone/trunk/debian/linphone-nox.dirs
linphone/trunk/debian/linphone-nox.docs
linphone/trunk/debian/linphone-nox.install
linphone/trunk/debian/linphone.dirs
linphone/trunk/debian/linphone.doc-base
linphone/trunk/debian/linphone.docs
linphone/trunk/debian/linphone.install
linphone/trunk/debian/linphone2.xpm
linphone/trunk/debian/menu
linphone/trunk/debian/patches/
linphone/trunk/debian/patches/00list
linphone/trunk/debian/patches/00mscodec_null_name.dpatch
linphone/trunk/debian/patches/10mscodec_null_strcmp.dpatch
linphone/trunk/debian/patches/desktop_icon.dpatch
linphone/trunk/debian/patches/gnome_applet_dir.dpatch
linphone/trunk/debian/patches/link_vorbis.dpatch
linphone/trunk/debian/rules
linphone/trunk/debian/svn-deblayout
linphone/trunk/debian/watch
linphone/upstream/
linphone/upstream/linphone_1.3.0.orig.tar.gz
Log:
Initial import of the package.
Property changes on: linphone/trunk/debian
___________________________________________________________________
Name: mergeWithUpstream
+ 1
Added: linphone/trunk/debian/README.Debian
===================================================================
--- linphone/trunk/debian/README.Debian 2006-03-15 22:09:28 UTC (rev 1451)
+++ linphone/trunk/debian/README.Debian 2006-03-15 22:52:50 UTC (rev 1452)
@@ -0,0 +1,35 @@
+Converting the address book entries between versions 0.12.2 and 1.0.0
+---------------------------------------------------------------------
+You seem to have lost your address book while updating linphone?
+
+Linphone has changed the format in which address book entries are stored between
+versions 0.12.2 and 1.0.0.
+
+To see your old entries back with a new version of linphone you can use the perl
+script cv_addr_book.pl provided in /usr/share/doc/linphone/. You only have to
+run it once under your current user (don't forget to chmod +x the script before
+running it).
+
+If you don't want to know the details, don't read the following paragraph. The
+address book is stored in the file ~/.gnome2/linphone. The old entries were in
+this format:
+
+[address_book]
+entry_count=4
+entry0=Name0 <sip:user0 at host0>
+entry1=Name1 <sip:user1 at host1>
+...
+
+whereas new entries are in this format:
+
+[friend_0]
+url=Name0 <sip:user0 at host0>
+pol=wait
+subscribe=1
+proxy=-1
+
+etc.
+
+Sorry for the inconveniences caused by this change.
+
+ -- Samuel Mimram <smimram at debian.org> Sun, 10 Apr 2005 17:59:31 +0200
Added: linphone/trunk/debian/TODO.Debian
===================================================================
--- linphone/trunk/debian/TODO.Debian 2006-03-15 22:09:28 UTC (rev 1451)
+++ linphone/trunk/debian/TODO.Debian 2006-03-15 22:52:50 UTC (rev 1452)
@@ -0,0 +1,27 @@
+Things that upstream should do
+------------------------------
+* Remove things that should be removed during distclean (ie everything which is
+ generated) and should not be in the tar.gz. [pending]
+* Add support for external libraries in configure.
+* Remove speex and gsm from the archive?
+* Is /usr/libexec standard (at least it is not in Debian) for gnome applets?
+ [pending]
+* Size of the gnome icon (linphone2.xpm) should be 32x32.
+* Enhance the manpages.
+* Have the most recent version in http://simon.morlat.free.fr/download/ in order
+ to be able to uscan (or a symlink).
+* Version the librairies.
+* Put the rings in .ogg.
+* Why so many statically-linked libs?
+
+Whishlist
+---------
+* Lower the ring volume?
+* Add a system tray icon (à la gnomemeeting)?
+* Add a bandwidth graph?
+* J'aimerais bien qu'il soit possible de faire exécuter une commande que je choisis quand qqn m'appelle, plutôt que de balancer une sonnerie dans la carte son (le but étant de pouvoir interfacer avec une "vraie" ligne de téléphone)
+* Je pense que ça pourrait être pratique si linphone était en 2 parties : un backend qui fait le boulot, et un ou plusieurs frontend (gnome, ligne de commande, ...) qui communiquent par une socket unix ou TCP/UDP. Comme ça, je pourrais avoir le programme qui tourne en permanence en background (pour recevoir des appels) et lancer le frontend graphique juste quand je veux...
+
+debian
+------
+* Add a watch file.
Added: linphone/trunk/debian/changelog
===================================================================
--- linphone/trunk/debian/changelog 2006-03-15 22:09:28 UTC (rev 1451)
+++ linphone/trunk/debian/changelog 2006-03-15 22:52:50 UTC (rev 1452)
@@ -0,0 +1,132 @@
+linphone (1.3.0-1) unstable; urgency=low
+
+ * New upstream release.
+ * New maintainer Debian VoIP Team, added myself to uploaders.
+ * New soname for libortp.
+ * Removed addressbook_entries.dpatch, integrated upstream.
+
+ -- Samuel Mimram <smimram at debian.org> Thu, 9 Mar 2006 21:41:06 +0000
+
+linphone (1.2.0-3) unstable; urgency=low
+
+ * Addd desktop_icon.dpatch to correct the icon location in linphone.desktop,
+ closes: #346435.
+ * Added addressbook_entries.dpatch to make addressbook work as expected when
+ clicking on an entry (thanks Emiliano Necciari).
+
+ -- Samuel Mimram <smimram at debian.org> Fri, 20 Jan 2006 23:42:23 +0100
+
+linphone (1.2.0-2) unstable; urgency=low
+
+ * Updated liblinphone1's shlibs, closes: #345457.
+
+ -- Samuel Mimram <smimram at debian.org> Sat, 31 Dec 2005 19:24:49 +0100
+
+linphone (1.2.0-1) unstable; urgency=low
+
+ * New upstream release.
+ * Primary selection isn't destroyed anymore, closes: #309374.
+ * Linphonec now handles ctrl+D, closes: #333423.
+ * Swedish translation integrated upstream, closes: #340432.
+ * Removed pl_utf8 patch, integrated upstream.
+ * Soname bump: libortp2 instead of libortp0.
+
+ -- Samuel Mimram <smimram at debian.org> Sun, 18 Dec 2005 12:39:06 +0100
+
+linphone (1.1.0-2) unstable; urgency=low
+
+ * Added a shlibs to version the dependencies on liblinphone1 and updated
+ libortp0's one, closes: #327795.
+ * Added pl_utf8 patch to correct the charset of the polish translation,
+ closes: #327457.
+ * Installing ortp.pc in libortp0-dev.
+
+ -- Samuel Mimram <smimram at debian.org> Mon, 12 Sep 2005 12:02:50 +0200
+
+linphone (1.1.0-1) unstable; urgency=low
+
+ * New upstream release.
+ * IPv6 should work now, closes: #301874.
+ * Clearing of passwords should work now, closes: #321064.
+ * Corrected typos in german translation, closes: #313999.
+ * Removed addrbook_sip_addr patch (integrated upstream).
+ * Added yelp to linphone's Suggests, closes: #325863.
+
+ -- Samuel Mimram <smimram at debian.org> Thu, 8 Sep 2005 19:37:27 +0200
+
+linphone (1.0.1-6) unstable; urgency=low
+
+ * Build-depending on libjack0.100.0-dev instead of libjack0.80.0-dev,
+ closes: #317211.
+ * Updated standards version to 3.6.2.
+
+ -- Samuel Mimram <smimram at debian.org> Mon, 18 Jul 2005 21:31:20 +0200
+
+linphone (1.0.1-5) unstable; urgency=low
+
+ * Added a patch to check sip addresses format when adding contacts in
+ address book, closes: #305078.
+
+ -- Samuel Mimram <smimram at debian.org> Sat, 30 Apr 2005 13:58:35 +0200
+
+linphone (1.0.1-4) unstable; urgency=low
+
+ * Added a perl script and a README.Debian to explain how to convert old
+ adress book entries to new format, closes: #303819.
+
+ -- Samuel Mimram <smimram at debian.org> Sun, 10 Apr 2005 17:57:39 +0200
+
+linphone (1.0.1-3) unstable; urgency=low
+
+ * Tightened the shlibs of libortp0 to 1.0.1 version.
+
+ -- Samuel Mimram <smimram at debian.org> Thu, 31 Mar 2005 18:11:23 +0200
+
+linphone (1.0.1-2) unstable; urgency=low
+
+ * Added the 10mscodec_null_strcmp patch to make some more checks for NULL
+ pointers. I hope this will solve the crash on startup, closes: #301494.
+
+ -- Samuel Mimram <smimram at debian.org> Wed, 30 Mar 2005 11:19:04 +0200
+
+linphone (1.0.1-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Samuel Mimram <smimram at debian.org> Wed, 23 Mar 2005 12:50:48 +0100
+
+linphone (1.0.0-1) unstable; urgency=low
+
+ * New upstream release.
+ * The code was reorganized to be cleaner, some libraries have been merged.
+ * Big-endian architectures are now supported, closes: #275738, #284079.
+ * Sound should not be decreased on startup anymore, closes: #299227.
+ * Samuel Thibault's patches were integrated upstream (many thanks),
+ closes: #297213, #297215, #297622.
+ * Put the rings in a separate package (linphone-common) to save disk space
+ on the Debian mirrors.
+ * Using dh_desktop to register the .desktop file.
+ * Added -g to the CFLAGS.
+
+ -- Samuel Mimram <smimram at debian.org> Mon, 21 Mar 2005 18:11:06 +0100
+
+linphone (0.12.2-2) unstable; urgency=low
+
+ * Removed all big-endian archs since they are not supported by this version
+ of linphone (please wait until the release of the 1.0 version).
+ * Now using other packages' shlibs with dh_shlibdeps.
+ * Switched to dpatch to handle the patches.
+ * Install /usr/share/doc/linphone-nox/linphonec and corrected the error
+ message accordingly to display the right path, closes: #270935.
+ * Applied a patch to have IPv6 really enabled in the libmediastreamer (thanks
+ Henrik Riomar and Fabio Massimo Di Nitto).
+ * Check for NULL arguments in mscodec.c.
+ * Updated the config.guess and config.sub.
+
+ -- Samuel Mimram <samuel.mimram at ens-lyon.org> Fri, 10 Sep 2004 11:20:03 +0200
+
+linphone (0.12.2-1) unstable; urgency=low
+
+ * Initial Release, closes: #68243.
+
+ -- Samuel Mimram <samuel.mimram at ens-lyon.org> Wed, 30 Jun 2004 13:58:16 +0200
Added: linphone/trunk/debian/compat
===================================================================
--- linphone/trunk/debian/compat 2006-03-15 22:09:28 UTC (rev 1451)
+++ linphone/trunk/debian/compat 2006-03-15 22:52:50 UTC (rev 1452)
@@ -0,0 +1 @@
+4
Added: linphone/trunk/debian/control
===================================================================
--- linphone/trunk/debian/control 2006-03-15 22:09:28 UTC (rev 1451)
+++ linphone/trunk/debian/control 2006-03-15 22:52:50 UTC (rev 1452)
@@ -0,0 +1,116 @@
+Source: linphone
+Section: sound
+Priority: optional
+Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
+Uploaders: Samuel Mimram <smimram at debian.org>
+Build-Depends: debhelper (>= 4.0.0), autotools-dev, pkg-config, libglib2.0-dev, libosip2-dev (>= 2.2.0), libasound2-dev, libjack0.100.0-dev, libspeex-dev, libsamplerate0-dev, libxml-parser-perl, gtk-doc-tools, docbook-utils, libgnomeui-dev, libgnome2-dev, gnome-applets, libpanel-applet2-dev, dpatch, libavcodec-dev, libvorbis-dev, libreadline5-dev, libsdl1.2-dev
+Standards-Version: 3.6.2
+
+Package: linphone
+Architecture: any
+Depends: ${shlibs:Depends}, linphone-nox (=${Source-Version})
+Suggests: yelp
+Description: web phone
+ Linphone is a web phone: it lets you phone to your friends anywhere in the
+ whole world, freely, simply by using the internet. It is compatible with the
+ well known SIP protocol.
+ .
+ The main features of linphone are:
+ - a nice graphical interface;
+ - it includes a large variety of codecs with different quality / bandwidths;
+ - it uses the well-known and standardised SIP protocol.
+
+Package: linphone-nox
+Architecture: any
+Depends: ${shlibs:Depends}, linphone-common (=${Source-Version})
+Description: web phone
+ Linphone is a web phone: it lets you phone to your friends anywhere in the
+ whole world, freely, simply by using the internet. It is compatible with the
+ well known SIP protocol.
+ .
+ The main features of linphone are:
+ - a nice graphical interface;
+ - it includes a large variety of codecs with different quality / bandwidths;
+ - it uses the well-known and standardised SIP protocol.
+ .
+ This package contains the console version of linphone.
+
+Package: linphone-common
+Architecture: all
+Replaces: linphone-nox (<= 0.12.2-2)
+Description: web phone
+ Linphone is a web phone: it lets you phone to your friends anywhere in the
+ whole world, freely, simply by using the internet. It is compatible with the
+ well known SIP protocol.
+ .
+ The main features of linphone are:
+ - a nice graphical interface;
+ - it includes a large variety of codecs with different quality / bandwidths;
+ - it uses the well-known and standardised SIP protocol.
+ .
+ This package contains the resource files of linphone (the rings).
+
+Package: liblinphone1
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: linphone web phone's library (supporting the SIP protocol)
+ Linphone is a web phone: it lets you phone to your friends anywhere in the
+ whole world, freely, simply by using the internet. It is compatible with the
+ well known SIP protocol.
+ .
+ The main features of linphone are:
+ - a nice graphical interface;
+ - it includes a large variety of codecs with different quality / bandwidths;
+ - it uses the well-known and standardised SIP protocol.
+ .
+ This package contains only the shared runtime libraries.
+
+Package: liblinphone1-dev
+Section: libdevel
+Architecture: any
+Depends: liblinphone1 (=${Source-Version}), libc6-dev | libc-dev, libortp2-dev, libosip2-dev (>= 2.2.0), libjack0.100.0-dev, libspeex-dev, libsamplerate0-dev, libasound2-dev
+Conflicts: liblinphone0-dev
+Description: linphone web phone's library (supporting the SIP protocol)
+ Linphone is a web phone: it lets you phone to your friends anywhere in the
+ whole world, freely, simply by using the internet. It is compatible with the
+ well known SIP protocol.
+ .
+ The main features of linphone are:
+ - a nice graphical interface;
+ - it includes a large variety of codecs with different quality / bandwidths;
+ - it uses the well-known and standardised SIP protocol.
+ .
+ This package contains the files needed to use the linphone's library in your
+ programs.
+
+Package: libortp4
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: Real-time Transport Protocol stack
+ This library implements the RFC1889 (RTP) with a easy to use API with high
+ and low level access.
+ .
+ It main features are:
+ - support for multiples profiles, AV profile (RFC1890) being the default one;
+ - an optional packet scheduler for synchronizing rtp recv and send;
+ - implements blocking and non blocking IO for RTP sessions;
+ - supports mutiplexing IO;
+ - supports part of RFC2833 for telephone events over RTP.
+
+Package: libortp4-dev
+Section: libdevel
+Architecture: any
+Depends: libortp2 (=${Source-Version}), libglib2.0-dev, libc6-dev | libc-dev
+Conflicts: libortp0-dev
+Description: Real-time Transport Protocol stack
+ This library implements the RFC1889 (RTP) with a easy to use API with high
+ and low level access.
+ .
+ It main features are:
+ - support for multiples profiles, AV profile (RFC1890) being the default one;
+ - an optional packet scheduler for synchronizing rtp recv and send;
+ - implements blocking and non blocking IO for RTP sessions;
+ - supports mutiplexing IO;
+ - supports part of RFC2833 for telephone events over RTP.
Added: linphone/trunk/debian/copyright
===================================================================
--- linphone/trunk/debian/copyright 2006-03-15 22:09:28 UTC (rev 1451)
+++ linphone/trunk/debian/copyright 2006-03-15 22:52:50 UTC (rev 1452)
@@ -0,0 +1,81 @@
+This package was debianized by Samuel Mimram <samuel.mimram at ens-lyon.org> on
+Wed, 30 Jun 2004 13:58:16 +0200.
+
+It was downloaded from http://www.linphone.org/
+
+Upstream Authors: Simon Morlat, Florian Wintertein, Aymeric Moizard, Sharath Udupa.
+
+Copyright (C) 2001-2005 Simon Morlat
+
+ 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
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+On Debian systems you can find a copy of this license in
+/usr/share/common-licenses/GPL.
+
+
+Some libraries are under other copyrights / licenses:
+
+* FFmpeg: Copyright (C) 2000, 2001 Gerard Lantau.
+ Released under the GNU General Public License
+ (see /usr/share/common-licenses/GPL)
+
+* gsmlib: Copyright 1992, 1993, 1994 by Jutta Degener and Carsten Bormann,
+ Technische Universitaet Berlin
+
+ Released under the following license:
+
+ 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
+
+* oRTP: Copyright (C) Simon Morlat
+ Released under the GNU Lesser General Public License
+ (see /usr/share/common-licenses/LGPL).
+
+* osipua: Copyright (C) 2001 Simon Morlat and Aymeric Moizard
+ Released under the GNU Lesser General Public License
+ (see /usr/share/common-licenses/LGPL).
+
+* speex: Copyright (C) 2002-2003 Jean-Marc Valin
+
+ Released under the following license:
+
+ 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.
Added: linphone/trunk/debian/cv_addr_book.pl
===================================================================
--- linphone/trunk/debian/cv_addr_book.pl 2006-03-15 22:09:28 UTC (rev 1451)
+++ linphone/trunk/debian/cv_addr_book.pl 2006-03-15 22:52:50 UTC (rev 1452)
@@ -0,0 +1,75 @@
+#!/usr/bin/perl -w
+
+# Convert linphone's address book from version 0.12 to version 1.0.0.
+#
+# Copyright (C) 2005 Samuel Mimram
+#
+# 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
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+use strict;
+use Env '$HOME';
+
+my $conffile = "$HOME/.gnome2/linphone";
+my $tmpfile = "/tmp/linphone.tmp";
+my $friend_nb = 0;
+my $old_nb = 0;
+
+system "cp $conffile $tmpfile";
+
+open CONF, $conffile or die "Cannot open configuration file: $!";
+open OUT, ">>$tmpfile" or die "Cannot open temp file: $!";
+
+while (<CONF>)
+{
+ $friend_nb = ($1 + 1) if (/\[friend_(\d+)\]/);
+}
+
+print "$friend_nb existing new entries were found\n";
+
+seek CONF, 0, 0;
+
+while (<CONF>)
+{
+ last if (/^\[address_book\]$/);
+}
+
+if (<CONF> =~ /^entry_count=(\d+)$/)
+{
+ $old_nb = $1;
+ print "$old_nb old entries were found\n";
+}
+else
+{
+ die "Wrong file format (entry_count not found)";
+}
+
+
+my $i;
+my ($name, $user, $domain);
+
+for ($i = 0; $i < $old_nb; $i++)
+{
+ if (<CONF> =~ /^entry$i=(.*) <sip:(.*)\@(.*)>$/)
+ {
+ $name = $1;
+ $user = $2;
+ $domain = $3;
+ print OUT ("[friend_".($friend_nb + $i)."]\n");
+ print OUT "url=$name <sip:$user\@$domain>\n";
+ print OUT "pol=accept\nsubscribe=1\nproxy=-1\n\n";
+ }
+ else
+ {
+ die "Wrong file format (entry$i not found or invalid)";
+ }
+}
+
+close CONF;
+close OUT;
+
+system "cp $tmpfile $conffile";
+
+print "Successfully added old entries\n";
Added: linphone/trunk/debian/liblinphone1-dev.dirs
===================================================================
--- linphone/trunk/debian/liblinphone1-dev.dirs 2006-03-15 22:09:28 UTC (rev 1451)
+++ linphone/trunk/debian/liblinphone1-dev.dirs 2006-03-15 22:52:50 UTC (rev 1452)
@@ -0,0 +1,2 @@
+usr/include/linphone
+usr/lib
Added: linphone/trunk/debian/liblinphone1-dev.install
===================================================================
--- linphone/trunk/debian/liblinphone1-dev.install 2006-03-15 22:09:28 UTC (rev 1451)
+++ linphone/trunk/debian/liblinphone1-dev.install 2006-03-15 22:52:50 UTC (rev 1452)
@@ -0,0 +1,4 @@
+usr/include/linphone/*.h
+usr/lib/liblinphone.la
+usr/lib/liblinphone.so
+usr/lib/pkgconfig/linphone.pc
Added: linphone/trunk/debian/liblinphone1.dirs
===================================================================
--- linphone/trunk/debian/liblinphone1.dirs 2006-03-15 22:09:28 UTC (rev 1451)
+++ linphone/trunk/debian/liblinphone1.dirs 2006-03-15 22:52:50 UTC (rev 1452)
@@ -0,0 +1 @@
+usr/lib
Added: linphone/trunk/debian/liblinphone1.install
===================================================================
--- linphone/trunk/debian/liblinphone1.install 2006-03-15 22:09:28 UTC (rev 1451)
+++ linphone/trunk/debian/liblinphone1.install 2006-03-15 22:52:50 UTC (rev 1452)
@@ -0,0 +1 @@
+usr/lib/liblinphone.so.*
Added: linphone/trunk/debian/liblinphone1.shlibs
===================================================================
--- linphone/trunk/debian/liblinphone1.shlibs 2006-03-15 22:09:28 UTC (rev 1451)
+++ linphone/trunk/debian/liblinphone1.shlibs 2006-03-15 22:52:50 UTC (rev 1452)
@@ -0,0 +1 @@
+liblinphone 1 liblinphone1 (>= 1.2.0)
Added: linphone/trunk/debian/libortp4-dev.dirs
===================================================================
--- linphone/trunk/debian/libortp4-dev.dirs 2006-03-15 22:09:28 UTC (rev 1451)
+++ linphone/trunk/debian/libortp4-dev.dirs 2006-03-15 22:52:50 UTC (rev 1452)
@@ -0,0 +1,2 @@
+usr/lib
+usr/include/ortp
Added: linphone/trunk/debian/libortp4-dev.install
===================================================================
--- linphone/trunk/debian/libortp4-dev.install 2006-03-15 22:09:28 UTC (rev 1451)
+++ linphone/trunk/debian/libortp4-dev.install 2006-03-15 22:52:50 UTC (rev 1452)
@@ -0,0 +1,5 @@
+usr/include/ortp/*.h
+usr/lib/libortp.la
+usr/lib/libortp.so
+usr/lib/pkgconfig/ortp.pc
+usr/share/doc/libortp2-dev/html
Added: linphone/trunk/debian/libortp4.dirs
===================================================================
--- linphone/trunk/debian/libortp4.dirs 2006-03-15 22:09:28 UTC (rev 1451)
+++ linphone/trunk/debian/libortp4.dirs 2006-03-15 22:52:50 UTC (rev 1452)
@@ -0,0 +1 @@
+usr/lib
Added: linphone/trunk/debian/libortp4.docs
===================================================================
--- linphone/trunk/debian/libortp4.docs 2006-03-15 22:09:28 UTC (rev 1451)
+++ linphone/trunk/debian/libortp4.docs 2006-03-15 22:52:50 UTC (rev 1452)
@@ -0,0 +1,3 @@
+oRTP/AUTHORS
+oRTP/README
+oRTP/TODO
Added: linphone/trunk/debian/libortp4.install
===================================================================
--- linphone/trunk/debian/libortp4.install 2006-03-15 22:09:28 UTC (rev 1451)
+++ linphone/trunk/debian/libortp4.install 2006-03-15 22:52:50 UTC (rev 1452)
@@ -0,0 +1 @@
+usr/lib/libortp.so.*
Added: linphone/trunk/debian/linphone-common.dirs
===================================================================
--- linphone/trunk/debian/linphone-common.dirs 2006-03-15 22:09:28 UTC (rev 1451)
+++ linphone/trunk/debian/linphone-common.dirs 2006-03-15 22:52:50 UTC (rev 1452)
@@ -0,0 +1 @@
+usr/share/sounds/linphone
Added: linphone/trunk/debian/linphone-common.install
===================================================================
--- linphone/trunk/debian/linphone-common.install 2006-03-15 22:09:28 UTC (rev 1451)
+++ linphone/trunk/debian/linphone-common.install 2006-03-15 22:52:50 UTC (rev 1452)
@@ -0,0 +1 @@
+usr/share/sounds/linphone/*
Added: linphone/trunk/debian/linphone-nox.dirs
===================================================================
--- linphone/trunk/debian/linphone-nox.dirs 2006-03-15 22:09:28 UTC (rev 1451)
+++ linphone/trunk/debian/linphone-nox.dirs 2006-03-15 22:52:50 UTC (rev 1452)
@@ -0,0 +1 @@
+usr/bin
Added: linphone/trunk/debian/linphone-nox.docs
===================================================================
--- linphone/trunk/debian/linphone-nox.docs 2006-03-15 22:09:28 UTC (rev 1451)
+++ linphone/trunk/debian/linphone-nox.docs 2006-03-15 22:52:50 UTC (rev 1452)
@@ -0,0 +1,5 @@
+BUGS
+README
+README.arm
+TODO
+debian/TODO.Debian
Added: linphone/trunk/debian/linphone-nox.install
===================================================================
--- linphone/trunk/debian/linphone-nox.install 2006-03-15 22:09:28 UTC (rev 1451)
+++ linphone/trunk/debian/linphone-nox.install 2006-03-15 22:52:50 UTC (rev 1452)
@@ -0,0 +1,6 @@
+usr/bin/linphonec
+usr/bin/sipomatic
+usr/share/locale/*
+usr/share/man/man1/linphonec.1
+usr/share/man/man1/sipomatic.1
+usr/share/doc/linphone-nox/html
Added: linphone/trunk/debian/linphone.dirs
===================================================================
--- linphone/trunk/debian/linphone.dirs 2006-03-15 22:09:28 UTC (rev 1451)
+++ linphone/trunk/debian/linphone.dirs 2006-03-15 22:52:50 UTC (rev 1452)
@@ -0,0 +1,7 @@
+usr/bin
+usr/lib/bonobo/servers
+usr/lib/gnome-applets
+usr/lib/menu
+usr/share/pixmaps/linphone
+usr/share/gnome/apps
+usr/share/gnome/help/linphone
Added: linphone/trunk/debian/linphone.doc-base
===================================================================
--- linphone/trunk/debian/linphone.doc-base 2006-03-15 22:09:28 UTC (rev 1451)
+++ linphone/trunk/debian/linphone.doc-base 2006-03-15 22:52:50 UTC (rev 1452)
@@ -0,0 +1,11 @@
+Document: linphone
+Title: Debian linphone Manual
+Author: Simon Morlat
+Abstract: Linphone is a SIP phone.
+Section: sound
+
+Format: HTML
+Index: /usr/share/doc/linphone/html/index.html
+Files: /usr/share/doc/linphone/html/*.html
+
+
Added: linphone/trunk/debian/linphone.docs
===================================================================
--- linphone/trunk/debian/linphone.docs 2006-03-15 22:09:28 UTC (rev 1451)
+++ linphone/trunk/debian/linphone.docs 2006-03-15 22:52:50 UTC (rev 1452)
@@ -0,0 +1,7 @@
+BUGS
+README
+README.arm
+TODO
+debian/cv_addr_book.pl
+debian/TODO.Debian
+debian/README.Debian
Added: linphone/trunk/debian/linphone.install
===================================================================
--- linphone/trunk/debian/linphone.install 2006-03-15 22:09:28 UTC (rev 1451)
+++ linphone/trunk/debian/linphone.install 2006-03-15 22:52:50 UTC (rev 1452)
@@ -0,0 +1,9 @@
+usr/bin/linphone
+usr/lib/bonobo/servers/GNOME_LinphoneApplet.server
+usr/libexec/linphone_applet /usr/lib/gnome-applets
+usr/share/man/man1/linphone.1
+usr/share/pixmaps/linphone
+usr/share/applications/linphone.desktop
+usr/share/gnome-2.0/ui/GNOME_LinphoneApplet.xml
+usr/share/gnome/help/linphone
+usr/share/doc/linphone/html
Added: linphone/trunk/debian/linphone2.xpm
===================================================================
--- linphone/trunk/debian/linphone2.xpm 2006-03-15 22:09:28 UTC (rev 1451)
+++ linphone/trunk/debian/linphone2.xpm 2006-03-15 22:52:50 UTC (rev 1452)
@@ -0,0 +1,158 @@
+/* XPM */
+static char *linphone2[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 120 2",
+" c #00590054004E",
+". c #082807A20707",
+"X c #08780811076A",
+"o c #0CC50C430B6F",
+"O c #10890F940E27",
+"+ c #119010FD0FD5",
+"@ c #157114851300",
+"# c #1831169B1430",
+"$ c #1D371C071A17",
+"% c #20701F781DBB",
+"& c #22DA21741EEE",
+"* c #253E24802306",
+"= c #28A82723246D",
+"- c #2B5F29B02699",
+"; c #2D632C072998",
+": c #30EB2FC52D96",
+"> c #32FE31A12EDC",
+", c #3675352432BE",
+"< c #3946370F333C",
+"1 c #3C713A363666",
+"2 c #3E303CBD39D4",
+"3 c #41AB3F1D3AAB",
+"4 c #445642013DC8",
+"5 c #490E45B14002",
+"6 c #4693448940EC",
+"7 c #499647134273",
+"8 c #4C3549034345",
+"9 c #4FD94D934971",
+"0 c #54CD504B4987",
+"q c #549951124B02",
+"w c #58E654C54DC9",
+"e c #57AF55A9524B",
+"r c #5891565651FB",
+"t c #5C9D5A31557A",
+"y c #601D5D75591D",
+"u c #62645E5E5709",
+"i c #61B35ECC595B",
+"p c #669963075C46",
+"a c #6A57661A5E78",
+"s c #69DE673A622A",
+"d c #6E426A82637D",
+"f c #72BA6DEB655A",
+"g c #758A71BB6AC4",
+"h c #7AE576576E37",
+"j c #77CF75997136",
+"k c #7A8E76F470D4",
+"l c #7ECD7B0D7399",
+"z c #82D97DE574A6",
+"x c #81477EB979E0",
+"c c #88988077743E",
+"v c #85F58144778F",
+"b c #875E83B97C4F",
+"n c #8AB6864E7DC4",
+"m c #8D3B88ED8027",
+"M c #93A38BB37F32",
+"N c #8BC687FD8098",
+"B c #8E728AAE8355",
+"V c #8FA78D9488CB",
+"C c #93F28E9C84D5",
+"Z c #928D8F3388BA",
+"A c #970991838743",
+"S c #964E92A98B6A",
+"D c #9B2E92CF85A3",
+"F c #9C5796B68C7F",
+"G c #9FD899538DC8",
+"H c #9F4E9ACF91DD",
+"J c #A02E9DFE9972",
+"K c #A1D8983B89B1",
+"L c #A36E9B158D5A",
+"P c #A3D69E76942A",
+"I c #A3BB9FEB98D7",
+"U c #A997A038913C",
+"Y c #A717A1C39747",
+"T c #A695A3259C32",
+"R c #ABECA399954F",
+"E c #ABFCA6AC9C46",
+"W c #AF0CA94F9DE5",
+"Q c #B29AA82F97D6",
+"! c #B39DAB5B9CEB",
+"~ c #BA77AF269DFF",
+"^ c #BBB0B0BA9FE9",
+"/ c #AE3DAAAFA35A",
+"( c #B441AED6A3F1",
+") c #B316AFE3A927",
+"_ c #B73FB184A5CD",
+"` c #B66EB2C1AB4D",
+"' c #BD03B449A4FE",
+"] c #BC12B670AB2C",
+"[ c #BF92B93CAC7B",
+"{ c #BABFB7B2B158",
+"} c #BF57BB7DB3A7",
+"| c #C26CB712A57C",
+" . c #C575B9C9A7D3",
+".. c #C2C1BC06AE62",
+"X. c #C90ABEE2ADC2",
+"o. c #C42CBE91B2D7",
+"O. c #C740C15DB4E8",
+"+. c #C70BC344BB8E",
+"@. c #CCBBC52EB5E5",
+"#. c #CCEAC72DBBA6",
+"$. c #CF5BC918BC07",
+"%. c #D386CC49BD33",
+"&. c #CC1BC896C107",
+"*. c #CF55CB91C3B8",
+"=. c #D386CE7FC3F0",
+"-. c #D6D9D137C58E",
+";. c #DE07D639C59B",
+":. c #DD48D7FDCD15",
+">. c #E0C9D8FFC86F",
+",. c #DFCCD99ACC58",
+"<. c #DF90DBDED411",
+"1. c #E161D943C80C",
+"2. c #E292DB20CB30",
+"3. c #E60EE034D39D",
+"4. c #E914E2F0D5BF",
+"5. c #EBABE704DD1D",
+"6. c #EE59E9B6DFD8",
+"7. c #EF7EEB63E2C5",
+"8. c #F441F02BE78D",
+"9. c None",
+/* pixels */
+"9.9.9.9.9.9.9.9.9.9.9.9.9.9.9.9.9. o $ * ; : * X 9.9.9.9.9.9.9.",
+"9.9.9.9.9.9.9.9.9.9.9.9. o , e l F ) ) } o.` y . 9.9.9.9.9.9.",
+"9.9.9.9.9.9.9.9.9.9. + , j / *.*.-.&./ W B g P } 4 9.9.9.9.9.9.",
+"9.9.9.9.9.9.9.9. % y E :.*.{ ] P D m C ( L G =.3.n . 9.9.9.9.9.",
+"9.9.9.9.9.9. @ t { <.*.J A G Q ~ ~ c S o.P =.6.3.' & 9.9.9.9.9.",
+"9.9.9.9.9. 1 ) <.+.H m G m Y A C g u W { P { :.4.%.> 9.9.9.9.9.",
+"9.9.9.9.9.& Z *.Y p z Q M B +.T =.*.} o./ b d Z / E 4 9.9.9.9.",
+"9.9.9.9. u =.:.$.O.^ f v G / *.8.6.7.5.&.Z N j y S 3 9.9.9.9.",
+"9.9. $ , t %.6.5.2.;.E ! ' J +.} +.} E F l d ! ' l n $ 9.9.9.9.",
+"9. * r - f -.6.8.>.Q _ Y ._ _ B s n H f T H Y ,.G n k X 9.9.9.",
+"9.o 7 @ l 4.3.*.' _ [ h g $.b S @.` J W A ] / =. at .b B 2 9.9.9.",
+"9.# , 9. 4 ] R P | @.b m ] 2.[ ' >.] B _ O.J F n -.%.h V = 9.9.",
+"9., 7 . 9.o f R R L f v O.%.;.%._ %.;.] J T A ( C _ %.! k g X 9.",
+"9.X 4 e 9.+ d D F ] .;.1.;.1.$.o.>.%.I N P S Y b O.;.v j 3 9.",
+"9.9.1 g . 9. p %.1.1.1.1.;.;.;.,... at .>. at .B F z S A b $. at .h Z = ",
+"9.o s $ 9.9.9.o f %.%. at .%.;.;.1.;.=._ %.>.E m H k Y F S ..Z J 9 ",
+"9.. 4 2 9.9.9.o a [ Q W %.;.;.;.2...[ >. at .l _ $.O.] / S G L 7 ",
+"9., v > 9.9.9. 4 l a L ;.;.>.;.1.;.Y $. at ...] Y / Q K Q ' R p ",
+"9.@ e ; $ y + f P %.;.;.;.;.,.=./ ! P R F R ^ | | | R g ",
+"9.- s 6 X $ 5 1 1 6 o - 4 W >.2.;.;.;.,.$.G U Q ~ ] | | | .U u ",
+"9.9 < ; l E $...o.! F n a 7 A %.1.;.;.%. at .^ ^ | | | | | | U a $ ",
+"9.* l P O.l y 0 a V Y @.$._ d g O.1.>.%.| | | | | .' K a & . 9.",
+". 2 ` E w 3 - + $ & a $.%.y 5 ^ >.~ D .| | Q M w @ . 9.",
+"@ m Y < 4 s p % - f n h q a %.W + - D m M | K f 3 + 9.9.9.",
+"< ..A , r g P ( [ %...$.-.R n v . @ w h w $ . 9.9.9.9.9.9.",
+"s ( Y ] $.-.%.W M f f n Y X.z ; 9. X . 9.9.9.9.9.9.9.9.",
+"* p S ! F a d m 2 & p p 1 z ! , 9.9.9.9.9.9.9.9.9.9.9.9.9.9.9.",
+" X @ # O . 7 Y n @ . X & Y a o 9.9.9.9.9.9.9.9.9.9.9.9.9.9.9.",
+"9.9.9.9.9.9.o f P h = o 9.1 Y q 9.9.9.9.9.9.9.9.9.9.9.9.9.9.9.",
+"9.9.9.9.9.9. = d D I F m P a 1 9.9.9.9.9.9.9.9.9.9.9.9.9.9.9.",
+"9.9.9.9.9.9.9. $ a m Y P b 7 $ 9.9.9.9.9.9.9.9.9.9.9.9.9.9.9.",
+"9.9.9.9.9.9.9.9. + ; 4 3 & o 9.9.9.9.9.9.9.9.9.9.9.9.9.9.9.9."
+};
Added: linphone/trunk/debian/menu
===================================================================
--- linphone/trunk/debian/menu 2006-03-15 22:09:28 UTC (rev 1451)
+++ linphone/trunk/debian/menu 2006-03-15 22:52:50 UTC (rev 1452)
@@ -0,0 +1,3 @@
+?package(linphone):needs="X11" section="Apps/Net" \
+ title="Linphone" command="/usr/bin/linphone" hints="Telephony"\
+ icon="/usr/share/pixmaps/linphone/linphone2.xpm"
Added: linphone/trunk/debian/patches/00list
===================================================================
--- linphone/trunk/debian/patches/00list 2006-03-15 22:09:28 UTC (rev 1451)
+++ linphone/trunk/debian/patches/00list 2006-03-15 22:52:50 UTC (rev 1452)
@@ -0,0 +1,5 @@
+desktop_icon
+gnome_applet_dir
+00mscodec_null_name
+10mscodec_null_strcmp
+link_vorbis
Added: linphone/trunk/debian/patches/00mscodec_null_name.dpatch
===================================================================
--- linphone/trunk/debian/patches/00mscodec_null_name.dpatch 2006-03-15 22:09:28 UTC (rev 1451)
+++ linphone/trunk/debian/patches/00mscodec_null_name.dpatch 2006-03-15 22:52:50 UTC (rev 1452)
@@ -0,0 +1,46 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## mscodec_null_name.dpatch by Samuel Mimram <samuel.mimram at ens-lyon.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Check if the name arguments are NULL (if it's the case, we should return NULL).
+
+ at DPATCH@
+diff -urNad linphone-1.0.0pre4/mediastreamer/mscodec.c /tmp/dpep.w47mIR/linphone-1.0.0pre4/mediastreamer/mscodec.c
+--- linphone-1.0.0pre4/mediastreamer/mscodec.c 2003-06-08 08:17:54.000000000 +0200
++++ /tmp/dpep.w47mIR/linphone-1.0.0pre4/mediastreamer/mscodec.c 2004-10-31 16:51:30.000000000 +0100
+@@ -69,7 +69,7 @@
+ {
+ GList *elem=filter_list;
+ MSFilterInfo *info;
+- while (elem!=NULL)
++ while (elem!=NULL && name!=NULL)
+ {
+ info=(MSFilterInfo *)elem->data;
+ if ( (info->type==MS_FILTER_AUDIO_CODEC) ){
+@@ -87,7 +87,7 @@
+ {
+ GList *elem=filter_list;
+ MSFilterInfo *info;
+- while (elem!=NULL)
++ while (elem!=NULL && name!=NULL)
+ {
+ info=(MSFilterInfo *)elem->data;
+ if ( (info->type==MS_FILTER_VIDEO_CODEC) ){
+@@ -122,7 +122,7 @@
+ {
+ GList *elem=filter_list;
+ MSFilterInfo *info;
+- while (elem!=NULL)
++ while (elem!=NULL && name!=NULL)
+ {
+ info=(MSFilterInfo *)elem->data;
+ if ((info->type==MS_FILTER_AUDIO_CODEC) || (info->type==MS_FILTER_VIDEO_CODEC)){
+@@ -140,7 +140,7 @@
+ {
+ GList *elem=filter_list;
+ MSFilterInfo *info;
+- while (elem!=NULL)
++ while (elem!=NULL && name!=NULL)
+ {
+ info=(MSFilterInfo *)elem->data;
+ if ((info->type==MS_FILTER_AUDIO_CODEC) || (info->type==MS_FILTER_VIDEO_CODEC)){
Property changes on: linphone/trunk/debian/patches/00mscodec_null_name.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: linphone/trunk/debian/patches/10mscodec_null_strcmp.dpatch
===================================================================
--- linphone/trunk/debian/patches/10mscodec_null_strcmp.dpatch 2006-03-15 22:09:28 UTC (rev 1451)
+++ linphone/trunk/debian/patches/10mscodec_null_strcmp.dpatch 2006-03-15 22:52:50 UTC (rev 1452)
@@ -0,0 +1,52 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10mscodec_null_strcmp.dpatch by Samuel Mimram <smimram at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Check that we are not using NULL pointers.
+
+ at DPATCH@
+diff -urNad linphone-1.0.1/mediastreamer/mscodec.c /tmp/dpep.crLUDd/linphone-1.0.1/mediastreamer/mscodec.c
+--- linphone-1.0.1/mediastreamer/mscodec.c 2005-03-30 11:14:09.000000000 +0200
++++ /tmp/dpep.crLUDd/linphone-1.0.1/mediastreamer/mscodec.c 2005-03-30 11:18:23.000000000 +0200
+@@ -82,9 +82,9 @@
+ while (elem!=NULL && name!=NULL)
+ {
+ info=(MSFilterInfo *)elem->data;
+- if ( (info->type==MS_FILTER_AUDIO_CODEC) ){
++ if (info && (info->type==MS_FILTER_AUDIO_CODEC) ){
+ MSCodecInfo *codinfo=(MSCodecInfo *)info;
+- if (strcmp(codinfo->description,name)==0){
++ if (codinfo->description && strcmp(codinfo->description,name)==0){
+ return MS_CODEC_INFO(info);
+ }
+ }
+@@ -100,9 +100,9 @@
+ while (elem!=NULL && name!=NULL)
+ {
+ info=(MSFilterInfo *)elem->data;
+- if ( (info->type==MS_FILTER_VIDEO_CODEC) ){
++ if (info && (info->type==MS_FILTER_VIDEO_CODEC) ){
+ MSCodecInfo *codinfo=(MSCodecInfo *)info;
+- if (strcmp(codinfo->description,name)==0){
++ if (codinfo->description && strcmp(codinfo->description,name)==0){
+ return MS_CODEC_INFO(info);
+ }
+ }
+@@ -137,7 +137,7 @@
+ info=(MSFilterInfo *)elem->data;
+ if ((info->type==MS_FILTER_AUDIO_CODEC) || (info->type==MS_FILTER_VIDEO_CODEC)){
+ MSCodecInfo *codinfo=(MSCodecInfo *)elem->data;
+- if (strcmp(info->name,name)==0){
++ if (info->name && strcmp(info->name,name)==0){
+ return codinfo->encoder();
+ }
+ }
+@@ -155,7 +155,7 @@
+ info=(MSFilterInfo *)elem->data;
+ if ((info->type==MS_FILTER_AUDIO_CODEC) || (info->type==MS_FILTER_VIDEO_CODEC)){
+ MSCodecInfo *codinfo=(MSCodecInfo *)elem->data;
+- if (strcmp(info->name,name)==0){
++ if (info->name && strcmp(info->name,name)==0){
+ return codinfo->decoder();
+ }
+ }
Property changes on: linphone/trunk/debian/patches/10mscodec_null_strcmp.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: linphone/trunk/debian/patches/desktop_icon.dpatch
===================================================================
--- linphone/trunk/debian/patches/desktop_icon.dpatch 2006-03-15 22:09:28 UTC (rev 1451)
+++ linphone/trunk/debian/patches/desktop_icon.dpatch 2006-03-15 22:52:50 UTC (rev 1452)
@@ -0,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## desktop_icon.dpatch by Samuel Mimram <smimram at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Correct path in .desktop files.
+
+ at DPATCH@
+diff -urNad linphone-1.2.0~/share/linphone_applet.desktop linphone-1.2.0/share/linphone_applet.desktop
+--- linphone-1.2.0~/share/linphone_applet.desktop 2002-02-08 08:54:01.000000000 +0100
++++ linphone-1.2.0/share/linphone_applet.desktop 2006-01-09 00:50:09.000000000 +0100
+@@ -5,5 +5,5 @@
+ Comment[de]=Linphone ist ein web-phone.
+ Type=Application
+ Exec=linphone --applet --activate-goad-server=linphone_applet
+-Icon=linphone/linphone2.png
+-Terminal=0
+\ No newline at end of file
++Icon=linphone2.png
++Terminal=0
+diff -urNad linphone-1.2.0~/share/linphone.desktop linphone-1.2.0/share/linphone.desktop
+--- linphone-1.2.0~/share/linphone.desktop 2003-02-03 17:52:01.000000000 +0100
++++ linphone-1.2.0/share/linphone.desktop 2006-01-09 00:49:56.000000000 +0100
+@@ -5,6 +5,6 @@
+ Comment[de]=Linphone ist ein web-phone.
+ Type=Application
+ Exec=linphone
+-Icon=linphone/linphone2.png
++Icon=linphone2.png
+ Terminal=0
+ Categories=Application;Network;
Property changes on: linphone/trunk/debian/patches/desktop_icon.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: linphone/trunk/debian/patches/gnome_applet_dir.dpatch
===================================================================
--- linphone/trunk/debian/patches/gnome_applet_dir.dpatch 2006-03-15 22:09:28 UTC (rev 1451)
+++ linphone/trunk/debian/patches/gnome_applet_dir.dpatch 2006-03-15 22:52:50 UTC (rev 1452)
@@ -0,0 +1,37 @@
+#! /bin/sh -e
+## gnome_applet_dir.dpatch by Samuel Mimram <samuel.mimram at ens-lyon.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Use Debian's "default" directory for applets.
+
+if [ $# -lt 1 ]; then
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+ exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+ -patch) patch -p1 ${patch_opts} < $0;;
+ -unpatch) patch -R -p1 ${patch_opts} < $0;;
+ *)
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+ exit 1;;
+esac
+
+exit 0
+
+ at DPATCH@
+diff -urNad /home/smimram/work/gnu/linphone/1.0/linphone-1.0.0pre4/gnome/GNOME_LinphoneApplet.server.in.in linphone-1.0.0pre4/gnome/GNOME_LinphoneApplet.server.in.in
+--- /home/smimram/work/gnu/linphone/1.0/linphone-1.0.0pre4/gnome/GNOME_LinphoneApplet.server.in.in 2003-01-16 22:59:48.000000000 +0100
++++ linphone-1.0.0pre4/gnome/GNOME_LinphoneApplet.server.in.in 2004-10-25 11:45:01.000000000 +0200
+@@ -2,7 +2,7 @@
+
+ <oaf_server iid="OAFIID:GNOME_LinphoneApplet_Factory"
+ type="exe"
+- location="@LIBEXECDIR@/linphone_applet">
++ location="/usr/lib/gnome-applets/linphone_applet">
+
+ <oaf_attribute name="repo_ids" type="stringv">
+ <item value="IDL:Bonobo/GenericFactory:1.0"/>
Property changes on: linphone/trunk/debian/patches/gnome_applet_dir.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: linphone/trunk/debian/patches/link_vorbis.dpatch
===================================================================
--- linphone/trunk/debian/patches/link_vorbis.dpatch 2006-03-15 22:09:28 UTC (rev 1451)
+++ linphone/trunk/debian/patches/link_vorbis.dpatch 2006-03-15 22:52:50 UTC (rev 1452)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## link_vorbis.dpatch by Samuel Mimram <smimram at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Workaround forgotten linking with vorbisenc.
+
+ at DPATCH@
+diff -urNad linphone-1.3.0~/mediastreamer/Makefile.in linphone-1.3.0/mediastreamer/Makefile.in
+--- linphone-1.3.0~/mediastreamer/Makefile.in 2006-03-08 10:04:40.000000000 +0100
++++ linphone-1.3.0/mediastreamer/Makefile.in 2006-03-15 23:48:54.000000000 +0100
+@@ -384,7 +384,7 @@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+ VIDEO_CFLAGS = @VIDEO_CFLAGS@
+-VIDEO_LIBS = @VIDEO_LIBS@
++VIDEO_LIBS = @VIDEO_LIBS@ -lvorbisenc
+ XGETTEXT = @XGETTEXT@
+ ac_ct_AR = @ac_ct_AR@
+ ac_ct_CC = @ac_ct_CC@
Property changes on: linphone/trunk/debian/patches/link_vorbis.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: linphone/trunk/debian/rules
===================================================================
--- linphone/trunk/debian/rules 2006-03-15 22:09:28 UTC (rev 1451)
+++ linphone/trunk/debian/rules 2006-03-15 22:52:50 UTC (rev 1452)
@@ -0,0 +1,130 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+#
+# Modified to make a template file for a multi-binary package with separated
+# build-arch and build-indep targets by Bill Allombert 2001
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+include /usr/share/dpatch/dpatch.make
+
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+ confflags += --build $(DEB_HOST_GNU_TYPE)
+else
+ confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+endif
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+ INSTALL_PROGRAM += -s
+endif
+
+configure-stamp: configure
+ dh_testdir
+ CFLAGS="$(CFLAGS)" ./configure $(confflags) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --disable-static --sysconfdir=/etc --with-osip=/usr --with-speex=/usr --enable-ipv6
+ #--enable-video
+ touch configure-stamp
+
+build: patch-stamp build-stamp
+build-stamp: configure-stamp
+ dh_testdir
+ $(MAKE)
+ touch build-stamp
+
+clean: unpatch
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp configure-stamp
+
+ -$(MAKE) clean
+ -$(MAKE) distclean
+ rm -f config.log config.status config.h Makefile libtool stamp-h1 intltool-extract intltool-merge intltool-update m4/Makefile confdefs.h
+ rm -f ipkg/Makefile
+ rm -rf developer-docs/mediastreamer/html developer-docs/mediastreamer/mediastreamer-decl.txt developer-docs/mediastreamer/mediastreamer-decl-list.txt developer-docs/mediastreamer/mediastreamer-undocumented.txt developer-docs/mediastreamer/sgml/mediastreamer-doc.bottom developer-docs/mediastreamer/sgml/mediastreamer-doc.top developer-docs/mediastreamer/sgml/filters.sgml developer-docs/mediastreamer/tmpl/filters.sgml
+ rm -f exosip/Makefile media_api/Makefile mediastreamer2/Makefile mediastreamer/Makefile coreapi/Makefile conftest.dir/depcomp conftest.dir/sub/conftest.c
+ rm -f gnome/GNOME_LinphoneApplet.server.in gnome/GNOME_LinphoneApplet.server gnome/Makefile
+ rm -rf gsmlib/.deps gsmlib/Makefile
+ rm -rf lpc10-1.5/.deps lpc10-1.5/Makefile
+ rm -rf oRTP/src/Makefile oRTP/src/.deps oRTP/docs/html oRTP/docs/Makefile oRTP/build/win32/Makefile oRTP/build/Makefile oRTP/config.log oRTP/Makefile oRTP/libtool oRTP/config.status oRTP/stamp-h1 oRTP/src/tests/Makefile oRTP/src/tests/.deps oRTP/ortp.pc
+ rm -rf oRTP/docs/ortp-decl.txt oRTP/docs/ortp-decl-list.txt oRTP/docs/sgml/ortp-doc.bottom oRTP/docs/sgml/ortp-doc.top oRTP/docs/ortp-undocumented.txt
+ rm -f oRTP/include/ortp/Makefile oRTP/include/Makefile
+ rm -f pixmaps/Makefile
+ rm -f po/.intltool-merge-cache po/Makefile.in po/Makefile po/POTFILES po/*.gmo
+ rm -rf share/C/manual share/fr/manual share/it/manual share/ja/manual
+ rm -rf support/.deps support/Makefile
+
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+ cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+ cp -f /usr/share/misc/config.guess config.guess
+endif
+
+ dh_clean
+
+install:
+ dh_testdir
+ dh_testroot
+ dh_clean -k -s
+ dh_installdirs
+
+ $(MAKE) install PIXDESTDIR=$(CURDIR)/debian/tmp prefix=$(CURDIR)/debian/tmp/usr sysconfdir=$(CURDIR)/debian/tmp/etc
+ mkdir -p debian/tmp/usr/share/doc/linphone-nox/html
+ cp debian/tmp/usr/share/gnome/help/linphone/C/* debian/tmp/usr/share/doc/linphone-nox/html
+ mkdir -p debian/tmp/usr/share/doc/linphone
+ cd debian/tmp/usr/share/doc/linphone; ln -s ../linphone-nox/html
+ mkdir -p debian/tmp/usr/share/doc/libortp2-dev/html
+ cp debian/tmp/usr/share/gtk-doc/html/ortp/* debian/tmp/usr/share/doc/libortp2-dev/html
+
+ # The icon did not have the right size (32x32)
+ cp -f debian/linphone2.xpm debian/tmp/usr/share/pixmaps/linphone/linphone2.xpm
+
+ rm -rf debian/tmp/usr/lib/libeXosip* debian/tmp/usr/include/eXosip debian/tmp/usr/bin/sip_reg debian/tmp/usr/bin/eXosip*
+ rm -rf debian/tmp/usr/share/gtk-doc/html/ortp debian/tmp/usr/share/gtk-doc/html/mediastreamer
+ rm -f debian/tmp/usr/share/linphonec/linphonec
+
+ #mkdir -p debian/libortp2/DEBIAN
+ #install -m644 debian/libortp2.shlibs debian/libortp2/DEBIAN/shlibs
+
+binary-indep: build install
+
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs ChangeLog
+ dh_installdocs
+ dh_installexamples
+ dh_install --sourcedir=debian/tmp --list-missing
+ dh_installmenu
+ dh_installman
+ dh_desktop
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_makeshlibs #-Xlibortp
+ dh_installdeb
+ dh_shlibdeps -l debian/tmp/usr/lib -L liblinphone1 -L libortp2
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-arch binary-indep
+.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch
Property changes on: linphone/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Added: linphone/trunk/debian/svn-deblayout
===================================================================
--- linphone/trunk/debian/svn-deblayout 2006-03-15 22:09:28 UTC (rev 1451)
+++ linphone/trunk/debian/svn-deblayout 2006-03-15 22:52:50 UTC (rev 1452)
@@ -0,0 +1,3 @@
+origDir=../upstream
+origUrl=svn+ssh://svn.alioth.debian.org/svn/pkg-voip/linphone/upstream
+tagsUrl=svn+ssh://svn.alioth.debian.org/svn/pkg-voip/linphone/tags
Added: linphone/trunk/debian/watch
===================================================================
--- linphone/trunk/debian/watch 2006-03-15 22:09:28 UTC (rev 1451)
+++ linphone/trunk/debian/watch 2006-03-15 22:52:50 UTC (rev 1452)
@@ -0,0 +1,3 @@
+version=3
+
+http://simon.morlat.free.fr/download/stable/source/linphone-([\d\w\.]+).tar.gz debian uupdate
Added: linphone/upstream/linphone_1.3.0.orig.tar.gz
===================================================================
(Binary files differ)
Property changes on: linphone/upstream/linphone_1.3.0.orig.tar.gz
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
More information about the Pkg-voip-commits
mailing list