[Pkg-voip-commits] r4334 - in linphone/trunk/debian: . patches
smimram at alioth.debian.org
smimram at alioth.debian.org
Thu Aug 30 22:33:54 UTC 2007
Author: smimram
Date: 2007-08-30 22:33:53 +0000 (Thu, 30 Aug 2007)
New Revision: 4334
Added:
linphone/trunk/debian/libortp7-dev.install
linphone/trunk/debian/libortp7.docs
linphone/trunk/debian/libortp7.install
linphone/trunk/debian/linphone.menu
linphone/trunk/debian/patches/hide_manual_menu.dpatch
Removed:
linphone/trunk/debian/libortp5-dev.install
linphone/trunk/debian/libortp5.docs
linphone/trunk/debian/libortp5.install
linphone/trunk/debian/linphone.doc-base
linphone/trunk/debian/menu
Modified:
linphone/trunk/debian/changelog
linphone/trunk/debian/control
linphone/trunk/debian/linphone-nox.install
linphone/trunk/debian/linphone.install
linphone/trunk/debian/patches/00list
linphone/trunk/debian/rules
Log:
New upstream release.
Modified: linphone/trunk/debian/changelog
===================================================================
--- linphone/trunk/debian/changelog 2007-08-30 15:51:32 UTC (rev 4333)
+++ linphone/trunk/debian/changelog 2007-08-30 22:33:53 UTC (rev 4334)
@@ -1,3 +1,13 @@
+linphone (1.99.0-1) unstable; urgency=low
+
+ * New upstream release.
+ * Added a build-dependency on libexosip2-dev.
+ * New soname for libortp.
+ * Correctly builds with latest libosip2, closes: #439481.
+ * Hide manual menu entry since none is available, closes: #287159.
+
+ -- Samuel Mimram <smimram at debian.org> Thu, 30 Aug 2007 16:23:08 +0200
+
linphone (1.7.1-3) unstable; urgency=low
* Make liblinphone1-dev depend on libmediastreamer0-dev (thanks Alex Samad),
Modified: linphone/trunk/debian/control
===================================================================
--- linphone/trunk/debian/control 2007-08-30 15:51:32 UTC (rev 4333)
+++ linphone/trunk/debian/control 2007-08-30 22:33:53 UTC (rev 4334)
@@ -3,7 +3,7 @@
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), 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
+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), libexosip2-dev (>= 3.0.3), 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
XS-Vcs-Svn: svn://svn.debian.org/pkg-voip/
XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/
@@ -71,7 +71,7 @@
Package: liblinphone1-dev
Section: libdevel
Architecture: any
-Depends: liblinphone1 (=${binary:Version}), libmediastreamer0-dev, libortp5-dev, libosip2-dev (>= 2.2.0), libjack0.100.0-dev, libspeex-dev, libsamplerate0-dev, libasound2-dev
+Depends: liblinphone1 (=${binary:Version}), libmediastreamer0-dev, libortp7-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
@@ -106,7 +106,7 @@
Package: libmediastreamer0-dev
Section: libdevel
Architecture: any
-Depends: libmediastreamer0 (=${binary:Version}), libartsc0-dev, libasound2-dev, libortp5-dev, libspeex-dev
+Depends: libmediastreamer0 (=${binary:Version}), libartsc0-dev, libasound2-dev, libortp7-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
@@ -120,7 +120,7 @@
This package contains the shared runtime libraries for handling media
operations.
-Package: libortp5
+Package: libortp7
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
@@ -135,10 +135,10 @@
- supports mutiplexing IO;
- supports part of RFC2833 for telephone events over RTP.
-Package: libortp5-dev
+Package: libortp7-dev
Section: libdevel
Architecture: any
-Depends: libortp5 (=${binary:Version}), libglib2.0-dev
+Depends: libortp7 (=${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
Deleted: linphone/trunk/debian/libortp5-dev.install
===================================================================
--- linphone/trunk/debian/libortp5-dev.install 2007-08-30 15:51:32 UTC (rev 4333)
+++ linphone/trunk/debian/libortp5-dev.install 2007-08-30 22:33:53 UTC (rev 4334)
@@ -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/libortp5.docs
===================================================================
--- linphone/trunk/debian/libortp5.docs 2007-08-30 15:51:32 UTC (rev 4333)
+++ linphone/trunk/debian/libortp5.docs 2007-08-30 22:33:53 UTC (rev 4334)
@@ -1,3 +0,0 @@
-oRTP/AUTHORS
-oRTP/README
-oRTP/TODO
Deleted: linphone/trunk/debian/libortp5.install
===================================================================
--- linphone/trunk/debian/libortp5.install 2007-08-30 15:51:32 UTC (rev 4333)
+++ linphone/trunk/debian/libortp5.install 2007-08-30 22:33:53 UTC (rev 4334)
@@ -1 +0,0 @@
-usr/lib/libortp.so.*
Copied: linphone/trunk/debian/libortp7-dev.install (from rev 4264, linphone/trunk/debian/libortp5-dev.install)
===================================================================
--- linphone/trunk/debian/libortp7-dev.install (rev 0)
+++ linphone/trunk/debian/libortp7-dev.install 2007-08-30 22:33:53 UTC (rev 4334)
@@ -0,0 +1,4 @@
+usr/include/ortp/*.h
+usr/lib/libortp.la
+usr/lib/libortp.so
+usr/lib/pkgconfig/ortp.pc
Copied: linphone/trunk/debian/libortp7.docs (from rev 4264, linphone/trunk/debian/libortp5.docs)
===================================================================
--- linphone/trunk/debian/libortp7.docs (rev 0)
+++ linphone/trunk/debian/libortp7.docs 2007-08-30 22:33:53 UTC (rev 4334)
@@ -0,0 +1,3 @@
+oRTP/AUTHORS
+oRTP/README
+oRTP/TODO
Copied: linphone/trunk/debian/libortp7.install (from rev 4264, linphone/trunk/debian/libortp5.install)
===================================================================
--- linphone/trunk/debian/libortp7.install (rev 0)
+++ linphone/trunk/debian/libortp7.install 2007-08-30 22:33:53 UTC (rev 4334)
@@ -0,0 +1 @@
+usr/lib/libortp.so.*
Modified: linphone/trunk/debian/linphone-nox.install
===================================================================
--- linphone/trunk/debian/linphone-nox.install 2007-08-30 15:51:32 UTC (rev 4333)
+++ linphone/trunk/debian/linphone-nox.install 2007-08-30 22:33:53 UTC (rev 4334)
@@ -5,4 +5,3 @@
usr/share/man/man1/sipomatic.1
usr/share/man/cs/man1/linphonec.1
usr/share/man/cs/man1/sipomatic.1
-usr/share/doc/linphone-nox/html
Deleted: linphone/trunk/debian/linphone.doc-base
===================================================================
--- linphone/trunk/debian/linphone.doc-base 2007-08-30 15:51:32 UTC (rev 4333)
+++ linphone/trunk/debian/linphone.doc-base 2007-08-30 22:33:53 UTC (rev 4334)
@@ -1,11 +0,0 @@
-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
-
-
Modified: linphone/trunk/debian/linphone.install
===================================================================
--- linphone/trunk/debian/linphone.install 2007-08-30 15:51:32 UTC (rev 4333)
+++ linphone/trunk/debian/linphone.install 2007-08-30 22:33:53 UTC (rev 4334)
@@ -5,4 +5,3 @@
usr/share/pixmaps/linphone
usr/share/applications/linphone.desktop
usr/share/gnome/help/linphone
-usr/share/doc/linphone/html
Copied: linphone/trunk/debian/linphone.menu (from rev 4264, linphone/trunk/debian/menu)
===================================================================
--- linphone/trunk/debian/linphone.menu (rev 0)
+++ linphone/trunk/debian/linphone.menu 2007-08-30 22:33:53 UTC (rev 4334)
@@ -0,0 +1,3 @@
+?package(linphone):needs="X11" section="Applications/Network" \
+ title="Linphone" command="/usr/bin/linphone" hints="Telephony"\
+ icon="/usr/share/pixmaps/linphone/linphone2.xpm"
Deleted: linphone/trunk/debian/menu
===================================================================
--- linphone/trunk/debian/menu 2007-08-30 15:51:32 UTC (rev 4333)
+++ linphone/trunk/debian/menu 2007-08-30 22:33:53 UTC (rev 4334)
@@ -1,3 +0,0 @@
-?package(linphone):needs="X11" section="Apps/Net" \
- title="Linphone" command="/usr/bin/linphone" hints="Telephony"\
- icon="/usr/share/pixmaps/linphone/linphone2.xpm"
Modified: linphone/trunk/debian/patches/00list
===================================================================
--- linphone/trunk/debian/patches/00list 2007-08-30 15:51:32 UTC (rev 4333)
+++ linphone/trunk/debian/patches/00list 2007-08-30 22:33:53 UTC (rev 4334)
@@ -0,0 +1 @@
+hide_manual_menu
Added: linphone/trunk/debian/patches/hide_manual_menu.dpatch
===================================================================
--- linphone/trunk/debian/patches/hide_manual_menu.dpatch (rev 0)
+++ linphone/trunk/debian/patches/hide_manual_menu.dpatch 2007-08-30 22:33:53 UTC (rev 4334)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## hide_manual_menu.dpatch by Roland Stigge <stigge at antcom.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Hide user manual menu since no manual is available.
+
+ at DPATCH@
+diff -urNad linphone-1.7.1~/gtk/interface.c linphone-1.7.1/gtk/interface.c
+--- linphone-1.7.1~/gtk/interface.c 2007-04-16 13:53:49.000000000 +0200
++++ linphone-1.7.1/gtk/interface.c 2007-08-13 13:41:29.000000000 +0200
+@@ -205,7 +205,9 @@
+ gtk_container_add (GTK_CONTAINER (help1_menu), about1);
+
+ user_manual1 = gtk_image_menu_item_new_from_stock ("gtk-help", accel_group);
++#if 0
+ gtk_widget_show (user_manual1);
++#endif
+ gtk_container_add (GTK_CONTAINER (help1_menu), user_manual1);
+
+ frame6 = gtk_frame_new (NULL);
Property changes on: linphone/trunk/debian/patches/hide_manual_menu.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: linphone/trunk/debian/rules
===================================================================
--- linphone/trunk/debian/rules 2007-08-30 15:51:32 UTC (rev 4333)
+++ linphone/trunk/debian/rules 2007-08-30 22:33:53 UTC (rev 4334)
@@ -104,11 +104,11 @@
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-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
+# 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)
@@ -155,7 +155,7 @@
dh_fixperms -a
dh_makeshlibs -a #-Xlibortp
dh_installdeb -a
- dh_shlibdeps -a -l debian/tmp/usr/lib -L liblinphone1 -L libortp5 -L libmediastreamer0
+ dh_shlibdeps -a -l debian/tmp/usr/lib -L liblinphone1 -L libortp7 -L libmediastreamer0
dh_gencontrol -a
dh_md5sums -a
dh_builddeb -a
More information about the Pkg-voip-commits
mailing list