The following commit has been merged in the master branch:
commit b0b99e36d9ea4cc07406d6959bd2674bb8a32977
Author: James Vega <[email protected]>
Date: Wed Apr 20 00:29:35 2011 -0400
uupdate: Correctly handle hidden files in upstream archives.
Closes: #601945
Signed-off-by: James Vega <[email protected]>
diff --git a/debian/changelog b/debian/changelog
index b32c323..d704694 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ devscripts (2.10.73) UNRELEASED; urgency=low
+ Use the correct path when repacking zip files. (Closes: #622889)
+ Make file show all matched file types instead of just the first.
(Closes: #574155)
+ * uupdate: Handle hidden files when the upstream archive doesn't contain its
+ files under one top-level directory. (Closes: #601945)
-- James Vega <[email protected]> Tue, 19 Apr 2011 21:57:10 -0400
diff --git a/scripts/uupdate.sh b/scripts/uupdate.sh
index 52fa478..0fa60e9 100755
--- a/scripts/uupdate.sh
+++ b/scripts/uupdate.sh
@@ -308,7 +308,8 @@ if [ "$PATCH" ]; then
fi
X=${X%.xz}
;;
- *) if [ -r "$OPWD/$PATCH" ]; then
+ *)
+ if [ -r "$OPWD/$PATCH" ]; then
CATPATCH="cat $OPWD/$PATCH"
else
CATPATCH="cat ../$PATCH"
@@ -685,6 +686,9 @@ else
# Otherwise, we put them into a new directory
mkdir $PACKAGE-$SNEW_VERSION
mv $TEMP_DIR/* $PACKAGE-$SNEW_VERSION
+ if ls $TEMP_DIR/.[!.]* >/dev/null 2>&1 ; then
+ mv $TEMP_DIR/.[!.]* $PACKAGE-$SNEW_VERSION
+ fi
fi
rm -rf $TEMP_DIR
cp -a $PACKAGE-$SNEW_VERSION $PACKAGE-$SNEW_VERSION.orig
--
Git repository for devscripts
--
To unsubscribe, send mail to [email protected].
