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

Alejandro Rios P. alerios-guest at costa.debian.org
Tue Jun 20 17:55:32 UTC 2006 

Author: alerios-guest
Date: 2006-06-20 17:55:31 +0000 (Tue, 20 Jun 2006)
New Revision: 1923

Removed:
   destar/trunk/debian/patches/30_add_port_option.dpatch
   destar/trunk/debian/patches/30_pychart.dpatch
Modified:
   destar/trunk/debian/changelog
   destar/trunk/debian/control
   destar/trunk/debian/copyright
   destar/trunk/debian/docs
   destar/trunk/debian/patches/00list
   destar/trunk/debian/patches/10_notexecutables.dpatch
   destar/trunk/debian/patches/20_fix_changelog.dpatch
Log:
* Updated to new upstream release.
* TODO: coordination with op-panel and freepbx.


Modified: destar/trunk/debian/changelog
===================================================================
--- destar/trunk/debian/changelog	2006-06-20 17:49:27 UTC (rev 1922)
+++ destar/trunk/debian/changelog	2006-06-20 17:55:31 UTC (rev 1923)
@@ -1,3 +1,10 @@
+destar (0.2beta-1) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * New upstream release
+
+ -- Alejandro Rios P. <alejandro.rios at avatar.com.co>  Sun, 18 Jun 2006 11:36:48 -0500
+
 destar (0.1.1-4) unstable; urgency=low
 
   * Changed maintainer's email address.

Modified: destar/trunk/debian/control
===================================================================
--- destar/trunk/debian/control	2006-06-20 17:49:27 UTC (rev 1922)
+++ destar/trunk/debian/control	2006-06-20 17:55:31 UTC (rev 1923)
@@ -1,8 +1,8 @@
 Source: destar
 Section: comm
 Priority: optional
-Maintainer: Santiago Ruano Rincón <santiago at debian.org>
-Uploaders: Alejandro Rios P. <alejandro.rios at avatar.com.co>
+Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
+Uploaders: Santiago Ruano Rincón <santiago at debian.org>, Alejandro Rios P. <alejandro.rios at avatar.com.co>, Mark Purcell <msp at debian.org>
 Build-Depends: debhelper (>=4.0.0)
 Build-Depends-Indep: python, dpatch
 Standards-Version: 3.6.2

Modified: destar/trunk/debian/copyright
===================================================================
--- destar/trunk/debian/copyright	2006-06-20 17:49:27 UTC (rev 1922)
+++ destar/trunk/debian/copyright	2006-06-20 17:55:31 UTC (rev 1923)
@@ -13,6 +13,7 @@
 		  Diego Andrés Asenjo González <dasenjo at avatar point com point co>
 		  Tzafrir Cohen <tzafrir.cohen at xorcom point com>
 		  Santiago Ruano Rincón <santiago at unicauca point edu point co>
+		  Manuel Alejandro Ceron Estrada <ceronman at gmail point com>
 
 
 License:

Modified: destar/trunk/debian/docs
===================================================================
--- destar/trunk/debian/docs	2006-06-20 17:49:27 UTC (rev 1922)
+++ destar/trunk/debian/docs	2006-06-20 17:55:31 UTC (rev 1923)
@@ -3,5 +3,4 @@
 FRONTEND.txt
 GPL-2.txt
 README.txt
-TIPS.txt
 TODO.txt

Modified: destar/trunk/debian/patches/00list
===================================================================
--- destar/trunk/debian/patches/00list	2006-06-20 17:49:27 UTC (rev 1922)
+++ destar/trunk/debian/patches/00list	2006-06-20 17:55:31 UTC (rev 1923)
@@ -1,6 +1,4 @@
 09_http_server.dpatch
 10_notexecutables.dpatch
 20_fix_changelog.dpatch
-30_pychart.dpatch
 no_medusa.dpatch
-30_add_port_option.dpatch

Modified: destar/trunk/debian/patches/10_notexecutables.dpatch
===================================================================
--- destar/trunk/debian/patches/10_notexecutables.dpatch	2006-06-20 17:49:27 UTC (rev 1922)
+++ destar/trunk/debian/patches/10_notexecutables.dpatch	2006-06-20 17:55:31 UTC (rev 1923)
@@ -5,23 +5,24 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad destar-0.0.169/Makefile /tmp/dpep.Gu0egT/destar-0.0.169/Makefile
---- destar-0.0.169/Makefile	2005-08-08 14:58:37.000000000 -0500
-+++ /tmp/dpep.Gu0egT/destar-0.0.169/Makefile	2005-08-08 15:01:12.000000000 -0500
-@@ -32,11 +32,14 @@
+diff -urNad destar-0.2beta~/Makefile destar-0.2beta/Makefile
+--- destar-0.2beta~/Makefile	2006-06-20 17:37:17.000000000 +0000
++++ destar-0.2beta/Makefile	2006-06-20 17:38:33.000000000 +0000
+@@ -48,14 +48,15 @@
  	install -d $(PYDIR)
  	#cp -a *.py *.ptl misc medusa $(PYDIR)
  	install -m 644 *.py *.ptl $(PYDIR)/
 +	install -m 755 Server.py $(PYDIR)/
+ 	install -d $(LOCALEDIR)
+ 	cp -fa lang/* $(LOCALEDIR)
  	install -d $(PYDIR)/misc
  	install -m 644 misc/*.py $(PYDIR)/misc/
+-	install -m 644 misc/*.py $(PYDIR)/misc/
  ifneq ($(SYS_MEDUSA),1)
  	install -d $(PYDIR)/medusa
 -	install medusa/*.py $(PYDIR)/medusa/
 +	install -m 644 medusa/*.py $(PYDIR)/medusa/
 +	install -m 755 medusa/http_server.py $(PYDIR)/medusa/
-+
  endif
  	install -m 755 destar $(PYDIR)/destar.py
  	install -d $(PAGES_DIR)
-

Modified: destar/trunk/debian/patches/20_fix_changelog.dpatch
===================================================================
--- destar/trunk/debian/patches/20_fix_changelog.dpatch	2006-06-20 17:49:27 UTC (rev 1922)
+++ destar/trunk/debian/patches/20_fix_changelog.dpatch	2006-06-20 17:55:31 UTC (rev 1923)
@@ -5,12 +5,12 @@
 ## DP: patch to fix two typos in the changelog file
 
 @DPATCH@
-diff -urNad destar-0.1.1/CHANGELOG.txt /tmp/dpep.GwWKcz/destar-0.1.1/CHANGELOG.txt
---- destar-0.1.1/CHANGELOG.txt	2006-01-24 00:35:43.000000000 -0500
-+++ /tmp/dpep.GwWKcz/destar-0.1.1/CHANGELOG.txt	2006-01-24 18:34:39.000000000 -0500
-@@ -1,6 +1,6 @@
--2005-12-22
-+2006-01-24
+diff -urNad destar-0.2beta~/CHANGELOG.txt destar-0.2beta/CHANGELOG.txt
+--- destar-0.2beta~/CHANGELOG.txt	2006-06-20 17:24:22.000000000 +0000
++++ destar-0.2beta/CHANGELOG.txt	2006-06-20 17:24:57.000000000 +0000
+@@ -232,7 +232,7 @@
+ 
+ 2005-12-22
  *cfg_phone_queue.py: fixed bug #5885: MoH fails in calls from PSTN placed directly on queues.
 -*configletx.py: is recommended to use _X. instead of _.
 +*configlets.py: is recommended to use _X. instead of _.

Deleted: destar/trunk/debian/patches/30_add_port_option.dpatch
===================================================================
--- destar/trunk/debian/patches/30_add_port_option.dpatch	2006-06-20 17:49:27 UTC (rev 1922)
+++ destar/trunk/debian/patches/30_add_port_option.dpatch	2006-06-20 17:55:31 UTC (rev 1923)
@@ -1,50 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 30_add_port_option.dpatch by  <liw at iki.fi>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Add -P|--port option to destar.
-
- at DPATCH@
-
---- destar-0.1.1.unchanged/destar	2005-11-13 04:00:41.000000000 +0200
-+++ destar-0.1.1/destar	2006-03-16 22:59:48.000000000 +0200
-@@ -33,6 +33,7 @@
- import daemonize
- be_daemon = False
- pid_file = '/var/run/destar.pid'
-+port = 8080
- 
- 
- def print_version():
-@@ -57,8 +58,8 @@
- 
- 
- try:
--	opts,args = getopt.getopt(sys.argv[1:],'dhp:v', 
--		['daemonize','help','pid=', 'version'])
-+	opts,args = getopt.getopt(sys.argv[1:],'dhp:vP:', 
-+		['daemonize','help','pid=', 'version', 'port='])
- except getopt.GetoptError:
- 	print "DeStar: Command-line parsing error. Aborting."
- 	print_usage()
-@@ -75,6 +76,11 @@
- 	if opt in ('-v', '--version'):
- 		print_version()
- 		sys.exit(0)
-+	if opt in ('-P', '--port'):
-+		try:
-+			port = int(val)
-+		except ValueError:
-+			pass
- 
- 
- print_version()
-@@ -100,7 +106,7 @@
- # 'Publisher.py' contains our session management, 'page_main' contains
- # the start page.
- import Server, Publisher
--pub = Server.Server("page_main", port=8080, publisher=Publisher.DeStarPublisher)
-+pub = Server.Server("page_main", port=port, publisher=Publisher.DeStarPublisher)
- 
- 
- 

Deleted: destar/trunk/debian/patches/30_pychart.dpatch
===================================================================
--- destar/trunk/debian/patches/30_pychart.dpatch	2006-06-20 17:49:27 UTC (rev 1922)
+++ destar/trunk/debian/patches/30_pychart.dpatch	2006-06-20 17:55:31 UTC (rev 1923)
@@ -1,51 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## pychart.dpatch by Santiago Ruano Rincon <santiago at unicauca.edu.co>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: This patch fixes bug #350546
-
- at DPATCH@
-diff -urNad destar-0.1.1/CHANGELOG.txt /tmp/dpep.lq8MjO/destar-0.1.1/CHANGELOG.txt
---- destar-0.1.1/CHANGELOG.txt	2006-02-01 22:33:27.000000000 -0500
-+++ /tmp/dpep.lq8MjO/destar-0.1.1/CHANGELOG.txt	2006-02-01 23:22:07.000000000 -0500
-@@ -1,3 +1,6 @@
-+2005-02-01
-+* page_admin_reports.ptl: fixed bug with pychart
-+
- 2006-01-24
- *cfg_phone_queue.py: fixed bug #5885: MoH fails in calls from PSTN placed directly on queues.
- *configlets.py: is recommended to use _X. instead of _.
-diff -urNad destar-0.1.1/page_admin_reports.ptl /tmp/dpep.lq8MjO/destar-0.1.1/page_admin_reports.ptl
---- destar-0.1.1/page_admin_reports.ptl	2005-11-05 15:43:10.000000000 -0500
-+++ /tmp/dpep.lq8MjO/destar-0.1.1/page_admin_reports.ptl	2006-02-01 23:22:07.000000000 -0500
-@@ -26,11 +26,18 @@
- 
- from Templates import *
- from quixote.form2 import *
--from pychart import *
- import cdrutils
- import time
- import backend
- 
-+pychart_exists = True
-+try:
-+	from pychart import *
-+except ImportError:
-+	pychart_exists = False
-+
-+
-+
- _q_parent = 'page_admin'
- _q_title  = _("Reports")
- _q_desc   = _("Statistics")
-@@ -279,6 +286,9 @@
- 	
- def _q_index [plain] (request):
- 	header(_q_desc)
--	cdrForm(request)
-+	if pychart_exists:
-+		cdrForm(request)
-+	else:
-+		 _("You need to install pychart and use a cdr with sqlite to get these statistics")
- 	footer()
-

More information about the Pkg-voip-commits mailing list