[Python-modules-commits] r16706 - in packages/namebench/trunk/debian (9 files)
nomadium-guest at users.alioth.debian.org
nomadium-guest at users.alioth.debian.org
Sat Apr 23 01:10:52 UTC 2011
Date: Saturday, April 23, 2011 @ 01:10:32
Author: nomadium-guest
Revision: 16706
* Replace Build-Depends on python with python-all (>= 2.6.6-3~).
* Move comments from README.source to copyright file.
* Simplify watch file.
* Small fixes in Description and manpage.
* Remove debian/namebench.sgml.
* Remove debian/patches/594146.diff since it is not realling fixing that bug.
Modified:
packages/namebench/trunk/debian/changelog
packages/namebench/trunk/debian/control
packages/namebench/trunk/debian/copyright
packages/namebench/trunk/debian/namebench.rst
packages/namebench/trunk/debian/orig-tar.sh
packages/namebench/trunk/debian/watch
Deleted:
packages/namebench/trunk/debian/README.source
packages/namebench/trunk/debian/namebench.sgml
packages/namebench/trunk/debian/patches/
Deleted: packages/namebench/trunk/debian/README.source
===================================================================
--- packages/namebench/trunk/debian/README.source 2011-04-22 16:53:50 UTC (rev 16705)
+++ packages/namebench/trunk/debian/README.source 2011-04-23 01:10:32 UTC (rev 16706)
@@ -1,14 +0,0 @@
-
-
-The upstream tarball has been modified as follows, to comply with DFSG:
-
- * Directory nb_third_party was removed since it contained all the dependences
- needed to build and run namebench. As Debian Policy dictates, those
- dependences were listed as Depends and/or Build-Depends.
-
- * Directory cocoa has been removed since it contained binary files not
- useful at build time (those file are only needed to build namebench
- on Mac OS X. Also, this folder contains an unlicensed, undistributable,
- and unmodifieable file (cocoa/main.m).
-
- -- Miguel Landaeta <miguel at miguel.cc> Tue, 08 Jun 2010 19:10:44 -0430
Modified: packages/namebench/trunk/debian/changelog
===================================================================
--- packages/namebench/trunk/debian/changelog 2011-04-22 16:53:50 UTC (rev 16705)
+++ packages/namebench/trunk/debian/changelog 2011-04-23 01:10:32 UTC (rev 16706)
@@ -2,17 +2,19 @@
* Switch from dh_pysupport to dh_python2.
* Simplify rules file.
+ * Replace Build-Depends on python with python-all (>= 2.6.6-3~).
* 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.
+ * Move comments from README.source to copyright file.
+ * Simplify watch file.
+ * Small fixes in Description and manpage.
- -- Miguel Landaeta <miguel at miguel.cc> Tue, 19 Apr 2011 12:12:10 -0430
+ -- Miguel Landaeta <miguel at miguel.cc> Fri, 22 Apr 2011 20:32:15 -0430
namebench (1.3.1+dfsg-1) unstable; urgency=low
Modified: packages/namebench/trunk/debian/control
===================================================================
--- packages/namebench/trunk/debian/control 2011-04-22 16:53:50 UTC (rev 16705)
+++ packages/namebench/trunk/debian/control 2011-04-23 01:10:32 UTC (rev 16706)
@@ -3,7 +3,7 @@
Uploaders: Miguel Landaeta <miguel at miguel.cc>
Section: net
Priority: optional
-Build-Depends: debhelper (>= 7.0.50~), python, python-docutils
+Build-Depends: debhelper (>= 7.0.50~), python-all (>= 2.6.6-3~), python-docutils
Standards-Version: 3.9.2
XS-Python-Version: >= 2.5
Vcs-Svn: svn://svn.debian.org/svn/python-modules/packages/namebench/trunk
@@ -21,7 +21,7 @@
${misc:Depends},
${python:Depends}
Recommends: python-tk, www-browser
-Description: open-source DNS benchmark utility
+Description: 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
output, or standardized datasets in order to provide an individualized
Modified: packages/namebench/trunk/debian/copyright
===================================================================
--- packages/namebench/trunk/debian/copyright 2011-04-22 16:53:50 UTC (rev 16705)
+++ packages/namebench/trunk/debian/copyright 2011-04-23 01:10:32 UTC (rev 16706)
@@ -2,6 +2,15 @@
Upstream-Name: namebench
Upstream-Contact: Thomas Strömberg <tstromberg at google.com>
Source: http://code.google.com/p/namebench/
+Comment: The upstream tarball has been modified as follows, to comply with DFSG:
+ * Directory nb_third_party was removed since it contained all the dependences
+ needed to build and run namebench. As Debian Policy dictates, those
+ dependences were listed as Depends and/or Build-Depends.
+ .
+ * Directory cocoa has been removed since it contained binary files not
+ useful at build time (those file are only needed to build namebench
+ on Mac OS X. Also, this folder contains an unlicensed, undistributable,
+ and unmodifieable file (cocoa/main.m).
Files: *
Copyright: © 2009-2010, Google Inc.
Modified: packages/namebench/trunk/debian/namebench.rst
===================================================================
--- packages/namebench/trunk/debian/namebench.rst 2011-04-22 16:53:50 UTC (rev 16705)
+++ packages/namebench/trunk/debian/namebench.rst 2011-04-23 01:10:32 UTC (rev 16706)
@@ -13,7 +13,7 @@
SYNOPSIS
========
-namebench [nameserver1 ... [nameserverN]]
+**namebench [nameserver1 ... [nameserverN]]**
DESCRIPTION
===========
@@ -57,7 +57,7 @@
-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
@@ -70,5 +70,4 @@
SEE ALSO
========
-* dig(1)
-* host(1)
+**dig(1)**, **host(1)**.
Deleted: packages/namebench/trunk/debian/namebench.sgml
===================================================================
--- packages/namebench/trunk/debian/namebench.sgml 2011-04-22 16:53:50 UTC (rev 16705)
+++ packages/namebench/trunk/debian/namebench.sgml 2011-04-23 01:10:32 UTC (rev 16706)
@@ -1,311 +0,0 @@
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-
-<!-- Process this file with docbook-to-man to generate an nroff manual
- page: `docbook-to-man manpage.sgml > manpage.1'. You may view
- the manual page with: `docbook-to-man manpage.sgml | nroff -man |
- less'. A typical entry in a Makefile or Makefile.am is:
-
-manpage.1: manpage.sgml
- docbook-to-man $< > $@
-
-
- The docbook-to-man binary is found in the docbook-to-man package.
- Please remember that if you create the nroff version in one of the
- debian/rules file targets (such as build), you will need to include
- docbook-to-man in your Build-Depends control field.
-
- -->
-
- <!-- Fill in your name for FIRSTNAME and SURNAME. -->
- <!ENTITY dhfirstname "<firstname>Thomas</firstname>">
- <!ENTITY dhsurname "<surname>Stromberg</surname>">
- <!-- Please adjust the date whenever revising the manpage. -->
- <!ENTITY dhdate "<date>January 06, 2010</date>">
- <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
- allowed: see man(7), man(1). -->
- <!ENTITY dhsection "<manvolnum>1</manvolnum>">
- <!ENTITY dhemail "<email>miguel at miguel.cc</email>">
- <!ENTITY dhusername "Miguel Landaeta">
- <!ENTITY dhucpackage "<refentrytitle>NAMEBENCH</refentrytitle>">
- <!ENTITY dhpackage "namebench">
-
- <!ENTITY debian "<productname>Debian</productname>">
- <!ENTITY gnu "<acronym>GNU</acronym>">
-]>
-
-<refentry>
- <refentryinfo>
- <address>
- &dhemail;
- </address>
- <author>
- &dhfirstname;
- &dhsurname;
- </author>
- <copyright>
- <year>2010</year>
- <holder>&dhusername;</holder>
- </copyright>
- &dhdate;
- </refentryinfo>
- <refmeta>
- &dhucpackage;
-
- &dhsection;
- </refmeta>
- <refnamediv>
- <refname>&dhpackage;</refname>
-
- <refpurpose>open-source DNS benchmark utility</refpurpose>
- </refnamediv>
- <refsynopsisdiv>
- <cmdsynopsis>
- <command>&dhpackage;</command>
-
- <arg><option>nameserver1 <replaceable>...</replaceable></option>
-
- <arg><option>nameserverN</option></arg></arg>
- </cmdsynopsis>
- </refsynopsisdiv>
- <refsect1>
- <title>DESCRIPTION</title>
-
- <para><command>&dhpackage;</command> searches the fastest DNS
- servers available for your computer to use.
- <command>&dhpackage;</command> runs a fair and thorough benchmark
- using your web browser history, tcpdump output, or standardized
- datasets in order to provide an individualized recommendation.
- </para>
-
- </refsect1>
- <refsect1>
- <title>OPTIONS</title>
-
- <para>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
- <application>README</application> file or visit the project's
- website.</para>
-
- <variablelist>
- <varlistentry>
- <term><option>-h, --help</option>
- </term>
- <listitem>
- <para>Show summary of options.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>-r RUN_COUNT, --runs=RUN_COUNT</option>
- </term>
- <listitem>
- <para>Number of test runs to perform on each nameserver.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>-z CONFIG, --config=CONFIG</option>
- </term>
- <listitem>
- <para>Configuration file to use.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>-o OUTPUT_FILE, --output=OUTPUT_FILE</option>
- </term>
- <listitem>
- <para>Filename to write output to.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>-t TEMPLATE, --template=TEMPLATE</option>
- </term>
- <listitem>
- <para>Template to use for output generation (ascii, html, resolv.conf).</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>-c CSV_FILE, --csv_output=CSV_FILE</option>
- </term>
- <listitem>
- <para>Filename to write query details to (CSV).</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>-j HEALTH_THREAD_COUNT, --threads=HEALTH_THREAD_COUNT</option>
- </term>
- <listitem>
- <para>Number of health check threads to use.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>-J BENCHMARK_THREAD_COUNT, --threads=BENCHMARK_THREAD_COUNT</option>
- </term>
- <listitem>
- <para>Number of benchmark threads to use.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>-P PING_TIMEOUT, --ping_timeout=PING_TIMEOUT</option>
- </term>
- <listitem>
- <para>Number of seconds ping requests timeout in.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>-y TIMEOUT, --timeout=TIMEOUT</option>
- </term>
- <listitem>
- <para>Number of seconds general requests timeout in.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>-Y HEALTH_TIMEOUT, --health_timeout=HEALTH_TIMEOUT</option>
- </term>
- <listitem>
- <para>Health check timeout (in seconds).</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>-i INPUT_SOURCE, --import=INPUT_SOURCE</option>
- </term>
- <listitem>
- <para>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).</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>-I, --invalidate_cache</option>
- </term>
- <listitem>
- <para>Force health cache to be invalidated.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>-q QUERY_COUNT, --tests=QUERY_COUNT</option>
- </term>
- <listitem>
- <para>Number of queries per run.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>-m SELECT_MODE, --select_mode=SELECT_MODE</option>
- </term>
- <listitem>
- <para>Selection algorithm to use (weighted, random, chunk).</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>-s NUM_SERVERS, --num_servers=NUM_SERVERS</option>
- </term>
- <listitem>
- <para>Number of nameservers to include in test.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>-S, --system_only</option>
- </term>
- <listitem>
- <para>Only test the currently configured system nameservers.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>-w, --open_webbrowser</option>
- </term>
- <listitem>
- <para>Opens the final report in your browser.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>-u, --upload_results</option>
- </term>
- <listitem>
- <para>Upload anonmyized results to SITE_URL (default: False).</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>-U SITE_URL, --site_url=SITE_URL</option>
- </term>
- <listitem>
- <para>URL to upload results to (default: http://namebench.appspot.com/)</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>-H, --hide_results</option>
- </term>
- <listitem>
- <para>Upload results, but keep them hidden from indexes.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>-x, --no_gui</option>
- </term>
- <listitem>
- <para>Disable GUI.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>-C, --enable-censorship-checks</option>
- </term>
- <listitem>
- <para>Enable censorship checks.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>-6, --ipv6_only</option>
- </term>
- <listitem>
- <para>Only include IPv6 name servers.</para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><option>-O, --only</option>
- </term>
- <listitem>
- <para>Only test nameservers passed as arguments.</para>
- </listitem>
- </varlistentry>
- </variablelist>
- </refsect1>
- <refsect1>
- <title>SEE ALSO</title>
-
- <para>dig(1), host(1).</para>
-
- </refsect1>
- <refsect1>
- <title>AUTHOR</title>
-
- <para>This manual page was written by &dhusername; <&dhemail;>
- 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.
- </para>
- <para>On Debian systems, the complete text of the GNU General Public
- License can be found in /usr/share/common-licenses/GPL.
- </para>
-
- </refsect1>
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:2
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:nil
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
-
-
Modified: packages/namebench/trunk/debian/orig-tar.sh
===================================================================
--- packages/namebench/trunk/debian/orig-tar.sh 2011-04-22 16:53:50 UTC (rev 16705)
+++ packages/namebench/trunk/debian/orig-tar.sh 2011-04-23 01:10:32 UTC (rev 16706)
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh
set -x
Modified: packages/namebench/trunk/debian/watch
===================================================================
--- packages/namebench/trunk/debian/watch 2011-04-22 16:53:50 UTC (rev 16705)
+++ packages/namebench/trunk/debian/watch 2011-04-23 01:10:32 UTC (rev 16706)
@@ -1,7 +1,5 @@
version=3
-opts=\
-downloadurlmangle=s|.*[?]name=(.*?)&.*|http://namebench.googlecode.com/files/$1|,\
-filenamemangle=s|[^/]+[?]name=(.*?)&.*|$1|,\
-dversionmangle=s/\+dfsg// \
-http://code.google.com/p/namebench/downloads/detail[?]name=namebench-(.*)-source.tgz&.* \
+opts=dversionmangle=s/\+dfsg// \
+http://code.google.com/p/namebench/downloads/list \
+http://namebench.googlecode.com/files/namebench-(.*)-source.tgz \
debian debian/orig-tar.sh
More information about the Python-modules-commits
mailing list