[Pkg-voip-commits] r9260 - in /openr2/trunk/debian: changelog patches/avr32 patches/fix_printf patches/gcc46 patches/series watch

[tzafrir at alioth.debian.org]

Author: tzafrir
Date: Thu Sep 15 08:20:21 2011
New Revision: 9260

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9260
Log:
* New upstream release: 1.3.1
  - Patch avr32 removed - merged upstream.
  - Patch fix_printf removed - merged upstream.
* Patch gcc46: Fix building with gcc 4.6 (Matthias Klose, Closes: #625393).
* Fixed watch file.

Added:
    openr2/trunk/debian/patches/gcc46
Removed:
    openr2/trunk/debian/patches/avr32
    openr2/trunk/debian/patches/fix_printf
Modified:
    openr2/trunk/debian/changelog
    openr2/trunk/debian/patches/series
    openr2/trunk/debian/watch

Modified: openr2/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/openr2/trunk/debian/changelog?rev=9260&op=diff
==============================================================================
--- openr2/trunk/debian/changelog (original)
+++ openr2/trunk/debian/changelog Thu Sep 15 08:20:21 2011
@@ -1,8 +1,13 @@
-openr2 (1.3.0-3) UNRELEASED; urgency=low
+openr2 (1.3.1-1) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+  * New upstream release:
+    - Patch avr32 removed - merged upstream.
+    - Patch fix_printf removed - merged upstream.
+  * Patch gcc46: Fix building with gcc 4.6 (Matthias Klose, Closes: #625393). 
+  * Fixed watch file.
 
- -- Tzafrir Cohen <tzafrir at debian.org>  Sun, 25 Jul 2010 23:35:20 +0300
+ -- Tzafrir Cohen <tzafrir at debian.org>  Thu, 15 Sep 2011 11:12:41 +0300
 
 openr2 (1.3.0-2) unstable; urgency=low
 

Added: openr2/trunk/debian/patches/gcc46
URL: http://svn.debian.org/wsvn/pkg-voip/openr2/trunk/debian/patches/gcc46?rev=9260&op=file
==============================================================================
--- openr2/trunk/debian/patches/gcc46 (added)
+++ openr2/trunk/debian/patches/gcc46 Thu Sep 15 08:20:21 2011
@@ -1,0 +1,28 @@
+Description: Remove unused variables. Fix build with gcc 4.6
+Author: Matthias Klose <doko at debian.org>
+
+--- openr2-1.3.0.orig/src/queue.c
++++ openr2-1.3.0/src/queue.c
+@@ -182,7 +182,6 @@ int queue_read(queue_state_t *s, uint8_t
+ int queue_read_byte(queue_state_t *s)
+ {
+     int real_len;
+-    int to_end;
+     int iptr;
+     int optr;
+     int byte;
+@@ -190,13 +189,13 @@ int queue_read_byte(queue_state_t *s)
+     /* Snapshot the values (although only iptr should be changeable during this processing) */
+     iptr = s->iptr;
+     optr = s->optr;
++
+     if ((real_len = iptr - optr) < 0)
+         real_len += s->len;
+     /*endif*/
+     if (real_len < 1)
+         return -1;
+     /*endif*/
+-    to_end = s->len - optr;
+     byte = s->data[optr];
+     if (++optr >= s->len)
+         optr = 0;

Modified: openr2/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/openr2/trunk/debian/patches/series?rev=9260&op=diff
==============================================================================
--- openr2/trunk/debian/patches/series (original)
+++ openr2/trunk/debian/patches/series Thu Sep 15 08:20:21 2011
@@ -1,2 +1,1 @@
-avr32
-fix_printf
+gcc46

Modified: openr2/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-voip/openr2/trunk/debian/watch?rev=9260&op=diff
==============================================================================
--- openr2/trunk/debian/watch (original)
+++ openr2/trunk/debian/watch Thu Sep 15 08:20:21 2011
@@ -1,10 +1,5 @@
-# Example watch control file for uscan
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
-# See uscan(1) for format
-
 # Compulsory line, this is a version 3 file
 version=3
 http://code.google.com/p/openr2/downloads/list \
-http://openr2.googlecode.com/files/openr2-(.*)\.tar\.gz
+detail\?name=openr2-(.*)\.tar\.gz.*