[Pkg-voip-commits] r9804 - in /yate/trunk/debian: changelog control patches/ patches/0001-Fix-parallel-make-v2.patch patches/series patches/warning-unknown-architecture.patch rules yate-h323chan.install

msp at alioth.debian.org msp at alioth.debian.org
Sat Jun 16 04:07:44 UTC 2012 

Author: msp
Date: Sat Jun 16 04:07:43 2012
New Revision: 9804

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9804
Log:
* NOT RELEASED YET
* NEW package libyate4.1.0 match-soname
* Fix "FTBFS on ia64, powerpc, s390, s390x" 
  - Added warning-unknown-architecture.patch (Closes: #672950)
* Fix "fails to upgrade from 'testing' - trying to overwrite
  /etc/yate/providers.conf" 
  - Added Conflicts/ Breaks (Closes: #666883)
* h323 currently fails to build, disabled --without-openh323 
* Add upstream 0001-Fix-parallel-make-v2.patch

Added:
    yate/trunk/debian/patches/
    yate/trunk/debian/patches/0001-Fix-parallel-make-v2.patch
    yate/trunk/debian/patches/series
    yate/trunk/debian/patches/warning-unknown-architecture.patch
Modified:
    yate/trunk/debian/changelog
    yate/trunk/debian/control
    yate/trunk/debian/rules
    yate/trunk/debian/yate-h323chan.install

Modified: yate/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/yate/trunk/debian/changelog?rev=9804&op=diff
==============================================================================
--- yate/trunk/debian/changelog (original)
+++ yate/trunk/debian/changelog Sat Jun 16 04:07:43 2012
@@ -1,3 +1,17 @@
+yate (4.1.0-1~dfsg-2) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * NEW package libyate4.1.0 match-soname
+  * Fix "FTBFS on ia64, powerpc, s390, s390x" 
+    - Added warning-unknown-architecture.patch (Closes: #672950)
+  * Fix "fails to upgrade from 'testing' - trying to overwrite
+    /etc/yate/providers.conf" 
+    - Added Conflicts/ Breaks (Closes: #666883)
+  * h323 currently fails to build, disabled --without-openh323 
+  * Add upstream 0001-Fix-parallel-make-v2.patch
+
+ -- Mark Purcell <msp at debian.org>  Mon, 14 May 2012 07:20:05 +1000
+
 yate (4.1.0-1~dfsg-1) unstable; urgency=low
 
   * New upstream release

Modified: yate/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/yate/trunk/debian/control?rev=9804&op=diff
==============================================================================
--- yate/trunk/debian/control (original)
+++ yate/trunk/debian/control Sat Jun 16 04:07:43 2012
@@ -36,7 +36,7 @@
  .
  This package contains YATE Server itself.
 
-Package: libyate4.0.0
+Package: libyate4.1.0
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -61,7 +61,7 @@
 Package: yate-dev
 Architecture: any
 Section: libdevel
-Depends: ${misc:Depends}, libyate4.0.0 (= ${binary:Version})
+Depends: ${misc:Depends}, libyate4.1.0 (= ${binary:Version})
 Description: Development files for YATE
  YATE is a telephony engine aimed at creating a telephony server that
  performs well enough to deal with PBX requirements and also flexible
@@ -112,8 +112,8 @@
  This is the H.323 protocol module.
 
 Package: yate-qt4
-Conflicts: yate (<= 2.2.0-1~dfsg-1.2)
-Replaces: yate (<= 2.2.0-1~dfsg-1.2)
+Conflicts: yate (<< 4)
+Breaks: yate (<< 4)
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, yate-core (= ${binary:Version}), yate-alsa (= ${binary:Version}) [linux-any]
 Description: YATE-based universal telephony client

Added: yate/trunk/debian/patches/0001-Fix-parallel-make-v2.patch
URL: http://svn.debian.org/wsvn/pkg-voip/yate/trunk/debian/patches/0001-Fix-parallel-make-v2.patch?rev=9804&op=file
==============================================================================
--- yate/trunk/debian/patches/0001-Fix-parallel-make-v2.patch (added)
+++ yate/trunk/debian/patches/0001-Fix-parallel-make-v2.patch Sat Jun 16 04:07:43 2012
@@ -1,0 +1,38 @@
+From: Jeroen Dekkers <jeroen at dekkers.ch>
+Date: Fri, 24 Feb 2012 02:40:34 +0100
+Subject: Fix parallel make
+
+---
+ Makefile.in |   11 ++++++++---
+ 1 files changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 93adcbf..5e1975e 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -173,8 +173,11 @@ love:
+ war:
+ 	@echo 'Please make love instead!'
+ 
+-modules clients test: engine
+-	$(MAKE) -C ./$@ all
++modules: engine
++	$(MAKE) -C ./modules all
++
++clients: modules
++	$(MAKE) -C ./clients all
+ 
+ libs: engine
+ 	@for i in libs/*; do \
+@@ -327,7 +330,9 @@ libyate.so: $(YLIB)
+ 	ln -sf $^ $@
+ 
+ .PHONY: library
+-library $(YLIB): yatepaths.h
++library: $(YLIB)
++
++$(YLIB): yatepaths.h tables
+ 	$(MAKE) -C ./engine all
+ 
+ .PHONY: help
+-- 

Added: yate/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/yate/trunk/debian/patches/series?rev=9804&op=file
==============================================================================
--- yate/trunk/debian/patches/series (added)
+++ yate/trunk/debian/patches/series Sat Jun 16 04:07:43 2012
@@ -1,0 +1,2 @@
+warning-unknown-architecture.patch
+0001-Fix-parallel-make-v2.patch

Added: yate/trunk/debian/patches/warning-unknown-architecture.patch
URL: http://svn.debian.org/wsvn/pkg-voip/yate/trunk/debian/patches/warning-unknown-architecture.patch?rev=9804&op=file
==============================================================================
--- yate/trunk/debian/patches/warning-unknown-architecture.patch (added)
+++ yate/trunk/debian/patches/warning-unknown-architecture.patch Sat Jun 16 04:07:43 2012
@@ -1,0 +1,22 @@
+Index: yate-4.1.0-1~dfsg/libs/miniwebrtc/typedefs.h
+===================================================================
+--- yate-4.1.0-1~dfsg.orig/libs/miniwebrtc/typedefs.h	2012-03-23 01:19:20.000000000 +1100
++++ yate-4.1.0-1~dfsg/libs/miniwebrtc/typedefs.h	2012-06-16 12:51:07.000000000 +1000
+@@ -80,7 +80,7 @@
+ #define WEBRTC_ARCH_32_BITS
+ #define WEBRTC_BIG_ENDIAN
+ #else
+-#error Please add support for your architecture in typedefs.h
++#warning : Please add support for your architecture in typedefs.h
+ #endif
+ 
+ #if defined(__SSE2__) || defined(_MSC_VER)
+@@ -139,7 +139,7 @@
+     #define WEBRTC_LITTLE_ENDIAN
+ 
+ #else
+-    #error "No platform defined for WebRTC type definitions (typedefs.h)"
++    #warning : "No platform defined for WebRTC type definitions (typedefs.h)"
+ #endif
+ 
+ #endif  // WEBRTC_TYPEDEFS_H_

Modified: yate/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/yate/trunk/debian/rules?rev=9804&op=diff
==============================================================================
--- yate/trunk/debian/rules (original)
+++ yate/trunk/debian/rules Sat Jun 16 04:07:43 2012
@@ -24,7 +24,7 @@
 config.status: check-ilbc 
 	dh_autoreconf --as-needed
 	dh_auto_configure --\
-		--disable-ilbc --without-amrnb --without-coredumper --enable-sctp
+		--without-openh323 --disable-ilbc --without-amrnb --without-coredumper --enable-sctp
 
 build: build-arch build-indep
 

Modified: yate/trunk/debian/yate-h323chan.install
URL: http://svn.debian.org/wsvn/pkg-voip/yate/trunk/debian/yate-h323chan.install?rev=9804&op=diff
==============================================================================
--- yate/trunk/debian/yate-h323chan.install (original)
+++ yate/trunk/debian/yate-h323chan.install Sat Jun 16 04:07:43 2012
@@ -1,2 +1,1 @@
-usr/lib/yate/h323chan.yate
 etc/yate/h323chan.conf

More information about the Pkg-voip-commits mailing list