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

[Kilian Krause]

Author: kilian
Date: 2006-01-12 11:05:11 +0000 (Thu, 12 Jan 2006)
New Revision: 1165

Added:
   libpri/trunk/debian/patches/kfreebsd.dpatch
Modified:
   libpri/trunk/debian/changelog
   libpri/trunk/debian/patches/00list
   libpri/trunk/debian/patches/Makefile.dpatch
Log:
add patch from #338388 to allow building with kFreeBSD.


Modified: libpri/trunk/debian/changelog
===================================================================
--- libpri/trunk/debian/changelog	2006-01-12 10:55:55 UTC (rev 1164)
+++ libpri/trunk/debian/changelog	2006-01-12 11:05:11 UTC (rev 1165)
@@ -6,8 +6,9 @@
   [ Kilian Krause ]
   * New ABI since 1.2.1 without chaning SONAME. Adjusting at least the package
     name accordingly. (Closes: #341109)
+  * Add GNU/kFreeBSD patch to run ldconfig (Closes: #338388)
 
- -- Kilian Krause <kilian at debian.org>  Wed, 11 Jan 2006 11:55:03 +0000
+ -- Kilian Krause <kilian at debian.org>  Thu, 12 Jan 2006 11:59:57 +0100
 
 libpri (1.2.1-2) unstable; urgency=low
 

Modified: libpri/trunk/debian/patches/00list
===================================================================
--- libpri/trunk/debian/patches/00list	2006-01-12 10:55:55 UTC (rev 1164)
+++ libpri/trunk/debian/patches/00list	2006-01-12 11:05:11 UTC (rev 1165)
@@ -1,2 +1,3 @@
 Makefile.dpatch
 libname
+kfreebsd


Property changes on: libpri/trunk/debian/patches/Makefile.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: libpri/trunk/debian/patches/kfreebsd.dpatch
===================================================================
--- libpri/trunk/debian/patches/kfreebsd.dpatch	2006-01-12 10:55:55 UTC (rev 1164)
+++ libpri/trunk/debian/patches/kfreebsd.dpatch	2006-01-12 11:05:11 UTC (rev 1165)
@@ -0,0 +1,30 @@
+#! /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
+
+ 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)


Property changes on: libpri/trunk/debian/patches/kfreebsd.dpatch
___________________________________________________________________
Name: svn:executable
   + *