[Python-modules-commits] r25658 - in packages/pyrrd/trunk/debian (7 files)

[valhalla-guest at users.alioth.debian.org]

    Date: Wednesday, August 21, 2013 @ 20:19:04
  Author: valhalla-guest
Revision: 25658

Convert to 3.0 (quilt), fix #691230

Added:
  packages/pyrrd/trunk/debian/patches/
  packages/pyrrd/trunk/debian/patches/backported_fix_for_fetch.diff
  packages/pyrrd/trunk/debian/patches/series
Modified:
  packages/pyrrd/trunk/debian/changelog
  packages/pyrrd/trunk/debian/control
  packages/pyrrd/trunk/debian/rules
  packages/pyrrd/trunk/debian/source/format

Modified: packages/pyrrd/trunk/debian/changelog
===================================================================
--- packages/pyrrd/trunk/debian/changelog	2013-08-21 15:35:56 UTC (rev 25657)
+++ packages/pyrrd/trunk/debian/changelog	2013-08-21 20:19:04 UTC (rev 25658)
@@ -1,8 +1,16 @@
-pyrrd (0.1.0-2) UNRELEASED; urgency=low
+pyrrd (0.1.0-2) unstable; urgency=low
 
+  * Added myself to uploaders until Andrea has again time to maintain
+    (by agreement with him).
+  * Convert to format 3.0 (quilt)
+  * Backport fix for RRD.fetch from upstream bzr revision 158
+    (git commit dcd78df45c52) (Closes: #691230)
+  * Updated standard versions to 3.9.4 (no change needed).
+
+  [ Jakub Wilk ]
   * Use canonical URIs for Vcs-* fields.
 
- -- Jakub Wilk <jwilk at debian.org>  Sun, 05 May 2013 16:01:58 +0200
+ -- Elena Grandi <elena.valhalla at gmail.com>  Wed, 21 Aug 2013 21:18:23 +0200
 
 pyrrd (0.1.0-1) unstable; urgency=low
 

Modified: packages/pyrrd/trunk/debian/control
===================================================================
--- packages/pyrrd/trunk/debian/control	2013-08-21 15:35:56 UTC (rev 25657)
+++ packages/pyrrd/trunk/debian/control	2013-08-21 20:19:04 UTC (rev 25658)
@@ -2,9 +2,9 @@
 Section: python
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Uploaders: Andrea Corradi <lash at unstable.it>
+Uploaders: Andrea Corradi <lash at unstable.it>, Elena Grandi <elena.valhalla at gmail.com>
 Build-Depends: debhelper (>= 5), python (>= 2.6.6-3~), python-setuptools
-Standards-Version: 3.9.2
+Standards-Version: 3.9.4
 Homepage: http://code.google.com/p/pyrrd/
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/pyrrd/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/pyrrd/trunk/

Added: packages/pyrrd/trunk/debian/patches/backported_fix_for_fetch.diff
===================================================================
--- packages/pyrrd/trunk/debian/patches/backported_fix_for_fetch.diff	                        (rev 0)
+++ packages/pyrrd/trunk/debian/patches/backported_fix_for_fetch.diff	2013-08-21 20:19:04 UTC (rev 25658)
@@ -0,0 +1,33 @@
+Index: PyRRD-0.1.0/pyrrd/backend/external.py
+===================================================================
+--- PyRRD-0.1.0.orig/pyrrd/backend/external.py	2011-09-18 23:02:21.000000000 +0200
++++ PyRRD-0.1.0/pyrrd/backend/external.py	2013-08-21 21:29:40.349397859 +0200
+@@ -264,7 +264,7 @@
+         data += [unicode(x) for x in obj.rra]
+         return (obj.filename, params + data)
+ 
+-    if function == 'update':
++    elif function == 'update':
+         validParams = ['template']
+         params = common.buildParameters(obj, validParams)
+         FIRST_VALUE = 0
+@@ -277,15 +277,15 @@
+             data = [data for data, nil in obj.values]
+         return (obj.filename, params + data)
+ 
+-    if function == 'fetch':
++    elif function == 'fetch':
+         validParams = ['resolution', 'start', 'end']
+         params = common.buildParameters(obj, validParams)
+-        return (obj.filename, obj.cf, params)
++        return (obj.filename, [obj.cf] + params)
+ 
+-    if function == 'info':
++    elif function == 'info':
+         return (obj.filename, obj)
+ 
+-    if function == 'graph':
++    elif function == 'graph':
+         validParams = ['start', 'end', 'step', 'title',
+             'vertical_label', 'width', 'height', 'only_graph',
+             'upper_limit', 'lower_limit', 'rigid', 'alt_autoscale',

Added: packages/pyrrd/trunk/debian/patches/series
===================================================================
--- packages/pyrrd/trunk/debian/patches/series	                        (rev 0)
+++ packages/pyrrd/trunk/debian/patches/series	2013-08-21 20:19:04 UTC (rev 25658)
@@ -0,0 +1 @@
+backported_fix_for_fetch.diff

Modified: packages/pyrrd/trunk/debian/rules
===================================================================
--- packages/pyrrd/trunk/debian/rules	2013-08-21 15:35:56 UTC (rev 25657)
+++ packages/pyrrd/trunk/debian/rules	2013-08-21 20:19:04 UTC (rev 25658)
@@ -30,6 +30,7 @@
 
 	rm pyrrd/*.pyc
 	rm pyrrd/util/*.pyc
+	rm CHECK_THIS_BEFORE_UPLOAD.txt
 
 install: build
 	dh_testdir

Modified: packages/pyrrd/trunk/debian/source/format
===================================================================
--- packages/pyrrd/trunk/debian/source/format	2013-08-21 15:35:56 UTC (rev 25657)
+++ packages/pyrrd/trunk/debian/source/format	2013-08-21 20:19:04 UTC (rev 25658)
@@ -1 +1 @@
-1.0
+3.0 (quilt)