Commit 7b5a2109 authored by anarcat's avatar anarcat

rebase to debian

parent 8c04997a
......@@ -83,9 +83,9 @@ version=$(shell git describe --match 'debian/*' --tags | sed 's/debian\///;s/-\(
# this builds a debian package but first updates the branches to follow the latest 1.x branch
git checkout -b upstream || git checkout upstream
git merge 6.x-1.x
git checkout -b debian || git checkout debian
git checkout -b upstream || git rebase origin/upstream
git merge origin/6.x-1.x
git checkout -b debian || git rebase origin/debian
git merge upstream
dch -v ${version} "automatic jenkins build"
git commit -m"dummy commit for $version autobuild" debian/changelog
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