[Piuparts-devel] [Git][debian/piuparts][develop] 2 commits: Update anonscm.debian.org and git.debian.org URLs to salsa

Mattia Rizzolo gitlab at salsa.debian.org
Sun Apr 22 16:21:48 BST 2018


Mattia Rizzolo pushed to branch develop at Debian / piuparts


Commits:
19bc013a by Holger Levsen at 2018-04-22T10:20:03-03:00
Update anonscm.debian.org and git.debian.org URLs to salsa

* Update several occurances of anonscm.debian.org and git.debian.org with
  salsa.debian.org URLs.
* index.tpl: add news entry about the salsa migration.

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -
9068007d by Holger Levsen at 2018-04-22T10:33:12-03:00
debian/copyright: update years of my contributions.

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


13 changed files:

- CONTRIBUTING
- README_pejacevic.txt
- README_server.txt
- debian/changelog
- debian/copyright
- htdocs/index.tpl
- instances/piuparts.conf-header.pejacevic
- instances/piuparts.conf-header.piu-slave-1und1-01
- instances/piuparts.conf-header.piu-slave-ubc-01
- piuparts-report.py
- piupartslib/pkgsummary.py
- update-piuparts-master-setup
- update-piuparts-slave-setup


Changes:

=====================================
CONTRIBUTING
=====================================
--- a/CONTRIBUTING
+++ b/CONTRIBUTING
@@ -15,7 +15,7 @@ You can send patches or requests to the development list,
 or to the tracking bug: <bugnumber>@bugs.debian.org.
 
 One possible workflow:
-  git clone git://anonscm.debian.org/piuparts/piuparts.git
+  git clone https://salsa.debian.org/debian/piuparts.git
   git checkout origin/develop -b <topicname>
   <edits>
   git commit -a


=====================================
README_pejacevic.txt
=====================================
--- a/README_pejacevic.txt
+++ b/README_pejacevic.txt
@@ -23,8 +23,8 @@ piuparts.debian.org is a setup running on three systems:
 * basically, apt-get build-dep piuparts - in reality both systems get their
   package configuration from git.debian.org/git/mirror/debian.org.git
 * pejacevic runs a webserver as well (see below for apache configuration)
-* Copy 'https://anonscm.debian.org/cgit/piuparts/piuparts.git/tree/update-piuparts-master-setup?h=develop'
-  and 'https://anonscm.debian.org/cgit/piuparts/piuparts.git/tree/update-piuparts-slave-setup?h=develop'
+* Copy 'https://salsa.debian.org/debian/piuparts/blob/develop/update-piuparts-master-setup'
+  and 'https://salsa.debian.org/debian/piuparts/blob/develop/update-piuparts-slave-setup'
   to the hosts which should be master and slave. (It's possible and has been
   done for a long time to run them on the same host.(
   Run the scripts as the piupartsm and piupartss users and clone that git


=====================================
README_server.txt
=====================================
--- a/README_server.txt
+++ b/README_server.txt
@@ -583,7 +583,7 @@ If you want to run piuparts-report (which is only+very useful if
 you run piuparts in master-slave mode), you need to 'apt-get
 install python-rpy r-recommended r-base-dev'. For more
 information see
-link:https://anonscm.debian.org/cgit/piuparts/piuparts.git/tree/README_pejacevic.txt[https://anonscm.debian.org/cgit/piuparts/piuparts.git/tree/README_pejacevic.txt].
+link:https://salsa.debian.org/debian/piuparts/blob/develop/README_pejacevic.txt[https://salsa.debian.org/debian/piuparts/blob/develop/README_pejacevic.txt].
 
 To generate the report on the master host run:
 


=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ piuparts (0.86) UNRELEASED; urgency=medium
 
   * debian/control: switch packaging to salsa.debian.org. Thanks to the alioth
     admins for providing such a nice service so long!
+  * Update several occurances of anonscm.debian.org and git.debian.org with
+    salsa.debian.org URLs.
+  * index.tpl: add news entry about the salsa migration.
+  * debian/copyright: update years of my contributions.
 
  -- Holger Levsen <holger at debian.org>  Sat, 21 Apr 2018 22:13:13 -0300
 


=====================================
debian/copyright
=====================================
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,9 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: piuparts
 Upstream-Contact: Holger Levsen <holger at debian.org>
-Source: https://anonscm.debian.org/cgit/piuparts/piuparts.git
+Source: https://salsa.debian.org/debian/piuparts.git
 Copyright: 2005-2008 Lars Wirzenius
-           2008-2017 Holger Levsen
+           2008-2018 Holger Levsen
            © 2011-2017 Andreas Beckmann
 Comment: Original author is also Lars Wirzenius <liw at iki.fi>
  Upstream is bunch of lunatics who don't make release tarballs publicly
@@ -11,7 +11,7 @@ Comment: Original author is also Lars Wirzenius <liw at iki.fi>
 
 Files: *
 Copyright: 2005-2008 Lars Wirzenius <liw at iki.fi>
-           2008-2017 Holger Levsen <holger at debian.org>
+           2008-2018 Holger Levsen <holger at debian.org>
            © 2011-2017 Andreas Beckmann <anbe at debian.org>
 License: GPL-2+
  This program is free software; you can redistribute it


=====================================
htdocs/index.tpl
=====================================
--- a/htdocs/index.tpl
+++ b/htdocs/index.tpl
@@ -54,7 +54,7 @@
     </tr>
     <tr class="normalrow">
      <td class="contentcell2">
-      You can talk to us on #debian-qa on irc.debian.org (OFTC) or send an email on the <a href="https://lists.alioth.debian.org/mailman/listinfo/piuparts-devel" target="_blank">piuparts development mailinglist</a>. The best ways to <a href="https://anonscm.debian.org/git/piuparts/piuparts.git/tree/CONTRIBUTING">contribute</a> are to provide patches via GIT pull requests and/or to file bugs based on piuparts runs.
+      You can talk to us on #debian-qa on irc.debian.org (OFTC) or send an email on the <a href="https://lists.alioth.debian.org/mailman/listinfo/piuparts-devel" target="_blank">piuparts development mailinglist</a>. The best ways to <a href="https://salsa.debian.org/debian/piuparts/blob/develop/CONTRIBUTING">contribute</a> are to provide patches via GIT pull requests and/or to file bugs based on piuparts runs.
      </td>
     </tr>
     <tr class="normalrow">
@@ -74,6 +74,11 @@
     </tr>
     <tr class="normalrow">
      <td class="contentcell2">
+      <b>2018-04-22</b> Move git repo to <a href="https://salsa.debian.org/debian/piuparts.git">salsa.debian.org</a>. Many thanks to the alioth.debian.org admins for providing such nice services so long!
+     </td>
+    </tr>
+    <tr class="normalrow">
+     <td class="contentcell2">
       <b>2017-08-14</b> Improve testing coverage of Wheezy LTS: <a href="https://piuparts.debian.org/wheezy2lts">wheezy2lts</a>, <a href="https://piuparts.debian.org/squeeze2wheezy-lts">squeeze2wheezy-lts</a> and <a href="https://piuparts.debian.org/squeeze2bpo2wheezy">squeeze2bpo2wheezy</a> now test upgrades up to wheezy-lts.
      </td>
     </tr>
@@ -230,7 +235,7 @@
     </tr>
     <tr class="normalrow">
      <td class="contentcell2">
-      <b>2013-03-02</b> While the <a href="https://anonscm.debian.org/cgit/piuparts/piuparts.git">piuparts.git repo on Alioth</a> will continue to be the main repo, there is also a <a href="https://github.com/h01ger/piuparts">piuparts clone on github</a>, for those who prefer to send pull requests that way.
+      <b>2013-03-02</b> While the <a href="https://anonscm.debian.org/cgit/piuparts/piuparts.git">piuparts.git repo on Alioth</a> (update 2018-04-23: moved to <a href="https://salsa.debian.org/debian/piuparts.git">salsa</a>) will continue to be the main repo, there is also a <a href="https://github.com/h01ger/piuparts">piuparts clone on github</a>, for those who prefer to send pull requests that way.
      </td>
     </tr>
     <tr class="normalrow">


=====================================
instances/piuparts.conf-header.pejacevic
=====================================
--- a/instances/piuparts.conf-header.pejacevic
+++ b/instances/piuparts.conf-header.pejacevic
@@ -3,5 +3,5 @@
 # - pejacevic.debian.org (as master) and
 # - piu-slave-bm-a.debian.org (as slave).
 #
-# For more information on this setup see https://anonscm.debian.org/cgit/piuparts/piuparts.git/tree/README_pejacevic.txt
+# For more information on this setup see https://salsa.debian.org/debian/piuparts/blob/develop/README_pejacevic.txt
 #


=====================================
instances/piuparts.conf-header.piu-slave-1und1-01
=====================================
--- a/instances/piuparts.conf-header.piu-slave-1und1-01
+++ b/instances/piuparts.conf-header.piu-slave-1und1-01
@@ -7,5 +7,5 @@
 # NOTE: However this slave does exist yet, as piuparts-master does not yet
 #	support multiple architectures…
 #
-# For more information on this setup see https://anonscm.debian.org/cgit/piuparts/piuparts.git/tree/README_pejacevic.txt
+# For more information on this setup see https://salsa.debian.org/debian/piuparts/blob/develop/README_pejacevic.txt
 #


=====================================
instances/piuparts.conf-header.piu-slave-ubc-01
=====================================
--- a/instances/piuparts.conf-header.piu-slave-ubc-01
+++ b/instances/piuparts.conf-header.piu-slave-ubc-01
@@ -4,5 +4,5 @@
 # Except for the mirror configuration this file is identical to the one
 # for pejacevic and piu-slave-bm-a.
 #
-# For more information on this setup see https://anonscm.debian.org/cgit/piuparts/piuparts.git/tree/README_pejacevic.txt
+# For more information on this setup see https://salsa.debian.org/debian/piuparts/blob/develop/README_pejacevic.txt
 #


=====================================
piuparts-report.py
=====================================
--- a/piuparts-report.py
+++ b/piuparts-report.py
@@ -112,7 +112,7 @@ HTML_HEADER = """<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
     </tr>
     <tr class="normalrow">
      <td class="contentcell">
-      <a href="https://anonscm.debian.org/cgit/piuparts/piuparts.git" target="_blank">Source</a>
+      <a href="h://salsa.debian.org/debian/piuparts.git" target="_blank">Source</a>
      </td>
     </tr>
     <tr class="normalrow">
@@ -122,7 +122,7 @@ HTML_HEADER = """<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
     </tr>
     <tr class="normalrow">
      <td class="contentcell">
-      piuparts <a href="https://bugs.debian.org/src:piuparts" target="_blank">bugs</a> / <a href="https://anonscm.debian.org/cgit/piuparts/piuparts.git/tree/TODO?h=develop" target="_blank">ToDo</a>
+      piuparts <a href="https://bugs.debian.org/src:piuparts" target="_blank">bugs</a> / <a href="https://salsa.debian.org/debian/piuparts/blob/develop/TODO" target="_blank">ToDo</a>
      </td>
     </tr>
     <tr class="normalrow">
@@ -153,9 +153,9 @@ HTML_HEADER = """<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
     <tr class="normalrow">
      <td class="contentcell">
       piuparts.d.o configuration:<br>
-      <a href="https://anonscm.debian.org/cgit/piuparts/piuparts.git/tree/instances/piuparts.conf-template.pejacevic?h=develop" target="_blank">piuparts.conf</a>,<br>
-      <a href="https://anonscm.debian.org/cgit/piuparts/piuparts.git/tree/conf/distros.conf?h=develop" target="_blank">distros.conf</a><br> and
-      <a href="https://anonscm.debian.org/cgit/piuparts/piuparts.git/tree/custom-scripts?h=develop" target="_blank">scripts</a>
+      <a href="https://salsa.debian.org/debian/piuparts/tree/develop/instances" target="_blank">piuparts.conf</a>,<br>
+      <a href="https://salsa.debian.org/debian/piuparts/blob/develop/conf/distros.conftarget="_blank">distros.conf</a><br> and
+      <a href="https://salsa.debian.org/debian/piuparts/tree/develop/custom-scripts" target="_blank">scripts</a>
      </td>
     </tr>
     <tr class="normalrow">
@@ -249,7 +249,7 @@ HTML_FOOTER = """
    <a href="mailto:holger at layer-acht.org">Holger Levsen</a> and
 
    <a href="mailto:piuparts-devel at lists.alioth.debian.org">others</a> using
-   <a href="https://anonscm.debian.org/cgit/piuparts/piuparts.git/" target="_blank">piuparts.git</a>.
+   <a href="https://salsa.debian.org/debian/piuparts.git" target="_blank">piuparts.git</a>.
    Ditto for this website.
    Weather icons are from the <a href="http://tango.freedesktop.org/Tango_Icon_Library" target="_blank">Tango Icon Library</a>.
    <a href="http://validator.w3.org/check?uri=referer">


=====================================
piupartslib/pkgsummary.py
=====================================
--- a/piupartslib/pkgsummary.py
+++ b/piupartslib/pkgsummary.py
@@ -35,7 +35,7 @@
 #
 # summary.json
 # {
-#  "_comment": "Debian Piuparts Package Results - https://anonscm.debian.org/...
+#  "_comment": "Debian Piuparts Package Results - https://piuparts.debian.org/...",
 #  "_date": "Wed Feb 26 01:48:43 UTC 2014",
 #  "_id": "Piuparts Package Test Results Summary",
 #  "_type": "source",
@@ -151,8 +151,7 @@ def new_summary():
                "_version": SUMMVER,
                "_date": utcdate,
                "_comment": "Debian Piuparts Package Results - "
-                            "https://anonscm.debian.org/cgit/piuparts/"
-                            "piuparts.git/tree/piupartslib/pkgsummary.py",
+                            "https://piuparts.debian.org/",
                "_type": "source",
                "packages": pkgstruct,
     })


=====================================
update-piuparts-master-setup
=====================================
--- a/update-piuparts-master-setup
+++ b/update-piuparts-master-setup
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 
-# Copyright 2009-2013 Holger Levsen (holger at layer-acht.org)
+# Copyright 2009-2018 Holger Levsen (holger at layer-acht.org)
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by the
@@ -46,7 +46,7 @@ if [ ! -d $PIUPARTS_PREFIX/src ] ; then
 	mkdir -p $PIUPARTS_PREFIX/src
 	chmod 0755 $PIUPARTS_PREFIX/src
 	cd $PIUPARTS_PREFIX/src
-	git clone git://git.debian.org/git/piuparts/piuparts.git
+	git clone https://salsa.debian.org/debian/piuparts.git
 	cd piuparts
 	git checkout develop
 fi


=====================================
update-piuparts-slave-setup
=====================================
--- a/update-piuparts-slave-setup
+++ b/update-piuparts-slave-setup
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 
-# Copyright 2009-2013, 2017 Holger Levsen (holger at layer-acht.org)
+# Copyright 2009-2018 Holger Levsen (holger at layer-acht.org)
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by the
@@ -46,7 +46,7 @@ if [ ! -d $PIUPARTS_PREFIX/src ] ; then
 	mkdir -p $PIUPARTS_PREFIX/src
 	chmod 0755 $PIUPARTS_PREFIX/src
 	cd $PIUPARTS_PREFIX/src
-	git clone git://git.debian.org/git/piuparts/piuparts.git
+	git clone https://salsa.debian.org/debian/piuparts.git
 	cd piuparts
 	git checkout develop
 fi



View it on GitLab: https://salsa.debian.org/debian/piuparts/compare/a211b5ee0f9a3ba958f88d7b21586fd4d1eca0a1...9068007d898439f7b2c47a56d6512ab556705ddd

---
View it on GitLab: https://salsa.debian.org/debian/piuparts/compare/a211b5ee0f9a3ba958f88d7b21586fd4d1eca0a1...9068007d898439f7b2c47a56d6512ab556705ddd
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/piuparts-devel/attachments/20180422/8102ec83/attachment-0001.html>


More information about the Piuparts-devel mailing list