Merge remote-tracking branch 'origin/8' into 9

This commit is contained in:
Sylvestre Ledru 2019-08-03 17:28:50 +02:00
commit 2dd73fd217

18
debian/README vendored
View File

@ -9,7 +9,7 @@ The current snapshot release is maintained in the "snapshot" branch.
The easiest way to get all branches is probably to have one The easiest way to get all branches is probably to have one
clone per version: clone per version:
for f in 4.0 5.0 6.0 7 snapshot; do for f in 7 8 9 snapshot; do
git clone git@salsa.debian.org:pkg-llvm-team/llvm-toolchain.git -b $f $f git clone git@salsa.debian.org:pkg-llvm-team/llvm-toolchain.git -b $f $f
done done
@ -55,7 +55,7 @@ branch at
http://llvm.org/svn/llvm-project/{llvm,...}/branches/release_90 http://llvm.org/svn/llvm-project/{llvm,...}/branches/release_90
you should use, you should use,
$ sh snapshot/debian/orig-tar.sh release_90 $ sh 9/debian/orig-tar.sh release_90
To retrieve a specific release candidate, you can pass the branch name as the To retrieve a specific release candidate, you can pass the branch name as the
first argument, and the tag rc number as the second argument. For example, to first argument, and the tag rc number as the second argument. For example, to
@ -63,12 +63,11 @@ get the 9.0.1 release candidate rc3 at
http://llvm.org/svn/llvm-project/{llvm,...}/tags/RELEASE_901/rc3 http://llvm.org/svn/llvm-project/{llvm,...}/tags/RELEASE_901/rc3
you should use, you should use,
$ sh snapshot/debian/orig-tar.sh RELEASE_901 rc3 9.0.1 $ sh 9/debian/orig-tar.sh RELEASE_901 rc3 9.0.1
For a stable release, the syntax is: For a stable release, the syntax is:
$ sh snapshot/debian/orig-tar.sh RELEASE_900 final 9.0 $ sh 9/debian/orig-tar.sh RELEASE_900 final 9.0
Additional maintainer scripts Additional maintainer scripts
============================= =============================
@ -81,6 +80,15 @@ The script releases/snapshot/debian/prepare-new-release.sh is used when
preparing a new point release. It automatically replaces version numbers preparing a new point release. It automatically replaces version numbers
in various files of the package. in various files of the package.
Making a change to all versions
===============================
Sometimes, we want to make a change on all branches.
In that case, start to make the change from the older
version (example: 8), then, change branch (example: 9) and
$ git merge origin/8
to retrieve the changes
Change in major upstream version Change in major upstream version
================================ ================================