[Pkg-giraffe-discuss] Import of ZCP 7.2.3.657 and preparations next upload

[Carsten Schoenert]

Hello Jelle,

Am 02.05.2016 um 11:34 schrieb Jelle van der Waa:
> I added your repo as remote and checked out your debian/sid branch:
> 
> git checkout tijuca/debian/sid -b "tijcua-sid"
> 
> But somehow this results to patch failures :-(

you try to built the wrong version.

> jelle at deb8:~/giraffe$ sudo gbp buildpackage --git-pbuilder -nc -d --git-ignore-new e-new 
[SNIP]
> dpkg-buildpackage: source version 7.2.1+dfsg1-1
                                    ^^^^^^^^^^^^^
You have to create a new valid debian/changelog entry for the new
version first. And let the HEAD of each branch point to the head of the
branches from other (my) remote.

I use mostly this way for doing so (maybe can be done easier):

$ git remote add github_cs git at github.com:tijuca/Giraffe.git
$ git fetch github_cs

# moving HEAD of debian/sid to github_cs/debian/sid, I assume you are on
debian/sid!
$ git pull github_cs debian/sid

# doing the same for upstream/7.2 and pristine-tar
$ git checkout upstream/7.2
$ git pull github_cs upstream/7.2
...
$ git checkout pristine-tar
$ git pull github_cs pristine-tar
...
# move back to debian/sid
$ git checkout debian/sid

Now you can create the debian/changelog automatically.

I use 'gbp dch -aS' for a *S*napshot built.
That should create a entry with a version

  zarafa (7.2.3.657+dfsg1-1~1.gbp24f145) UNRELEASED; urgency=medium

After that you can start the build, please ensure you have a actual
pbuilder chroot:

$ gbp buildpackage --git-pbuilder --git-ignore-new -j4

git-buildpackage will create the needed orig.tar.xz for the needed
version if not already done.

-- 
Regards
Carsten Schoenert