[Debian-med-packaging] MNE v0.8 packaging

[Alexandre Gramfort]

hi Andreas,

I think I pushed a fix.

Sorry for the noob question but what do you mean by "you can avoid
this kind of problems when using `dch` to edit
the changelog" ? how does the packaging system run the tests?

Can I check myself if the package built?

Alex


On Sat, Aug 2, 2014 at 3:09 PM, Andreas Tille <andreas at fam-tille.de> wrote:
> Hi Alexandre,
>
> the state in Git does not build.  While I fixed the missing Debian
> revision number in the changelog entry (please be so kind to always run
> a test build - with your latest commit the package does not even start
> building; you can avoid this kind of problems when using `dch` to edit
> the changelog) the test suite is running into one error.  I attached a
> build log.  Any hint how to run this successfully?
>
> Kind regards
>
>      Andreas.
>
> On Sat, Aug 02, 2014 at 12:31:52AM +0200, Alexandre Gramfort wrote:
>> hi Andreas,
>>
>> I think i've made it :)
>> I pushed v0.8 and immediately pushed v0.8.1 which is our quick fix release.
>>
>> Let me know if everything looks good on your side.
>>
>> thanks for your help and patience :)
>>
>> Alex
>>
>>
>> On Fri, Aug 1, 2014 at 11:25 AM, Andreas Tille <andreas at an3as.eu> wrote:
>> > Hi,
>> >
>> > just reading
>> >
>> >    http://lists.alioth.debian.org/pipermail/debian-med-packaging/2014-July/028210.html
>> >
>> > and wondering, whether this might be an alternative to the manual
>> > merge ...
>> >
>> > Kind regards
>> >
>> >        Andreas.
>> >
>> > On Fri, Aug 01, 2014 at 11:17:58AM +0200, Andreas Tille wrote:
>> >> On Fri, Aug 01, 2014 at 03:34:45AM +0200, Alexandre Gramfort wrote:
>> >> > >> uscan --verbose --force-download
>> >> >
>> >> > this works
>> >>
>> >> OK.
>> >>
>> >> > >> git import-orig --pristine-tar ../python-mne_0.8.orig.tar.gz
>> >> >
>> >> > I had to specify debian as my debian-branch in .git/gbp.conf
>> >> > as otherwise it was merging to my master branch.
>> >>
>> >> Usually it should merge to *upstream* branch.  I have no gbp.conf file
>> >> (which rather would belong to the debian/ dir if I'm not totally
>> >> mistaken) and it always worked fine that way.
>> >>
>> >> > Yet this now produces
>> >> > merge conflicts. It there a way to use something like
>> >> > --strategy-option theirs in the merge?
>> >> >
>> >> > is it fine if I do the merge manually ? that will keep all the history though.
>> >>
>> >> Do you get
>> >>
>> >> $ git import-orig --pristine-tar ../python-mne_0.8.orig.tar.gz
>> >> ...
>> >> pristine-tar: committed python-mne_0.8.orig.tar.gz.delta to branch pristine-tar
>> >> gbp:info: Merging to 'master'
>> >> gbp:error: Merge failed, please resolve.
>> >>
>> >>
>> >> $ LC_ALL=C git status
>> >> ...
>> >> Unmerged paths:
>> >>   (use "git add <file>..." to mark resolution)
>> >>
>> >>         both modified:   mne/tests/test_utils.py
>> >>         both modified:   mne/utils.py
>> >>
>> >> ?
>> >>
>> >> Please always post such details rather than "this now produces merge
>> >> conflicts".  Any yes, while I have no idea why this is happening this is
>> >> probably the way to go.  Some more experienced Git experts than me might
>> >> insist if I'm wrong.
>> >>
>> >> > thanks for your help
>> >>
>> >> Kind regards
>> >>
>> >>       Andreas.
>> >>
>> >> --
>> >> http://fam-tille.de
>> >>
>> >> _______________________________________________
>> >> Debian-med-packaging mailing list
>> >> Debian-med-packaging at lists.alioth.debian.org
>> >> http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-packaging
>> >>
>> >
>> > --
>> > http://fam-tille.de
>>
>
> --
> http://fam-tille.de