[Python-modules-commits] r12047 - in packages/namebench (11 files)
nomadium-guest at users.alioth.debian.org
nomadium-guest at users.alioth.debian.org
Sun Feb 28 21:28:07 UTC 2010
Date: Sunday, February 28, 2010 @ 21:28:06
Author: nomadium-guest
Revision: 12047
Create branch for upcoming upstream release 1.2.
Added:
packages/namebench/branches/
packages/namebench/branches/1.2/
packages/namebench/branches/1.2/debian/namebench.preinst
packages/namebench/branches/1.2/debian/orig-tar.sh
Modified:
packages/namebench/branches/1.2/debian/changelog
packages/namebench/branches/1.2/debian/copyright
packages/namebench/branches/1.2/debian/namebench.install
packages/namebench/branches/1.2/debian/namebench.links
packages/namebench/branches/1.2/debian/namebench.sgml
packages/namebench/branches/1.2/debian/rules
packages/namebench/branches/1.2/debian/watch
Modified: packages/namebench/branches/1.2/debian/changelog
===================================================================
--- packages/namebench/trunk/debian/changelog 2010-02-28 20:36:29 UTC (rev 12046)
+++ packages/namebench/branches/1.2/debian/changelog 2010-02-28 21:28:06 UTC (rev 12047)
@@ -1,3 +1,9 @@
+namebench (1.2-RC2+dfsg-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Miguel Landaeta <miguel at miguel.cc> Sun, 28 Feb 2010 16:44:30 -0430
+
namebench (1.1+dfsg-2) unstable; urgency=low
* Fixed FTBFS with Python 2.6 as default. (Closes: #571551).
Modified: packages/namebench/branches/1.2/debian/copyright
===================================================================
--- packages/namebench/trunk/debian/copyright 2010-02-28 20:36:29 UTC (rev 12046)
+++ packages/namebench/branches/1.2/debian/copyright 2010-02-28 21:28:06 UTC (rev 12047)
@@ -1,7 +1,7 @@
The sources where downloaded as http://namebench.googlecode.com/files/namebench-1.1.tgz.
Files: *
-Copyright: © 2009 Google Inc.
+Copyright: © 2009-2010 Google Inc.
Author: Thomas Strömberg <tstromberg at google.com>
License: Apache-2.0
The full text of the Apache 2.0 license is distributed as LICENSE in
Modified: packages/namebench/branches/1.2/debian/namebench.install
===================================================================
--- packages/namebench/trunk/debian/namebench.install 2010-02-28 20:36:29 UTC (rev 12046)
+++ packages/namebench/branches/1.2/debian/namebench.install 2010-02-28 21:28:06 UTC (rev 12047)
@@ -1,5 +1,5 @@
install/usr/namebench/templates usr/share/namebench
install/usr/namebench/data usr/share/namebench
-install/usr/namebench/namebench.cfg etc
+install/usr/namebench/config/* etc/namebench
install/usr/bin/* usr/share/namebench
install/usr/lib/* usr/lib
Modified: packages/namebench/branches/1.2/debian/namebench.links
===================================================================
--- packages/namebench/trunk/debian/namebench.links 2010-02-28 20:36:29 UTC (rev 12046)
+++ packages/namebench/branches/1.2/debian/namebench.links 2010-02-28 21:28:06 UTC (rev 12047)
@@ -1,2 +1,2 @@
-etc/namebench.cfg usr/share/namebench/namebench.cfg
+etc/namebench usr/share/namebench/config
usr/share/namebench/namebench.py usr/bin/namebench
Added: packages/namebench/branches/1.2/debian/namebench.preinst
===================================================================
--- packages/namebench/branches/1.2/debian/namebench.preinst (rev 0)
+++ packages/namebench/branches/1.2/debian/namebench.preinst 2010-02-28 21:28:06 UTC (rev 12047)
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+set -e
+
+# Remove a no-longer used conffile
+rm_conffile() {
+ local PKGNAME="$1"
+ local CONFFILE="$2"
+
+ [ -e "$CONFFILE" ] || return 0
+
+ local md5sum="$(md5sum $CONFFILE | sed -e 's/ .*//')"
+ local old_md5sum="$(dpkg-query -W -f='${Conffiles}' $PKGNAME | \
+ sed -n -e "\' $CONFFILE ' { s/ obsolete$//; s/.* //; p }")"
+ if [ "$md5sum" != "$old_md5sum" ]; then
+ echo "Obsolete conffile $CONFFILE has been modified by you."
+ echo "Saving as $CONFFILE.dpkg-bak ..."
+ mv -f "$CONFFILE" "$CONFFILE".dpkg-bak
+ else
+ echo "Removing obsolete conffile $CONFFILE ..."
+ rm -f "$CONFFILE"
+ fi
+}
+
+case "$1" in
+install|upgrade)
+ rm_conffile namebench "/etc/namebench.cfg"
+ ;;
+*)
+ echo "preinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
Modified: packages/namebench/branches/1.2/debian/namebench.sgml
===================================================================
--- packages/namebench/trunk/debian/namebench.sgml 2010-02-28 20:36:29 UTC (rev 12046)
+++ packages/namebench/branches/1.2/debian/namebench.sgml 2010-02-28 21:28:06 UTC (rev 12047)
@@ -124,40 +124,41 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><option>-j THREAD_COUNT, --threads=THREAD_COUNT</option>
+ <term><option>-j HEALTH_THREAD_COUNT, --threads=HEALTH_THREAD_COUNT</option>
</term>
<listitem>
- <para>Number of threads to use.</para>
+ <para>Number of health check threads to use.</para>
</listitem>
</varlistentry>
<varlistentry>
- <term><option>-y TIMEOUT, --timeout=TIMEOUT</option>
+ <term><option>-J BENCHMARK_THREAD_COUNT, --threads=BENCHMARK_THREAD_COUNT</option>
</term>
<listitem>
- <para>Number of seconds general requests timeout in.</para>
+ <para>Number of benchmark threads to use.</para>
</listitem>
</varlistentry>
<varlistentry>
- <term><option>-Y HEALTH_TIMEOUT, --health_timeout=HEALTH_TIMEOUT</option>
+ <term><option>-y TIMEOUT, --timeout=TIMEOUT</option>
</term>
<listitem>
- <para>Health check timeout (in seconds).</para>
+ <para>Number of seconds general requests timeout in.</para>
</listitem>
</varlistentry>
<varlistentry>
- <term><option>-d DATA_FILE, --datafile=DATA_FILE</option>
+ <term><option>-Y HEALTH_TIMEOUT, --health_timeout=HEALTH_TIMEOUT</option>
</term>
<listitem>
- <para>File containing a list of domain names to query.</para>
+ <para>Health check timeout (in seconds).</para>
</listitem>
</varlistentry>
<varlistentry>
- <term><option>-i IMPORT_SOURCE, --import=IMPORT_SOURCE</option>
+ <term><option>-i INPUT_SOURCE, --import=INPUT_SOURCE</option>
</term>
<listitem>
- <para>Import history from an external application (chrome,
- chromium, epiphany, firefox, internet_explorer, konqueror, opera,
- safari, seamonkey, squid).</para>
+ <para>Import hostnames from an filename or application (alexa,
+ camino, chrome, chromium, epiphany, firefox, flock, galeon, icab,
+ internet_explorer, konqueror, midori, omniweb, opera, safari,
+ seamonkey, squid, sunrise).</para>
</listitem>
</varlistentry>
<varlistentry>
@@ -168,7 +169,7 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><option>-t TEST_COUNT, --tests=TEST_COUNT</option>
+ <term><option>-q QUERY_COUNT, --tests=QUERY_COUNT</option>
</term>
<listitem>
<para>Number of queries per run.</para>
Added: packages/namebench/branches/1.2/debian/orig-tar.sh
===================================================================
--- packages/namebench/branches/1.2/debian/orig-tar.sh (rev 0)
+++ packages/namebench/branches/1.2/debian/orig-tar.sh 2010-02-28 21:28:06 UTC (rev 12047)
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -x
+
+# called by uscan with '--upstream-version' <version> <file>
+echo "version $2"
+package=`dpkg-parsechangelog | sed -n 's/^Source: //p'`
+debian_version=`dpkg-parsechangelog | sed -ne 's/^Version: \(.*+dfsg\)-.*/\1/p'`
+TAR=../"$package"_${debian_version}.orig.tar.gz
+DIR=$package-${debian_version}.orig
+
+# clean up the upstream tarball
+tar -zxvf $3 && mv $package-$2 $DIR
+GZIP=--best tar -c -z -f $TAR --exclude 'cocoa' --exclude 'third_party' $DIR
+rm -rf $3 $DIR
Property changes on: packages/namebench/branches/1.2/debian/orig-tar.sh
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:eol-style
+ native
Modified: packages/namebench/branches/1.2/debian/rules
===================================================================
--- packages/namebench/trunk/debian/rules 2010-02-28 20:36:29 UTC (rev 12046)
+++ packages/namebench/branches/1.2/debian/rules 2010-02-28 21:28:06 UTC (rev 12047)
@@ -1,4 +1,8 @@
#!/usr/bin/make -f
+
+DEB_UPSTREAM_VERSION := \
+ $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)+dfsg-.*/\1/p')
+
%:
NO_THIRD_PARTY=yes dh --with python-support $@
@@ -13,3 +17,11 @@
override_dh_auto_build:
dh_auto_build
docbook-to-man debian/namebench.sgml > namebench.1
+
+get-orig-source:
+ uscan \
+ --verbose \
+ --no-symlink \
+ --upstream-version $(DEB_UPSTREAM_VERSION) \
+ --download-version $(DEB_UPSTREAM_VERSION) \
+ --force-download
Modified: packages/namebench/branches/1.2/debian/watch
===================================================================
--- packages/namebench/trunk/debian/watch 2010-02-28 20:36:29 UTC (rev 12046)
+++ packages/namebench/branches/1.2/debian/watch 2010-02-28 21:28:06 UTC (rev 12047)
@@ -1,4 +1,4 @@
version=3
opts=dversionmangle=s/\+dfsg// \
http://code.google.com/p/namebench/downloads/list \
-http://namebench.googlecode.com/files/namebench-(.*)\.tgz debian
+http://namebench.googlecode.com/files/namebench-(.*)\.tgz debian debian/orig-tar.sh
More information about the Python-modules-commits
mailing list