Re: alfa 1.0 and mocassin 2.02.72 packages ready for review

[Ole Streicher <olebole@debian.org>]

Hi Roger,

Roger Wesson <rw@nebulousresearch.org> writes:
> I've just uploaded to Alioth packages for new upstream versions of the
> codes alfa and mocassin

Thanks. I has a look to alfa (because of the RC bug). It doesn't build
because of local modifications:

---------------------------8<--------------------------------------------
dpkg-source: info: local changes detected, the modified files are:
 alfa/Makefile
 alfa/README.md
 alfa/man/alfa.1
 alfa/source/alfa.f90
 alfa/source/bashcompletion
 alfa/source/commandline.f90
 alfa/source/continuum.f90
 alfa/source/continuum_new.f90
 alfa/source/functions.f90
 alfa/source/linefit.f90
 alfa/source/quicksort.f90
 alfa/source/readfiles.f90
 alfa/source/spectralfit.f90
 alfa/source/types.f90
 alfa/source/uncertainties.f90
dpkg-source: error: aborting due to unexpected upstream changes, [...]
---------------------------8<--------------------------------------------

Also, the "upstream" branch is unrelated to the "master"
branch. Usually, one merges the "upstream" branch into the master
branch, after the upstream files are committed to the upstream
branch. What I usually do, is:

---------------------------8<--------------------------------------------
uscan
git checkout upstream
rm -rf *
tar xf ../alfa_1.0.orig.tar.gz
mv ALFA-1.0/* .
rmdir ALFA-1.0
git add --all
git commit -m "New upstream version 1.0"
git tag upstream/1.0
pristine-tar commit ../alfa_1.0.orig.tar.gz
git checkout master
git merge upstream
dch -v 1.0-1 "New upstream release"
....
---------------------------8<--------------------------------------------

One could also use git-buildpackage, which does basically the same.

For Mocassin, I get 

---------------------------8<--------------------------------------------
fatal: ambiguous argument '25751068d21953679bfe63f2d729283d78195817^{tree}': unknown revision or path not in the working tree.
---------------------------8<--------------------------------------------

when trying to "pristine-tar checkout ../mocassin_2.02.72.orig.tar.gz".
Mybe you forgot to push the latest changes in the upstream branch?

Best regards

Ole