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

[Kilian Krause]

Author: kilian
Date: 2006-04-30 15:19:14 +0000 (Sun, 30 Apr 2006)
New Revision: 1655

Removed:
   libpri/trunk/debian/patches/Makefile.dpatch
Modified:
   libpri/trunk/debian/changelog
   libpri/trunk/debian/patches/kfreebsd.dpatch
Log:
* kfreebsd.dpatch, Makefile.dpatch: Patches have been applied upstream
* Makefile.dpatch: Remove unused fix from patches


Modified: libpri/trunk/debian/changelog
===================================================================
--- libpri/trunk/debian/changelog	2006-04-30 15:10:52 UTC (rev 1654)
+++ libpri/trunk/debian/changelog	2006-04-30 15:19:14 UTC (rev 1655)
@@ -1,8 +1,10 @@
 libpri (1.2.2-4) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+  * Patches have been applied upstream
+  * Makefile.dpatch: Remove unused fix from patches
 
- -- Kilian Krause <kilian at debian.org>  Sun, 16 Apr 2006 23:16:59 +0000
+ -- Kilian Krause <kilian at debian.org>  Sun, 30 Apr 2006 17:18:11 +0200
 
 libpri (1.2.2-3) unstable; urgency=low
 

Deleted: libpri/trunk/debian/patches/Makefile.dpatch
===================================================================
--- libpri/trunk/debian/patches/Makefile.dpatch	2006-04-30 15:10:52 UTC (rev 1654)
+++ libpri/trunk/debian/patches/Makefile.dpatch	2006-04-30 15:19:14 UTC (rev 1655)
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## Makefile.dpatch by Mark Purcell <msp at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-
- at DPATCH@
-diff -urNad libpri-1.2.0-beta2~/Makefile libpri-1.2.0-beta2/Makefile
---- libpri-1.2.0-beta2~/Makefile	2005-09-26 16:57:23.000000000 +0100
-+++ libpri-1.2.0-beta2/Makefile	2005-11-01 21:42:10.000000000 +0000
-@@ -86,7 +86,7 @@
- 	if [ -x /usr/sbin/sestatus ] && ( /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"); then  restorecon -v $(INSTALL_PREFIX)$(INSTALL_BASE)/lib/$(DYNAMIC_LIBRARY); fi
- 	( cd $(INSTALL_PREFIX)$(INSTALL_BASE)/lib ; ln -sf libpri.so.1 libpri.so )
- 	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); fi
- else
- 	install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include -m 644 libpri.h
- 	install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib -m 755 $(DYNAMIC_LIBRARY)

Modified: libpri/trunk/debian/patches/kfreebsd.dpatch
===================================================================
--- libpri/trunk/debian/patches/kfreebsd.dpatch	2006-04-30 15:10:52 UTC (rev 1654)
+++ libpri/trunk/debian/patches/kfreebsd.dpatch	2006-04-30 15:19:14 UTC (rev 1655)
@@ -3,6 +3,7 @@
 ##
 ## 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
 
 @DPATCH@
 diff -urNad libpri-1.2.1~/Makefile libpri-1.2.1/Makefile