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

nomadium-guest at users.alioth.debian.org nomadium-guest at users.alioth.debian.org
Sun Nov 21 00:12:50 UTC 2010


    Date: Sunday, November 21, 2010 @ 00:12:29
  Author: nomadium-guest
Revision: 14942

* Switch from dh_pysupport to dh_python2.
* Simplify rules file.
* Bump Standards-Version to 3.9.1. No changes were required.
* Replace docbook-to-man with rst2man as tool to generate the manpage.

Added:
  packages/namebench/trunk/debian/namebench.rst
Modified:
  packages/namebench/trunk/debian/changelog
  packages/namebench/trunk/debian/control
  packages/namebench/trunk/debian/namebench.install
  packages/namebench/trunk/debian/rules

Modified: packages/namebench/trunk/debian/changelog
===================================================================
--- packages/namebench/trunk/debian/changelog	2010-11-20 23:33:12 UTC (rev 14941)
+++ packages/namebench/trunk/debian/changelog	2010-11-21 00:12:29 UTC (rev 14942)
@@ -1,3 +1,12 @@
+namebench (1.3.1+dfsg-2) UNRELEASED; urgency=low
+
+  * Switch from dh_pysupport to dh_python2.
+  * Simplify rules file.
+  * Bump Standards-Version to 3.9.1. No changes were required.
+  * Replace docbook-to-man with rst2man as tool to generate the manpage.
+
+ -- Miguel Landaeta <miguel at miguel.cc>  Sat, 20 Nov 2010 19:25:43 -0430
+
 namebench (1.3.1+dfsg-1) unstable; urgency=low
 
   * New upstream release.

Modified: packages/namebench/trunk/debian/control
===================================================================
--- packages/namebench/trunk/debian/control	2010-11-20 23:33:12 UTC (rev 14941)
+++ packages/namebench/trunk/debian/control	2010-11-21 00:12:29 UTC (rev 14942)
@@ -3,9 +3,8 @@
 Uploaders: Miguel Landaeta <miguel at miguel.cc>
 Section: net
 Priority: optional
-Build-Depends: debhelper (>= 7.0.50~), python-support (>= 0.8), python,
-               docbook-to-man (>= 1:2.0.0)
-Standards-Version: 3.8.4
+Build-Depends: debhelper (>= 7.0.50~), python, python-docutils
+Standards-Version: 3.9.1
 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/
@@ -13,10 +12,9 @@
 
 Package: namebench
 Architecture: all
-Depends: python, python-support (>= 0.8), ${python:Depends},
-         python-dnspython (>= 1.8), python-graphy (>= 1.0),
-         python-httplib2 (>= 0.5), python-jinja2 (>= 2.2.1),
-         python-simplejson, ${misc:Depends}
+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
 Description: open-source DNS benchmark utility
  Searches the fastest DNS servers available for your computer to use. namebench

Modified: packages/namebench/trunk/debian/namebench.install
===================================================================
--- packages/namebench/trunk/debian/namebench.install	2010-11-20 23:33:12 UTC (rev 14941)
+++ packages/namebench/trunk/debian/namebench.install	2010-11-21 00:12:29 UTC (rev 14942)
@@ -1,5 +1,5 @@
-install/usr/namebench/templates      usr/share/namebench
-install/usr/namebench/data           usr/share/namebench
-install/usr/namebench/config/*       etc/namebench
-install/usr/bin/*                    usr/share/namebench
-install/usr/lib/*                    usr/lib
+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

Added: packages/namebench/trunk/debian/namebench.rst
===================================================================
--- packages/namebench/trunk/debian/namebench.rst	                        (rev 0)
+++ packages/namebench/trunk/debian/namebench.rst	2010-11-21 00:12:29 UTC (rev 14942)
@@ -0,0 +1,74 @@
+===========
+ namebench
+===========
+
+---------------------------------
+open-source DNS benchmark utility
+---------------------------------
+
+:Author: Thomas Strömberg <tstromberg at google.com>
+:Date:   2010-11-20
+:Manual section: 1
+
+SYNOPSIS
+========
+
+namebench [nameserver1 ... [nameserverN]] 
+
+DESCRIPTION
+===========
+
+namebench searches the fastest DNS servers available for your computer
+to use. namebench runs a fair and thorough benchmark using your web
+browser history, tcpdump output, or standardized datasets in order to
+provide an individualized recommendation.
+
+
+OPTIONS
+=======
+
+This program follows the usual GNU command line syntax, with long
+options starting with two dashes (-). A summary of options is
+included below.  For a complete description, see the README file
+or visit the project's website.
+
+-h, --help  Show summary of options.
+-r RUN_COUNT, --runs=RUN_COUNT  Number of test runs to perform on each nameserver.
+-z CONFIG, --config=CONFIG  Configuration file to use.
+-o OUTPUT_FILE, --output=OUTPUT_FILE  Filename to write output to.
+-t TEMPLATE, --template=TEMPLATE  Template to use for output generation (ascii, html, resolv.conf).
+-c CSV_FILE, --csv_output=CSV_FILE  Filename to write query details to (CSV).
+-j HEALTH_THREAD_COUNT, --threads=HEALTH_THREAD_COUNT  Number of health check threads to use.
+-J BENCHMARK_THREAD_COUNT, --threads=BENCHMARK_THREAD_COUNT  Number of benchmark threads to use.
+-P PING_TIMEOUT, --ping_timeout=PING_TIMEOUT  Number of seconds ping requests timeout in.
+-y TIMEOUT, --timeout=TIMEOUT  Number of seconds general requests timeout in.
+-Y HEALTH_TIMEOUT, --health_timeout=HEALTH_TIMEOUT  Health check timeout (in seconds).
+-i INPUT_SOURCE, --import=INPUT_SOURCE  Import hostnames from an filename or application (alexa, cachehit, cachemiss, cachemix, camino, chrome, chromium, epiphany, firefox, flock, galeon, icab, internet_explorer, konqueror, midori, omniweb, opera, safari, seamonkey, squid, sunrise).
+-I, --invalidate_cache  Force health cache to be invalidated.
+-q QUERY_COUNT, --tests=QUERY_COUNT  Number of queries per run.
+-m SELECT_MODE, --select_mode=SELECT_MODE  Selection algorithm to use (weighted, random, chunk).
+-s NUM_SERVERS, --num_servers=NUM_SERVERS  Number of nameservers to include in test.
+-S, --system_only  Only test the currently configured system nameservers.
+-w, --open_webbrowser  Opens the final report in your browser.
+-u, --upload_results  Upload anonmyized results to SITE_URL (default: False).
+-U SITE_URL, --site_url=SITE_URL  URL to upload results to (default: http://namebench.appspot.com/).
+-H, --hide_results  Upload results, but keep them hidden from indexes.
+-x, --no_gui  Disable GUI.
+-C, --enable-censorship-checks  Enable censorship checks.
+-6, --ipv6_only  Only include IPv6 name servers.
+-O, --only  Only test nameservers passed as arguments.
+  
+COPYRIGHT
+=========
+This manual page was written by Miguel Landaeta <miguel at miguel.cc> for the
+Debian system (but may be used by others). Permission is granted to copy,
+distribute and/or modify this document under the terms of the terms of GNU
+General Public License, Version 2 or any later version published by the Free
+Software Foundation. On Debian systems, the complete text of the GNU General
+Public License can be found in /usr/share/common-licenses/GPL.
+
+SEE ALSO
+========
+
+* dig(1)
+* host(1)

Modified: packages/namebench/trunk/debian/rules
===================================================================
--- packages/namebench/trunk/debian/rules	2010-11-20 23:33:12 UTC (rev 14941)
+++ packages/namebench/trunk/debian/rules	2010-11-21 00:12:29 UTC (rev 14942)
@@ -1,28 +1,23 @@
 #!/usr/bin/make -f
 
-DEB_UPSTREAM_VERSION := \
-	$(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)+dfsg-.*/\1/p')
+export NO_THIRD_PARTY=yes
 
 %:
-	NO_THIRD_PARTY=yes dh --with python-support $@
+	dh --with python2 $@
 
 override_dh_auto_install:
-	NO_THIRD_PARTY=yes python setup.py install --root install --prefix /usr
-	rm install/usr/lib/python*/site-packages/namebench.py
+	python setup.py install --root debian/tmp --install-layout=deb
+	rm debian/tmp/usr/lib/python*/*-packages/namebench.py
 
-override_dh_auto_clean:
-	dh_auto_clean
-	rm -rf install
-
 override_dh_auto_build:
 	dh_auto_build
-	docbook-to-man debian/namebench.sgml > namebench.1
+	rst2man debian/namebench.rst namebench.1
 
 get-orig-source:
+	cd $(dir $(firstword $(MAKEFILE_LIST)))../ && \
 	uscan \
 		--verbose \
 		--no-symlink \
-		--upstream-version $(DEB_UPSTREAM_VERSION) \
-		--download-version $(DEB_UPSTREAM_VERSION) \
-		--destdir .                                \
+		--destdir $(CURDIR) \
+		--watchfile debian/watch \
 		--force-download




More information about the Python-modules-commits mailing list