Diversion via dgit-git.debian.net (gideon)

diff --git a/debian/changelog b/debian/changelog
index 86acb725d16508f8609127aee92cdcc8fed00b9f..90adffb46282ec7d7e2228d02e8272d79cb6c659 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 dgit (0.23~) unstable; urgency=low
 
+  * Check for new dgit git service on dgit-git.debian.net (ie
+    gideon.debian.org), with transition plan based on diversion feature.
+
   * New handling for .pc directory: dgit history now no longer contains
     .pc at all.  It is deleted whenever we find it.  (When doing quilt
     fixup, we recreate a suitable .pc in a temporary directory so that we

diff --git a/dgit b/dgit
index 4c8a09dadfa9e43f44c5f8556864874a0e15adc0..6d346207444184adb992f57b10445a986449fddb 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -520,9 +520,15 @@ our %defcfg = ('dgit.default.distro' => 'debian',
               'dgit.default.archive-query' => 'madison:',
               'dgit.default.sshpsql-dbname' => 'service=projectb',
               'dgit-distro.debian.archive-query' => 'sshpsql:',
-              'dgit-distro.debian.git-host' => 'git.debian.org',
+              'dgit-distro.debian.git-host' => 'dgit-git.debian.net',
+              'dgit-distro.debian.git-user-force' => 'dgit',
               'dgit-distro.debian.git-proto' => 'git+ssh://',
-              'dgit-distro.debian.git-path' => '/git/dgit-repos/repos',
+              'dgit-distro.debian.git-path' => '/dgit/debian/repos',
+              'dgit-distro.debian.diverts.alioth' => '/alioth',
+              'dgit-distro.debian/alioth.git-host' => 'git.debian.org',
+              'dgit-distro.debian/alioth.git-user-force' => '',
+              'dgit-distro.debian/alioth.git-proto' => 'git+ssh://',
+              'dgit-distro.debian/alioth.git-path' => '/git/dgit-repos/repos',
               'dgit-distro.debian.git-check' => 'ssh-cmd',
               'dgit-distro.debian.git-create' => 'ssh-cmd',
               'dgit-distro.debian.sshpsql-host' => 'mirror.ftp-master.debian.org',