[Python-modules-commits] r16652 - in packages/namebench/trunk/debian (8 files)

nomadium-guest at users.alioth.debian.org nomadium-guest at users.alioth.debian.org
Tue Apr 19 19:02:45 UTC 2011 

    Date: Tuesday, April 19, 2011 @ 19:02:36
  Author: nomadium-guest
Revision: 16652

* Bump Standards-Version to 3.9.2. No changes were required.
* Python transition:
  - Add support for python2.7.
  - Drop support for python2.5.
* Replace invalid Unicode chars in simplejson call to avoid crashes.
  (Closes: #594146).
* Drop versioned dependencies since they are satisfied even in stable.
* Make copyright file DEP-5 compliant.

Added:
  packages/namebench/trunk/debian/patches/
  packages/namebench/trunk/debian/patches/594146.diff
  packages/namebench/trunk/debian/patches/series
Modified:
  packages/namebench/trunk/debian/changelog
  packages/namebench/trunk/debian/control
  packages/namebench/trunk/debian/copyright
  packages/namebench/trunk/debian/namebench.install
  packages/namebench/trunk/debian/rules

Modified: packages/namebench/trunk/debian/changelog
===================================================================
--- packages/namebench/trunk/debian/changelog	2011-04-19 16:16:08 UTC (rev 16651)
+++ packages/namebench/trunk/debian/changelog	2011-04-19 19:02:36 UTC (rev 16652)
@@ -2,10 +2,17 @@
 
   * Switch from dh_pysupport to dh_python2.
   * Simplify rules file.
-  * Bump Standards-Version to 3.9.1. No changes were required.
+  * Bump Standards-Version to 3.9.2. No changes were required.
   * Replace docbook-to-man with rst2man as tool to generate the manpage.
+  * Python transition:
+    - Add support for python2.7.
+    - Drop support for python2.5.
+  * Replace invalid Unicode chars in simplejson call to avoid crashes.
+    (Closes: #594146).
+  * Drop versioned dependencies since they are satisfied even in stable.
+  * Make copyright file DEP-5 compliant.
 
- -- Miguel Landaeta <miguel at miguel.cc>  Sat, 20 Nov 2010 19:25:43 -0430
+ -- Miguel Landaeta <miguel at miguel.cc>  Tue, 19 Apr 2011 12:12:10 -0430
 
 namebench (1.3.1+dfsg-1) unstable; urgency=low
 

Modified: packages/namebench/trunk/debian/control
===================================================================
--- packages/namebench/trunk/debian/control	2011-04-19 16:16:08 UTC (rev 16651)
+++ packages/namebench/trunk/debian/control	2011-04-19 19:02:36 UTC (rev 16652)
@@ -4,7 +4,7 @@
 Section: net
 Priority: optional
 Build-Depends: debhelper (>= 7.0.50~), python, python-docutils
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 XS-Python-Version: >= 2.5
 Vcs-Svn: svn://svn.debian.org/svn/python-modules/packages/namebench/trunk
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/namebench/trunk/
@@ -12,10 +12,15 @@
 
 Package: namebench
 Architecture: all
-Depends: python, ${python:Depends}, python-dnspython (>= 1.8),
- python-graphy (>= 1.0), python-httplib2 (>= 0.5), python-jinja2 (>= 2.2.1),
- python-simplejson, ${misc:Depends}
-Recommends: python-tk (>= 2.4), www-browser
+Depends:
+ python-dnspython,
+ python-graphy,
+ python-httplib2,
+ python-jinja2,
+ python-simplejson,
+ ${misc:Depends},
+ ${python:Depends}
+Recommends: python-tk, www-browser
 Description: open-source DNS benchmark utility
  Searches the fastest DNS servers available for your computer to use. namebench
  runs a fair and thorough benchmark using your web browser history, tcpdump

Modified: packages/namebench/trunk/debian/copyright
===================================================================
--- packages/namebench/trunk/debian/copyright	2011-04-19 16:16:08 UTC (rev 16651)
+++ packages/namebench/trunk/debian/copyright	2011-04-19 19:02:36 UTC (rev 16652)
@@ -1,15 +1,40 @@
-The sources where downloaded as http://namebench.googlecode.com/files/namebench-1.1.tgz.
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=174
+Upstream-Name: namebench
+Upstream-Contact: Thomas Strömberg <tstromberg at google.com>
+Source: http://code.google.com/p/namebench/
 
 Files: *
-Copyright: © 2009-2010 Google Inc.
-Author: Thomas Strömberg <tstromberg at google.com>
+Copyright: © 2009-2010, Google Inc.
 License: Apache-2.0
- The full text of the Apache 2.0 license is distributed as LICENSE in
- namebench's source, and is distributed in /usr/share/common-licenses/Apache-2.0
- on Debian systems.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ .
+     http://www.apache.org/licenses/LICENSE-2.0
+     /usr/share/common-licenses/Apache-2.0 (on Debian systems)
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
 
 Files: debian/*
-Copyright: © 2010 Miguel Landaeta <miguel at miguel.cc>
+Copyright: © 2010-2011, Miguel Landaeta <miguel at miguel.cc>
 License: GPL-2+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ .
  The full text of the GPL is distributed in /usr/share/common-licenses/GPL-2
  on Debian systems.

Modified: packages/namebench/trunk/debian/namebench.install
===================================================================
--- packages/namebench/trunk/debian/namebench.install	2011-04-19 16:16:08 UTC (rev 16651)
+++ packages/namebench/trunk/debian/namebench.install	2011-04-19 19:02:36 UTC (rev 16652)
@@ -1,5 +1,5 @@
-usr/namebench/templates  usr/share/namebench
-usr/namebench/data       usr/share/namebench
-usr/namebench/config/*   etc/namebench
 usr/bin/*                usr/share/namebench
 usr/lib/*                usr/lib
+usr/namebench/config/*   etc/namebench
+usr/namebench/data       usr/share/namebench
+usr/namebench/templates  usr/share/namebench

Added: packages/namebench/trunk/debian/patches/594146.diff
===================================================================
--- packages/namebench/trunk/debian/patches/594146.diff	                        (rev 0)
+++ packages/namebench/trunk/debian/patches/594146.diff	2011-04-19 19:02:36 UTC (rev 16652)
@@ -0,0 +1,18 @@
+Description: Replace invalid unicode chars in simplejson call
+ If those illegal characters are not removed, they could crash the program.
+Author: Miguel Landaeta <miguel at miguel.cc>
+Bug-Debian: http://bugs.debian.org/594146
+Forwarded: no
+Last-Update: 2010-08-25
+
+--- namebench-1.3.1+dfsg.orig/libnamebench/reporter.py
++++ namebench-1.3.1+dfsg/libnamebench/reporter.py
+@@ -419,7 +419,7 @@ class ReportGenerator(object):
+ 
+   def CreateJsonData(self):
+     sharing_data = self._CreateSharingData()
+-    return simplejson.dumps(sharing_data)
++    return simplejson.dumps(unicode(sharing_data, 'utf-8', 'replace'))
+ 
+   def _ResponseToCountTtlText(self, response):
+     """For a given DNS response, parse the most important details out.

Added: packages/namebench/trunk/debian/patches/series
===================================================================
--- packages/namebench/trunk/debian/patches/series	                        (rev 0)
+++ packages/namebench/trunk/debian/patches/series	2011-04-19 19:02:36 UTC (rev 16652)
@@ -0,0 +1 @@
+594146.diff

Modified: packages/namebench/trunk/debian/rules
===================================================================
--- packages/namebench/trunk/debian/rules	2011-04-19 16:16:08 UTC (rev 16651)
+++ packages/namebench/trunk/debian/rules	2011-04-19 19:02:36 UTC (rev 16652)
@@ -1,9 +1,7 @@
 #!/usr/bin/make -f
-
 export NO_THIRD_PARTY=yes
-
 %:
-	dh --with python2 $@
+	dh $@ --with python2
 
 override_dh_auto_install:
 	python setup.py install --root debian/tmp --install-layout=deb

More information about the Python-modules-commits mailing list