This is an automated email from the git hooks/post-receive script. osamu pushed a commit to branch master in repository devscripts.
commit 5051b9b44006161c79b06ddc960988e5f209bb4a Author: Osamu Aoki <[email protected]> Date: Sun Aug 27 20:24:51 2017 +0900 uupdate: -b option is not "New upstream release" BTS: #842468, #845610 --- debian/changelog | 2 ++ scripts/uupdate.sh | 20 ++++++++++++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 933e28e..5743293 100644 --- a/debian/changelog +++ b/debian/changelog @@ -38,6 +38,8 @@ devscripts (2.17.10) UNRELEASED; urgency=medium + Rename and convert the detached signature with updated mk-origtargz. * mk-origtargz + Rename and convert the detached signature. Closes: #832267, #870281 + * uupdate + + -b option is not "New upstream release". Closes: #842468, #845610 -- Mattia Rizzolo <[email protected]> Tue, 25 Jul 2017 14:18:24 +0200 diff --git a/scripts/uupdate.sh b/scripts/uupdate.sh index caeae4d..f7a32da 100755 --- a/scripts/uupdate.sh +++ b/scripts/uupdate.sh @@ -525,7 +525,11 @@ if [ "$OPMODE" = 1 ]; then STATUS=1 fi chmod a+x debian/rules - debchange $BADVERSION -v "$NEW_VERSION-$SUFFIX" "New upstream release" + if [ -z "$BADVERSION" ]; then + debchange -v "$NEW_VERSION-$SUFFIX" "New upstream release" + else + debchange $BADVERSION -v "$NEW_VERSION-$SUFFIX" "" + fi echo "$PROGNAME: Remember: Your current directory is the OLD sourcearchive!" echo "$PROGNAME: Do a \"cd ../$PACKAGE-$SNEW_VERSION\" to see the new package" exit @@ -937,12 +941,16 @@ elif [ "$OPMODE" = 2 ]; then fi [ -e ../${PACKAGE}_${NEW_VERSION}.uscan.log ] && \ cp -f ../${PACKAGE}_${NEW_VERSION}.uscan.log debian/uscan.log - debchange $BADVERSION -v "$NEW_VERSION-$SUFFIX" "New upstream release" + if [ -z "$BADVERSION" ]; then + debchange -v "$NEW_VERSION-$SUFFIX" "New upstream release" + else + debchange $BADVERSION -v "$NEW_VERSION-$SUFFIX" "" + fi echo "$PROGNAME: Remember: Your current directory is the OLD sourcearchive!" echo "$PROGNAME: Do a \"cd ../$PACKAGE-$SNEW_VERSION\" to see the new package" else - # new "uupdate -f ..." used in the version=4 watch file + # OPMODE=3: new "uupdate -f ..." used in the version=4 watch file # Sanity checks if [ ! -d debian ]; then @@ -1115,7 +1123,11 @@ else [ -e debian/rules ] && chmod a+x debian/rules [ -e ../${PACKAGE}_${NEW_VERSION}.uscan.log ] && \ cp -f ../${PACKAGE}_${NEW_VERSION}.uscan.log debian/uscan.log - debchange $BADVERSION -v "$EPOCH$NEW_VERSION-$SUFFIX" "New upstream release" + if [ -z "$BADVERSION" ]; then + debchange -v "$EPOCH$NEW_VERSION-$SUFFIX" "New upstream release" + else + debchange $BADVERSION -v "$EPOCH$NEW_VERSION-$SUFFIX" "" + fi echo "$PROGNAME: Remember: Your current directory is changed back to the old source tree!" echo "$PROGNAME: Do a \"cd ../$PACKAGE-$NEW_VERSION\" to see the new source tree and edit it to be nice Debianized source." -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git _______________________________________________ devscripts-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel
