diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-19 09:26:01 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-19 09:26:01 +0000 |
commit | c29d7c1ba10d6debd11f9d8aad5d069a6491e60e (patch) | |
tree | a2ad46eb513b315f0efd8170af5eb08870165757 /debian/refresh-early-patches.sh | |
parent | Merging upstream version 1.76.0+dfsg1. (diff) | |
download | rustc-c29d7c1ba10d6debd11f9d8aad5d069a6491e60e.tar.xz rustc-c29d7c1ba10d6debd11f9d8aad5d069a6491e60e.zip |
Adding debian version 1.76.0+dfsg1-1.debian/1.76.0+dfsg1-1debian
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/refresh-early-patches.sh')
-rwxr-xr-x | debian/refresh-early-patches.sh | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/debian/refresh-early-patches.sh b/debian/refresh-early-patches.sh deleted file mode 100755 index 12f1811c4..000000000 --- a/debian/refresh-early-patches.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash -set -e - -ver="$1" -dfsg="${2:-+dfsg1}" -upstream_tag="upstream/${ver/\~/_}${dfsg/\~/_}" - -git show -s upstream/experimental -git show -s debian/experimental -printf "\ngit top-level dir: %s\n" "$(git rev-parse --show-toplevel)" -printf "version: $ver\n" - -if ! git merge-base --is-ancestor upstream/experimental debian/experimental; then - echo >&2 "upstream/experimental is not an ancestor of debian/experimental" -fi -if git rev-parse "${upstream_tag}" 2>/dev/null >/dev/null; then - echo >&2 "tag already exists: ${upstream_tag}" -fi - -read -p "continue? [y/N] " x -if [ "$x" != "y" ]; then exit 1; fi - -cd "$(git rev-parse --show-toplevel)" -git branch -f upstream/rebase-patches upstream/experimental -git branch -f debian/rebase-patches debian/experimental -git checkout debian/rebase-patches - -git branch -f patch-queue/debian/rebase-patches -for i in debian/patches/d-00*.patch; do gbp pq apply "$i"; done - -gbp import-orig "../rustc_${ver}${dfsg}.orig.tar.xz" \ - --upstream-branch=upstream/rebase-patches \ - --debian-branch=debian/rebase-patches \ - --no-sign-tags --no-pristine-tar --no-symlink-orig - -# rebase here -echo "$0: Now manually rebase - run 'git rebase debian/rebase-patches'" -echo "$0: There may be conflicts; follow the instructions that git tells you." -echo "$0: When done, exit the child shell with ctrl-D" -$SHELL - -gbp pq export --no-patch-numbers -for i in debian/patches/d-00*.patch; do git add "$i"; done -git commit -m "Update early-stage patches for ${ver}${dfsg}" -git checkout . -git rebase @~ --onto=debian/experimental -git branch -f debian/experimental -git checkout debian/experimental - -# cleanup -git tag -d "${upstream_tag}" || true -git branch -D upstream/rebase-patches || true -git branch -D debian/rebase-patches || true -git branch -D patch-queue/debian/rebase-patches || true |