The following commit has been merged in the master branch:
commit 3ed13eb8acc42a731132f2247be93a364ec2927a
Author: James Vega <[email protected]>
Date: Sun Apr 4 21:29:00 2010 -0400
uupdate: Include support for unpacking (only) of 7z files.
diff --git a/debian/changelog b/debian/changelog
index 2f29ade..ec8d001 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,8 +29,8 @@ devscripts (2.10.62) UNRELEASED; urgency=low
* uupdate:
+ Fix a typo which caused redirection of stdout to a file name "@".
(Closes: #569062)
- + Add support for xz compressed archives/patches. Thanks to Hideki Yamane
- for the patch. (Closes: #568615)
+ + Add support for xz compressed archives/patches and 7z archives. Thanks
+ to Hideki Yamane for the patch. (Closes: #568615)
+ Clarify wording when neither a diff nor a debian.tar is found. (Closes:
#575820)
* Update descriptions of debcommit to include darcs as a supported VCS.
diff --git a/scripts/uupdate.1 b/scripts/uupdate.1
index 999a51a..161d1f5 100644
--- a/scripts/uupdate.1
+++ b/scripts/uupdate.1
@@ -20,7 +20,7 @@ itself. The full details of what the code does are given
below.
.PP
Currently supported source code file types are \fI.tar.gz\fR,
\fI.tar.bz2\fR, \fI.tar.Z\fR, \fI.tgz\fR, \fI.tar\fR, \fI.tar.lzma\fR,
-\fI.tar.xz\fR and \fI.zip\fR
+\fI.tar.xz\fR, \fI.7z\fR and \fI.zip\fR
archives. Also supported are already unpacked source code archives;
simply give the path of the source code directory. Supported patch
file types are \fBgzip\fR-compressed, \fBbzip2\fR-compressed,
diff --git a/scripts/uupdate.sh b/scripts/uupdate.sh
index c7f6c67..ab24d54 100755
--- a/scripts/uupdate.sh
+++ b/scripts/uupdate.sh
@@ -516,6 +516,7 @@ else
*.tgz) X="${X%.tgz}"; UNPACK="tar zxf"; TYPE=gz ;;
*.tar) X="${X%.tar}"; UNPACK="tar xf"; TYPE="" ;;
*.zip) X="${X%.zip}"; UNPACK="unzip"; TYPE="" ;;
+ *.7z) X="${X%.7z}"; UNPACK="7z x"; TYPE="" ;;
*)
echo "$PROGNAME: sorry: Unknown archive type" >&2
exit 1
--
Git repository for devscripts
--
To unsubscribe, send mail to [email protected].
