diff options
| author | Didier Raboud <odyx@debian.org> | 2021-08-24 14:50:14 +0200 |
|---|---|---|
| committer | Didier Raboud <odyx@debian.org> | 2021-08-24 15:17:46 +0200 |
| commit | 46189a56574f1e287b6f2c4de0b4aa19da745b6c (patch) | |
| tree | 3701969a2b82411dac932c7bfd1040027443b923 | |
| parent | 26c89b9c574441959a268f50661a28ec852eedee (diff) | |
Redo get-orig-source d/rules target
| -rwxr-xr-x | debian/rules | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/debian/rules b/debian/rules index 7246a2fe1..a251f56fa 100755 --- a/debian/rules +++ b/debian/rules @@ -59,9 +59,17 @@ endif dh_apparmor -pcups-browsed --profile-name=usr.sbin.cups-browsed get-orig-source: - set -ex;\ - gbp import-orig --pristine-tar --uscan --no-merge --upstream-branch=upstream/latest;\ - utag=`git describe --exact-match heads/upstream/latest | sed -e 's#^upstream/##'` ;\ - ucommit=`git rev-parse --verify upstream/latest`;\ - git debrebase new-upstream $$utag ;\ + set -ex; \ + dbranch=`git branch --show-current`; \ + gbp import-orig --pristine-tar --uscan --no-merge --upstream-branch=upstream/latest --upstream-tag="upstream/vcs-%(version)s"; \ + utag=`git describe --exact-match heads/upstream/latest | sed -e 's#^upstream/vcs-##'`; \ + ucommit=`git rev-parse --verify upstream/latest`; \ + git checkout -f upstream/latest-tarballs; \ + git merge -Xtheirs -m "Merge $$utag from upstream's VCS" upstream/vcs-$$utag; \ + tar --strip-components=1 -xavf ../cups-filters_$$utag.orig.tar.xz; \ + git add -A .; \ + git commit -m "$$utag tarball artifacts" || :; \ + git tag -s -m "$$utag tarball from upstream" upstream/$$utag; \ + git checkout $$dbranch; \ + git debrebase new-upstream $$utag upstream/$$utag; \ git debrebase conclude |