[SCM] bristol/master: Import Debian patch 0.60.11-3

[IOhannes m zmölnig (Debian/GNU)]

On 09/09/2016 10:16 PM, Herbert Fortes wrote:
> On 09-09-2016 12:18, James Cowgill wrote:
>> Hi,
>> Please fix this mess - ie revert the changes to:
[...]

for the record, i just cleaned up the repo.

> I think, for Bristol, I should did some thing
> like:
> 
> git clone
> cd bristol
> tar -xvf ../bristol*debian.tar.xz
> git add debian
> git commit
> 
> Is that right ?

no, not really.
first of all, please (re)read our [Packaging Guidelines] esp. §3.2

in general: do you packaging *within* the git repository.
once the git-repository is ready, we generate source-orig and debian
tarballs (and all the other foo) from the repo, not the other way round.
so don't do the fixes outside and then try to batch-apply them into the
repo. (this basically makes the "tar -xvf ../bristol*debian.tar.xz" step
obsolete)

then make small *atomic* commits. a good guideline for the atomicity of
a commit is: one d/changelog line equals one commit (in an ideal world,
where you don't make any errors).
it is encouraged to use `gbp-dch` to generate a new (and to be manually
revised) d/changelog releaseentry.

a single commit for a new upload is usually too coarse (even uploads
that fix minor things usually have two commits: one for the change; and
one for finalizing the changelog).


btw git makes it easy to learn from others: just fire up `gitk` and see
what people committed in the past (or use `git log` if you are going
frugal).
also i find that `git gui` can help tremendously with creating atomic
commits, even if you have files that have changes that should go into
different commits. (you can do that from the cmdline as well, but i keep
forgetting how)

gfmasdr
IOhannes


[Packaging Guidelines]
https://wiki.debian.org/DebianMultimedia/DevelopPackaging


> 
> 
> 
> Regards,
> Herbert
> 
> 
> _______________________________________________
> pkg-multimedia-maintainers mailing list
> pkg-multimedia-maintainers at lists.alioth.debian.org
> http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
> 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-multimedia-maintainers/attachments/20160909/02a8c84f/attachment.sig>