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

[Santiago José Ruano Rincón]

Author: santiago-guest
Date: 2006-02-02 04:38:43 +0000 (Thu, 02 Feb 2006)
New Revision: 1214

Added:
   destar/trunk/debian/patches/20_fix_changelog.dpatch
   destar/trunk/debian/patches/30_pychart.dpatch
Removed:
   destar/trunk/debian/patches/99_fix_changelog.dpatch
Modified:
   destar/trunk/debian/changelog
   destar/trunk/debian/patches/00list
Log:
* package version 0.1.1-2



Modified: destar/trunk/debian/changelog
===================================================================
--- destar/trunk/debian/changelog	2006-01-30 00:04:31 UTC (rev 1213)
+++ destar/trunk/debian/changelog	2006-02-02 04:38:43 UTC (rev 1214)
@@ -1,3 +1,9 @@
+destar (0.1.1-2) unstable; urgency=low
+
+  * missing dependancy on python-pychart (Closes: #350546)
+
+ -- Santiago Ruano Rincon <santiago at unicauca.edu.co>  Wed,  1 Feb 2006 23:26:39 -0500
+
 destar (0.1.1-1) unstable; urgency=low
 
   * New upstream release

Modified: destar/trunk/debian/patches/00list
===================================================================
--- destar/trunk/debian/patches/00list	2006-01-30 00:04:31 UTC (rev 1213)
+++ destar/trunk/debian/patches/00list	2006-02-02 04:38:43 UTC (rev 1214)
@@ -1,4 +1,5 @@
 09_http_server.dpatch
 10_notexecutables.dpatch
-99_fix_changelog.dpatch
+20_fix_changelog.dpatch
+30_pychart.dpatch
 no_medusa.dpatch

Added: destar/trunk/debian/patches/20_fix_changelog.dpatch
===================================================================
--- destar/trunk/debian/patches/20_fix_changelog.dpatch	2006-01-30 00:04:31 UTC (rev 1213)
+++ destar/trunk/debian/patches/20_fix_changelog.dpatch	2006-02-02 04:38:43 UTC (rev 1214)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 99_fix_changelog.dpatch by Santiago Ruano Rincon <santiago at unicauca.edu.co>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: patch to fix two typos in the changelog file
+
+ at 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
+ *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 _.
+ 
+ 2005-12-19
+ *backend.py: fixed bug on CFIM/CFBS, still needs more testing.


Property changes on: destar/trunk/debian/patches/20_fix_changelog.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: destar/trunk/debian/patches/30_pychart.dpatch
===================================================================
--- destar/trunk/debian/patches/30_pychart.dpatch	2006-01-30 00:04:31 UTC (rev 1213)
+++ destar/trunk/debian/patches/30_pychart.dpatch	2006-02-02 04:38:43 UTC (rev 1214)
@@ -0,0 +1,51 @@
+#! /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()
+ 	


Property changes on: destar/trunk/debian/patches/30_pychart.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Deleted: destar/trunk/debian/patches/99_fix_changelog.dpatch
===================================================================
--- destar/trunk/debian/patches/99_fix_changelog.dpatch	2006-01-30 00:04:31 UTC (rev 1213)
+++ destar/trunk/debian/patches/99_fix_changelog.dpatch	2006-02-02 04:38:43 UTC (rev 1214)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 99_fix_changelog.dpatch by Santiago Ruano Rincon <santiago at unicauca.edu.co>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: patch to fix two typos in the changelog file
-
- at 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
- *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 _.
- 
- 2005-12-19
- *backend.py: fixed bug on CFIM/CFBS, still needs more testing.