[Blends-commit] [Git][blends-team/blends][master] Do not mention subversion any more
Andreas Tille
gitlab at salsa.debian.org
Tue Apr 3 14:12:59 UTC 2018
Andreas Tille pushed to branch master at Debian Blends Team / blends
Commits:
89991912 by Andreas Tille at 2018-04-03T16:12:48+02:00
Do not mention subversion any more
- - - - -
4 changed files:
- doc/en/07_starting.xml
- doc/en/08_websentinel.xml
- doc/en/09_todo.xml
- doc/en/A_devel.xml
Changes:
=====================================
doc/en/07_starting.xml
=====================================
--- a/doc/en/07_starting.xml
+++ b/doc/en/07_starting.xml
@@ -171,10 +171,10 @@ written by Ben Armstrong <email>synrg at debian.org</email>.
</para>
<para>
Sooner or later a Debian Pure Blend will establish an own project at
- <ulink url="http://alioth.debian.org">alioth.debian.org</ulink>, since
+ <ulink url="https://salsa.debian.org">salsa.debian.org</ulink>, since
this enables many features for group maintaining packages, create
mailing lists for different purposes, maintain a version control
- system like SVN or Git etc. The Alioth project enables to provide
+ system like Git etc. The Alioth project enables to provide
web sites as well and the Debian Med project is using this since a
long time.
</para>
=====================================
doc/en/08_websentinel.xml
=====================================
--- a/doc/en/08_websentinel.xml
+++ b/doc/en/08_websentinel.xml
@@ -52,16 +52,10 @@ sentinel pages. Thus you can influence the tasks pages by simply
editing the tasks files inside the VCS of the sources of the Blends
metapackages. The canonical location of these tasks files inside the
sources is (with the exception of Debian Edu that is locatet in Debian
-Edu SVN repositories) the Blends VCS at
+Edu Git repositories) the Blends Git at
<informalexample>
<programlisting>
- svn://svn.debian.org/svn/blends/projects/BLEND/trunk/SRCPKG/tasks
- </programlisting>
-</informalexample>
-or when using Git which is possible as well
-<informalexample>
- <programlisting>
- git://git.debian.org/git/blends/projects/BLEND.git
+ https://salsa.debian.org/blends-team/BLEND.git
</programlisting>
</informalexample>
Here you can add or remove additional Dependencies to existing packages
@@ -131,20 +125,6 @@ Debian control files do and is kept quite simple:
</varlistentry>
<varlistentry>
- <term>Vcs-Svn</term>
- <listitem><para>If there is some Debian packaging stuff available this
- can be addressed in this field. Unofficial packages which
- have this field set are rendered in a separate section with
- links to the packaging SVN.
- </para><para>
- The usage for this field is the same as it is described in
- <ulink url="http://www.debian.org/doc/developers-reference/best-pkging-practices.html#bpp-vcs"
- > paragraph 6.2.5 of Debian developers reference</ulink>
- </para>
- </listitem>
-</varlistentry>
-
-<varlistentry>
<term>Vcs-Git</term>
<listitem><para>If there is some Debian packaging stuff available this
can be addressed in this field. Unofficial packages which
@@ -164,7 +144,7 @@ Debian control files do and is kept quite simple:
can be addressed in this field. Unofficial packages which
have this field set are rendered in a separate section above
unofficial packages outside the official Debian mirrors.
- If you have set <filename>Vcs-Svn</filename> or <filename>Vcs-Git</filename>
+ If you have set <filename>Vcs-Git</filename>
there is no need to set <filename>Vcs-Browser</filename> explicitely
because it is obtained automatically from the other fields.
But you might override this automatically generated URL if
@@ -228,23 +208,6 @@ Debian control files do and is kept quite simple:
</listitem>
</varlistentry>
-<varlistentry>
- <term>Published-* (deprecated)</term>
- <listitem>
- <para>These tags were previouosely used to specify scientific
- publications. Its use is now deprecated and you rather
- should use the file <filename>debian/upstream</filename> as documented in
- <ulink url="http://wiki.debian.org/UpstreamMetadata">Debian
- Wiki</ulink>. The <filename>debian/upstream</filename> files will be gathered
- in their state in SVN - so changes become effective after some
- delay caused by cron jobs. This new way to handle publications
- prevents code duplication and can be used more flexible by single
- maintainers and is also useful for other purposes than only for
- Blends sentinel.
- </para>
- </listitem>
-</varlistentry>
-
</variablelist>
</para>
@@ -324,7 +287,7 @@ RFC822 files and
<varlistentry>
<term>DataDir</term>
<listitem><para>Directory where the rendering code stores temporary data like
- SVN checkout of tasks files etc. This is usually set to
+ Git clones of tasks files etc. This is usually set to
<filename>/srv/blends.debian.org/data/<ProjectName></filename>
</para>
</listitem>
@@ -477,13 +440,8 @@ the Debian GIS thermometer as example view
</sect1>
<!-- PET is currently not installed for Debian Med - PET maintainer is pinged
- <sect1 id="svnoverview">
- <title>SVN overview</title>
-<para>
-This page gives a recent overview about the current development
+FIXME: PET gives a recent overview about the current development
activities of the Blend developers.
-</para>
- </sect1>
-->
<sect1 id="qareport">
=====================================
doc/en/09_todo.xml
=====================================
--- a/doc/en/09_todo.xml
+++ b/doc/en/09_todo.xml
@@ -14,13 +14,13 @@ could <ulink url="http://lists.debian.org/debian-blends/">subscribe
to this list or read the list archive</ulink>.
</para>
<para>
-Moreover the project <ulink url="http://alioth.debian.org/projects/blends/">
-Blends</ulink> on Alioth exists to organise the cooperation of developers.
-The <ulink url="http://svn.debian.org/wsvn/blends/">subversion repository</ulink>
+Moreover the project <ulink url="https://salsa.debian.org/blends-team">
+Blends</ulink> on Salsa exists to organise the cooperation of developers.
+The <ulink url="https://salsa.debian.org/blends-team/blends">Git repository</ulink>
can be browsed or checked out by by
<informalexample>
<programlisting>
- svn checkout svn://svn.debian.org/svn/blends blends
+ git clone https://salsa.debian.org/blends-team/blends.git
</programlisting>
</informalexample>
<programlisting>
@@ -28,7 +28,7 @@ for anonymous users. Developers should check out via
</programlisting>
<informalexample>
<programlisting>
- svn checkout svn+ssh://<varname>username</varname>@svn.debian.org/svn/blends blends
+ gbp clone git at salsa.debian.org:blends-team/blends.git
</programlisting>
</informalexample>
<programlisting>
@@ -36,33 +36,17 @@ The current layout for the repository is as follows:
</programlisting>
<informalexample>
<programlisting>
- blends -+- blends
- | |
- | +- tags -----+- blends -+- 0.3 [older versions of blends tools]
- | | | +- 0.3.1
- | | | ...
- | | | +- <varname><latest></varname>
- | | |
- | | +- doc -+- 0.1 [older versions of this doc]
- | | +- 0.2
- | | +- 0.3
- | | [Since 0.4.1 the doc is in blends directory]
- | |
- | +- trunk ----blends [code in development for blends source package]
- | |
- | +-- doc [this document = blends-doc package]
- |
- +- projects -+--- med ---+- tags
- | |
- | +- trunk [development version of Debian Med]
- |
- +- science -+- tags
- | |
- | +- trunk [development version of Debian Science]
- |
- +- ...
- |
- ...
+ blends -+- blends (code of blends-dev and this documentation)
+ |
+ +- website (code to create the web sentinel + other tools)
+ |
+ +- med (Debian Med)
+ |
+ +- science (Debian Science)
+ |
+ +- ... (most other Blends)
+ |
+ ...
</programlisting>
</informalexample>
There is
=====================================
doc/en/A_devel.xml
=====================================
--- a/doc/en/A_devel.xml
+++ b/doc/en/A_devel.xml
@@ -729,13 +729,13 @@ Description: sample blends and packages
</sect1>
-<sect1 id="svn">
- <title>Working with the source repository (<filename>svn</filename> in process of moving to <filename>git</filename>)</title>
+<sect1 id="git">
+ <title>Working with the source repository in <filename>Git</filename></title>
<para>
Sometimes it might be interesting for developers to check out the
latest code of the Blend tools or a special Blend code for the meta
packages. In <xref linkend="communication"/> the directory layout of the
- <filename>svn</filename>-directory was described. How to derive the
+ <filename>Git</filename>-repository was described. How to derive the
Debian packages from this layout?
<variablelist>
@@ -745,7 +745,7 @@ Description: sample blends and packages
For the Blend tools and this documentation
<informalexample>
<programlisting>
- git clone git+ssh://<varname>username</varname>@git.debian.org/git/blends/blends.git
+ gbp clone git at salsa.debian.org:blends-team/blends.git
</programlisting>
</informalexample>
@@ -753,11 +753,11 @@ Description: sample blends and packages
<informalexample>
<programlisting>
- svn checkout svn+ssh://<varname>username</varname>@svn.debian.org/svn/blends/projects/<varname>BLEND-name</varname>/trunk
+ gbp clone git at salsa.debian.org:blends-team//<varname>BLEND-name</varname>.git
</programlisting>
</informalexample>
- Note: This will be moved to Git (at least) soon after Wheezy release.</para>
+ </para>
</listitem>
</varlistentry>
@@ -798,8 +798,8 @@ Description: sample blends and packages
<varlistentry>
<term>Build Debian packages</term>
<listitem><para>
- Unpack the created source tarball and proceed like you build
- Debian packages normally.</para>
+ gbp buildpackage
+ </para>
</listitem>
</varlistentry>
@@ -818,7 +818,7 @@ the tools described below.
In <xref linkend="sentinel"/> the creation of so called tasks
pages <xref linkend="packageslist"/> and bugs pages <xref linkend="bugs"/> was
described. These pages are automatically build by a cron job on blends.debian.org
-from the current state of the tasks files in the SVN repository.
+from the current state of the tasks files in the Git repositories of all registered Blends.
If you have commited changes to the tasks pages and want to see the
effect immediately the steps to do are as follows:
</para>
@@ -841,7 +841,7 @@ valid <package><blend-name></package>.
</para>
<para>
In case you are planing some more experimental changes there is
-another host (sponsored by GPLhost.com)
+another host (sponsored by rackspace.com)
called <package>blends.debian.net</package> which is running a copy of
UDD and also hosts the latest development snapshot of the Blends web
tools. Just ask Andreas Tille <email>tille at debian.org</email> in case
@@ -849,7 +849,7 @@ you like a login on this host.
</para>
<para>
The code which builds web and tasks pages is available in Git at
-<filename>git://git.debian.org/git/blends/website.git</filename>. It is
+<filename>https://salsa.debian.org/blends-team/website</filename>. It is
using the <ulink url="http://genshi.edgewall.org/">Genshi
templating system</ulink> which enables influencing the layout of the pages
by editing the templates in the
@@ -896,7 +896,7 @@ should care for this!
</para>
<para>
The static pages are maintained in Git at
-<filename>git://git.debian.org/git/blends/website.git</filename> in the
+<filename>https://salsa.debian.org/blends-team/website</filename> in the
<filename>websites</filename> directory.
Once you have changed the content of the pages you can activate
the changes by doing:
View it on GitLab: https://salsa.debian.org/blends-team/blends/commit/89991912bb42f2259ed50708dad27ef99e60c4fd
---
View it on GitLab: https://salsa.debian.org/blends-team/blends/commit/89991912bb42f2259ed50708dad27ef99e60c4fd
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/blends-commit/attachments/20180403/65cc6ac3/attachment-0001.html>
More information about the Blends-commit
mailing list