Package: devscripts
Version: 2.10.2
Severity: minor
File: /usr/bin/uupdate
When calling 'uupdate -u foo-1.1.tar.gz' and the diff-file could not be applied,
uupdate prints out an error message:
New Release will be 1.1-1.
-- Untarring the new sourcecode archive foo-1.1.tar.gz
1 out of 2 hunks FAILED -- saving rejects to file config.sample.rej
uupdate: the diffs from version 0.9.12-1 did not apply cleanly!
Rejected diffs are in ./config.sample.rej
^^
But uupdate is called from directory <package>-<oldversion>. So from this point
the rejected diff is located in ../<package>-<newversion>/. Thatswhy I suggest
that the message above should be changed. See attached diff.
-- System Information:
Debian Release: lenny/sid
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: i386 (i686)
Kernel: Linux 2.6.15
Locale: [EMAIL PROTECTED], [EMAIL PROTECTED] (charmap=ISO-8859-15)
Shell: /bin/sh linked to /bin/bash
Versions of packages devscripts depends on:
ii debianutils 2.18 Miscellaneous utilities specific t
ii dpkg-dev 1.13.25 package building tools for Debian
ii libc6 2.3.6.ds1-13 GNU C Library: Shared libraries
ii perl 5.8.8-7 Larry Wall's Practical Extraction
ii sed 4.1.5-1 The GNU sed stream editor
Versions of packages devscripts recommends:
ii fakeroot 1.6.5 Gives a fake root environment
-- no debconf information
--- scripts/uupdate.sh 2007-02-25 10:36:45.000000000 +0100
+++ /tmp/uupdate.sh 2007-04-13 22:20:31.000000000 +0200
@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /bin/bash -x
#
# Upgrade an existing package
# Christoph Lameter, December 24, 1996
@@ -414,7 +414,7 @@
echo "Success. The supplied diffs worked fine on the Debian
sources."
else
echo "$PROGNAME: the diffs supplied did not apply cleanly!" >&2
- X=$(find . -name "*.rej")
+ X=$(find ../$PACKAGE-$NEW_VERSION -name "*.rej")
if [ -n "$X" ]; then
echo "Rejected diffs are in $X" >&2
fi
@@ -682,7 +682,7 @@
echo "Success! The diffs from version $VERSION worked fine."
else
echo "$PROGNAME: the diffs from version $VERSION did not apply
cleanly!" >&2
- X=$(find . -name "*.rej")
+ X=$(find ../$PACKAGE-$NEW_VERSION -name "*.rej")
if [ -n "$X" ]; then
echo "Rejected diffs are in $X" >&2
fi
