[Pkg-voip-commits] r2579 - in wengophone/trunk/debian: . patches patches/debian patches/generic

Marco Nenciarini mnencia at costa.debian.org
Wed Oct 18 14:41:18 UTC 2006 

Author: mnencia
Date: 2006-10-18 14:41:18 +0000 (Wed, 18 Oct 2006)
New Revision: 2579

Removed:
   wengophone/trunk/debian/patches/generic/fix-implicit-pointer-functions.patch
   wengophone/trunk/debian/patches/generic/stun-fix-non-i386.patch
Modified:
   wengophone/trunk/debian/changelog
   wengophone/trunk/debian/patches/debian/disable-crashreport.patch
   wengophone/trunk/debian/patches/debian/disable-ilbc.patch
   wengophone/trunk/debian/patches/series
Log:
rc5 was released just now, it is the same of the previous release plus
some patch of the mine merged. So i've updated the pachage version to
make clear this is the rc5


Modified: wengophone/trunk/debian/changelog
===================================================================
--- wengophone/trunk/debian/changelog	2006-10-18 14:13:40 UTC (rev 2578)
+++ wengophone/trunk/debian/changelog	2006-10-18 14:41:18 UTC (rev 2579)
@@ -1,11 +1,15 @@
-wengophone (2.0.0~rc4-svn8088-2) unstable; urgency=low
+wengophone (2.0.0~rc5-svn8108-1) unstable; urgency=low
 
+  * New upstream snapshot.
+  * debian/copyright: Added references to licenses of sorce files
+    included from other projects.
   * Modified fix-varargs-alpha patch to make wengophone compiling on
     alpha.
-  * debian/copyright: Added references to licenses of sorce files 
-    included from other projects.
+  * Removed patches:
+     + fix-implicit-pointer-functions (merged upstream)
+     + stun-fix-non-i386 (merged upstream)
 
- -- Marco Nenciarini <mnencia at debian.org>  Wed, 18 Oct 2006 16:08:43 +0200
+ -- Marco Nenciarini <mnencia at debian.org>  Wed, 18 Oct 2006 16:36:01 +0200
 
 wengophone (2.0.0~rc4-svn8088-1) unstable; urgency=medium
 

Modified: wengophone/trunk/debian/patches/debian/disable-crashreport.patch
===================================================================
--- wengophone/trunk/debian/patches/debian/disable-crashreport.patch	2006-10-18 14:13:40 UTC (rev 2578)
+++ wengophone/trunk/debian/patches/debian/disable-crashreport.patch	2006-10-18 14:41:18 UTC (rev 2579)
@@ -1,12 +1,11 @@
-Index: wengophone-2.0.0~rc4-svn8014/CMakeLists.txt
+Index: wengophone-2.0.0~rc5-svn8108/CMakeLists.txt
 ===================================================================
---- wengophone-2.0.0~rc4-svn8014.orig/CMakeLists.txt	2006-10-09 00:59:06.000000000 +0000
-+++ wengophone-2.0.0~rc4-svn8014/CMakeLists.txt	2006-10-12 16:17:04.000000000 +0000
-@@ -59,6 +59,6 @@
+--- wengophone-2.0.0~rc5-svn8108.orig/CMakeLists.txt	2006-10-18 02:03:19.000000000 +0200
++++ wengophone-2.0.0~rc5-svn8108/CMakeLists.txt	2006-10-18 16:31:45.000000000 +0200
+@@ -60,5 +60,5 @@
    libs/sipwrapper/src/phapi
    libs/imwrapper/src/multiim
    wengophone
 -  crashreport
 +#  crashreport
  )
- 

Modified: wengophone/trunk/debian/patches/debian/disable-ilbc.patch
===================================================================
--- wengophone/trunk/debian/patches/debian/disable-ilbc.patch	2006-10-18 14:13:40 UTC (rev 2578)
+++ wengophone/trunk/debian/patches/debian/disable-ilbc.patch	2006-10-18 14:41:18 UTC (rev 2579)
@@ -1,8 +1,8 @@
-Index: wengophone-2.0.0~rc4-svn8074/wifo/CMakeLists.txt
+Index: wengophone-2.0.0~rc5-svn8108/wifo/CMakeLists.txt
 ===================================================================
---- wengophone-2.0.0~rc4-svn8074.orig/wifo/CMakeLists.txt	2006-10-16 18:17:13.000000000 +0200
-+++ wengophone-2.0.0~rc4-svn8074/wifo/CMakeLists.txt	2006-10-16 18:17:13.000000000 +0200
-@@ -28,7 +28,6 @@
+--- wengophone-2.0.0~rc5-svn8108.orig/wifo/CMakeLists.txt	2006-10-18 02:03:19.000000000 +0200
++++ wengophone-2.0.0~rc5-svn8108/wifo/CMakeLists.txt	2006-10-18 16:31:57.000000000 +0200
+@@ -20,7 +20,6 @@
    phapi-util
    phapi/fidlib
    phapi/gsm
@@ -10,10 +10,10 @@
    phapi/speex
    phapi/speexec
    phapi/stun
-Index: wengophone-2.0.0~rc4-svn8074/wifo/phapi/CMakeLists.txt
+Index: wengophone-2.0.0~rc5-svn8108/wifo/phapi/CMakeLists.txt
 ===================================================================
---- wengophone-2.0.0~rc4-svn8074.orig/wifo/phapi/CMakeLists.txt	2006-10-16 18:32:43.000000000 +0200
-+++ wengophone-2.0.0~rc4-svn8074/wifo/phapi/CMakeLists.txt	2006-10-16 18:33:04.000000000 +0200
+--- wengophone-2.0.0~rc5-svn8108.orig/wifo/phapi/CMakeLists.txt	2006-10-18 02:03:19.000000000 +0200
++++ wengophone-2.0.0~rc5-svn8108/wifo/phapi/CMakeLists.txt	2006-10-18 16:31:57.000000000 +0200
 @@ -7,7 +7,6 @@
    ${OSIP2_INCLUDE_DIRS}
    ${EXOSIP_INCLUDE_DIRS}
@@ -22,7 +22,7 @@
    ${STUN_INCLUDE_DIRS}
    ${GSM_INCLUDE_DIRS}
    ${OWUTIL_INCLUDE_DIRS}
-@@ -32,7 +31,6 @@
+@@ -39,7 +38,6 @@
    ${OSIP2_LIBRARY}
    ${EXOSIP_LIBRARY}
    ${ORTP_LIBRARY}
@@ -30,7 +30,7 @@
    ${STUN_LIBRARY}
    ${GSM_LIBRARY}
    ${PHAPI-UTIL_LIBRARY}
-@@ -54,7 +52,6 @@
+@@ -68,7 +66,6 @@
    -DUSE_WAVEIN_CBK=1
    -DPSEUDO_AEC=0
    -DNO_ECHO__SUPPRESSOR=1

Deleted: wengophone/trunk/debian/patches/generic/fix-implicit-pointer-functions.patch
===================================================================
--- wengophone/trunk/debian/patches/generic/fix-implicit-pointer-functions.patch	2006-10-18 14:13:40 UTC (rev 2578)
+++ wengophone/trunk/debian/patches/generic/fix-implicit-pointer-functions.patch	2006-10-18 14:41:18 UTC (rev 2579)
@@ -1,12 +0,0 @@
-Index: wengophone-2.0.0~rc4-svn7960/wifo/phapi/phaudiodriver.c
-===================================================================
---- wengophone-2.0.0~rc4-svn7960.orig/wifo/phapi/phaudiodriver.c	2006-10-10 13:20:15.000000000 +0200
-+++ wengophone-2.0.0~rc4-svn7960/wifo/phapi/phaudiodriver.c	2006-10-10 13:20:55.000000000 +0200
-@@ -18,6 +18,7 @@
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
- 
-+#include <stdlib.h>
- #include <string.h>
- #include "phlog.h"
- #include "phaudiodriver.h"

Deleted: wengophone/trunk/debian/patches/generic/stun-fix-non-i386.patch
===================================================================
--- wengophone/trunk/debian/patches/generic/stun-fix-non-i386.patch	2006-10-18 14:13:40 UTC (rev 2578)
+++ wengophone/trunk/debian/patches/generic/stun-fix-non-i386.patch	2006-10-18 14:41:18 UTC (rev 2579)
@@ -1,45 +0,0 @@
-Index: wengophone-2.0.0~rc4-svn8074/wifo/phapi/stun/stun.c
-===================================================================
---- wengophone-2.0.0~rc4-svn8074.orig/wifo/phapi/stun/stun.c	2006-10-16 17:26:28.000000000 +0200
-+++ wengophone-2.0.0~rc4-svn8074/wifo/phapi/stun/stun.c	2006-10-16 17:26:40.000000000 +0200
-@@ -773,16 +773,18 @@
- 	  }
- #elif defined(__GNUC__) && ( defined(__i686__) || defined(__i386__) || defined(__x86_64__) )
-       asm("rdtsc" : "=A" (tick));
--#elif defined (__SUNPRO_CC) || defined( __sparc__ )	
--      tick = gethrtime();
--#elif defined(__MACH__) || defined( __powerpc__ )
--      int fd=open("/dev/random",O_RDONLY);
--      read(fd,&tick,sizeof(tick));
--      closesocket(fd);
--#elif defined(EMBED)
--      tick = rand();
- #else
--#     error Need some way to seed the random number generator 
-+      int fd=open("/dev/random",O_RDONLY);
-+      if (fd < 0)
-+          fd=open("/dev/urandom",O_RDONLY);
-+
-+      if (fd >= 0)
-+      {
-+          read(fd,&tick,sizeof(tick));
-+          close(fd);
-+      }
-+      else
-+          tick = time(NULL);
- #endif 
-       seed = (tick);
- #ifdef WIN32
-Index: wengophone-2.0.0~rc4-svn8074/wifo/netlib/src/stun_func.cpp
-===================================================================
---- wengophone-2.0.0~rc4-svn8074.orig/wifo/netlib/src/stun_func.cpp	2006-10-16 17:26:28.000000000 +0200
-+++ wengophone-2.0.0~rc4-svn8074/wifo/netlib/src/stun_func.cpp	2006-10-16 17:26:40.000000000 +0200
-@@ -718,8 +718,6 @@
-       tick |= lowtick;
- #elif defined(__GNUC__) && ( defined(__i686__) || defined(__i386__) || defined(__x86_64__) )
-       asm("rdtsc" : "=A" (tick));
--#elif defined (__SUNPRO_CC) || defined( __sparc__ )
--      tick = gethrtime();
- #else
- 	  int fd=open("/dev/random",O_RDONLY);
- 	  if (fd < 0)

Modified: wengophone/trunk/debian/patches/series
===================================================================
--- wengophone/trunk/debian/patches/series	2006-10-18 14:13:40 UTC (rev 2578)
+++ wengophone/trunk/debian/patches/series	2006-10-18 14:41:18 UTC (rev 2579)
@@ -1,6 +1,4 @@
 generic/cmake-fix-static-sfp-plugin.patch
-generic/stun-fix-non-i386.patch
-generic/fix-implicit-pointer-functions.patch
 generic/fix-varargs-alpha.patch
 debian/disable-crashreport.patch
 debian/cmake-svnrelease-from-debian-changelog.patch

More information about the Pkg-voip-commits mailing list