Re: Updating the fis-gtm package to V6.1-000
Hi Andreas,
On Wed, Aug 27, 2014, at 04:46 PM, Andreas Tille wrote:
> On Wed, Aug 27, 2014 at 03:44:44PM -0400, Amul Shah wrote:
> > Folks,
> > I'm working towards updating the fis-gtm package. I have several TODOs for this:
> > - Incorporate the updated sources
> > - Refresh existing and apply new patches, quilt is just awesome
> > - Update the virtual package fis-gtm depends to V6.1-000
> > - Use the ARCH settings (https://groups.google.com/d/msg/comp.lang.mumps/mH9mdI8ozQ0/n752Z_8jlJYJ)
> > for 64bit (x86_64) and 32bit (i586) builds
> > - Test - I had problems with this last time and may need help
>
> Sounds like a sensible plan.
>
> > The first question I have is what repository should I work from? For now, I cloned
> > https://alioth.debian.org/anonscm/git/debian-med/fis-gtm.git
>
> That's annonymous. You should rather clone (or set remote origin to):
>
> ssh://git.debian.org/git/debian-med/fis-gtm.git
>
> Please use
>
> git import-orig --pristine-tar <new_upstream_tarball>
[amul:3] This step took a bit of trial and error until I got it to work. I'm going to step through the errors so I have a record of it and if I'm doing something incorrectly, it can be corrected. Here's the error that I started out with.
instance1:~/fis-gtm-debmed.git> git-import-orig --pristine-tar ~/Downloads/fis-gtm-V6.1-000.tar.gz -u 6.1-000
gbp:error:
Repository does not have branch 'upstream' for upstream sources. If there is none see
file:///usr/share/doc/git-buildpackage/manual-html/gbp.import.html#GBP.IMPORT.CONVERT
on howto create it otherwise use --upstream-branch to specify it.
[amul:3] The HTML doc link above indicated going to the initial source import. I tried that (see the bit about COMMIT_ID), but the merge resulted in numerous conflicts. I fired up gitk and saw prior upstream commits had already chained off the initial source import until the upstream/6.0-003. I used the commit ID of the upstream/6.0-003 below.
git clone ssh://git.debian.org/git/debian-med/fis-gtm.git fis-gtm-debmed.git
cd fis-gtm-debmed.git
git branch upstream d883233f4018839ce9f3da6faa57a5de8e2de98f
git-import-orig --pristine-tar ~/Downloads/fis-gtm-V6.1-000.tar.gz -u 6.1-000
<commit>
dch -v 6.1-000
<commit>
rm -rf .pc
mv ~/Downloads/fis-gtm-V6.1-000.tar.gz ../fis-gtm_6.1.orig.tar.gz
git-buildpackage
[amul:3] I ended up hitting the same error that stopped me in my tracks last time. Here's the error. I'll try to correct it tomorrow.
Finished running lintian.
Now signing changes and any dsc files...
signfile fis-gtm_6.1-000.dsc Amul Shah <Amul.Shah@fisglobal.com>
gpg: directory `/home/shaha/.gnupg' created
gpg: new configuration file `/home/shaha/.gnupg/gpg.conf' created
gpg: WARNING: options in `/home/shaha/.gnupg/gpg.conf' are not yet active during this run
gpg: keyring `/home/shaha/.gnupg/secring.gpg' created
gpg: keyring `/home/shaha/.gnupg/pubring.gpg' created
gpg: skipped "Amul Shah <Amul.Shah@fisglobal.com>": secret key not available
gpg: /tmp/debsign.BbZPAaF6/fis-gtm_6.1-000.dsc: clearsign failed: secret key not available
debsign: gpg error occurred! Aborting....
debuild: fatal error at line 1271:
running debsign failed
gbp:error: debuild -i -I returned 29
gbp:error: Couldn't run 'debuild -i -I'
[amul:3] When I tried to push I hit yet another problem.
instance1:~/fis-gtm-debmed.git> git push
Counting objects: 1229, done.
Delta compression using up to 2 threads.
Compressing objects: 100% (652/652), done.
Writing objects: 100% (653/653), 786.83 KiB, done.
Total 653 (delta 577), reused 0 (delta 0)
remote: Sending notification emails to: debian-med-commit@lists.alioth.debian.org
To ssh://git.debian.org/git/debian-med/fis-gtm.git
3a6c8c0..c8316bd master -> master
! [rejected] pristine-tar -> pristine-tar (non-fast-forward)
! [rejected] upstream -> upstream (non-fast-forward)
error: failed to push some refs to 'ssh://git.debian.org/git/debian-med/fis-gtm.git'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes (e.g. 'git pull') before pushing again. See the
'Note about fast-forwards' section of 'git push --help' for details.
instance1:~/fis-gtm-debmed.git> git pull
Already up-to-date.
[amul:3] Searches revealed some quick answers (below), but those didn't resolve the reject messages. I cloned into another directory and saw that my changes made it to the master branch. What am I doing wrong, and do I need to correct this?
git pull origin upstream
git pull origin pristine-tar
[amul:3] Where I am right now: I committed my changes, but could not test them. If someone else could give it a try that would be a great help. I also have a git push error that I don't understand. I try doing some more searches tomorrow.
Thanks for the help,
Amul
Reply to: