Move VCS URLs to Salsa

3 files changed, 9 insertions, 7 deletions

diff --git a/debian/README.source b/debian/README.source
index 28b53c5..e0559d8 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,7 +1,7 @@
 README.source for ulogd2
 ========================
 
-This is a pretty standard 3.0 (quilt) format package, using debhelper 9. There
+This is a pretty standard 3.0 (quilt) format package, using debhelper 11. There
 are no gotchas that I am aware of that may affect NMUs or similar.
 
 git-buildpackage is used to maintain the git tree, and debian/gbp.conf is
@@ -15,10 +15,12 @@ simple requests so that I can incorporate your changes into the package as
 easily as possible. Note that all of this section is optional, so you do not
 *have* to do any of this should you not want to.
 
-### Using Alioth
+### Using Salsa
 
 This package is maintained under the pkg-netfilter umbrella. Any member of the
-pkg-netfilter project has commit access to the Git repository.
+pkg-netfilter project has commit access to the Git repository. If you are not a
+member you are encouraged to fork the repository into your own account and
+submit a merge request.
 
 ### Using plain Git
 
@@ -45,4 +47,4 @@ Then, to import a new upstream release:
 
 git checkout master
 git fetch upstream  # fetch upstream commits, including tags
-git-import-orig --upstream-vcs-tag=ulogd-2.0.3 ../ulogd-2.0.3.tar.bz2
+gbp import-orig --uscan --upstream-vcs-tag=ulogd-2.0.7 --pristine-tar
diff --git a/debian/changelog b/debian/changelog
index 67176cb..d126cd9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,7 @@ ulogd2 (2.0.7-1) UNRELEASED; urgency=medium
   * Refresh put-logfiles-in-var-log-ulog.patch.
   * Remove ulogd-restructures-signal-handling-by-self-pipe-tric.patch, was
     cherry-picked from upstream Git.
-  * Move the package into the pkg-netfilter umbrella:
+  * Move the package into the pkg-netfilter umbrella on Salsa:
     - debian/gbp.conf: move packaging into the master branch (using the debian
       branch was weird and non-standard).
     - debian/control: update Maintainer field, move myself to Uploaders,
diff --git a/debian/control b/debian/control
index 6eab15b..8fc141d 100644
--- a/debian/control
+++ b/debian/control
@@ -21,8 +21,8 @@ Build-Depends:
  pkg-config,
 Standards-Version: 4.1.4
 Homepage: https://www.netfilter.org/projects/ulogd/
-Vcs-Browser: https://anonscm.debian.org/git/pkg-netfilter/ulogd2.git
-Vcs-Git: https://anonscm.debian.org/git/pkg-netfilter/ulogd2.git
+Vcs-Browser: https://salsa.debian.org/pkg-netfilter-team/ulogd2
+Vcs-Git: https://salsa.debian.org/pkg-netfilter-team/ulogd2.git
 
 Package: ulogd2
 Architecture: linux-any