[Python-modules-commits] r12203 - in packages/namebench/trunk/debian (6 files)
nomadium-guest at users.alioth.debian.org
nomadium-guest at users.alioth.debian.org
Sun Mar 7 01:14:39 UTC 2010
Date: Sunday, March 7, 2010 @ 01:14:31
Author: nomadium-guest
Revision: 12203
* Updated XS-Python-Version, Build-Depends and Depends since this version doesn't work with Python 2.4 anymore.
* Fixed get-orig-source in order to leave the tarball in the current directory.
* Added a better handling of conffiles during upgrades.
Added:
packages/namebench/trunk/debian/namebench.postinst
Modified:
packages/namebench/trunk/debian/changelog
packages/namebench/trunk/debian/control
packages/namebench/trunk/debian/namebench.preinst
packages/namebench/trunk/debian/orig-tar.sh
packages/namebench/trunk/debian/rules
Modified: packages/namebench/trunk/debian/changelog
===================================================================
--- packages/namebench/trunk/debian/changelog 2010-03-06 22:40:31 UTC (rev 12202)
+++ packages/namebench/trunk/debian/changelog 2010-03-07 01:14:31 UTC (rev 12203)
@@ -6,7 +6,7 @@
* Update years in copyright file.
* Configuration files are now installed in /etc/namebench directory.
- -- Miguel Landaeta <miguel at miguel.cc> Mon, 01 Mar 2010 20:45:19 -0430
+ -- Miguel Landaeta <miguel at miguel.cc> Sat, 06 Mar 2010 20:11:22 -0430
namebench (1.1+dfsg-2) unstable; urgency=low
Modified: packages/namebench/trunk/debian/control
===================================================================
--- packages/namebench/trunk/debian/control 2010-03-06 22:40:31 UTC (rev 12202)
+++ packages/namebench/trunk/debian/control 2010-03-07 01:14:31 UTC (rev 12203)
@@ -3,17 +3,17 @@
Uploaders: Miguel Landaeta <miguel at miguel.cc>
Section: net
Priority: optional
-Build-Depends: debhelper (>> 7.0.50), python-support (>= 0.8), python (>= 2.4),
+Build-Depends: debhelper (>> 7.0.50), python-support (>= 0.8), python (>= 2.5),
docbook-to-man (>= 1:2.0.0)
Standards-Version: 3.8.4
-XS-Python-Version: all
+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/
Homepage: http://code.google.com/p/namebench/
Package: namebench
Architecture: all
-Depends: python (>= 2.4), python-support (>= 0.8), ${python:Depends},
+Depends: python (>= 2.5), python-support (>= 0.8), ${python:Depends},
python-dnspython (>= 1.7.1), python-graphy (>= 1.0),
python-httplib2 (>= 0.5), python-jinja2 (>= 2.2.1), ${misc:Depends}
Recommends: python-tk (>= 2.4), www-browser
Added: packages/namebench/trunk/debian/namebench.postinst
===================================================================
--- packages/namebench/trunk/debian/namebench.postinst (rev 0)
+++ packages/namebench/trunk/debian/namebench.postinst 2010-03-07 01:14:31 UTC (rev 12203)
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+set -e
+
+# Move a conffile without triggering a dpkg question
+mv_conffile() {
+ local OLDCONFFILE="$1"
+ local NEWCONFFILE="$2"
+
+ [ -e "$OLDCONFFILE" ] || return 0
+
+ echo "Preserving user changes to $NEWCONFFILE ..."
+ mv -f "$OLDCONFFILE" "$NEWCONFFILE".dpkg-old
+}
+
+case "$1" in
+configure)
+ if dpkg --compare-versions "$2" le "1.2+dfsg-1"; then
+ mv_conffile "/etc/namebench.cfg" "/etc/namebench/namebench.cfg"
+ fi
+ ;;
+*)
+ echo "preinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
Modified: packages/namebench/trunk/debian/namebench.preinst
===================================================================
--- packages/namebench/trunk/debian/namebench.preinst 2010-03-06 22:40:31 UTC (rev 12202)
+++ packages/namebench/trunk/debian/namebench.preinst 2010-03-07 01:14:31 UTC (rev 12203)
@@ -2,8 +2,8 @@
set -e
-# Remove a no-longer used conffile
-rm_conffile() {
+# Prepare to move a conffile without triggering a dpkg question
+prep_mv_conffile() {
local PKGNAME="$1"
local CONFFILE="$2"
@@ -12,19 +12,16 @@
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 ..."
+ if [ "$md5sum" = "$old_md5sum" ]; then
rm -f "$CONFFILE"
fi
}
case "$1" in
install|upgrade)
- rm_conffile namebench "/etc/namebench.cfg"
+ if dpkg --compare-versions "$2" le "1.2+dfsg-1"; then
+ prep_mv_conffile namebench "/etc/namebench.cfg"
+ fi
;;
*)
echo "preinst called with unknown argument \`$1'" >&2
Modified: packages/namebench/trunk/debian/orig-tar.sh
===================================================================
--- packages/namebench/trunk/debian/orig-tar.sh 2010-03-06 22:40:31 UTC (rev 12202)
+++ packages/namebench/trunk/debian/orig-tar.sh 2010-03-07 01:14:31 UTC (rev 12203)
@@ -6,7 +6,7 @@
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
+TAR="$package"_${debian_version}.orig.tar.gz
DIR=$package-${debian_version}.orig
# clean up the upstream tarball
Modified: packages/namebench/trunk/debian/rules
===================================================================
--- packages/namebench/trunk/debian/rules 2010-03-06 22:40:31 UTC (rev 12202)
+++ packages/namebench/trunk/debian/rules 2010-03-07 01:14:31 UTC (rev 12203)
@@ -24,4 +24,5 @@
--no-symlink \
--upstream-version $(DEB_UPSTREAM_VERSION) \
--download-version $(DEB_UPSTREAM_VERSION) \
+ --destdir . \
--force-download
More information about the Python-modules-commits
mailing list