[Pkg-voip-commits] r3879 - in libpri/trunk/debian: . patches

Fri Aug 3 18:16:58 UTC 2007

Author: paravoid
Date: 2007-08-03 18:16:58 +0000 (Fri, 03 Aug 2007)
New Revision: 3879

Added:
   libpri/trunk/debian/patches/fix-soname.dpatch
Modified:
   libpri/trunk/debian/changelog
   libpri/trunk/debian/patches/00list
Log:
* Change SONAME to 1.2 (fix-soname.dpatch); the library is incompatible to
  libpri 1.0 but backwards compatible with libpri 1.2.

Modified: libpri/trunk/debian/changelog
===================================================================

--- libpri/trunk/debian/changelog	2007-08-03 17:42:22 UTC (rev 3878)
+++ libpri/trunk/debian/changelog	2007-08-03 18:16:58 UTC (rev 3879)
@@ -18,8 +18,12 @@
   * Re-Adding bristuff.
   * Which requires re-applying and fixing libname.dpatch .
 
- -- Mark Purcell <msp at debian.org>  Fri, 03 Aug 2007 18:24:37 +0100
+  [ Faidon Liambotis ]
+  * Change SONAME to 1.2 (fix-soname.dpatch); the library is incompatible to
+    libpri 1.0 but backwards compatible with libpri 1.2.
 
+ -- Faidon Liambotis <paravoid at debian.org>  Fri, 03 Aug 2007 21:04:56 +0300
+
 libpri (1.4.0-2) unstable; urgency=low
 
   * unstable release

Modified: libpri/trunk/debian/patches/00list
===================================================================
--- libpri/trunk/debian/patches/00list	2007-08-03 17:42:22 UTC (rev 3878)
+++ libpri/trunk/debian/patches/00list	2007-08-03 18:16:58 UTC (rev 3879)
@@ -1 +1,2 @@
 libname
+fix-soname

Added: libpri/trunk/debian/patches/fix-soname.dpatch
===================================================================
--- libpri/trunk/debian/patches/fix-soname.dpatch	                        (rev 0)
+++ libpri/trunk/debian/patches/fix-soname.dpatch	2007-08-03 18:16:58 UTC (rev 3879)
@@ -0,0 +1,77 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix-soname.dpatch by Faidon Liambotis <paravoid at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Use a correct SONAME
+## DP: Should be forwarded upstream.
+
+ at DPATCH@
+diff -urNad libpri-1.4.1-orig/Makefile libpri-1.4.1/Makefile
+--- libpri-1.4.1-orig/Makefile	2007-08-03 20:58:06.000000000 +0300
++++ libpri-1.4.1/Makefile	2007-08-03 20:57:32.000000000 +0300
+@@ -37,15 +37,17 @@
+ else
+ LIBNAME=pri
+ endif
++SONAME=1.2
++
+ STATIC_LIBRARY=lib$(LIBNAME).a
+-DYNAMIC_LIBRARY=lib$(LIBNAME).so.1.0
++DYNAMIC_LIBRARY=lib$(LIBNAME).so.$(SONAME)
+ 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)
+ INSTALL_PREFIX=$(DESTDIR)
+ INSTALL_BASE=/usr
+ INCLUDE_DIR=$(INSTALL_PREFIX)$(INSTALL_BASE)/include/$(LIB_SUF)
+-SOFLAGS = -Wl,-hlib$(LIBNAME).so.1.0
++SOFLAGS = -Wl,-h$(DYNAMIC_LIBRARY)
+ LDCONFIG = /sbin/ldconfig
+ ifneq (,$(findstring X$(OSARCH)X, XLinuxX XGNU/kFreeBSDX))
+ LDCONFIG_FLAGS=-n
+@@ -60,7 +62,6 @@
+ CFLAGS += -DSOLARIS -I../zaptel-solaris
+ LDCONFIG = 
+ LDCONFIG_FLAGS = \# # Trick to comment out the period in the command below
+-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
+ 
+@@ -89,19 +90,19 @@
+ ifneq (${OSARCH},SunOS)
+ 	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 lib$(LIBNAME).so.1.0 lib$(LIBNAME).so ; ln -sf lib$(LIBNAME).so.1.0 lib$(LIBNAME).so.1 )
++	( cd $(INSTALL_PREFIX)$(INSTALL_BASE)/lib ; ln -sf lib$(LIBNAME).so.$(SONAME) lib$(LIBNAME).so )
+ 	install -m 644 $(STATIC_LIBRARY) $(INSTALL_PREFIX)$(INSTALL_BASE)/lib
+ 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 lib$(LIBNAME).so.1.0 lib$(LIBNAME).so ; $(SOSLINK) )
++	( cd $(INSTALL_PREFIX)$(INSTALL_BASE)/lib ; ln -sf lib$(LIBNAME).so.$(SONAME) lib$(LIBNAME).so )
+ 	install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib -m 644 $(STATIC_LIBRARY)
+ endif
+ 
+ uninstall:
+ 	@echo "Removing Libpri"
+-	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.$(SONAME)
+ 	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
+@@ -132,12 +133,10 @@
+ $(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS)
+ 	$(CC) -shared $(SOFLAGS) -o $@ $(DYNAMIC_OBJS)
+ 	$(LDCONFIG) $(LDCONFIG_FLAGS) .
+-	ln -sf libpri.so.1.0 libpri.so
+-	ln -sf libpri.so.1.0 libpri.so.1
+-	$(SOSLINK)
++	ln -sf libpri.so.$(SONAME) libpri.so
+ 
+ clean:
+-	rm -f *.o *.so *.lo *.so.1 *.so.1.0
++	rm -f *.o *.so *.lo *.so.$(SONAME)
+ 	rm -f testprilib $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)
+ 	rm -f pritest pridump
+ 	rm -f .depend


