[Pkg-voip-commits] r1509 - in asterisk/tags/1.2.4.dfsg-7/debian: . patches

[Kilian Krause]

Author: kilian
Date: 2006-03-30 10:10:34 +0000 (Thu, 30 Mar 2006)
New Revision: 1509

Modified:
   asterisk/tags/1.2.4.dfsg-7/debian/changelog
   asterisk/tags/1.2.4.dfsg-7/debian/patches/30_ast-data-dir.dpatch
   asterisk/tags/1.2.4.dfsg-7/debian/patches/correct_pid_display.dpatch
Log:
revert patches to 1.2.4 versions


Modified: asterisk/tags/1.2.4.dfsg-7/debian/changelog
===================================================================
--- asterisk/tags/1.2.4.dfsg-7/debian/changelog	2006-03-30 10:04:27 UTC (rev 1508)
+++ asterisk/tags/1.2.4.dfsg-7/debian/changelog	2006-03-30 10:10:34 UTC (rev 1509)
@@ -2,8 +2,6 @@
 
   * Recompile to fix missing asterisk-config from last binNMU round
     (Closes: #356712, #358413, #355524, #358145)
-  * correct_pid_display.dpatch: adjusted to 1.2.6
-  * 30_ast-data-dir.dpatch: adjusted to 1.2.6
   * postinstall: Add /var/spool/asterisk/meetme if nonexistant.
     (Closes: #355046)
   * asterisk.init: Install both asterisk-classic and asterisk-bristuff with

Modified: asterisk/tags/1.2.4.dfsg-7/debian/patches/30_ast-data-dir.dpatch
===================================================================
--- asterisk/tags/1.2.4.dfsg-7/debian/patches/30_ast-data-dir.dpatch	2006-03-30 10:04:27 UTC (rev 1508)
+++ asterisk/tags/1.2.4.dfsg-7/debian/patches/30_ast-data-dir.dpatch	2006-03-30 10:10:34 UTC (rev 1509)
@@ -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 +1826,8 @@
+@@ -1823,6 +1825,8 @@
+ 		} else if (!strcasecmp(v->name, "astvarlibdir")) {
  			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/astdb", v->value);
-			snprintf(ast_config_AST_KEY_DIR, sizeof(ast_config_AST_KEY_DIR), "%s/keys", v->value);
+ 			snprintf(ast_config_AST_DB, sizeof(ast_config_AST_DB), "%s/%s", v->value, "astdb");    
 +		} 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`$(ID) -un` = xroot ]; then sh mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
+ 	if [ x`whoami` = 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/tags/1.2.4.dfsg-7/debian/patches/correct_pid_display.dpatch
===================================================================
--- asterisk/tags/1.2.4.dfsg-7/debian/patches/correct_pid_display.dpatch	2006-03-30 10:04:27 UTC (rev 1508)
+++ asterisk/tags/1.2.4.dfsg-7/debian/patches/correct_pid_display.dpatch	2006-03-30 10:10:34 UTC (rev 1509)
@@ -16,7 +16,7 @@
  		unlink((char *)ast_config_AST_PID);
  		f = fopen((char *)ast_config_AST_PID, "w");
  		if (f) {
--			fprintf(f, "%d\n", (int)getpid());
+-			fprintf(f, "%d\n", getpid());
 +			fprintf(f, "%d\n", ast_mainpid);
  			fclose(f);
  		} else