Re: DebianMed policy error
Hi, Andreas,
On الأربعاء 12 آب 2015 03:06, Andreas Tille wrote:
> Hi,
>
> if anybody spots an error - the policy is in SVN and can be fixed by
> anybody.
I just tried expanded the backports section and got authorization failed
when I tried to commit. I checked out using
svn co
svn://afif-guest@svn.debian.org/debian-med/trunk/community/website/docs/
I'm sorry if it's due to my lack of svn knowledge. Anyway, I'm attaching
the patch for now. It also fixes a spelling error that caught my eye.
Thanks and regards
Afif
--
Afif Elghraoui | عفيف الغراوي
http://afif.ghraoui.name
--- docs2/docs/policy.xml 2015-08-13 22:45:14.063647601 -0700
+++ docs/policy.xml 2015-08-13 22:39:51.303400919 -0700
@@ -399,7 +399,7 @@
</sect3>
<sect3 id="git-track-new-branches">
<title>To track extra upstream branches, simply check them out.</title>
- <para>With recent versions of git, the remote branch will be automatically tracked when running <command>git</command> checkout. For example, when a <literal>pristine-tar</literal> branch is available upstream and not yet tracked locally, the command <command>git checkout</command> <option><replaceable>pristine-tar</replaceable></option> will implicitely run the command <command>git branch</command> <option>-t <replaceable>pristine-tar</replaceable> <replaceable>origin/pristine-tar</replaceable></option>.
+ <para>With recent versions of git, the remote branch will be automatically tracked when running <command>git</command> checkout. For example, when a <literal>pristine-tar</literal> branch is available upstream and not yet tracked locally, the command <command>git checkout</command> <option><replaceable>pristine-tar</replaceable></option> will implicitly run the command <command>git branch</command> <option>-t <replaceable>pristine-tar</replaceable> <replaceable>origin/pristine-tar</replaceable></option>.
</para>
</sect3>
<sect3 id="git-missing-pristine-tar">
@@ -597,7 +597,33 @@
<sect2 id="backports">
<title>Backports</title>
<para>
- Debian offers <ulink url="http://backports.debian.org";>backports</ulink> to its stable version. Backports of Debian Med packages should be kept as branches in our <link linkend="svn-repository-structure">Subversion</link> or <link linkend="git-repository-structures">Git</link> repositories.
+ Debian offers <ulink url="http://backports.debian.org";>backports</ulink> to provide
+ up-to-date software for users of the official stable releases. Backports of Debian Med packages
+ should be kept as branches in our <link linkend="svn-repository-structure">Subversion</link> or
+ <link linkend="git-repository-structures">Git</link> repositories. In Git, the branch should be
+ named using the release code names. As an example, the backports branch for Debian 8 ("jessie")
+ should be named <literal>debian/jessie</literal>.
+ </para>
+ <para>
+ In Git, preparing a backport can be as simple as:
+ <programlisting>
+ <command>git checkout -b debian/jessie</command>
+ <command>dch --bpo</command>
+ </programlisting>
+ And then building the package using a Stable chroot after making any necessary adjustments to the packaging. See the
+ <ulink url="https://wiki.debian.org/BuildingFormalBackports";>wiki on backports</ulink> and
+ the <ulink url="http://backports.debian.org";>main backports website</ulink> for more detailed instructions.
+ </para>
+ <para>
+ When preparing subsequent versions of a backport, the changelog should
+ include all the changes since the previous backported version:
+ <programlisting>
+ <command>git checkout debian/jessie</command>
+ <command>git merge master</command>
+ </programlisting>
+ You will get a merge conflict on the changelog. When resolving the conflict,
+ keep the entry from the previous backport(s) as well as the subsequent
+ changelog entries from the uploads to Unstable.
</para>
</sect2>
<sect2 id="ppa">
Reply to: