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

[Tzafrir Cohen]

Author: tzafrir-guest
Date: 2006-03-04 20:42:06 +0000 (Sat, 04 Mar 2006)
New Revision: 1364

Modified:
   asterisk/trunk/debian/changelog
   asterisk/trunk/debian/patches/30_ast-data-dir.dpatch
   asterisk/trunk/debian/patches/correct_pid_display.dpatch
   asterisk/trunk/debian/postinst
   asterisk/trunk/debian/rules
Log:
* New upstream release: 1.2.5
* correct_pid_display.dpatch: adjusted to 1.2.5
* 30_ast-data-dir.dpatch: adjusted to 1.2.5
* logroate: create /var/log/asterisk/cdr-custom/ as well as cdr-csv
  (Closes: #355048)
* delete chan_capi modules from bristuff


Modified: asterisk/trunk/debian/changelog
===================================================================
--- asterisk/trunk/debian/changelog	2006-03-03 17:21:47 UTC (rev 1363)
+++ asterisk/trunk/debian/changelog	2006-03-04 20:42:06 UTC (rev 1364)
@@ -1,12 +1,16 @@
-asterisk (1:1.2.4.dfsg-7) UNRELEASED; urgency=low
+asterisk (1:1.2.5.dfsg-1) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+  * New upstream release. 
+  * correct_pid_display.dpatch: adjusted to 1.2.5
+  * 30_ast-data-dir.dpatch: adjusted to 1.2.5
   * postinstall: Add /var/spool/asterisk/meetme if nonexistant.
     (Closes: #355046)
   * asterisk.init: Install both asterisk-classic and asterisk-bristuff with
     /etc/init.d/asterisk (Closes: #354729)
-  * logroate: moved logdir for CSV to /var/log/asterisk/cdr-custom/ 
+  * logroate: create /var/log/asterisk/cdr-custom/ as well as cdr-csv
     (Closes: #355048)
+  * delete chan_capi modules from bristuff
 
  -- Kilian Krause <kilian at debian.org>  Fri,  3 Mar 2006 10:41:36 +0100
 

Modified: asterisk/trunk/debian/patches/30_ast-data-dir.dpatch
===================================================================
--- asterisk/trunk/debian/patches/30_ast-data-dir.dpatch	2006-03-03 17:21:47 UTC (rev 1363)
+++ asterisk/trunk/debian/patches/30_ast-data-dir.dpatch	2006-03-04 20:42:06 UTC (rev 1364)
@@ -26,10 +26,10 @@
  	ast_copy_string(ast_config_AST_LOG_DIR, AST_LOG_DIR, sizeof(ast_config_AST_LOG_DIR));
  	ast_copy_string(ast_config_AST_AGI_DIR, AST_AGI_DIR, sizeof(ast_config_AST_AGI_DIR));
  	ast_copy_string(ast_config_AST_DB, AST_DB, sizeof(ast_config_AST_DB));
-@@ -1823,6 +1825,8 @@
- 		} else if (!strcasecmp(v->name, "astvarlibdir")) {
+@@ -1823,6 +1826,8 @@
  			ast_copy_string(ast_config_AST_VAR_DIR, v->value, sizeof(ast_config_AST_VAR_DIR));
- 			snprintf(ast_config_AST_DB, sizeof(ast_config_AST_DB), "%s/%s", v->value, "astdb");    
+ 			snprintf(ast_config_AST_DB, sizeof(ast_config_AST_DB), "%s/astdb", v->value);
+			snprintf(ast_config_AST_KEY_DIR, sizeof(ast_config_AST_KEY_DIR), "%s/keys", v->value);
 +		} else if (!strcasecmp(v->name, "astdatadir")) {
 +			ast_copy_string(ast_config_AST_DATA_DIR, v->value, sizeof(ast_config_AST_DATA_DIR));
  		} else if (!strcasecmp(v->name, "astlogdir")) {
@@ -129,7 +129,7 @@
 @@ -539,38 +540,38 @@
  
  datafiles: all
- 	if [ x`whoami` = xroot ]; then sh mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
+ 	if [ x`$(ID) -un` = xroot ]; then sh mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
 -	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits
 -	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/priv-callerintros
 +	mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/digits

Modified: asterisk/trunk/debian/patches/correct_pid_display.dpatch
===================================================================
--- asterisk/trunk/debian/patches/correct_pid_display.dpatch	2006-03-03 17:21:47 UTC (rev 1363)
+++ asterisk/trunk/debian/patches/correct_pid_display.dpatch	2006-03-04 20:42:06 UTC (rev 1364)
@@ -16,7 +16,7 @@
  		unlink((char *)ast_config_AST_PID);
  		f = fopen((char *)ast_config_AST_PID, "w");
  		if (f) {
--			fprintf(f, "%d\n", getpid());
+-			fprintf(f, "%d\n", (int)getpid());
 +			fprintf(f, "%d\n", ast_mainpid);
  			fclose(f);
  		} else

Modified: asterisk/trunk/debian/postinst
===================================================================
--- asterisk/trunk/debian/postinst	2006-03-03 17:21:47 UTC (rev 1363)
+++ asterisk/trunk/debian/postinst	2006-03-04 20:42:06 UTC (rev 1364)
@@ -27,14 +27,11 @@
 		adduser asterisk dialout
 	fi
 
-	if [ -d /var/log/asterisk/cdr-csv -a ! -d /var/log/asterisk/cdr-custom ];then
-		mv /var/log/asterisk/cdr-csv /var/log/asterisk/cdr-custom
-	elif [ -d /var/log/asterisk/cdr-csv -a -d /var/log/asterisk/cdr-custom ];then
-		echo 'Found obsolete /var/log/asterisk/cdr-csv.'
-		echo 'Please move files manually to new location: /var/log/asterisk/cdr-custom'
-	elif [ ! -d /var/log/asterisk/cdr-custom ];then
-		mkdir -p /var/log/asterisk/cdr-custom
-	fi
+	for cdrdir in cvs custom; do 
+		if [ ! -d /var/log/asterisk/cdr-$cdrdir ];then
+			mkdir -p /var/log/asterisk/cdr-$cdrdir
+		fi
+	done
 	test -d /var/spool/asterisk/voicemail || mkdir -p /var/spool/asterisk/voicemail
 	test -d /var/spool/asterisk/meetme || mkdir -p /var/spool/asterisk/meetme
 	test -d /var/lib/asterisk || mkdir -p /var/lib/asterisk

Modified: asterisk/trunk/debian/rules
===================================================================
--- asterisk/trunk/debian/rules	2006-03-03 17:21:47 UTC (rev 1363)
+++ asterisk/trunk/debian/rules	2006-03-04 20:42:06 UTC (rev 1364)
@@ -200,6 +200,7 @@
 	#rm debian/asterisk/usr/lib/asterisk/modules/pbx_gtkconsole.so
 	rm -f debian/asterisk-classic/usr/lib/asterisk/modules/chan_h323.so
 	rm -f debian/asterisk-bristuff/usr/lib/asterisk/modules/chan_h323.so
+	rm -f debian/asterisk-bristuff/usr/lib/asterisk/modules/*_capi*.so
 	dh_makeshlibs -a 
 	dh_shlibdeps -a
 	dh_gencontrol -a