Re: Looking for feedback on a recent upload

[Thomas Schiex <thomas.schiex@inra.fr>]

Dear Andreas,

My apologies for the regrettable git pushing. The debian mechanics is
hard to decipher when you are not used to it.

In all cases, many thanks for the additional clarification. I understand
you are busy, so don't spend time reading / answering this mail.

My answers for the list:

Le 03/07/2018 à 11:59, Andreas Tille a écrit :
> Hi Thomas,
>
> On Tue, Jul 03, 2018 at 10:18:19AM +0200, Thomas Schiex wrote:
>> Thanks a lot, the uscan worked fine!  Excited with this, I did this:
>>
>> - I integrated your commit in our upstream git repo (with thanks :-)
> Why?  Its fully sufficient in
>
>    https://salsa.debian.org/science-team/toulbar2
>
> since this is definitely no upstream change

I'm pushing as much as I can in the upstream repo because I'd like the
"debianizability" to be stored upstream for ease of management (it
already was mostly there initially because we prepared our own .deb
archives, without the terrible scrutiny of "lintian -EviI --pedantic").

>> - prepared a new GitHub release file including it
> I do not understand this.  Do you want to strip those files *generally*
> from the upstream tarball?  Than in turn you do not need the
> Files-Exclude in debian/copyright since nothing needs exclusion any
> more.
Adding Files-exclude: in debian/copyright  should not remove the
excluded files from the source tarball that is produced by GitHub. So
the tarball will still need "repacking" but the repacking "magic" will
be stored upstream and the debian patching minimal (almost empty: just a
one liner quilt patch).
>> - gbp imported the tarball in an empty git repo and pushed it to salsa.
> Why are you using an empty git repository?  The workflow would have been
> as follows:
>
>   gbp clone git@salsa.debian.org:science-team/toulbar2.git
>   cd toulbar2
>   uscan --verbose --force-download
>   gbp import-orig --pristine-tar ../toulbar2_1.0.0+dfsg.orig.tar.xz
>
> Your action seems to have messed up the Git repository on Salsa.
My apologies for this. I do not have a clear idea of who is using these
repos when.
I'm afraid the best course now that I messed up the salsa toulbar2 git
repo is to redo it cleanly.
I'm not a total git noob but not a pro either. Here is my plan:

0) I will wait for debian-science messages saying "No please don't do
that" for 24 hours and then do the following (if no message arrives):

I have a fresh clone of the upstream repo of toulbar2 in the directory
gh-toulbar2. This includes the watch file with repacking that uscan
likes and that Andreas provided.

1) Start form an empty git repo

    (mkdir deb-toulbar2; cd deb-toulbar2; git init; cd ..)

2) recover the "repacked archive prepared by uscan/watch magic from the
upstream repo

    cd gh-toulbar2
    uscan --verbose --force-download
    cd ..

3) import it in the empty git repo:

     cd deb-toulbar2
    gbp import-orig --pristine-tar ../toulbar2_1.0.0+dfsg.orig.tar.xz

4) push it unconditionally on salsa: 
    git remote add origin git@salsa.debian.org:science-team/toulbar2.git
    git push --all --tags origin -f

Hopefully this should lead to a correctly origanized and sanitized repo.

Next time we have a new release  out (let say version "ver"), it is
still unclear to me whether I need to do:

     cd deb-toulbar2
    uscan --verbose --force-download
    gbp import-orig --pristine-tar ../toulbar2_$ver+dfsg.orig.tar.xz
    git push --all --tags origin

Or if the watch file will watch upstream and do all this on its own on
salsa when a new higher version pops up.
https://wiki.debian.org/debian/watch says it downloads but does not say
if it imports.

All comments welcome.

Kind regards,
Thomas