[Pkg-voip-commits] r2430 - in linphone/trunk/debian: . patches

Samuel Mimram smimram at costa.debian.org
Mon Sep 25 20:53:55 UTC 2006


Author: smimram
Date: 2006-09-25 20:53:54 +0000 (Mon, 25 Sep 2006)
New Revision: 2430

Added:
   linphone/trunk/debian/libmediastreamer0-dev.install
   linphone/trunk/debian/libmediastreamer0.install
   linphone/trunk/debian/libortp5-dev.install
   linphone/trunk/debian/libortp5.docs
   linphone/trunk/debian/libortp5.install
Removed:
   linphone/trunk/debian/liblinphone1-dev.dirs
   linphone/trunk/debian/liblinphone1.dirs
   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.dirs
Modified:
   linphone/trunk/debian/changelog
   linphone/trunk/debian/control
   linphone/trunk/debian/patches/00list
   linphone/trunk/debian/rules
   linphone/trunk/debian/watch
Log:
New upstream release.

Modified: linphone/trunk/debian/changelog
===================================================================
--- linphone/trunk/debian/changelog	2006-09-25 14:47:27 UTC (rev 2429)
+++ linphone/trunk/debian/changelog	2006-09-25 20:53:54 UTC (rev 2430)
@@ -1,3 +1,24 @@
+linphone (1.4.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Removed no_developer_docs.dpatch, 00mscodec_null_name.dpatch,
+    10mscodec_null_strcmp.dpatch, gcc-4.1.dpatch and
+    world_readable_passwords.dpatch, not needed anymore.
+  * New packages: libmediastreamer0 and libmediastreamer0-dev.
+  * New SONAME for libortp.
+  * Updated watch file.
+  * Acknowledge NMU, closes: #382616.
+
+ -- Samuel Mimram <smimram at debian.org>  Tue, 19 Sep 2006 09:55:19 +0000
+
+linphone (1.3.5-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Always include config.h in sndcard.h (Closes: #382616).
+  * Make binNMUable.
+
+ -- Luk Claes <luk at debian.org>  Sat, 16 Sep 2006 12:16:32 +0200
+
 linphone (1.3.5-1) unstable; urgency=low
 
   [ Kilian Krause ]

Modified: linphone/trunk/debian/control
===================================================================
--- linphone/trunk/debian/control	2006-09-25 14:47:27 UTC (rev 2429)
+++ linphone/trunk/debian/control	2006-09-25 20:53:54 UTC (rev 2430)
@@ -3,12 +3,12 @@
 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), autoconf, automake1.9, autotools-dev, libtool, pkg-config, libglib2.0-dev, libosip2-dev (>= 2.2.0), libasound2-dev, libjack0.100.0-dev, libspeex-dev (>= 1.1.12), 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
+Build-Depends: debhelper (>= 4.0.0), dpkg-dev (>= 1.13.19), autoconf, automake1.9, autotools-dev, libtool, pkg-config, libglib2.0-dev, libosip2-dev (>= 2.2.0), libasound2-dev, libjack0.100.0-dev, libspeex-dev (>= 1.1.12), 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, libartsc0-dev
 Standards-Version: 3.7.2
 
 Package: linphone
 Architecture: any
-Depends: ${shlibs:Depends}, linphone-nox (=${Source-Version})
+Depends: ${shlibs:Depends}, linphone-nox (=${binary:Version})
 Suggests: yelp
 Description: web phone
  Linphone is a web phone: it lets you phone to your friends anywhere in the
@@ -22,7 +22,7 @@
 
 Package: linphone-nox
 Architecture: any
-Depends: ${shlibs:Depends}, linphone-common (=${Source-Version})
+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
@@ -69,7 +69,7 @@
 Package: liblinphone1-dev
 Section: libdevel
 Architecture: any
-Depends: liblinphone1 (=${Source-Version}), libc6-dev | libc-dev, libortp4-dev, libosip2-dev (>= 2.2.0), libjack0.100.0-dev, libspeex-dev, libsamplerate0-dev, libasound2-dev
+Depends: liblinphone1 (=${binary:Version}), libortp5-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
@@ -84,10 +84,44 @@
  This package contains the files needed to use the linphone's library in your
  programs.
 
-Package: libortp4
+Package: libmediastreamer0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
+Description: linphone web phone's media library
+ 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 shared runtime libraries for handling media
+ operations.
+
+Package: libmediastreamer0-dev
+Section: libdevel
+Architecture: any
+Depends: libmediastreamer0 (=${binary:Version}), libartsc0-dev, libasound2-dev, libortp5-dev, libspeex-dev
+Description: linphone web phone's media library
+ 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 shared runtime libraries for handling media
+ operations.
+
+Package: libortp5
+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.
@@ -99,11 +133,11 @@
    - supports mutiplexing IO;
    - supports part of RFC2833 for telephone events over RTP.
 
-Package: libortp4-dev
+Package: libortp5-dev
 Section: libdevel
 Architecture: any
-Depends: libortp4 (=${Source-Version}), libglib2.0-dev, libc6-dev | libc-dev
-Conflicts: libortp0-dev, libortp2-dev
+Depends: libortp5 (=${binary:Version}), libglib2.0-dev
+Conflicts: libortp0-dev, libortp2-dev, libortp4-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.

Deleted: linphone/trunk/debian/liblinphone1-dev.dirs
===================================================================
--- linphone/trunk/debian/liblinphone1-dev.dirs	2006-09-25 14:47:27 UTC (rev 2429)
+++ linphone/trunk/debian/liblinphone1-dev.dirs	2006-09-25 20:53:54 UTC (rev 2430)
@@ -1,2 +0,0 @@
-usr/include/linphone
-usr/lib

Deleted: linphone/trunk/debian/liblinphone1.dirs
===================================================================
--- linphone/trunk/debian/liblinphone1.dirs	2006-09-25 14:47:27 UTC (rev 2429)
+++ linphone/trunk/debian/liblinphone1.dirs	2006-09-25 20:53:54 UTC (rev 2430)
@@ -1 +0,0 @@
-usr/lib

Added: linphone/trunk/debian/libmediastreamer0-dev.install
===================================================================
--- linphone/trunk/debian/libmediastreamer0-dev.install	                        (rev 0)
+++ linphone/trunk/debian/libmediastreamer0-dev.install	2006-09-25 20:53:54 UTC (rev 2430)
@@ -0,0 +1,6 @@
+usr/lib/libmediastreamer.so
+usr/lib/libmediastreamer.la
+usr/lib/libquickstream.so
+usr/lib/libquickstream.la
+usr/lib/pkgconfig/mediastreamer.pc
+usr/include/mediastreamer2/*.h

Added: linphone/trunk/debian/libmediastreamer0.install
===================================================================
--- linphone/trunk/debian/libmediastreamer0.install	                        (rev 0)
+++ linphone/trunk/debian/libmediastreamer0.install	2006-09-25 20:53:54 UTC (rev 2430)
@@ -0,0 +1,2 @@
+usr/lib/libmediastreamer.so.*
+usr/lib/libquickstream.so.*

Deleted: linphone/trunk/debian/libortp4-dev.dirs
===================================================================
--- linphone/trunk/debian/libortp4-dev.dirs	2006-09-25 14:47:27 UTC (rev 2429)
+++ linphone/trunk/debian/libortp4-dev.dirs	2006-09-25 20:53:54 UTC (rev 2430)
@@ -1,2 +0,0 @@
-usr/lib
-usr/include/ortp

Deleted: linphone/trunk/debian/libortp4-dev.install
===================================================================
--- linphone/trunk/debian/libortp4-dev.install	2006-09-25 14:47:27 UTC (rev 2429)
+++ linphone/trunk/debian/libortp4-dev.install	2006-09-25 20:53:54 UTC (rev 2430)
@@ -1,5 +0,0 @@
-usr/include/ortp/*.h
-usr/lib/libortp.la
-usr/lib/libortp.so
-usr/lib/pkgconfig/ortp.pc
-usr/share/doc/libortp2-dev/html

Deleted: linphone/trunk/debian/libortp4.dirs
===================================================================
--- linphone/trunk/debian/libortp4.dirs	2006-09-25 14:47:27 UTC (rev 2429)
+++ linphone/trunk/debian/libortp4.dirs	2006-09-25 20:53:54 UTC (rev 2430)
@@ -1 +0,0 @@
-usr/lib

Deleted: linphone/trunk/debian/libortp4.docs
===================================================================
--- linphone/trunk/debian/libortp4.docs	2006-09-25 14:47:27 UTC (rev 2429)
+++ linphone/trunk/debian/libortp4.docs	2006-09-25 20:53:54 UTC (rev 2430)
@@ -1,3 +0,0 @@
-oRTP/AUTHORS
-oRTP/README
-oRTP/TODO

Deleted: linphone/trunk/debian/libortp4.install
===================================================================
--- linphone/trunk/debian/libortp4.install	2006-09-25 14:47:27 UTC (rev 2429)
+++ linphone/trunk/debian/libortp4.install	2006-09-25 20:53:54 UTC (rev 2430)
@@ -1 +0,0 @@
-usr/lib/libortp.so.*

Copied: linphone/trunk/debian/libortp5-dev.install (from rev 2405, linphone/trunk/debian/libortp4-dev.install)
===================================================================
--- linphone/trunk/debian/libortp5-dev.install	                        (rev 0)
+++ linphone/trunk/debian/libortp5-dev.install	2006-09-25 20:53:54 UTC (rev 2430)
@@ -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

Copied: linphone/trunk/debian/libortp5.docs (from rev 2405, linphone/trunk/debian/libortp4.docs)
===================================================================
--- linphone/trunk/debian/libortp5.docs	                        (rev 0)
+++ linphone/trunk/debian/libortp5.docs	2006-09-25 20:53:54 UTC (rev 2430)
@@ -0,0 +1,3 @@
+oRTP/AUTHORS
+oRTP/README
+oRTP/TODO

Copied: linphone/trunk/debian/libortp5.install (from rev 2405, linphone/trunk/debian/libortp4.install)
===================================================================
--- linphone/trunk/debian/libortp5.install	                        (rev 0)
+++ linphone/trunk/debian/libortp5.install	2006-09-25 20:53:54 UTC (rev 2430)
@@ -0,0 +1 @@
+usr/lib/libortp.so.*

Deleted: linphone/trunk/debian/linphone-common.dirs
===================================================================
--- linphone/trunk/debian/linphone-common.dirs	2006-09-25 14:47:27 UTC (rev 2429)
+++ linphone/trunk/debian/linphone-common.dirs	2006-09-25 20:53:54 UTC (rev 2430)
@@ -1 +0,0 @@
-usr/share/sounds/linphone

Deleted: linphone/trunk/debian/linphone.dirs
===================================================================
--- linphone/trunk/debian/linphone.dirs	2006-09-25 14:47:27 UTC (rev 2429)
+++ linphone/trunk/debian/linphone.dirs	2006-09-25 20:53:54 UTC (rev 2430)
@@ -1,7 +0,0 @@
-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

Modified: linphone/trunk/debian/patches/00list
===================================================================
--- linphone/trunk/debian/patches/00list	2006-09-25 14:47:27 UTC (rev 2429)
+++ linphone/trunk/debian/patches/00list	2006-09-25 20:53:54 UTC (rev 2430)
@@ -1,7 +1,2 @@
-no_developer_docs
 desktop_icon
 gnome_applet_dir
-00mscodec_null_name
-10mscodec_null_strcmp
-gcc-4.1
-world_readable_passwords

Modified: linphone/trunk/debian/rules
===================================================================
--- linphone/trunk/debian/rules	2006-09-25 14:47:27 UTC (rev 2429)
+++ linphone/trunk/debian/rules	2006-09-25 20:53:54 UTC (rev 2430)
@@ -41,13 +41,21 @@
 UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/.dfsg$$//')
 
 FILENAME := linphone_$(UPVERSION).orig.tar.gz
-URL := http://simon.morlat.free.fr/download/stable/source/linphone-$(UPVERSION).tar.gz
+URL := http://download.savannah.nongnu.org/releases/linphone/stable/source/linphone-$(UPVERSION).tar.gz
 
 configure-stamp: configure
 	dh_testdir
 	./autogen.sh
-	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
+	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 \
+	    --disable-video
 	touch configure-stamp
 
 build: patch-stamp build-stamp
@@ -99,7 +107,7 @@
 	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
+#	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
@@ -129,7 +137,7 @@
 	dh_fixperms
 	dh_makeshlibs #-Xlibortp
 	dh_installdeb
-	dh_shlibdeps -l debian/tmp/usr/lib -L liblinphone1 -L libortp2
+	dh_shlibdeps -l debian/tmp/usr/lib -L liblinphone1 -L libortp5 -L libmediastreamer0
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb

Modified: linphone/trunk/debian/watch
===================================================================
--- linphone/trunk/debian/watch	2006-09-25 14:47:27 UTC (rev 2429)
+++ linphone/trunk/debian/watch	2006-09-25 20:53:54 UTC (rev 2430)
@@ -1,3 +1,3 @@
 version=3
 
-http://simon.morlat.free.fr/download/stable/source/linphone-([\d\w\.]+).tar.gz debian uupdate
+http://download.savannah.nongnu.org/releases/linphone/stable/source/linphone-([\d\w\.]+).tar.gz debian uupdate




More information about the Pkg-voip-commits mailing list