[Python-modules-commits] r16757 - in packages/namebench/trunk/debian (5 files)

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

    Date: Sunday, April 24, 2011 @ 22:36:08
  Author: nomadium-guest
Revision: 16757

* Install libnamebench as private module.

Modified:
  packages/namebench/trunk/debian/changelog
  packages/namebench/trunk/debian/control
  packages/namebench/trunk/debian/namebench.install
  packages/namebench/trunk/debian/namebench.links
  packages/namebench/trunk/debian/patches/594146.diff

Modified: packages/namebench/trunk/debian/changelog
===================================================================
--- packages/namebench/trunk/debian/changelog	2011-04-24 21:47:59 UTC (rev 16756)
+++ packages/namebench/trunk/debian/changelog	2011-04-24 22:36:08 UTC (rev 16757)
@@ -16,6 +16,7 @@
   * Simplify watch file.
   * Small fixes in Description and manpage.
   * Replace XS-P-V deprecated field with X-P-V.
+  * Install libnamebench as private module.
 
  -- Miguel Landaeta <miguel at miguel.cc>  Sun, 24 Apr 2011 13:54:47 -0430
 

Modified: packages/namebench/trunk/debian/control
===================================================================
--- packages/namebench/trunk/debian/control	2011-04-24 21:47:59 UTC (rev 16756)
+++ packages/namebench/trunk/debian/control	2011-04-24 22:36:08 UTC (rev 16757)
@@ -3,7 +3,7 @@
 Uploaders: Miguel Landaeta <miguel at miguel.cc>
 Section: net
 Priority: optional
-Build-Depends: debhelper (>= 7.0.50~), python-all (>= 2.6.6-3~), python-docutils
+Build-Depends: debhelper (>= 7.0.50~), python (>= 2.6.6-3~), python-docutils
 Standards-Version: 3.9.2
 X-Python-Version: >= 2.5
 Vcs-Svn: svn://svn.debian.org/svn/python-modules/packages/namebench/trunk

Modified: packages/namebench/trunk/debian/namebench.install
===================================================================
--- packages/namebench/trunk/debian/namebench.install	2011-04-24 21:47:59 UTC (rev 16756)
+++ packages/namebench/trunk/debian/namebench.install	2011-04-24 22:36:08 UTC (rev 16757)
@@ -1,5 +1,5 @@
-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
+usr/bin/*                                  usr/lib/namebench
+usr/lib/python2.*/*-packages/libnamebench  usr/lib/namebench
+usr/namebench/config/*                     etc/namebench
+usr/namebench/data                         usr/share/namebench
+usr/namebench/templates                    usr/share/namebench

Modified: packages/namebench/trunk/debian/namebench.links
===================================================================
--- packages/namebench/trunk/debian/namebench.links	2011-04-24 21:47:59 UTC (rev 16756)
+++ packages/namebench/trunk/debian/namebench.links	2011-04-24 22:36:08 UTC (rev 16757)
@@ -1,2 +1,2 @@
-etc/namebench                     usr/share/namebench/config
-usr/share/namebench/namebench.py  usr/bin/namebench
+etc/namebench                   usr/share/namebench/config
+usr/lib/namebench/namebench.py  usr/bin/namebench

Modified: packages/namebench/trunk/debian/patches/594146.diff
===================================================================
--- packages/namebench/trunk/debian/patches/594146.diff	2011-04-24 21:47:59 UTC (rev 16756)
+++ packages/namebench/trunk/debian/patches/594146.diff	2011-04-24 22:36:08 UTC (rev 16757)
@@ -1,6 +1,7 @@
 Description: Decode GeoIP results with the correct encoding to avoid crashes
 Author: Miguel Landaeta <miguel at miguel.cc>
 Forwarded: no
+Bug-Debian: http://bugs.debian.org/594146
 Last-Update: 2011-04-24
 
 --- namebench-1.3.1+dfsg.orig/libnamebench/geoip.py
@@ -9,7 +10,7 @@
    h = httplib2.Http(tempfile.gettempdir(), timeout=10)
    unused_resp, content = h.request('http://j.maxmind.com/app/geoip.js', 'GET')
    keep = ['region_name', 'country_name', 'city', 'latitude', 'longitude', 'country_code']
-+  # GeoIP lookups results are encoded in latin1, please see http://bugs.debian.org/bug=594146
++  # GeoIP lookups results are encoded in latin1, please see http://bugs.debian.org/594146
 +  content = content.decode('ISO-8859-1')
    results = dict([x for x in re.findall("geoip_(.*?)\(.*?\'(.*?)\'", content) if x[0] in keep])
    results.update({'source': 'mmind'})