Commit 6dc89066 authored by Andreas Tille's avatar Andreas Tille
Browse files

Second round to replace Alioth by Salsa - needs to be continued!

parent bfed5927

policy.xml

+18 −31
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ 
		interested in joining us.</para>

		<para>If you speak a language other than English, you can contribute

		rightaway with translations of package descriptions at

		<ulink url="http://ddtp.debian.net">ddtp.debian.net</ulink>.</para>

		<ulink url="https://ddtp.debian.net">ddtp.debian.net</ulink>.</para>

		<para>When working on these, you will find immediate targets for improvements

		of the original English versions, too. For these, though, you need access

		to Debian Med's source code repository. Very welcome are tutorials that
@@ -264,7 +264,7 @@ 
  		<sect3 id="git-missing-pristine-tar">

  		<title>To create a pristine-tar branch when it is missing.</title>

  		<para>

  			See the <ulink url="http://honk.sigxcpu.org/projects/git-buildpackage/manual-html/gbp.import.html">documentation of git-buildpackage</ulink>

  			See the <ulink url="https://honk.sigxcpu.org/projects/git-buildpackage/manual-html/gbp.import.html">documentation of git-buildpackage</ulink>

  			for details.  Use a similar command for any other missing branch.

  		<programlisting>

<command>git checkout</command> <option>--orphan</option> <replaceable>upstream</replaceable>
@@ -274,42 +274,29 @@ 
</programlisting>

  		</para>

  		</sect3>

			<sect3 id="create-git-repository-on-alioth">

			<title>Pushing to git.debian.org, creating a new bare repository on Alitoh.</title>

			<para>Before pushing to git.debian.org for the first time, an empty repository needs to be created there.

			To do this connect to <literal>git.debian.org</literal>, enter the<filename class="directory">/git/debian-med</filename> 

			directory, and run the<code><command> ./setup-repository</command></code> script.</para>

            <para id="example-create-bare-git-repository-on-alioth">

            Run it similar to:<programlisting>

<command>ssh</command> git.debian.org

<command>cd</command> /git/debian-med

<command>./setup-repository</command> &lt;pkg&gt; 'Packaging of &lt;pkg&gt; in Debian'

			<sect3 id="create-git-repository-on-salsa">

			<title>Creating a new repository on Salsa</title>

			<para>Before pushing to salsa.debian.org for the first time, an empty repository needs to be created there in the Gitlab interface.

			</para><para>

			Each package is kept in its own Git repository.

			Now, on your local machine add the salsa repository as a remote:<programlisting>

<command>git remote add</command> <literal>origin</literal> <filename class="directory">git@salsa.debian.org:med-team/&lt;pkg&gt;.git</filename>

</programlisting>

</para>

			<para>

			This will create an empty, bare, shared Git repository and setup some hooks. Each package is kept in its own Git repository.

			Now, on your local machine add the alioth repository as a remote:<programlisting>

<command>git remote add</command> <literal>origin</literal> <filename class="directory">git+ssh://git.debian.org/git/debian-med/&lt;pkg&gt;.git</filename>

</programlisting>

</para>

			<para>This is done automatically after cloning a repository, for instance with

				<link linkend="debcheckout-git-track">debcheckout</link>.  The default

				remote branch is called <quote>origin</quote>.

			</para>

			</sect3>

			<sect3 id="git-change-default-branch">

				<title>To change the default branch.</title>

				<para>

					If the Debian work is not on the <literal>master</literal> branch, change

					the default branch by editing the <filename>HEAD</filename> file in the

					bare repository on Alioth, and replace <literal>master</literal> by the

					bare repository on Salsa, and replace <literal>master</literal> by the

					name of the new default branch.  For a branch called <literal>debian/unstable</literal>

					the contents of the file will <literal>refs/heads/debian/unstable</literal>.

				</para>

			</sect3>

			<sect3 id="push-package-to-alioth">

			<sect3 id="push-package-to-salsa">

				<title>To push the package.</title>

				<para>(make sure you've added the alioth remote!), do the

				<para>(make sure you've added the salsa remote!), do the

				following: <code><command>git push</command> <option>origin

				master</option></code>.  For the first push, it's necessary to specify

				<option>origin master</option>. The next time you will push, a
@@ -404,8 +391,8 @@ rm ../*_source.changes</programlisting> 
    			via proper source packages.  The right way to build Debian packages is described in

    			<ulink url="https://www.debian.org/doc/manuals/maint-guide/">Debian New Maintainers' Guide</ulink>.

    			</para>

    			<para>See also the <ulink url="http://anonscm.debian.org/viewvc/debian-med/trunk/package_template/">package

    			template</ulink> in our Subversion repository.

    			<para>See also the <ulink url="https://salsa.debian.org/med-team/community/package_template">package

    			template</ulink> on Salsa.

    			</para>

                        <para>There is also the option of joining the <ulink url="https://wiki.debian.org/DebianMed/MoM">Mentoring

                        if the Month</ulink> as student to get a personal training how to start working inside the Debian Med team.
@@ -503,9 +490,9 @@ rm ../*_source.changes</programlisting> 
	</sect1>

	<sect1 id="tasks">

		<title>Tasks</title>

		<para>The Debian Med <ulink url="http://blends.alioth.debian.org/blends">Debian Pure Blend</ulink> is organised by <ulink url="http://debian-med.alioth.debian.org/tasks/index">tasks</ulink>, that group packages around broad themes such as <ulink url="http://debian-med.alioth.debian.org/tasks/imaging">medical imaging</ulink> for instance. The tasks list programs that are already packaged in Debian as well as packages in preparation.</para>

		<para>The Debian Med <ulink url="https://blends.debian.org/blends">Debian Pure Blend</ulink> is organised by <ulink url="https://blends.debian.org/med/tasks">tasks</ulink>, that group packages around broad themes such as <ulink url="https://blends.debian.org/med/tasks/imaging">medical imaging</ulink> for instance. The tasks list programs that are already packaged in Debian as well as packages in preparation.</para>

		<para>The tasks files are not hosted in the Debian Med repositories, but in the Debian Blends repository. Nevertheless, all members of the Debian Med project on the Alioth forge have write access to the Blends subversion repository. You can easily check out its sources with the command <command>debcheckout -a debian-med</command>.</para>

		<para>The syntax of the tasks files is very similar to Debian control files, and described in the <ulink url="http://blends.alioth.debian.org/blends/ch-sentinel.en.html">Debian Blends website</ulink>.</para>

		<para>The syntax of the tasks files is very similar to Debian control files, and described in the <ulink url="https://blends.debian.org/blends/ch08.html#edittasksfiles">Debian Blends website</ulink>.</para>

	</sect1>

	<sect1 id="policy">

		<title>Policy</title>
@@ -561,8 +548,8 @@ rm ../*_source.changes</programlisting> 
					<para>Please use the following templates, and refer to the Debian Policy

					<ulink url="https://www.debian.org/doc/debian-policy/#version-control-system-vcs-fields">§ 5.6.26</ulink>

					for details:<programlisting>

Vcs-Browser: http://anonscm.debian.org/cgit/debian-med/&lt;package&gt;.git

Vcs-Git: git://anonscm.debian.org/debian-med/&lt;package&gt;.git</programlisting>

Vcs-Browser: https://salsa.debian.org/med-team/&lt;package&gt;

Vcs-Git: https://salsa.debian.org/med-team/&lt;package&gt;.git</programlisting>

					</para>

				</formalpara>

				</listitem>