[Pkg-voip-commits] r4834 - in /libpri/trunk/debian: changelog patches/bristuff.dpatch patches/enable-gcc-optimizations.dpatch patches/libname.dpatch

tzafrir-guest at alioth.debian.org tzafrir-guest at alioth.debian.org
Sun Nov 18 14:48:52 UTC 2007 

Author: tzafrir-guest
Date: Sun Nov 18 14:48:52 2007
New Revision: 4834

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=4834
Log:
* New upstream release: 1.4.2.
* Update bristuff to new upstream release.
* Update makefile patches to new upstream.
* Do build bristuffed version as well with -Werror .
* Fix an uninitialized variable there.

Modified:
    libpri/trunk/debian/changelog
    libpri/trunk/debian/patches/bristuff.dpatch
    libpri/trunk/debian/patches/enable-gcc-optimizations.dpatch
    libpri/trunk/debian/patches/libname.dpatch

Modified: libpri/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/libpri/trunk/debian/changelog?rev=4834&op=diff
==============================================================================
--- libpri/trunk/debian/changelog (original)
+++ libpri/trunk/debian/changelog Sun Nov 18 14:48:52 2007
@@ -1,11 +1,19 @@
-libpri (1.4.1-3) UNRELEASED; urgency=low
+libpri (1.4.2-1) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
 
+  [ Kilian Krause ]
   * Add dpkg-dev (>= 1.13.19) to Build-Depends for binary:Version
   * Add Homepage field as added in dpkg-dev 1.14.6.
 
- -- Kilian Krause <kilian at debian.org>  Sat, 22 Sep 2007 12:08:47 +0200
+  [ Tzafrir Cohen ]
+  * New upstream release.
+  * Update bristuff to new upstream release.
+  * Update makefile patches to new upstream.
+  * Do build bristuffed version as well with -Werror .
+  * Fix an uninitialized variable there.
+
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Sun, 18 Nov 2007 16:44:14 +0200
 
 libpri (1.4.1-2) unstable; urgency=low
 

Modified: libpri/trunk/debian/patches/bristuff.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/libpri/trunk/debian/patches/bristuff.dpatch?rev=4834&op=diff
==============================================================================
--- libpri/trunk/debian/patches/bristuff.dpatch (original)
+++ libpri/trunk/debian/patches/bristuff.dpatch Sun Nov 18 14:48:52 2007
@@ -213,8 +213,7 @@
  	pri_event_ring	  ring;		/* Ring */
  	pri_event_hangup  hangup;	/* Hang up */
  	pri_event_ringing ringing;	/* Ringing */
--	pri_event_ringing answer;	/* Answer */
-+	pri_event_answer  answer;	/* Answer */
+ 	pri_event_answer  answer;	/* Answer */
  	pri_event_restart_ack restartack;	/* Restart Acknowledge */
  	pri_event_proceeding  proceeding;	/* Call proceeding & Progress */
  	pri_event_setup_ack   setup_ack;	/* SETUP_ACKNOWLEDGE structure */
@@ -359,8 +358,8 @@
  DYNAMIC_LIBRARY=libpri.so.1.0
  STATIC_OBJS=copy_string.o pri.o q921.o prisched.o q931.o pri_facility.o
  DYNAMIC_OBJS=copy_string.lo pri.lo q921.lo prisched.lo q931.lo pri_facility.lo
--CFLAGS+=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS)
-+CFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS) $(LAYER2ALWAYSUP) $(FASTBUSYONBUSY) -DRELAX_TRB $(RELAXEDTIMERS)
+-CFLAGS+=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS)
++CFLAGS+=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS) $(LAYER2ALWAYSUP) $(FASTBUSYONBUSY) -DRELAX_TRB $(RELAXEDTIMERS)
  INSTALL_PREFIX=$(DESTDIR)
  INSTALL_BASE=/usr
  SOFLAGS = -Wl,-hlibpri.so.1.0
@@ -3520,7 +3519,7 @@
 -                     pri->t203_timer = pri_schedule_event(pri, pri->timers[PRI_TIMER_T203], t203_expire, pri);
 +                     if (pri->t203_timer[teio])
 +                           pri_schedule_del(pri, pri->t203_timer[teio]);
-+                     pri->t203_timer[teio] = pri_schedule_event2(pri, pri->timers[PRI_TIMER_T203], t203_expire, pri, tei);
++                     pri->t203_timer[teio] = pri_schedule_event2(pri, pri->timers[PRI_TIMER_T203], t203_expire, pri, h->h.tei);
                 }
 -         }
 +          } else {
@@ -5270,7 +5269,7 @@
  	UPDATE_OURCALLSTATE(pri, c, Q931_CALL_STATE_DISCONNECT_REQUEST);
  	c->peercallstate = Q931_CALL_STATE_DISCONNECT_INDICATION;
  	if (c->alive) {
-@@ -2771,14 +3499,30 @@
+@@ -2771,15 +3499,31 @@
  		if (c->retranstimer)
  			pri_schedule_del(pri, c->retranstimer);
  		c->retranstimer = pri_schedule_event(pri, pri->timers[PRI_TIMER_T305], pri_disconnect_timeout, c);
@@ -5290,8 +5289,9 @@
 +//static int setup_ies[] = { Q931_BEARER_CAPABILITY, Q931_CHANNEL_IDENT, Q931_DISPLAY, Q931_PROGRESS_INDICATOR,
 +//	 Q931_IE_SIGNAL, Q931_CALLING_PARTY_NUMBER, Q931_CALLED_PARTY_NUMBER, Q931_SENDING_COMPLETE, -1 };
 +
- static int setup_ies[] = { Q931_BEARER_CAPABILITY, Q931_CHANNEL_IDENT, Q931_IE_FACILITY, Q931_PROGRESS_INDICATOR, Q931_NETWORK_SPEC_FAC, Q931_DISPLAY, Q931_IE_USER_USER,
- 	Q931_CALLING_PARTY_NUMBER, Q931_CALLED_PARTY_NUMBER, Q931_REDIRECTING_NUMBER, Q931_SENDING_COMPLETE, Q931_IE_ORIGINATING_LINE_INFO, Q931_IE_GENERIC_DIGITS, -1 };
+ static int setup_ies[] = { Q931_BEARER_CAPABILITY, Q931_CHANNEL_IDENT, Q931_IE_FACILITY, Q931_PROGRESS_INDICATOR, Q931_NETWORK_SPEC_FAC, Q931_DISPLAY,
+ 	Q931_CALLING_PARTY_NUMBER, Q931_CALLED_PARTY_NUMBER, Q931_REDIRECTING_NUMBER, Q931_IE_USER_USER, Q931_SENDING_COMPLETE,
+ 	Q931_IE_ORIGINATING_LINE_INFO, Q931_IE_GENERIC_DIGITS, -1 };
  
 +static int setup_cpe_ies[] = { Q931_BEARER_CAPABILITY, Q931_CHANNEL_IDENT, Q931_IE_FACILITY, Q931_PROGRESS_INDICATOR, Q931_NETWORK_SPEC_FAC, Q931_IE_USER_USER,
 +	Q931_CALLING_PARTY_NUMBER, Q931_CALLED_PARTY_NUMBER, Q931_REDIRECTING_NUMBER, Q931_SENDING_COMPLETE, Q931_IE_ORIGINATING_LINE_INFO, Q931_IE_GENERIC_DIGITS, -1 };

Modified: libpri/trunk/debian/patches/enable-gcc-optimizations.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/libpri/trunk/debian/patches/enable-gcc-optimizations.dpatch?rev=4834&op=diff
==============================================================================
--- libpri/trunk/debian/patches/enable-gcc-optimizations.dpatch (original)
+++ libpri/trunk/debian/patches/enable-gcc-optimizations.dpatch Sun Nov 18 14:48:52 2007
@@ -13,8 +13,8 @@
  DYNAMIC_LIBRARY=libpri.so.1.0
  STATIC_OBJS=copy_string.o pri.o q921.o prisched.o q931.o pri_facility.o
  DYNAMIC_OBJS=copy_string.lo pri.lo q921.lo prisched.lo q931.lo pri_facility.lo
--CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS)
-+CFLAGS+=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS)
+-CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS)
++CFLAGS+=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS)
  INSTALL_PREFIX=$(DESTDIR)
  INSTALL_BASE=/usr
  SOFLAGS = -Wl,-hlibpri.so.1.0

Modified: libpri/trunk/debian/patches/libname.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/libpri/trunk/debian/patches/libname.dpatch?rev=4834&op=diff
==============================================================================
--- libpri/trunk/debian/patches/libname.dpatch (original)
+++ libpri/trunk/debian/patches/libname.dpatch Sun Nov 18 14:48:52 2007
@@ -26,7 +26,7 @@
 +DYNAMIC_LIBRARY=lib$(LIBNAME).so.1.0
  STATIC_OBJS=copy_string.o pri.o q921.o prisched.o q931.o pri_facility.o
  DYNAMIC_OBJS=copy_string.lo pri.lo q921.lo prisched.lo q931.lo pri_facility.lo
- CFLAGS+=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS)
+ CFLAGS+=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS)
  INSTALL_PREFIX=$(DESTDIR)
  INSTALL_BASE=/usr
 -SOFLAGS = -Wl,-hlibpri.so.1.0

More information about the Pkg-voip-commits mailing list