[pkg-bacula-devel] [pkg-bacula-commits] [SCM] Bacula, a network backup, recovery and verification program branch, alexandro-dev-rebased, created. debian/5.0.3-1-14-geacee0d

Luca Capello luca at pca.it
Thu May 17 18:31:29 UTC 2012


Hi Alexander!

On Wed, 16 May 2012 00:12:52 +0200, Alexander Golovko wrote:
> The branch, alexandro-dev-rebased has been created

No need to create new branches for every patch or rebase, keep
everything on your branch.  Other than "cleanness" of the Git repository
(I know, I am sort of maniac), one advantage I see is that we can have
format-patches of what needs to be merged, similarly to:

  <mid:871umxpm38.fsf at gismo.pca.it>
  <http://lists.alioth.debian.org/pipermail/pkg-bacula-devel/2012-May/000172.html>

> commit eacee0d033577c8ad65671136455d78ba3898ec6
> Author: Alexander Golovko <alexandro at ankalagon.ru>
> Date:   Mon May 14 02:07:16 2012 +0400
>
>     Fix building with multiarch libmysqlclient-dev (thanks to Ben Hutchings)
>     
>     Closes: #672765

I have some comments about this:

- please re-use as much as possible existing work.  In this case, Ben
  provided a *full* patch, so simply import his work, also for the
  debian/changelog entry:

  <http://anonscm.debian.org/gitweb/?p=pkg-bacula/bacula.git;a=commitdiff;h=9e5f75495f791a1846c4c9932d3420f9134c72a4>

- do not mix semantically-different patches, e.g. the wrapping in both
  debian/control.  The wrapping in debian/rules is fine because it is in
  sync with the style used in other part of that file.

- I prefer to write debian/changelog entries for each file, re-grouping
  them only if the comment is the same.  In case like Ben's patch,
  debian/control has a different comment than debian/rules, so separate
  them.  In this case, I usually put the closing statement at the end of
  the comment of the more important file, thus debian/patch/FILE.patch.

  I also prefer to write authors in alphabetical order, sorry if I was
  not clear before, fixed:

    <http://anonscm.debian.org/gitweb/?p=pkg-bacula/bacula.git;a=commitdiff;h=c6f8641c00ad858970e2371ff4e551bd41c1109f>

Going back to the real patch, I committed a mix between Ben's original
patch and yours (tested on local packages):

  <http://anonscm.debian.org/gitweb/?p=pkg-bacula/bacula.git;a=commitdiff;h=ee975daf3993294c6957519f103942c961247d9f>

> commit 1f400facc98b201cca2d1554a1ba493c673d5e8c
> Author: Alexander Golovko <alexandro at ankalagon.ru>
> Date:   Sun May 13 13:00:47 2012 +0400
>
>     Fix linking with binutils-gold
>     
>     Closes: #553956

Pushed to master.

Thx, bye,
Gismo / Luca
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 835 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-bacula-devel/attachments/20120517/d1dd5c85/attachment.pgp>


More information about the pkg-bacula-devel mailing list