[Pkg-voip-commits] r8472 - in /lcr/trunk/debian: changelog control patches/af_isdn patches/configure_warning patches/replace_local.patch patches/series patches/tone_zone_sound rules

dorchain-guest at alioth.debian.org dorchain-guest at alioth.debian.org
Wed Jun 9 13:48:56 UTC 2010 

Author: dorchain-guest
Date: Wed Jun  9 13:48:51 2010
New Revision: 8472

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8472
Log:
New upstream version

Added:
    lcr/trunk/debian/patches/af_isdn
    lcr/trunk/debian/patches/tone_zone_sound
Modified:
    lcr/trunk/debian/changelog
    lcr/trunk/debian/control
    lcr/trunk/debian/patches/configure_warning
    lcr/trunk/debian/patches/replace_local.patch
    lcr/trunk/debian/patches/series
    lcr/trunk/debian/rules

Modified: lcr/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/lcr/trunk/debian/changelog?rev=8472&op=diff
==============================================================================
--- lcr/trunk/debian/changelog (original)
+++ lcr/trunk/debian/changelog Wed Jun  9 13:48:51 2010
@@ -1,3 +1,14 @@
+lcr (1.7~20100601-1) UNRELEASED; urgency=low
+
+  [ Joerg Dorchain ]
+  * New upstream version
+  * debian/control:
+    - update debian policy 3.8.4
+  * refreshed patches
+  * new compile patches necessary
+
+ -- Joerg Dorchain <joerg at dorchain.net>  Wed, 9 Jun 2010 13:00:00 +0200
+
 lcr (1.6~20090906-1) UNRELEASED; urgency=low
 
   [ Joerg Dorchain ]

Modified: lcr/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/lcr/trunk/debian/control?rev=8472&op=diff
==============================================================================
--- lcr/trunk/debian/control (original)
+++ lcr/trunk/debian/control Wed Jun  9 13:48:51 2010
@@ -4,8 +4,8 @@
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Joerg Dorchain <joerg at dorchain.net>, Victor Seva <linuxmaniac at torreviejawireless.org>
 Build-Depends: debhelper (>= 7), autotools-dev, libmisdnv2user-dev, asterisk-dev, libncurses-dev,  automake1.9, quilt
-Standards-Version: 3.8.3
-Homepage: http://isdn.eversberg.eu/download/lcr-1.3/
+Standards-Version: 3.8.4
+Homepage: http://isdn.eversberg.eu/download/lcr-1.7/
 Vcs-Svn: svn://svn.debian.org/pkg-voip/lcr/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/lcr/?op=log
 

Added: lcr/trunk/debian/patches/af_isdn
URL: http://svn.debian.org/wsvn/pkg-voip/lcr/trunk/debian/patches/af_isdn?rev=8472&op=file
==============================================================================
--- lcr/trunk/debian/patches/af_isdn (added)
+++ lcr/trunk/debian/patches/af_isdn Wed Jun  9 13:48:51 2010
@@ -1,0 +1,13 @@
+Index: lcr-1.7~20100601/mISDN.cpp
+===================================================================
+--- lcr-1.7~20100601.orig/mISDN.cpp	2010-06-09 15:34:24.759051647 +0200
++++ lcr-1.7~20100601/mISDN.cpp	2010-06-09 15:35:14.367047727 +0200
+@@ -13,7 +13,7 @@
+ #include "myisdn.h"
+ 
+ #include <mISDN/mISDNcompat.h>
+-int __af_isdn = MISDN_AF_ISDN;
++extern int __af_isdn;
+ #include <mISDN/q931.h>
+ 
+ #undef offsetof

Modified: lcr/trunk/debian/patches/configure_warning
URL: http://svn.debian.org/wsvn/pkg-voip/lcr/trunk/debian/patches/configure_warning?rev=8472&op=diff
==============================================================================
--- lcr/trunk/debian/patches/configure_warning (original)
+++ lcr/trunk/debian/patches/configure_warning Wed Jun  9 13:48:51 2010
@@ -3,7 +3,7 @@
 @@ -25,13 +25,13 @@ dnl This keeps being the first instructi
  dnl Change the 2nd argument if the version increases
  dnl 1st + 2nd argument is used for distribution package name
- AC_INIT(lcr, 1.6, andreas at eversberg.eu)
+ AC_INIT(lcr, 1.7, andreas at eversberg.eu)
 -AC_PREREQ(2.59)
 +AC_PREREQ(2.60)
  AC_CONFIG_SRCDIR([main.c])
@@ -12,8 +12,8 @@
  # fix warnings from autoconf + automake
 -AC_GNU_SOURCE
 -# AC_USE_SYSTEM_EXTENSIONS
-+#AC_GNU_SOURCE
++# AC_GNU_SOURCE
 +AC_USE_SYSTEM_EXTENSIONS
- AM_INIT_AUTOMAKE(lcr,1.6)
+ AM_INIT_AUTOMAKE(lcr,1.7)
  
  

Modified: lcr/trunk/debian/patches/replace_local.patch
URL: http://svn.debian.org/wsvn/pkg-voip/lcr/trunk/debian/patches/replace_local.patch?rev=8472&op=diff
==============================================================================
--- lcr/trunk/debian/patches/replace_local.patch (original)
+++ lcr/trunk/debian/patches/replace_local.patch Wed Jun  9 13:48:51 2010
@@ -1,9 +1,7 @@
 Author: <joerg at dorchain.net>
 Description: Replace all occurences of local in pathnames
-Index: lcr-1.6~20090906/Makefile.am
-===================================================================
---- lcr-1.6~20090906.orig/Makefile.am	2009-09-07 13:35:03.834457538 +0200
-+++ lcr-1.6~20090906/Makefile.am	2009-09-07 13:36:12.292950699 +0200
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -20,19 +20,19 @@
  ##    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  ##    Boston, MA 02110-1301, USA.
@@ -30,31 +28,10 @@
  EXTENSIONdir=$(INSTALLdir)/extensions
  
  astmoddir = $(DESTDIR)/usr/lib/asterisk/modules
-Index: lcr-1.6~20090906/genrc.c
-===================================================================
---- lcr-1.6~20090906.orig/genrc.c	2009-09-07 13:35:03.878459355 +0200
-+++ lcr-1.6~20090906/genrc.c	2009-09-07 13:36:12.292950699 +0200
-@@ -80,12 +80,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, "/");
- 
-Index: lcr-1.6~20090906/options.c
-===================================================================
---- lcr-1.6~20090906.orig/options.c	2009-09-07 13:35:03.898459331 +0200
-+++ lcr-1.6~20090906/options.c	2009-09-07 13:36:12.296951419 +0200
-@@ -19,7 +19,7 @@
- #include "options.h"
+--- a/options.c
++++ b/options.c
+@@ -21,7 +21,7 @@
+ #include <pwd.h>
  
  struct options options = {
 -	"/usr/local/lcr/log",		/* log file */
@@ -62,11 +39,9 @@
  	0x0000,				/* debug mode */
  	'a',				/* a-law */
  	"0",				/* national prefix */
-Index: lcr-1.6~20090906/default/options.conf
-===================================================================
---- lcr-1.6~20090906.orig/default/options.conf	2009-09-07 13:35:03.858458743 +0200
-+++ lcr-1.6~20090906/default/options.conf	2009-09-07 13:36:12.296951419 +0200
-@@ -24,8 +24,8 @@
+--- a/default/options.conf
++++ b/default/options.conf
+@@ -25,8 +25,8 @@
  
  # The log file can be used to track actions by the LCR. Omit the parameter
  # to turn off log file. By default, log file is located inside the directory

Modified: lcr/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/lcr/trunk/debian/patches/series?rev=8472&op=diff
==============================================================================
--- lcr/trunk/debian/patches/series (original)
+++ lcr/trunk/debian/patches/series Wed Jun  9 13:48:51 2010
@@ -1,2 +1,4 @@
 replace_local.patch
 configure_warning
+tone_zone_sound
+af_isdn

Added: lcr/trunk/debian/patches/tone_zone_sound
URL: http://svn.debian.org/wsvn/pkg-voip/lcr/trunk/debian/patches/tone_zone_sound?rev=8472&op=file
==============================================================================
--- lcr/trunk/debian/patches/tone_zone_sound (added)
+++ lcr/trunk/debian/patches/tone_zone_sound Wed Jun  9 13:48:51 2010
@@ -1,0 +1,13 @@
+Index: lcr-1.7~20100601/chan_lcr.c
+===================================================================
+--- lcr-1.7~20100601.orig/chan_lcr.c	2010-06-09 15:05:16.054049328 +0200
++++ lcr-1.7~20100601/chan_lcr.c	2010-06-09 15:05:44.946048764 +0200
+@@ -2247,7 +2247,7 @@
+ 	union parameter newparam;
+         int res = 0;
+         struct chan_call *call;
+-	const struct tone_zone_sound *ts = NULL;
++	const struct ast_tone_zone_sound *ts = NULL;
+ 
+ 	ast_mutex_lock(&chan_lock);
+         call = ast->tech_pvt;

Modified: lcr/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/lcr/trunk/debian/rules?rev=8472&op=diff
==============================================================================
--- lcr/trunk/debian/rules (original)
+++ lcr/trunk/debian/rules Wed Jun  9 13:48:51 2010
@@ -13,7 +13,7 @@
 UP_MAJOR_VER:=$(shell echo $(LOCAL_TAR_VER) | sed -e 's/~[0-9.]*//')
 UP_DATE_VER:=$(shell echo $(LOCAL_TAR_VER) | sed -e 's/[0-9.]*~//')
 
-UPFILENAME := lcr_$(UP_DATE_VER).tar.gz
+UPFILENAME := lcr-$(UP_DATE_VER).tar.gz
 FILENAME := lcr_$(LOCAL_TAR_VER).orig.tar.gz
 URL := http://isdn.eversberg.eu/download/lcr-$(UP_MAJOR_VER)/$(UPFILENAME)
 
@@ -38,7 +38,7 @@
 ifneq "$(wildcard /usr/share/misc/config.guess)" ""
 	cp -f /usr/share/misc/config.guess config.guess
 endif
-	CPPFLAGS="-I/usr/include/mISDNuser" ./configure $(CROSS) --without-ssl --without-gsm --prefix=/usr --localstatedir=/var --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" # LDFLAGS="-Wl,-z,defs"
+	CPPFLAGS="-I/usr/include/mISDNuser" ./configure $(CROSS) --without-ssl --without-gsm-bs --without-gsm-ms --without-ss5 --prefix=/usr --localstatedir=/var --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" # LDFLAGS="-Wl,-z,defs"
 
 build: build-stamp
 build-stamp:  config.status

More information about the Pkg-voip-commits mailing list