[Pkg-voip-commits] r9546 - in /linphone/trunk/debian: README.Debian README.source changelog control linphone.docs rules

[msp at alioth.debian.org]

Author: msp
Date: Sun Feb 26 11:34:12 2012
New Revision: 9546

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9546
Log:
* Fix FTBFS on [!linux] - thanks pinotree
  - --disable-{alsa,v4l}[!linux]
  - Build-Depends srtp,asound2,v4l[linux-any]
* Cleanup obsolete versioned Build-Depends
* --disable-ssl to avoid unintended linking 
* Drop obsolete debian/README.*

Removed:
    linphone/trunk/debian/README.Debian
    linphone/trunk/debian/README.source
Modified:
    linphone/trunk/debian/changelog
    linphone/trunk/debian/control
    linphone/trunk/debian/linphone.docs
    linphone/trunk/debian/rules

Modified: linphone/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/linphone/trunk/debian/changelog?rev=9546&op=diff
==============================================================================
--- linphone/trunk/debian/changelog (original)
+++ linphone/trunk/debian/changelog Sun Feb 26 11:34:12 2012
@@ -1,3 +1,14 @@
+linphone (3.5.2-3) UNRELEASED; urgency=low
+
+  * Fix FTBFS on [!linux] - thanks pinotree
+    - --disable-{alsa,v4l}[!linux]
+    - Build-Depends srtp,asound2,v4l[linux-any]
+  * Cleanup obsolete versioned Build-Depends
+  * --disable-ssl to avoid unintended linking 
+  * Drop obsolete debian/README.*
+
+ -- Mark Purcell <msp at debian.org>  Sun, 26 Feb 2012 22:12:21 +1100
+
 linphone (3.5.2-2) unstable; urgency=low
 
   * Upload to unstable - debian-release endorsed 

Modified: linphone/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/linphone/trunk/debian/control?rev=9546&op=diff
==============================================================================
--- linphone/trunk/debian/control (original)
+++ linphone/trunk/debian/control Sun Feb 26 11:34:12 2012
@@ -3,21 +3,20 @@
 Priority: optional
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Samuel Mimram <smimram at debian.org>, Kilian Krause <kilian at debian.org>, Faidon Liambotis <paravoid at debian.org>, Mark Purcell <msp at debian.org>, Lionel Elie Mamane <lmamane at debian.org>, Tzafrir Cohen <tzafrir at debian.org>
-Build-Depends: debhelper (>= 8), dpkg-dev (>= 1.13.19), 
+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 [alpha amd64 armel armhf hppa i386 mips mipsel powerpc s390],
- libasound2-dev [alpha amd64 arm armeb armel armhf avr32 hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc sparc64],
- libv4l-dev [alpha amd64 arm armeb armel armhf avr32 hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc sparc64],
- libspeex-dev (>= 1.1.12), libspeexdsp-dev, libsamplerate0-dev, libxml-parser-perl, libgsm1-dev,
+ libsrtp-dev [linux-any],
+ libasound2-dev [linux-any],
+ libv4l-dev [linux-any],
+ libspeex-dev, libspeexdsp-dev, libsamplerate0-dev, libxml-parser-perl, libgsm1-dev,
  libgtk2.0-dev, libglade2-dev, libtheora-dev,
  libxv-dev,
  libavcodec-dev, libreadline-dev, libsdl1.2-dev, libswscale-dev, doxygen
-Build-Conflicts: libssl-dev
 Standards-Version: 3.9.1
 Homepage: http://www.linphone.org/
 Vcs-Svn: svn://svn.debian.org/pkg-voip/linphone/trunk/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/linphone/?op=log
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-voip/linphone/trunk/
 
 Package: linphone
 Architecture: any

Modified: linphone/trunk/debian/linphone.docs
URL: http://svn.debian.org/wsvn/pkg-voip/linphone/trunk/debian/linphone.docs?rev=9546&op=diff
==============================================================================
--- linphone/trunk/debian/linphone.docs (original)
+++ linphone/trunk/debian/linphone.docs Sun Feb 26 11:34:12 2012
@@ -3,4 +3,3 @@
 README.arm
 TODO
 debian/cv_addr_book.pl
-debian/README.Debian

Modified: linphone/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/linphone/trunk/debian/rules?rev=9546&op=diff
==============================================================================
--- linphone/trunk/debian/rules (original)
+++ linphone/trunk/debian/rules Sun Feb 26 11:34:12 2012
@@ -1,9 +1,15 @@
 #!/usr/bin/make -f
+
+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
+endif
+
 %:
 	dh $@ --parallel --with autotools_dev
 
 override_dh_auto_configure:
-	dh_auto_configure -- --disable-strict
+	dh_auto_configure -- --disable-strict --disable-ssl --disable-ssl-hmac $(CONFIGURE_ARGS)
 
 override_dh_makeshlibs:
 	dh_makeshlibs -V