[Pkg-voip-commits] r6848 - in /lcr/trunk/debian: ./ patches/

dorchain-guest at alioth.debian.org dorchain-guest at alioth.debian.org
Tue Mar 3 14:10:57 UTC 2009


Author: dorchain-guest
Date: Tue Mar  3 14:10:57 2009
New Revision: 6848

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6848
Log:
moved to quilt

Added:
    lcr/trunk/debian/patches/01_replace_local.patch
    lcr/trunk/debian/patches/03_lcr_as_vbox.patch
    lcr/trunk/debian/patches/04_chan_lcr_dtmf.patch
    lcr/trunk/debian/patches/series
Removed:
    lcr/trunk/debian/patches/00list
    lcr/trunk/debian/patches/01_replace_local.dpatch
    lcr/trunk/debian/patches/02_lcr_message_segfault.dpatch
    lcr/trunk/debian/patches/03_lcr_as_vbox.dpatch
    lcr/trunk/debian/patches/04_chan_lcr_dtmf.dpatch
Modified:
    lcr/trunk/debian/changelog
    lcr/trunk/debian/control
    lcr/trunk/debian/rules

Modified: lcr/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/lcr/trunk/debian/changelog?rev=6848&op=diff
==============================================================================
--- lcr/trunk/debian/changelog (original)
+++ lcr/trunk/debian/changelog Tue Mar  3 14:10:57 2009
@@ -20,5 +20,3 @@
     Seems that they are using that versioning style. 
 
  -- Joerg Dorchain <joerg at dorchain.net>  Fri, 26 Dec 2008 11:46:23 +0100
-
-  * Initial Packaging

Modified: lcr/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/lcr/trunk/debian/control?rev=6848&op=diff
==============================================================================
--- lcr/trunk/debian/control (original)
+++ lcr/trunk/debian/control Tue Mar  3 14:10:57 2009
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Joerg Dorchain <joerg at dorchain.net>
-Build-Depends: debhelper (>= 7), autotools-dev, misdnv2user, asterisk-dev, libssl-dev, libncurses-dev,  automake1.9, dpatch
+Build-Depends: debhelper (>= 7), autotools-dev, misdnv2user, asterisk-dev, libssl-dev, libncurses-dev,  automake1.9, quilt
 Standards-Version: 3.7.3
 Homepage: http://isdn.eversberg.eu/download/lcr-1.3/
 Vcs-Svn: svn://svn.debian.org/pkg-voip/lcr/trunk

Added: lcr/trunk/debian/patches/01_replace_local.patch
URL: http://svn.debian.org/wsvn/pkg-voip/lcr/trunk/debian/patches/01_replace_local.patch?rev=6848&op=file
==============================================================================
--- lcr/trunk/debian/patches/01_replace_local.patch (added)
+++ lcr/trunk/debian/patches/01_replace_local.patch Tue Mar  3 14:10:57 2009
@@ -1,0 +1,54 @@
+Author: <joerg at dorchain.net>
+Description: Replace all occurences of local in pathnames
+--- lcr-0.0.20081124.orig/Makefile.am
++++ lcr-0.0.20081124/Makefile.am
+@@ -20,17 +20,17 @@
+ ##    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ ##    Boston, MA 02110-1301, USA.
+ 
+-INSTALLdir = $(DESTDIR)/usr/local/lcr
++INSTALLdir = $(DESTDIR)/usr/share/lcr
+ 
+ pkglogdir=$(localstatedir)/log/@PACKAGE@
+-pkgsysconfdir=$(sysconfdir)/@PACKAGE@
++pkgsysconfdir=/etc/@PACKAGE@
+ 
+-#CONFIGdir=$(DESTDIR)$(pkgsysconfdir)
++CONFIGdir=$(DESTDIR)$(pkgsysconfdir)
+ #SHAREdir=$(DESTDIR)$(pkgdatadir)
+ #LOGdir=$(DESTDIR)$(pkglogdir)
+ #EXTENSIONdir=$(DESTDIR)$(localstatedir)/lib/lcr
+ 
+-CONFIGdir=$(INSTALLdir)
++#CONFIGdir=$(INSTALLdir)
+ SHAREdir=$(INSTALLdir)
+ LOGdir=$(INSTALLdir)
+ EXTENSIONdir=$(INSTALLdir)/extensions
+--- lcr-0.0.20081124.orig/genrc.c
++++ lcr-0.0.20081124/genrc.c
+@@ -84,12 +84,12 @@
+ 
+ 	n = i;
+ 
+-	printf("\nWhere do you like to load the modules from, enter 0 for default, 1 for\n'/usr/local/lcr/modules/' or the full path.\n[0 | 1 | <path>]: "); fflush(stdout);
++	printf("\nWhere do you like to load the modules from, enter 0 for default, 1 for\n'/usr/lib/lcr/modules/' or the full path.\n[0 | 1 | <path>]: "); fflush(stdout);
+ 	scanf("%s", input);
+ 	if (!strcmp(input, "0"))
+ 		SCPY(input, "");
+ 	if (!strcmp(input, "1"))
+-		SCPY(input, "/usr/local/lcr/modules");
++		SCPY(input, "/usr/lib/lcr/modules");
+ 	if (input[0]) if (input[strlen(input)-1] != '/')
+ 		SCAT(input, "/");
+ 
+--- lcr-0.0.20081124.orig/options.c
++++ lcr-0.0.20081124/options.c
+@@ -19,7 +19,7 @@
+ #include "options.h"
+ 
+ struct options options = {
+-	"/usr/local/lcr/log",		/* log file */
++	"/var/log/lcr/log",		/* log file */
+ 	0x0000,				/* debug mode */
+ 	'a',				/* a-law */
+ 	"0",				/* national prefix */

Added: lcr/trunk/debian/patches/03_lcr_as_vbox.patch
URL: http://svn.debian.org/wsvn/pkg-voip/lcr/trunk/debian/patches/03_lcr_as_vbox.patch?rev=6848&op=file
==============================================================================
--- lcr/trunk/debian/patches/03_lcr_as_vbox.patch (added)
+++ lcr/trunk/debian/patches/03_lcr_as_vbox.patch Tue Mar  3 14:10:57 2009
@@ -1,0 +1,52 @@
+Author: <joerg at Redstar.dorchain.net>
+Description: Use LCR as voicebox
+*** lcr.git/route.c	2009-01-06 18:44:41.000000000 +0100
+--- lcr.git-bodo/route.c	2009-02-03 17:01:53.000000000 +0100
+***************
+*** 326,332 ****
+  //	  "Caller calls the timer."},
+  	{ ACTION_GOTO,
+  	  "goto",	NULL, &EndpointAppPBX::action_dialing_goto, NULL,
+! 	  PARAM_CONNECT | PARAM_RULESET | PARAM_STRIP | PARAM_SAMPLE,
+  	  "Jump to given ruleset and optionally play sample. Dialed digits are not flushed."},
+  	{ ACTION_MENU,
+  	  "menu",	NULL, &EndpointAppPBX::action_dialing_menu, NULL,
+--- 326,332 ----
+  //	  "Caller calls the timer."},
+  	{ ACTION_GOTO,
+  	  "goto",	NULL, &EndpointAppPBX::action_dialing_goto, NULL,
+! 	  PARAM_CONNECT | PARAM_ALERTING | PARAM_RULESET | PARAM_STRIP | PARAM_SAMPLE,
+  	  "Jump to given ruleset and optionally play sample. Dialed digits are not flushed."},
+  	{ ACTION_MENU,
+  	  "menu",	NULL, &EndpointAppPBX::action_dialing_menu, NULL,
+
+Bodo.
+
+Am Freitag, den 23.01.2009, 10:46 +0100 schrieb Bodo Pfelzer:
+> Hi,
+> 
+> is it possible to use lcr as a classical voice-box without a phone
+> connected to the internal interface.
+> 
+> When I set 
+> 
+> cfnr            vbox
+> cfnr_delay      20
+> 
+> lcr seems to drop the call when it recognizes that no phone is
+> connected.
+> 
+> Setting
+> 
+> cfu vbox
+> 
+> works, but is not excatly what I want.
+> 
+> Bodo.
+
+
+_______________________________________________
+isdn4linux mailing list
+isdn4linux at listserv.isdn4linux.de
+https://www.isdn4linux.de/mailman/listinfo/isdn4linux
+

Added: lcr/trunk/debian/patches/04_chan_lcr_dtmf.patch
URL: http://svn.debian.org/wsvn/pkg-voip/lcr/trunk/debian/patches/04_chan_lcr_dtmf.patch?rev=6848&op=file
==============================================================================
--- lcr/trunk/debian/patches/04_chan_lcr_dtmf.patch (added)
+++ lcr/trunk/debian/patches/04_chan_lcr_dtmf.patch Tue Mar  3 14:10:57 2009
@@ -1,0 +1,56 @@
+Author: <joerg at Redstar.dorchain.net>
+Description: recognize DTMF A-D in chan lcr
+--- a/chan_lcr.c.orig	2009-01-07 15:30:59.000000000 +0100
++++ b/chan_lcr.c	2009-02-25 17:38:07.000000000 +0100
+@@ -890,7 +890,7 @@
+ 	memcpy(&call->connectinfo, &param->connectinfo, sizeof(struct connect_info));
+ 	/* queue event to asterisk */
+ 	if (call->ast && call->pbx_started)
+-		strncat(call->queue_string, "A", sizeof(call->queue_string)-1);
++		strncat(call->queue_string, "N", sizeof(call->queue_string)-1);
+ }
+ 
+ /*
+@@ -1507,7 +1507,7 @@
+ 						ast_queue_control(ast, AST_CONTROL_RINGING);
+ 						ast_setstate(ast, AST_STATE_RINGING);
+ 						break;
+-					case 'A':
++					case 'N':
+ 						CDEBUG(call, ast, "Sending queued ANSWER to Asterisk.\n");
+ 						ast_queue_control(ast, AST_CONTROL_ANSWER);
+ 						break;
+@@ -1515,10 +1515,10 @@
+ 						CDEBUG(call, ast, "Sending queued HANGUP to Asterisk.\n");
+ 						ast_queue_hangup(ast);
+ 						break;
+-					case '1': case '2': case '3': case 'a':
+-					case '4': case '5': case '6': case 'b':
+-					case '7': case '8': case '9': case 'c':
+-					case '*': case '0': case '#': case 'd':
++					case '1': case '2': case '3': case 'A':
++					case '4': case '5': case '6': case 'B':
++					case '7': case '8': case '9': case 'C':
++					case '*': case '0': case '#': case 'D':
+ 						CDEBUG(call, ast, "Sending queued digit '%c' to Asterisk.\n", *p);
+ 						/* send digit to asterisk */
+ 						memset(&fr, 0, sizeof(fr));
+@@ -1530,7 +1530,7 @@
+ 						ast_queue_frame(ast, &fr);
+ 						break;
+ 					default:
+-						CDEBUG(call, ast, "Ignoring queued digit 0x%02d.\n", *p);
++						CDEBUG(call, ast, "Ignoring queued digit 0x%02X.\n", *p);
+ 					}
+ 					p++;
+ 				}
+
+-- 
+Ralf Schlatterbeck
+email: ralf at zoo.priv.at FAX: +43/2243/26465/23
+
+_______________________________________________
+isdn4linux mailing list
+isdn4linux at listserv.isdn4linux.de
+https://www.isdn4linux.de/mailman/listinfo/isdn4linux
+

Added: lcr/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/lcr/trunk/debian/patches/series?rev=6848&op=file
==============================================================================
--- lcr/trunk/debian/patches/series (added)
+++ lcr/trunk/debian/patches/series Tue Mar  3 14:10:57 2009
@@ -1,0 +1,3 @@
+04_chan_lcr_dtmf.patch
+03_lcr_as_vbox.patch
+01_replace_local.patch

Modified: lcr/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/lcr/trunk/debian/rules?rev=6848&op=diff
==============================================================================
--- lcr/trunk/debian/rules (original)
+++ lcr/trunk/debian/rules Tue Mar  3 14:10:57 2009
@@ -39,8 +39,8 @@
 
 patch: patch-stamp
 patch-stamp:
-	dpatch apply-all
-	dpatch cat-all >$@
+	quilt push -a || test $$? = 2
+	touch $@
 
 build: build-stamp
 
@@ -65,8 +65,8 @@
 	dh_clean 
 
 unpatch:
-	dpatch deapply-all
-	rm -rf patch-stamp debian/patched
+	quilt pop -a -R || test $$? = 2
+	rm -rf .pc patch-stamp
 
 install: build
 	dh_testdir
@@ -111,4 +111,4 @@
 	@@[ -d ../tarballs/. ] || mkdir -p ../tarballs
 	@@wget -nv -T10 -t3 --verbose -O ../tarballs/$(FILENAME) $(URL)
 
-.PHONY: build clean binary-indep binary-arch binary install 
+.PHONY: build clean binary-indep binary-arch binary install patch unpatch




More information about the Pkg-voip-commits mailing list