Bug#916478: (no subject)
Control: tags -1 + patch
Hello,
Here is a patch to solve this:
* Drops references to package template (Closes: #916478)
* Replaces references to Alioth with Salsa equivalents
Thank you,
Ana
diff -Nru hamradio-maintguide-0.6/debian/changelog hamradio-maintguide-0.6+nmu1/debian/changelog
--- hamradio-maintguide-0.6/debian/changelog 2019-08-05 19:14:25.000000000 +0100
+++ hamradio-maintguide-0.6+nmu1/debian/changelog 2020-02-28 23:23:40.000000000 +0000
@@ -1,3 +1,11 @@
+hamradio-maintguide (0.6+nmu1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Drops references to package template (Closes: #916478)
+ * Replaces references to Alioth with Salsa equivalents
+
+ -- Ana Custura <ana@netstat.org.uk> Fri, 28 Feb 2020 23:23:40 +0000
+
hamradio-maintguide (0.6) unstable; urgency=medium
* Packaging:
@@ -6,7 +14,7 @@
preferred over /var/lib/ax25
* Compat level bumped to 12
* d/control:
- - Update dependency for texlive-plain-generic (Fixes: #933283)
+ - Update dependency for texlive-plain-generic (Closes: #933283)
- Update standards-version to 4.4.0
* d/copyright:
- Use secure URL for Format
diff -Nru hamradio-maintguide-0.6/intro.rst hamradio-maintguide-0.6+nmu1/intro.rst
--- hamradio-maintguide-0.6/intro.rst 2019-08-05 18:52:47.000000000 +0100
+++ hamradio-maintguide-0.6+nmu1/intro.rst 2020-02-28 23:23:40.000000000 +0000
@@ -23,10 +23,10 @@
subscribe. You will have to reply to an email in order to confirm your
subscription.
-To sign up for an Alioth account, visit `the Alioth homepage
-<https://alioth.debian.org/>`_ and register. You can then visit the `project
+To sign up for an Salsa account, visit `the Salsa registration page
+<https://signup.salsa.debian.org/>`_ and register. You can then visit the `project
page for the Hamradio Maintainers team
-<https://alioth.debian.org/projects/pkg-hamradio/>`_ and request to be added to
+<https://salsa.debian.org/debian-hamradio-team/>`_ and request to be added to
the team.
Our IRC channel is `#debian-hams <irc://irc.debian.org/#debian-hams>`_ on
diff -Nru hamradio-maintguide-0.6/packaging.rst hamradio-maintguide-0.6+nmu1/packaging.rst
--- hamradio-maintguide-0.6/packaging.rst 2019-08-05 19:08:00.000000000 +0100
+++ hamradio-maintguide-0.6+nmu1/packaging.rst 2020-02-28 23:23:40.000000000 +0000
@@ -11,9 +11,10 @@
complies with `Debian Policy <https://www.debian.org/doc/debian-policy/>`_. See
the `Debian New Maintainers Guide
<http://www.debian.org/doc/manuals/maint-guide/>`_ for help on getting started
-with packaging. You may also find our `package template
-<http://anonscm.debian.org/viewvc/pkg-hamradio/trunk/package_template/>`_
-useful.
+with packaging. You may also find our `salsa script
+<https://salsa.debian.org/debian-hamradio-team/hamradio-maintguide/tree/master/salsa>`_
+useful for configuring new repositories if you have an account on
+salsa.debian.org.
Announcing intention to package
-------------------------------
@@ -64,7 +65,7 @@
+-------------------+--------------------------------------------------------------------------------------+
| Homepage | Should be documented whenever possible. |
+-------------------+--------------------------------------------------------------------------------------+
-| Vcs-* | Please use the following template when using the team's Git repositories on Alioth: |
+| Vcs-* | Please use the following template when using the team's Git repositories on Salsa: |
| | :: |
| | |
| | Vcs-Browser: https://salsa.debian.org/debian-hamradio-team/<pkg> |
diff -Nru hamradio-maintguide-0.6/vcs.rst hamradio-maintguide-0.6+nmu1/vcs.rst
--- hamradio-maintguide-0.6/vcs.rst 2019-08-05 18:52:47.000000000 +0100
+++ hamradio-maintguide-0.6+nmu1/vcs.rst 2020-02-28 23:23:40.000000000 +0000
@@ -1,15 +1,14 @@
Version Control System
======================
-The Debian Hamradio Maintainers team has a project on `Alioth
-<http://alioth.debian.org/>`_. You are encouraged to use this for managing git
+The Debian Hamradio Maintainers team has a project on `Salsa
+<http://salsa.debian.org/>`_. You are encouraged to use this for managing git
repositories for the source of your team packages. If you do not currently have
-an account on Alioth or have not requested to be added to the project, you will
+an account on Salsa or have not requested to be added to the project, you will
need to do that before you can use this facility. To request to be added to the
project, send an email to the `mailing list
<https://lists.debian.org/debian-hams/>`_. In order to be able to push to the
-repositories on Alioth, you will need to `add an SSH key
-<https://alioth.debian.org/account/editsshkeys.php>`_ to your Alioth account.
+repositories on Salsa, you will need to add an SSH key to your Salsa account.
Anonymous access to git repositories
------------------------------------
@@ -44,11 +43,9 @@
If your package is not currently tracked with git, you can import the sources
from a source package.
-Begin by logging into Alioth and creating the new repository:
-::
-
- cd /git/pkg-hamradio/
- ./setup-repository <pkg-name> "Packaging for <pkg-name> in Debian"
+Begin by logging into Salsa and creating the new repository.
+To configure the Salsa repository you've created you can use the script at
+`<https://salsa.debian.org/debian-hamradio-team/hamradio-maintguide/tree/master/salsa>`_.
If you have the source package locally, you can skip this next step. If not,
you will need to download the source package from the Debian archives:
@@ -70,7 +67,7 @@
tags:
::
- git remote add origin git+ssh://alioth.debian.org/git/pkg-hamradio/<pkg-name>.git
+ git remote add origin git+ssh://salsa.debian.org/debian-hamradio-team/<pkg-name>.git
git push origin --all
git push origin --tags
@@ -86,18 +83,16 @@
If you've previously had a git repository elsewhere for your package, you can
import it quite easily.
-Begin by logging into Alioth and creating the new repository:
-::
-
- cd /git/pkg-hamradio/
- ./setup-repository <pkg-name> "Packaging for <pkg-name> in Debian"
+Begin by logging into Salsa and creating the new repository.
+To configure the Salsa repository you've created you can use the script at
+`<https://salsa.debian.org/debian-hamradio-team/hamradio-maintguide/tree/master/salsa>`_.
Then in your local git repository, add the remote and push all branches and
tags:
::
git remote remove origin
- git remote add origin git+ssh://alioth.debian.org/git/pkg-hamradio/<pkg-name>.git
+ git remote add origin git+ssh://salsa.debian.org/debian-hamradio-team/<pkg-name>.git
git push origin --all
git push origin --tags
@@ -107,21 +102,13 @@
Please remember to update your ``Vcs-Git`` and ``Vcs-Browser`` fields in
``debian/control`` to match the URLs shown above for anonymous access.
-Even if your existing repository is on Alioth, do **NOT** just copy the
-repository into ``/git/pkg-hamradio/``. The ``setup-repository`` script
-adds commit hooks to the repository to aid in tracking commits.
-
Creating a new git repository for a new package
-----------------------------------------------
You will need ``git-buildpackage`` installed on your local machine before
following these steps.
-Begin by logging into Alioth and creating the new repository:
-::
-
- cd /git/pkg-hamradio/
- ./setup-repository <pkg-name> "Packaging for <pkg-name> in Debian"
+Begin by logging into Salsa and creating the new repository.
On your machine, download the upstream source tarball and keep it somewhere
safe. You will need a tarball to import, so if upstream distributes source as a
@@ -138,17 +125,15 @@
You'll now find that the upstream source has been imported into your git
repository.
-You may optionally use the Debian Hamradio Maintainers template ``debian/``
-directory:
-::
+To configure the Salsa repository you've created you can use the script at
+`<https://salsa.debian.org/debian-hamradio-team/hamradio-maintguide/tree/master/salsa>`_.
- svn export svn://anonscm.debian.org/svn/pkg-hamradio/trunk/package_template debian
-When you are ready to push your changes to Alioth, add the remote and push all
+When you are ready to push your changes to Salsa, add the remote and push all
branches and tags:
::
- git remote add origin git+ssh://alioth.debian.org/git/pkg-hamradio/<pkg-name>.git
+ git remote add origin git+ssh://salsa.debian.org/debian-hamradio-team/<pkg-name>.git
git push --all
git push --tags
@@ -256,10 +241,9 @@
Commit notifications are displayed in the `#debian-hams
<irc://irc.debian.org/#debian-hams>`_ IRC channel on irc.debian.org and can
-also be found on the `pkg-hamradio-commits@lists.alioth.debian.org
-<https://lists.alioth.debian.org/mailman/listinfo/pkg-hamradio-commits>`_
-mailing list (`archives
-<http://lists.alioth.debian.org/pipermail/pkg-hamradio-commits/>`_).
+also be found on the `debian-hams@lists.debian.org
+<https://lists.debian.org/debian-hams>`_
+mailing list.
Futher Reading
--------------
Reply to: