[Pkg-voip-commits] r4191 - in asterisk-oh323/trunk/debian: . patches

[paravoid at alioth.debian.org]

Author: paravoid
Date: 2007-08-22 12:42:46 +0000 (Wed, 22 Aug 2007)
New Revision: 4191

Removed:
   asterisk-oh323/trunk/debian/patches/asterisk-modules-path.dpatch
Modified:
   asterisk-oh323/trunk/debian/patches/00list
   asterisk-oh323/trunk/debian/rules
Log:
Define ASTERISKMODDIR from debian/rules without using a dpatch

Modified: asterisk-oh323/trunk/debian/patches/00list
===================================================================
--- asterisk-oh323/trunk/debian/patches/00list	2007-08-22 12:38:40 UTC (rev 4190)
+++ asterisk-oh323/trunk/debian/patches/00list	2007-08-22 12:42:46 UTC (rev 4191)
@@ -3,4 +3,3 @@
 asterisk.h_include
 asterisk-driver_Makefile.dpatch
 wrapper_Makefile.dpatch
-asterisk-modules-path.dpatch

Deleted: asterisk-oh323/trunk/debian/patches/asterisk-modules-path.dpatch
===================================================================
--- asterisk-oh323/trunk/debian/patches/asterisk-modules-path.dpatch	2007-08-22 12:38:40 UTC (rev 4190)
+++ asterisk-oh323/trunk/debian/patches/asterisk-modules-path.dpatch	2007-08-22 12:42:46 UTC (rev 4191)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## asterisk-modules-path.dpatch by Faidon Liambotis <paravoid at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: The Debian package of asterisk places modules in /usr/lib/asterisk/modules
-
- at DPATCH@
-diff -urNad asterisk-oh323-0.7.3+cvs20070811~/Makefile asterisk-oh323-0.7.3+cvs20070811/Makefile
---- asterisk-oh323-0.7.3+cvs20070811~/Makefile	2007-06-04 13:55:04.000000000 +0300
-+++ asterisk-oh323-0.7.3+cvs20070811/Makefile	2007-08-22 15:35:07.000000000 +0300
-@@ -75,7 +75,7 @@
- #
- # Note: This directory is created under $DESTDIR.
- #
--ASTERISKMODDIR=/lib/asterisk/modules
-+ASTERISKMODDIR=/usr/lib/asterisk/modules
- 
- #
- # Set ASTERISKETCDIR variable to the directory where ASTERISK's configuration

Modified: asterisk-oh323/trunk/debian/rules
===================================================================
--- asterisk-oh323/trunk/debian/rules	2007-08-22 12:38:40 UTC (rev 4190)
+++ asterisk-oh323/trunk/debian/rules	2007-08-22 12:42:46 UTC (rev 4191)
@@ -26,6 +26,7 @@
 	LIBPT_BASE=libpt \
 	LIBH323_BASE=libopenh323 \
 	OH323WRAPLIBDIR=/usr/lib/ \
+	ASTERISKMODDIR=/usr/lib/asterisk/modules \
 	PROC="" \
 	PWLIB_VERSION=1.10.7 \
 	OH323_VERSION=1.18.0