[Pkg-voip-commits] r3067 - in destar/trunk/debian: . patches

[Santiago Ruano Rincón]

Author: santiago
Date: 2007-01-27 00:49:58 +0100 (Sat, 27 Jan 2007)
New Revision: 3067

Modified:
   destar/trunk/debian/changelog
   destar/trunk/debian/control
   destar/trunk/debian/patches/op_panel.dpatch
   destar/trunk/debian/patches/zaptel.dpatch
Log:
upstream release 0.2.2



Modified: destar/trunk/debian/changelog
===================================================================
--- destar/trunk/debian/changelog	2007-01-26 16:12:00 UTC (rev 3066)
+++ destar/trunk/debian/changelog	2007-01-26 23:49:58 UTC (rev 3067)
@@ -1,8 +1,9 @@
-destar (0.2.0-4) UNRELEASED; urgency=low
+destar (0.2.2-1) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+  * New upstream release 
 
- -- Santiago Ruano Rincón <santiago at debian.org>  Sat,  9 Dec 2006 01:08:40 -0500
+ -- Santiago Ruano Rincón <santiago at debian.org>  Fri, 26 Jan 2007 18:11:26 -0500
 
 destar (0.2.0-3) unstable; urgency=high
 

Modified: destar/trunk/debian/control
===================================================================
--- destar/trunk/debian/control	2007-01-26 16:12:00 UTC (rev 3066)
+++ destar/trunk/debian/control	2007-01-26 23:49:58 UTC (rev 3067)
@@ -11,7 +11,7 @@
 
 Package: destar
 Architecture: all
-Depends: python, ${python:Depends}, python-quixote1,  python-medusa, asterisk (>= 1.2.13), python-pysqlite2, sqlite3, python-pychart
+Depends: python, ${python:Depends}, python-quixote,  python-medusa, asterisk (>= 1.2.13), python-pysqlite2, sqlite3, python-pychart
 Recommends: op-panel
 Conflicts: freepbx
 XB-Python-Version: ${python:Versions}

Modified: destar/trunk/debian/patches/op_panel.dpatch
===================================================================
--- destar/trunk/debian/patches/op_panel.dpatch	2007-01-26 16:12:00 UTC (rev 3066)
+++ destar/trunk/debian/patches/op_panel.dpatch	2007-01-26 23:49:58 UTC (rev 3067)
@@ -5,10 +5,10 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad destar-0.2.0~/panelutils.py destar-0.2.0/panelutils.py
---- destar-0.2.0~/panelutils.py	2006-11-21 17:44:54.000000000 -0500
-+++ destar-0.2.0/panelutils.py	2006-11-21 17:46:09.000000000 -0500
-@@ -29,10 +29,10 @@
+diff -urNad destar-0.2.2~/panelutils.py destar-0.2.2/panelutils.py
+--- destar-0.2.2~/panelutils.py	2007-01-26 18:16:35.000000000 -0500
++++ destar-0.2.2/panelutils.py	2007-01-26 18:18:32.000000000 -0500
+@@ -29,11 +29,11 @@
  
  
  # Configuration to use with op-panel .deb package:
@@ -16,16 +16,10 @@
 +PANEL_CONF_DIR	= "/etc/op-panel/destar"
  PANEL_HTML_DIR	= "/usr/share/op-panel/flash"
  PANEL_START_CMD	= "/etc/init.d/op-panel start"
--PANEL_STOP_CMD	= "/etc/init.d/op-panel stop"
-+PANEL_STOP_CMD	= "pkill -HUP op_server"
+ PANEL_STOP_CMD	= "/etc/init.d/op-panel stop"
+-PANEL_RESTART_CMD = "/etc/init.d/op-panel restart"
++PANEL_RESTART_CMD = "pkill -HUP op_server"
  
  def isConfigured ():
  	import configlets
-@@ -123,7 +123,6 @@
- 	s = []
- 	s.append(_("Restarting the panel daemon ..."))
- 	s.append(stopPanelDaemon())
--	s.append(startPanelDaemon())
- 	return s
- 
- if isConfigured():
+

Modified: destar/trunk/debian/patches/zaptel.dpatch
===================================================================
--- destar/trunk/debian/patches/zaptel.dpatch	2007-01-26 16:12:00 UTC (rev 3066)
+++ destar/trunk/debian/patches/zaptel.dpatch	2007-01-26 23:49:58 UTC (rev 3067)
@@ -5,10 +5,10 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad destar-0.2.0~/backend.py destar-0.2.0/backend.py
---- destar-0.2.0~/backend.py	2006-11-21 17:44:53.000000000 -0500
-+++ destar-0.2.0/backend.py	2006-11-21 18:00:59.000000000 -0500
-@@ -398,6 +398,8 @@
+diff -urNad destar-0.2.2~/backend.py destar-0.2.2/backend.py
+--- destar-0.2.2~/backend.py	2007-01-26 18:33:24.000000000 -0500
++++ destar-0.2.2/backend.py	2007-01-26 18:36:41.000000000 -0500
+@@ -444,6 +444,8 @@
  	for _fn,cnf in configlets.asterisk_configfiles:
  		if _fn == 'op_server.cfg' and panelutils.isConfigured() != 1:
  			continue
@@ -17,7 +17,7 @@
  		try:
  			cnf.write()
  		except OSError:
-@@ -417,7 +419,10 @@
+@@ -463,7 +465,10 @@
  
  
  	for short_fn,cnf in configlets.asterisk_configfiles:
@@ -29,21 +29,9 @@
  			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
+diff -urNad destar-0.2.2~/page_config_trunks.ptl destar-0.2.2/page_config_trunks.ptl
+--- destar-0.2.2~/page_config_trunks.ptl	2007-01-26 18:33:24.000000000 -0500
++++ destar-0.2.2/page_config_trunks.ptl	2007-01-26 18:36:41.000000000 -0500
 @@ -44,5 +44,7 @@
  			phones = True
  	if not phones: