| 1 |
#!/bin/sh |
| 2 |
|
| 3 |
if git diff-index --quiet HEAD --; then |
| 4 |
git fetch --all # -or- git fetch <upstream repo> |
| 5 |
else |
| 6 |
echo Working directory not clean. Exiting. |
| 7 |
exit 1 |
| 8 |
fi |
| 9 |
|
| 10 |
if [ -n "$1" ]; then |
| 11 |
tag=$(git describe --tags $1) |
| 12 |
else |
| 13 |
tag=$(git describe --tags $(git rev-list --tags='v[0-9]*' --max-count=1)) |
| 14 |
fi |
| 15 |
ver=$(echo $tag|sed s/^v//) |
| 16 |
dstag=upstream/${ver}+ds |
| 17 |
rmfiles=$(awk 'BEGIN{RS=ORS="\n\n";FS=OFS="\n"}/Files-Excluded:/' debian/copyright|sed -n -e '/^Files-Excluded:/,${p}'|sed s/Files-Excluded://|sed /^$/d) |
| 18 |
if git rev-parse -q --verify "refs/tags/${dstag}" >/dev/null; then |
| 19 |
echo Upstream tag "${dstag}" exists already. Exiting. |
| 20 |
exit 1 |
| 21 |
fi |
| 22 |
if ! git merge $tag; then |
| 23 |
git add -u |
| 24 |
fi |
| 25 |
|
| 26 |
# remove all 'Files-Excluded' files listed in debian/copyright, except debian/ folder |
| 27 |
for i in $rmfiles; do if [ "$i" != "debian" ]; then git rm -rf "$i"; fi; done |
| 28 |
# restore the debian/ folder from previous commit |
| 29 |
git checkout HEAD debian/ |
| 30 |
# since backported patches should be all included in the new release, remove them all here |
| 31 |
sed -i '/^backport\//d' debian/patches/series |
| 32 |
git add debian/patches/series |
| 33 |
git rm debian/patches/backport/*.patch |
| 34 |
|
| 35 |
if git diff-index --quiet HEAD --; then |
| 36 |
git commit --amend -m "Merge upstream tag: $tag" |
| 37 |
else |
| 38 |
git commit -m "Merge upstream tag: $tag" |
| 39 |
fi |
| 40 |
|
| 41 |
git rm -qrf debian/ |
| 42 |
git commit -m "Pristine source of ${ver}+ds" |
| 43 |
|
| 44 |
git tag ${dstag} |
| 45 |
git reset --hard HEAD^ |
| 46 |
|
| 47 |
echo |
| 48 |
echo If you need to remove more files, do it now then run script to update the ds tag: |
| 49 |
printf \\tdebian/maint-tools/update_ds_tag\\n |