Re: [l10n, apt-git-repo] question about l10n for APT
On Wed, Dec 30, 2015 at 06:28:20AM +0000, lumin wrote:
> Hi,
>
> I'm one of the current translators in the alioth APT team.
> And recently I noticed a change about your usage of
> APT's git repo. So I'd like to ask some questions.
>
> Long time ago, the default branch for APT is debian/sid,
> so at that time I commit the l10n updates directly to debian/sid.
>
> However the current default branch becomes "master",
> and a part of contents in debian/sid is not merged
> into "master".
>
> So I'm confused about the co-existence of
> debian/exp + debian/sid && master.
>
> 1. what are debian/exp and debian/sid used for ?
> Are they still in use ? (only master is active now)
They are not in use. We did not merge debian/sid back
because debian/sid basically consisted only of backports,
and it was too hard to really merge it in a git way, so
we just didn't, but the individual commits or the ideas
behind them should all exist in master.
>
> Additionally:
>
> 2. does that mean, I should switch my working branch
> from "debian/sid" to "master" ?
Yes.
> 3. in the past, I only change the .po files at every commit.
> can I add related debian/changelog entry by myself ?
No. The debian/changelog file is automatically generated at
release time using the first line of each commit, unless the
commit has a Gbp-Dch: ignore or Git-Dch: ignore in it (or is
excluded manually).
--
Julian Andres Klode - Debian Developer, Ubuntu Member
See http://wiki.debian.org/JulianAndresKlode and http://jak-linux.org/.
When replying, only quote what is necessary, and write each reply
directly below the part(s) it pertains to (`inline'). Thank you.
Reply to: