[Pkg-voip-commits] r9562 - in /linphone/trunk/debian: changelog control rules

[msp at alioth.debian.org]

Author: msp
Date: Tue Feb 28 11:59:32 2012
New Revision: 9562

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9562
Log:
* [!linux] --disable-video (Closes: #661336)
* Build-Depends: libsrtp-dev [linux-any !sparc] - see Bug 628583

Modified:
    linphone/trunk/debian/changelog
    linphone/trunk/debian/control
    linphone/trunk/debian/rules

Modified: linphone/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/linphone/trunk/debian/changelog?rev=9562&op=diff
==============================================================================
--- linphone/trunk/debian/changelog (original)
+++ linphone/trunk/debian/changelog Tue Feb 28 11:59:32 2012
@@ -1,3 +1,10 @@
+linphone (3.5.2-6) unstable; urgency=low
+
+  * [!linux] --disable-video (Closes: #661336)
+  * Build-Depends: libsrtp-dev [linux-any !sparc] - see Bug 628583
+
+ -- Mark Purcell <msp at debian.org>  Tue, 28 Feb 2012 22:59:05 +1100
+
 linphone (3.5.2-5) unstable; urgency=low
 
   * Drop obsolete videodev.h (v4l1-headers) - mediastreamer2/configure works

Modified: linphone/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/linphone/trunk/debian/control?rev=9562&op=diff
==============================================================================
--- linphone/trunk/debian/control (original)
+++ linphone/trunk/debian/control Tue Feb 28 11:59:32 2012
@@ -6,7 +6,7 @@
 Build-Depends: debhelper (>= 8),
  autoconf, automake1.9, autotools-dev, libtool, pkg-config, intltool,
  libglib2.0-dev, libosip2-dev (>= 3.5.0), libexosip2-dev (>= 3.5.0),
- libsrtp-dev [linux-any],
+ libsrtp-dev [linux-any !sparc],
  libasound2-dev [linux-any],
  libv4l-dev [linux-any],
  libspeex-dev, libspeexdsp-dev, libsamplerate0-dev, libxml-parser-perl, libgsm1-dev,

Modified: linphone/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/linphone/trunk/debian/rules?rev=9562&op=diff
==============================================================================
--- linphone/trunk/debian/rules (original)
+++ linphone/trunk/debian/rules Tue Feb 28 11:59:32 2012
@@ -2,7 +2,7 @@
 
 DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 ifneq ($(DEB_HOST_ARCH_OS),linux)
-  CONFIGURE_ARGS += --disable-alsa --disable-libv4l1 --disable-libv4l2
+  CONFIGURE_ARGS += --disable-alsa --disable-video
 endif
 
 %: