Author: afif-guest Date: 2015-08-16 19:11:32 +0000 (Sun, 16 Aug 2015) New Revision: 19966
Modified: trunk/community/website/docs/policy.xml Log: Revise backports section following Charles' comments See his comments at: http://lists.alioth.debian.org/pipermail/debian-med-packaging/2015-August/034095.html Modified: trunk/community/website/docs/policy.xml =================================================================== --- trunk/community/website/docs/policy.xml 2015-08-16 19:04:03 UTC (rev 19965) +++ trunk/community/website/docs/policy.xml 2015-08-16 19:11:32 UTC (rev 19966) @@ -600,15 +600,15 @@ <para> 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>. + should be kept as branches in our <link linkend="git-repository-structures">Git</link> repositories. + 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-backports</literal>, in accordance with + <ulink url="http://dep.debian.net/deps/dep14/";>DEP-14</ulink>. </para> <para> In Git, preparing a backport can be as simple as: <programlisting> - <command>git checkout -b debian/jessie</command> + <command>git checkout -b debian/jessie-backports</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 @@ -619,8 +619,8 @@ 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> + <command>git checkout debian/jessie-backports</command> + <command>git merge debian/unstable</command> (or <literal>master</literal>) </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 _______________________________________________ debian-med-commit mailing list debian-med-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
