[Pkg-voip-commits] r3144 - in destar/branches: . 0.2.0-4_etch/debian 0.2.0-4_etch/debian/patches

[Alejandro Rios P.]

Author: alerios-guest
Date: 2007-02-13 15:17:20 +0100 (Tue, 13 Feb 2007)
New Revision: 3144

Added:
   destar/branches/0.2.0-4_etch/
   destar/branches/0.2.0-4_etch/debian/patches/debug_prints.dpatch
Modified:
   destar/branches/0.2.0-4_etch/debian/changelog
   destar/branches/0.2.0-4_etch/debian/control
   destar/branches/0.2.0-4_etch/debian/patches/00list
   destar/branches/0.2.0-4_etch/debian/patches/zaptel.dpatch
   destar/branches/0.2.0-4_etch/debian/postinst
Log:
* Created branch for 0.2.0-4 and merged relevant changes for etch from trunk.


Copied: destar/branches/0.2.0-4_etch (from rev 3128, destar/tags/0.2.0-3)

Modified: destar/branches/0.2.0-4_etch/debian/changelog
===================================================================
--- destar/tags/0.2.0-3/debian/changelog	2007-02-11 05:00:04 UTC (rev 3128)
+++ destar/branches/0.2.0-4_etch/debian/changelog	2007-02-13 14:17:20 UTC (rev 3144)
@@ -1,3 +1,13 @@
+destar (0.2.0-4) UNRELEASED; urgency=low
+ 
+ * NOT RELEASED YET
+ * Added comprobation to patches/zaptel.dpatch (Closes: #410501)
+ * Create /etc/asterisk/manager.d directory if its not present.
+ * Commented nasty debug messages shown when running 'destar -b'.
+ * Added svn info to debian/control.
+
+ -- Alejandro Rios P. <alejandro.rios at avatar.com.co>  Mon, 12 Feb 2007 19:14:35 -0500
+
 destar (0.2.0-3) unstable; urgency=high
 
   [Santiago Ruano Rincón]

Modified: destar/branches/0.2.0-4_etch/debian/control
===================================================================
--- destar/tags/0.2.0-3/debian/control	2007-02-11 05:00:04 UTC (rev 3128)
+++ destar/branches/0.2.0-4_etch/debian/control	2007-02-13 14:17:20 UTC (rev 3144)
@@ -6,6 +6,8 @@
 Build-Depends: debhelper (>= 5.0.37.2), dpatch
 Build-Depends-Indep: python
 Standards-Version: 3.7.2
+XS-Vcs-Svn: svn://svn.debian.org/pkg-voip/
+XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/
 
 Package: destar
 Architecture: all

Modified: destar/branches/0.2.0-4_etch/debian/patches/00list
===================================================================
--- destar/tags/0.2.0-3/debian/patches/00list	2007-02-11 05:00:04 UTC (rev 3128)
+++ destar/branches/0.2.0-4_etch/debian/patches/00list	2007-02-13 14:17:20 UTC (rev 3144)
@@ -3,3 +3,4 @@
 manager.dpatch
 example.dpatch
 zaptel.dpatch
+debug_prints.dpatch

Added: destar/branches/0.2.0-4_etch/debian/patches/debug_prints.dpatch
===================================================================
--- destar/tags/0.2.0-3/debian/patches/debug_prints.dpatch	2007-02-11 05:00:04 UTC (rev 3128)
+++ destar/branches/0.2.0-4_etch/debian/patches/debug_prints.dpatch	2007-02-13 14:17:20 UTC (rev 3144)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## debug_prints.dpatch by Alejandro Rios P. <alejandro.rios at avatar.com.co>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Comments nasty debug messages shown when running 'destar -b' 
+
+ at DPATCH@
+diff -urNad destar-0.2.2~/configlets.py destar-0.2.2/configlets.py
+--- destar-0.2.2~/configlets.py	2007-02-12 14:22:57.000000000 -0500
++++ destar-0.2.2/configlets.py	2007-02-12 14:23:32.000000000 -0500
+@@ -655,7 +655,7 @@
+ 				cont = '"""%s"""' % _v
+ 			elif v.type=="int":
+ 				if _v == 0:
+-					print v.name
++					#print v.name
+ 					continue
+ 				else:
+ 					cont = _v


Property changes on: destar/branches/0.2.0-4_etch/debian/patches/debug_prints.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: destar/branches/0.2.0-4_etch/debian/patches/zaptel.dpatch
===================================================================
--- destar/tags/0.2.0-3/debian/patches/zaptel.dpatch	2007-02-11 05:00:04 UTC (rev 3128)
+++ destar/branches/0.2.0-4_etch/debian/patches/zaptel.dpatch	2007-02-13 14:17:20 UTC (rev 3144)
@@ -12,7 +12,7 @@
  	for _fn,cnf in configlets.asterisk_configfiles:
  		if _fn == 'op_server.cfg' and panelutils.isConfigured() != 1:
  			continue
-+		if not os.access("/etc/zaptel.conf", os.O_RDWR):
++		if _fn == 'zaptel.conf' and not os.access("/etc/zaptel.conf", os.O_RDWR):
 +			continue
  		try:
  			cnf.write()
@@ -29,18 +29,6 @@
  			os.rename(cnf.fn, "%s.orig" % cnf.fn)
  			return True
  	return False
-diff -urNad destar-0.2.0~/configlets.py destar-0.2.0/configlets.py
---- destar-0.2.0~/configlets.py	2006-11-21 17:57:10.000000000 -0500
-+++ destar-0.2.0/configlets.py	2006-11-21 18:01:08.000000000 -0500
-@@ -46,7 +46,7 @@
- 		if fn == 'destar.conf':
- 			fn = os.path.join(CONF_DIR, 'manager.d', fn)
- 		if fn == 'zaptel.conf':
--			fn = os.path.join("/etc", fn)
-+				fn = os.path.join("/etc", fn)
- 		if fn == 'op_server.cfg' or fn == 'op_buttons.cfg':
- 			fn = os.path.join(panelutils.PANEL_CONF_DIR, fn)
- 		elif fn.find('/')==-1:
 diff -urNad destar-0.2.0~/page_config_trunks.ptl destar-0.2.0/page_config_trunks.ptl
 --- destar-0.2.0~/page_config_trunks.ptl	2006-11-21 17:44:53.000000000 -0500
 +++ destar-0.2.0/page_config_trunks.ptl	2006-11-21 17:57:12.000000000 -0500

Modified: destar/branches/0.2.0-4_etch/debian/postinst
===================================================================
--- destar/tags/0.2.0-3/debian/postinst	2007-02-11 05:00:04 UTC (rev 3128)
+++ destar/branches/0.2.0-4_etch/debian/postinst	2007-02-13 14:17:20 UTC (rev 3144)
@@ -23,7 +23,9 @@
         # /var/{log,run}/destar to it.
 	chown -R asterisk:asterisk /var/run/destar/
 	chown -R asterisk:asterisk /var/log/destar/
+	mkdir -p /etc/asterisk/manager.d
 	chown asterisk:asterisk /etc/asterisk/destar_cfg.py
+	chown -R asterisk:asterisk /etc/asterisk/manager.d
 	mkdir -p /etc/op-panel/destar/
 	touch /etc/op-panel/destar/op_server.cfg
 	touch /etc/op-panel/destar/op_buttons.cfg