New xmltooling 1.6.3

[Etienne Dysli-Metref]

On 17/01/18 10:40, Ferenc Wágner wrote:
> Did gbp clone leave you on the debian/master branch?

Yes, it did.

> That shouldn't be necessary, gbp import-orig reads the branch names
> from debian/gbp.conf. I tested the above command chain on my current 
> checkout, and it worked perfectly with gbp 0.8.12.2. I've never used 
> gbp clone, though.
I have gbp 0.7.2 so maybe it's a bit too old. Here is what my terminal
looks like when I insert a `gbp pq switch`. The merge on debian/master
at the end looks much better.

> $ gbp clone --debian-branch=debian/master --upstream-branch=upstream/latest --pristine-tar ssh://git.debian.org/git/pkg-shibboleth/xmltooling.git
>
> $ cd xmltooling
>
> xmltooling$ git status 
> On branch debian/master
> Your branch is up-to-date with 'origin/debian/master'.
> nothing to commit, working directory clean
>
> xmltooling$ gbp pq import
> gbp:info: Trying to apply patches at 'd7ea37c61cf2676407dc1e5eb7a818536cf555eb'
> gbp:info: Patches listed in 'debian/patches/series' imported on 'patch-queue/debian/master'
>
> xmltooling$ uscan --report
> uscan: Newest version of xmltooling on remote site is 1.6.3, local version is 1.6.2
> uscan:    => Newer package available from
>       https://shibboleth.net/downloads/c++-opensaml/latest/xmltooling-1.6.3.tar.bz2
>
> xmltooling$ gbp pq switch
> gbp:info: Switching to debian/master
>
> xmltooling$ gbp import-orig --upstream-vcs-tag=1.6.3 --uscan
> gbp:info: Launching uscan...
> uscan: Newest version of xmltooling on remote site is 1.6.3, local version is 1.6.2
> uscan:    => Newer package available from
>       https://shibboleth.net/downloads/c++-opensaml/latest/xmltooling-1.6.3.tar.bz2
> gpgv: Signature made Thu 11 Jan 2018 21:47:53 CET using RSA key ID 02277962
> gpgv: Good signature from "Scott Cantor <cantor.2 at osu.edu>"
> gbp:info: using ../xmltooling_1.6.3.orig.tar.bz2
> What is the upstream version? [1.6.3] 
> gbp:info: Importing '../xmltooling_1.6.3.orig.tar.bz2' to branch 'upstream/latest'...
> gbp:info: Source package is xmltooling
> gbp:info: Upstream version is 1.6.3
> gbp:info: Merging to 'debian/master'
> gbp:info: Successfully imported version 1.6.3 of ../xmltooling_1.6.3.orig.tar.bz2
>
> xmltooling$ git log --graph --decorate --pretty=oneline --abbrev-commit --all
> *   ecf950b (HEAD -> debian/master) Merge tag 'upstream/1.6.3' into debian/master
> |\  
> | *   3f34274 (tag: upstream/1.6.3, upstream/latest) Imported Upstream version 1.6.3
> | |\  
> | | * 1b85f92 (tag: 1.6.3, origin/maint-1.6) Bump version.
> | | * f8eeeb9 CPPXT-127 - Block entity reference nodes during unmarshalling.
> | | | * 79d96d0 (pristine-tar) pristine-tar data for xmltooling_1.6.3.orig.tar.bz2
> | | | * ec10b96 (origin/pristine-tar) pristine-tar data for xmltooling_1.6.2.orig.tar.bz2

  Etienne

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-shibboleth-devel/attachments/20180117/b8b1a7c2/attachment.sig>