[Pkg-voip-commits] r9279 - in /libpri/trunk/debian: changelog patches/gcc-4.6-werror patches/series

[tzafrir at alioth.debian.org]

Author: tzafrir
Date: Mon Sep 26 10:40:28 2011
New Revision: 9279

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9279
Log:
Ack NMU

Added:
    libpri/trunk/debian/patches/gcc-4.6-werror
Modified:
    libpri/trunk/debian/changelog
    libpri/trunk/debian/patches/series

Modified: libpri/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/libpri/trunk/debian/changelog?rev=9279&op=diff
==============================================================================
--- libpri/trunk/debian/changelog (original)
+++ libpri/trunk/debian/changelog Mon Sep 26 10:40:28 2011
@@ -3,7 +3,14 @@
   * New upstream release.
   * Update symbols file (practically intelnal ones, actually).
 
- -- Tzafrir Cohen <tzafrir at debian.org>  Thu, 14 Apr 2011 01:09:02 +0300
+ -- Tzafrir Cohen <tzafrir at debian.org>  Mon, 26 Sep 2011 12:00:35 +0300
+
+libpri (1.4.11.3-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Add gcc-4.6-werror to fix FTBFS with gcc-4.6.  Closes: #625379.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Fri, 09 Sep 2011 14:54:45 +0200
 
 libpri (1.4.11.3-1) unstable; urgency=low
 

Added: libpri/trunk/debian/patches/gcc-4.6-werror
URL: http://svn.debian.org/wsvn/pkg-voip/libpri/trunk/debian/patches/gcc-4.6-werror?rev=9279&op=file
==============================================================================
--- libpri/trunk/debian/patches/gcc-4.6-werror (added)
+++ libpri/trunk/debian/patches/gcc-4.6-werror Mon Sep 26 10:40:28 2011
@@ -1,0 +1,19 @@
+Author: Aurelien Jarno <aurel32 at debian.org>
+Description: Removed an unused variable
+
+Still applies to upstream tag 1.4.11.5, but not to 1.4.12 or branch 1.4
+(the development branch).
+
+--- libpri-1.4.11.3.orig/q921.c
++++ libpri-1.4.11.3/q921.c
+@@ -808,10 +808,8 @@ void q921_dump(struct pri *pri, q921_h *
+ 
+ 	if ((h->u.ft == 3) && (h->u.m3 == 0) && (h->u.m2 == 0) && (h->u.data[0] == 0x0f)) {
+ 		int ri;
+-		int tei;
+ 
+ 		ri = (h->u.data[1] << 8) | h->u.data[2];
+-		tei = (h->u.data[4] >> 1);
+ 		/* TEI assignment related */
+ 		switch (h->u.data[3]) {
+ 		case Q921_TEI_IDENTITY_REQUEST:

Modified: libpri/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/libpri/trunk/debian/patches/series?rev=9279&op=diff
==============================================================================
--- libpri/trunk/debian/patches/series (original)
+++ libpri/trunk/debian/patches/series Mon Sep 26 10:40:28 2011
@@ -1,1 +1,2 @@
 enable-gcc-optimizations
+gcc-4.6-werror