[Pkg-voip-commits] r1820 - libpri/trunk/debian/patches

[Kilian Krause]

Author: kilian
Date: 2006-06-10 13:51:41 +0000 (Sat, 10 Jun 2006)
New Revision: 1820

Removed:
   libpri/trunk/debian/patches/kfreebsd.dpatch
Modified:
   libpri/trunk/debian/patches/00list
   libpri/trunk/debian/patches/libname.dpatch
Log:
changes upstream now respected. remains bristuff...


Modified: libpri/trunk/debian/patches/00list
===================================================================
--- libpri/trunk/debian/patches/00list	2006-06-10 13:42:37 UTC (rev 1819)
+++ libpri/trunk/debian/patches/00list	2006-06-10 13:51:41 UTC (rev 1820)
@@ -1,2 +1 @@
 libname
-kfreebsd

Deleted: libpri/trunk/debian/patches/kfreebsd.dpatch
===================================================================
--- libpri/trunk/debian/patches/kfreebsd.dpatch	2006-06-10 13:42:37 UTC (rev 1819)
+++ libpri/trunk/debian/patches/kfreebsd.dpatch	2006-06-10 13:51:41 UTC (rev 1820)
@@ -1,31 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## freebsd.dpatch by Kilian Krause <kilian at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Adds GNU/kFreeBSD to the archs which need ldconfig be run
-## -- applied upstream for 1.2 branch
-
- at DPATCH@
-diff -urNad libpri-1.2.1~/Makefile libpri-1.2.1/Makefile
---- libpri-1.2.1~/Makefile	2006-01-12 11:02:06.000000000 +0000
-+++ libpri-1.2.1/Makefile	2006-01-12 11:02:59.000000000 +0000
-@@ -32,6 +32,10 @@
- OSARCH=$(shell uname -s)
- PROC?=$(shell uname -m)
- 
-+ifneq (,$(findstring $(OSARCH), Linux GNU/kFreeBSD))
-+OSARCH=GNU
-+endif
-+
- ifdef LIB_SUF
- LIBNAME=pri-$(LIB_SUF)
- else
-@@ -49,7 +53,7 @@
- INCLUDE_DIR=$(INSTALL_PREFIX)$(INSTALL_BASE)/include/$(LIB_SUF)
- SOFLAGS = -Wl,-hlib$(LIBNAME).so.1
- LDCONFIG = /sbin/ldconfig
--ifeq (${OSARCH},Linux)
-+ifeq (${OSARCH},GNU)
- LDCONFIG_FLAGS=-n
- else
- ifeq (${OSARCH},FreeBSD)

Modified: libpri/trunk/debian/patches/libname.dpatch
===================================================================
--- libpri/trunk/debian/patches/libname.dpatch	2006-06-10 13:42:37 UTC (rev 1819)
+++ libpri/trunk/debian/patches/libname.dpatch	2006-06-10 13:51:41 UTC (rev 1820)
@@ -8,9 +8,9 @@
 ## DP: libpri-$(LIB_SUF).so.1
 
 @DPATCH@
-diff -urNad libpri-1.2.2~/Makefile libpri-1.2.2/Makefile
---- libpri-1.2.2~/Makefile	2006-01-10 21:19:14.000000000 +0100
-+++ libpri-1.2.2/Makefile	2006-05-01 22:27:38.000000000 +0200
+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,16 +32,22 @@
  OSARCH=$(shell uname -s)
  PROC?=$(shell uname -m)
@@ -29,13 +29,13 @@
  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?=
+ INSTALL_PREFIX=$(DESTDIR)
  INSTALL_BASE=/usr
 -SOFLAGS = -Wl,-hlibpri.so.1.0
 +INCLUDE_DIR=$(INSTALL_PREFIX)$(INSTALL_BASE)/include/$(LIB_SUF)
 +SOFLAGS = -Wl,-hlib$(LIBNAME).so.1.0
  LDCONFIG = /sbin/ldconfig
- ifeq (${OSARCH},Linux)
+ ifneq (,$(findstring $(OSARCH), Linux GNU/kFreeBSD))
  LDCONFIG_FLAGS=-n
 @@ -55,7 +61,7 @@
  CFLAGS += -DSOLARIS -I../zaptel-solaris
@@ -46,7 +46,7 @@
  #INSTALL_PREFIX = /opt/asterisk  # Uncomment out to install in standard Solaris location for 3rd party code
  endif
  
-@@ -82,28 +88,27 @@
+@@ -82,29 +88,28 @@
  
  install: $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)
  	mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/lib
@@ -60,7 +60,7 @@
 -	( 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); 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)
@@ -76,11 +76,13 @@
 -	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)
+