[Pkg-voip-commits] r5900 - in /libpri/trunk/debian: changelog patches/bristuff.dpatch patches/enable-gcc-optimizations.dpatch patches/libname.dpatch
msp at alioth.debian.org
msp at alioth.debian.org
Wed Jun 25 22:07:22 UTC 2008
Author: msp
Date: Wed Jun 25 22:07:22 2008
New Revision: 5900
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5900
Log:
lenny release candidate ;-)
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=5900&op=diff
==============================================================================
--- libpri/trunk/debian/changelog (original)
+++ libpri/trunk/debian/changelog Wed Jun 25 22:07:22 2008
@@ -1,13 +1,11 @@
-libpri (1.4.4-1) UNRELEASED; urgency=low
-
- [ Mark Purcell ]
- * (NOT RELEASED YET) New upstream release
- * Refresh enable-gcc-optimizations.dpatch
- * Refresh libname.dpatch
+libpri (1.4.3-3) UNRELEASED; urgency=low
[ Tzafrir Cohen ]
* libpri.dpatch: When getting a SABME/UA after sending one, don't reset
state.
+
+ [ Mark Purcell ]
+ * lenny release candidate ;-)
-- Mark Purcell <msp at debian.org> Wed, 25 Jun 2008 21:54:41 +1000
Modified: libpri/trunk/debian/patches/bristuff.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/libpri/trunk/debian/patches/bristuff.dpatch?rev=5900&op=diff
==============================================================================
--- libpri/trunk/debian/patches/bristuff.dpatch (original)
+++ libpri/trunk/debian/patches/bristuff.dpatch Wed Jun 25 22:07:22 2008
@@ -3714,15 +3714,14 @@
return ev;
case 3:
if (h->u.m2 == 3) {
-@@ -882,17 +1747,30 @@ static pri_event *__q921_receive_qualifi
+@@ -882,17 +1747,29 @@ static pri_event *__q921_receive_qualifi
}
}
/* Send Unnumbered Acknowledgement */
- q921_send_ua(pri, h->u.p_f);
- return q921_dchannel_up(pri);
+ q921_send_ua(pri, h->u.p_f, h->h.tei);
-+ if (pri->q921_state[teio] == Q921_LINK_CONNECTION_RELEASED)
-+ return q921_dchannel_up(pri, h->h.tei);
++ return q921_dchannel_up(pri, h->h.tei);
} else if (h->u.m2 == 0) {
/* It's a UA */
- if (pri->q921_state == Q921_AWAITING_ESTABLISH) {
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=5900&op=diff
==============================================================================
--- libpri/trunk/debian/patches/enable-gcc-optimizations.dpatch (original)
+++ libpri/trunk/debian/patches/enable-gcc-optimizations.dpatch Wed Jun 25 22:07:22 2008
@@ -6,15 +6,15 @@
## DP: debian/rules passes at least the optimization level
@DPATCH@
-diff -urNad libpri-1.4.4~/Makefile libpri-1.4.4/Makefile
---- libpri-1.4.4~/Makefile 2008-05-08 05:51:44.000000000 +1000
-+++ libpri-1.4.4/Makefile 2008-06-25 21:56:54.000000000 +1000
-@@ -43,7 +43,7 @@
- DYNAMIC_LIBRARY:=libpri.so.$(SONAME)
- STATIC_OBJS=copy_string.o pri.o q921.o prisched.o q931.o pri_facility.o version.o
- DYNAMIC_OBJS=copy_string.lo pri.lo q921.lo prisched.lo q931.lo pri_facility.lo version.lo
+diff -urNad libpri-1.4.1~/Makefile libpri-1.4.1/Makefile
+--- libpri-1.4.1~/Makefile 2006-12-30 21:17:34.000000000 +0200
++++ libpri-1.4.1/Makefile 2007-08-07 04:15:59.000000000 +0300
+@@ -36,7 +36,7 @@
+ 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 -fPIC $(ALERTING) $(LIBPRI_COUNTERS)
+CFLAGS+=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS)
INSTALL_PREFIX=$(DESTDIR)
INSTALL_BASE=/usr
- SOFLAGS:=-Wl,-h$(DYNAMIC_LIBRARY)
+ 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=5900&op=diff
==============================================================================
--- libpri/trunk/debian/patches/libname.dpatch (original)
+++ libpri/trunk/debian/patches/libname.dpatch Wed Jun 25 22:07:22 2008
@@ -8,74 +8,79 @@
## DP: libpri-$(LIB_SUF).so.1
@DPATCH@
-diff -urNad libpri-1.4.4~/Makefile libpri-1.4.4/Makefile
---- libpri-1.4.4~/Makefile 2008-06-25 21:59:04.000000000 +1000
-+++ libpri-1.4.4/Makefile 2008-06-25 22:07:47.000000000 +1000
-@@ -39,13 +39,19 @@
- # of 1.2 and a version of 1.4.x
- SONAME:=1.4
+diff -urNad libpri-1.2.3~/Makefile libpri-1.2.3/Makefile
+--- libpri-1.2.3~/Makefile 2006-04-30 15:17:47.000000000 +0000
++++ libpri-1.2.3/Makefile 2006-06-10 13:48:23.000000000 +0000
+@@ -32,14 +32,20 @@
+ OSARCH=$(shell uname -s)
+ PROC?=$(shell uname -m)
--STATIC_LIBRARY=libpri.a
--DYNAMIC_LIBRARY:=libpri.so.$(SONAME)
+ifdef LIB_SUF
+LIBNAME=pri-$(LIB_SUF)
+else
+LIBNAME=pri
+endif
+-STATIC_LIBRARY=libpri.a
+-DYNAMIC_LIBRARY=libpri.so.1.0
+STATIC_LIBRARY=lib$(LIBNAME).a
+DYNAMIC_LIBRARY=lib$(LIBNAME).so.1.0
- STATIC_OBJS=copy_string.o pri.o q921.o prisched.o q931.o pri_facility.o version.o
- DYNAMIC_OBJS=copy_string.lo pri.lo q921.lo prisched.lo q931.lo pri_facility.lo version.lo
+ 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 -fPIC $(ALERTING) $(LIBPRI_COUNTERS)
INSTALL_PREFIX=$(DESTDIR)
INSTALL_BASE=/usr
+-SOFLAGS = -Wl,-hlibpri.so.1.0
+INCLUDE_DIR=$(INSTALL_PREFIX)$(INSTALL_BASE)/include/$(LIB_SUF)
- SOFLAGS:=-Wl,-h$(DYNAMIC_LIBRARY)
++SOFLAGS = -Wl,-hlib$(LIBNAME).so.1.0
LDCONFIG = /sbin/ldconfig
ifneq (,$(findstring X$(OSARCH)X, XLinuxX XGNU/kFreeBSDX))
-@@ -97,27 +103,28 @@
+ LDCONFIG_FLAGS=-n
+@@ -55,7 +61,7 @@
+ CFLAGS += -DSOLARIS -I../zaptel-solaris
+ LDCONFIG =
+ LDCONFIG_FLAGS = \# # Trick to comment out the period in the command below
+-SOSLINK = ln -sf libpri.so.1.0 libpri.so.1
++SOSLINK = ln -sf lib$(LIBNAME).so.1.0 lib$(LIBNAME).so.1
+ #INSTALL_PREFIX = /opt/asterisk # Uncomment out to install in standard Solaris location for 3rd party code
+ endif
+
+@@ -82,29 +88,28 @@
install: $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)
mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/lib
- mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/include
+ mkdir -p $(INCLUDE_DIR)
++ install -m 644 libpri.h $(INCLUDE_DIR)
ifneq (${OSARCH},SunOS)
- install -m 644 libpri.h $(INSTALL_PREFIX)$(INSTALL_BASE)/include
-+ install -m 644 libpri.h $(INCLUDE_DIR)
install -m 755 $(DYNAMIC_LIBRARY) $(INSTALL_PREFIX)$(INSTALL_BASE)/lib
if [ -x /usr/sbin/sestatus ] && ( /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"); then /sbin/restorecon -v $(INSTALL_PREFIX)$(INSTALL_BASE)/lib/$(DYNAMIC_LIBRARY); fi
-- ( cd $(INSTALL_PREFIX)$(INSTALL_BASE)/lib ; ln -sf libpri.so.$(SONAME) libpri.so)
+- ( cd $(INSTALL_PREFIX)$(INSTALL_BASE)/lib ; ln -sf libpri.so.1.0 libpri.so ; ln -sf libpri.so.1.0 libpri.so.1 )
+ ( cd $(INSTALL_PREFIX)$(INSTALL_BASE)/lib ; ln -sf lib$(LIBNAME).so.1.0 lib$(LIBNAME).so ; ln -sf lib$(LIBNAME).so.1.0 lib$(LIBNAME).so.1 )
install -m 644 $(STATIC_LIBRARY) $(INSTALL_PREFIX)$(INSTALL_BASE)/lib
- if test $$(id -u) = 0; then $(LDCONFIG) $(LDCONFIG_FLAGS) $(INSTALL_PREFIX)$(INSTALL_BASE)/lib; fi
+- if test $$(id -u) = 0; then $(LDCONFIG) $(LDCONFIG_FLAGS) $(INSTALL_PREFIX)$(INSTALL_BASE)/lib; fi
else
install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include -m 644 libpri.h
install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib -m 755 $(DYNAMIC_LIBRARY)
-- ( cd $(INSTALL_PREFIX)$(INSTALL_BASE)/lib ; ln -sf libpri.so.$(SONAME) libpri.so)
+- ( cd $(INSTALL_PREFIX)$(INSTALL_BASE)/lib ; ln -sf libpri.so.1.0 libpri.so ; $(SOSLINK) )
+ ( cd $(INSTALL_PREFIX)$(INSTALL_BASE)/lib ; ln -sf lib$(LIBNAME).so.1.0 lib$(LIBNAME).so ; $(SOSLINK) )
install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib -m 644 $(STATIC_LIBRARY)
endif
uninstall:
@echo "Removing Libpri"
-- rm -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib/libpri.so.$(SONAME)
+- rm -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib/libpri.so.1.0
+- rm -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib/libpri.so.1
- rm -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib/libpri.so
- rm -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib/libpri.a
- rm -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include/libpri.h
+-
+ rm -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib/lib$(LIBNAME).so.1.0
+ rm -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib/lib$(LIBNAME).so.1
+ rm -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib/lib$(LIBNAME).so
+ rm -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib/lib$(LIBNAME).a
+ rm -f $(INCLUDE_DIR)/libpri.h
-
++
pritest: pritest.o
$(CC) -o pritest pritest.o -L. -lpri -lzap $(CFLAGS)
-@@ -145,7 +152,7 @@
- $(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS)
- $(CC) -shared $(SOFLAGS) -o $@ $(DYNAMIC_OBJS)
- $(LDCONFIG) $(LDCONFIG_FLAGS) .
-- ln -sf libpri.so.$(SONAME) libpri.so
-+ ln -sf lib$(LIBNAME).so.1.0 lib$(LIBNAME).so.1
- version.c:
- @build_tools/make_version_c > $@.tmp
More information about the Pkg-voip-commits
mailing list