cipher - drop block-padding feature.

[debcargo-conf.git] / release.sh

diff --git a/release.sh b/release.sh
index 9ac5a27d09fe92a7d24512d06ce25754f74d8bf9..1bab92ccd27c61e8fd6ba60583dad95e94f62e8f 100755 (executable)
--- a/release.sh
+++ b/release.sh
@@ -95,6 +95,16 @@ if head -n1 "$PKGDIR/debian/changelog" | grep -qv UNRELEASED-FIXME-AUTOGENERATED
          "    git push --delete origin $RELBRANCH"
 fi
 
+CHANGEDBY=$(dpkg-parsechangelog -l $PKGDIR/debian/changelog -SMaintainer)
+if [ "$CHANGEDBY" != "$UPLOADER" ]; then
+       cat <<eof
+Changes by $CHANGEDBY to be sponsored by $UPLOADER.
+eof
+       if ! test -e $PKGDIR/debian/RFS; then
+               abort 1 "Sponsored upload, but $PKGDIR/debian/RFS does not exist"
+       fi
+fi
+
 ( cd "$PKGDIR"
 sed -i -e s/UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO/UNRELEASED/ debian/changelog
 if test -z "$DISTRO"; then
@@ -170,11 +180,10 @@ new_bin_packages="$(echo "$diff_bin_packages" | grep '^+' | sed -e 's/^+//g')"
 rm_bin_packages="$(echo "$diff_bin_packages" | grep '^-' | sed -e 's/^-//g')"
 
 show_build_notice() {
-    CRATE_FORMAT=$(echo $CRATE|sed -e "s/_/-/g")
 cat <<eof
 The recommended way to build and upload is to run something like:
 
-  cd build && ./build.sh $CRATE $VER && dput ${DEBSRC}_${DEBVER}_${DEB_HOST_ARCH}.changes && git push origin pending-$CRATE_FORMAT && git checkout - && cd -
+  cd build && ./build.sh $CRATE $VER && dput ${DEBSRC}_${DEBVER}_${DEB_HOST_ARCH}.changes && git push origin $RELBRANCH && git checkout - && cd -
 
 eof
 }
@@ -207,7 +216,7 @@ new binaries, then you can just go ahead and directly dput the source package.
 
 If you want to build and test it, run:
 
-  cd build && ./build.sh $CRATE && dput ${DEBSRC}_${DEBVER}_source.changes && git checkout - && git merge -
+  cd build && ./build.sh $CRATE && dput ${DEBSRC}_${DEBVER}_source.changes && git checkout - && git merge - && cd -
 
 For your reference, this source package builds $(echo "$upload_bin_packages" | wc -l) binary package(s):
 $upload_bin_packages