[Pkg-voip-commits] r9754 - in /linphone/trunk/debian: changelog control linphone-nox.install linphone-nox.manpages linphone.install linphone.manpages patches/ patches/fix-readline-detection.patch patches/series

msp at alioth.debian.org msp at alioth.debian.org
Fri Jun 1 23:43:38 UTC 2012


Author: msp
Date: Fri Jun  1 23:43:38 2012
New Revision: 9754

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9754
Log:
* Move linphonec out of linphone-nox package
  - Fixes "linphonec segfaults without framebuffer"  (Closes: #404113)
  - Fixes "please make a package separate for CLI" (Closes: #674221)
  - Fixes "please rework the deb dependencies" (Closes: #675389)
* Fix "FTBFS: linphonec.c:1432: undefined reference to
  `rl_attempted_completion_over'" patch from Sebastian Ramacher
  (Closes: #669501)

Added:
    linphone/trunk/debian/patches/
    linphone/trunk/debian/patches/fix-readline-detection.patch
    linphone/trunk/debian/patches/series
Modified:
    linphone/trunk/debian/changelog
    linphone/trunk/debian/control
    linphone/trunk/debian/linphone-nox.install
    linphone/trunk/debian/linphone-nox.manpages
    linphone/trunk/debian/linphone.install
    linphone/trunk/debian/linphone.manpages

Modified: linphone/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/linphone/trunk/debian/changelog?rev=9754&op=diff
==============================================================================
--- linphone/trunk/debian/changelog (original)
+++ linphone/trunk/debian/changelog Fri Jun  1 23:43:38 2012
@@ -1,3 +1,15 @@
+linphone (3.5.2-9) UNRELEASED; urgency=low
+
+  * Move linphonec out of linphone-nox package
+    - Fixes "linphonec segfaults without framebuffer"  (Closes: #404113)
+    - Fixes "please make a package separate for CLI" (Closes: #674221)
+    - Fixes "please rework the deb dependencies" (Closes: #675389)
+  * Fix "FTBFS: linphonec.c:1432: undefined reference to
+    `rl_attempted_completion_over'" patch from Sebastian Ramacher
+    (Closes: #669501)
+
+ -- Mark Purcell <msp at debian.org>  Sat, 02 Jun 2012 09:28:50 +1000
+
 linphone (3.5.2-8) unstable; urgency=high
 
   * Urgency high for RC bug

Modified: linphone/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/linphone/trunk/debian/control?rev=9754&op=diff
==============================================================================
--- linphone/trunk/debian/control (original)
+++ linphone/trunk/debian/control Fri Jun  1 23:43:38 2012
@@ -21,6 +21,8 @@
 Package: linphone
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, linphone-nox (=${binary:Version})
+Replaces: linphone-nox (<< 3.5.2-9)
+Breaks: linphone-nox (<< 3.5.2-9)
 Suggests: yelp
 Description: SIP softphone - graphical client
  Linphone is an audio and video internet phone using the SIP protocol. It 

Modified: linphone/trunk/debian/linphone-nox.install
URL: http://svn.debian.org/wsvn/pkg-voip/linphone/trunk/debian/linphone-nox.install?rev=9754&op=diff
==============================================================================
--- linphone/trunk/debian/linphone-nox.install (original)
+++ linphone/trunk/debian/linphone-nox.install Fri Jun  1 23:43:38 2012
@@ -1,2 +1,1 @@
-usr/bin/linphonec
 usr/bin/linphonecsh

Modified: linphone/trunk/debian/linphone-nox.manpages
URL: http://svn.debian.org/wsvn/pkg-voip/linphone/trunk/debian/linphone-nox.manpages?rev=9754&op=diff
==============================================================================
--- linphone/trunk/debian/linphone-nox.manpages (original)
+++ linphone/trunk/debian/linphone-nox.manpages Fri Jun  1 23:43:38 2012
@@ -1,2 +1,1 @@
-debian/tmp/usr/share/man/*/man1/linphonec*.1
-debian/tmp/usr/share/man/man1/linphonec*.1
+usr/share/man/man1/linphonecsh.1

Modified: linphone/trunk/debian/linphone.install
URL: http://svn.debian.org/wsvn/pkg-voip/linphone/trunk/debian/linphone.install?rev=9754&op=diff
==============================================================================
--- linphone/trunk/debian/linphone.install (original)
+++ linphone/trunk/debian/linphone.install Fri Jun  1 23:43:38 2012
@@ -1,4 +1,5 @@
 usr/bin/linphone
+usr/bin/linphonec
 usr/bin/mediastream
 usr/share/applications/linphone.desktop
 debian/linphone2.xpm            /usr/share/pixmaps/linphone

Modified: linphone/trunk/debian/linphone.manpages
URL: http://svn.debian.org/wsvn/pkg-voip/linphone/trunk/debian/linphone.manpages?rev=9754&op=diff
==============================================================================
--- linphone/trunk/debian/linphone.manpages (original)
+++ linphone/trunk/debian/linphone.manpages Fri Jun  1 23:43:38 2012
@@ -1,2 +1,2 @@
-usr/share/man/*/man1/linphone.1
-debian/tmp/usr/share/man/man1/linphone.1
+usr/share/man/man1/linphone.1
+usr/share/man/man1/linphonec.1

Added: linphone/trunk/debian/patches/fix-readline-detection.patch
URL: http://svn.debian.org/wsvn/pkg-voip/linphone/trunk/debian/patches/fix-readline-detection.patch?rev=9754&op=file
==============================================================================
--- linphone/trunk/debian/patches/fix-readline-detection.patch (added)
+++ linphone/trunk/debian/patches/fix-readline-detection.patch Fri Jun  1 23:43:38 2012
@@ -1,0 +1,19 @@
+--- linphone-3.5.2.orig/m4/readline.m4
++++ linphone-3.5.2/m4/readline.m4
+@@ -21,8 +21,14 @@ if test "$readline_prefix" != "none"; th
+ 	LIBS="$LIBS $READLINE_LIBS"
+ 	AC_CHECK_HEADERS(readline.h readline/readline.h, readline_h_found=yes)
+ 	AC_CHECK_HEADERS(history.h readline/history.h)
+-	
+-	AC_CHECK_LIB(readline, readline, [readline_libs_found=yes],[],[-lncurses])
++
++  for termcap_lib in "" termcap curses ncurses; do
++    LIBS="$LIBS_save $READLINE_LIBS $termcap_lib"
++	   AC_CHECK_LIB(readline, readline, [readline_libs_found=yes])
++    if test "x$readline_libs_found" = "xyes" ; then
++      break
++    fi
++  done
+ 	
+ 	LIBS=$LIBS_save
+ 	CPPFLAGS=$CPPFLAGS_save

Added: linphone/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/linphone/trunk/debian/patches/series?rev=9754&op=file
==============================================================================
--- linphone/trunk/debian/patches/series (added)
+++ linphone/trunk/debian/patches/series Fri Jun  1 23:43:38 2012
@@ -1,0 +1,1 @@
+fix-readline-detection.patch




More information about the Pkg-voip-commits mailing list