Commit 3b85758a authored by intrigeri's avatar intrigeri
Browse files

Remove obsolete text.

None of this is needed / true since we don't build custom packages anymore.
parent 24e12d7a
......@@ -33,7 +33,6 @@ the Tails images build process.
TAG="debian/1%$(echo ${VERSION:?} | tr '~' '_')"
UPSTREAM_VERSION=$(echo ${VERSION:?} | perl -pi -E 's/-.*//')
1. `git fetch && git fetch debian-upstream`
......@@ -53,11 +52,6 @@ the Tails images build process.
git checkout tails/stretch && git merge origin/tails/stretch && \
git merge --no-edit "${TAG:?}"
Now you most likely will have to deal with a merge conflict in
`debian/changelog` -- just reorder the conflicting entries by
version number, `git add` modified files as needed, and ensure
a merge commit is created eventually.
1. Let's ensure our patches still apply cleanly:
1. Check if they do:
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment