More bzr->git transition fallout.

diff --git a/.gitignore b/.gitignore
index 1e2f748ba99d30618a73ef64d9e4ec3783c61005..740a568c3b8261f132193c7f2dd6be3f18d993a0 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -14,7 +14,6 @@ config.aux/ltmain.sh
 config.aux/missing
 config.aux/py-compile
 ,*
-ChangeLog.d/bzr-changelog
 *.la
 *.lo
 .deps
@@ -82,7 +81,6 @@ server/disorderd
 server/trackname
 sounds/Makefile
 templates/Makefile
-.bzr.backup
 doc/disorder-speaker.8.html
 .gdb_history
 core

diff --git a/README.developers b/README.developers
index 5c71b07bbdc75f26fb2e6e3e1592c07bdb2fbc9e..20cd7d9b6adecc0fc059697581753291a9b9c657 100644 (file)
--- a/README.developers
+++ b/README.developers
@@ -4,7 +4,7 @@ Dependencies:
      Automake         1.10           1.7 is no good; 1.8/9 might work
      Autoconf         2.61           Slightly older might work too
      Libtool          1.5.22         1.4 is no good
-     Bazaar (bzr)                    You might be able to manage without
+     git                             You might be able to manage without
      Python           2.5.2          2.4 won't work
 
    * On Debian and derivatives this should work:
@@ -30,7 +30,7 @@ Dependencies:
 
 Building:
 
-   * Compiled versions of configure and the makefiles are not included in bzr,
+   * Compiled versions of configure and the makefiles are not included in git,
      so if you didn't use a source tarball, you must start as follows:
 
         bash ./autogen.sh
@@ -183,7 +183,7 @@ Code And Patches:
      structure initializers are used; the configure script asks for -std=gnu99
      by default.  Some supported platforms are still on GCC 4.0.
 
-   * Please submit patches either using 'diff -u', or by publishing a bzr
+   * Please submit patches either using 'diff -u', or by publishing a git
      branch somewhere I can get at it.
 
    * Please make it clear that your changes can be distributed under DisOrder's

diff --git a/debian/control b/debian/control
index 4036a11e68d13075f88b99bb486aca913b404d8d..0c183d31ca3f684b16e541a58233ff5e2ffb3fe2 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Section: sound
 Priority: optional
 Standards-Version: 3.8.1.0
 Build-Depends: libgc6-dev | libgc-dev, libgcrypt-dev, libdb4.3-dev | libdb4.5-dev | libdb4.7-dev | libdb4.8-dev, libpcre3-dev, libvorbis-dev, libmad0-dev, libasound2-dev, libao-dev, python, libflac-dev, libgtk2.0-dev (>= 2.12.12)
-Vcs-Bzr: http://www.greenend.org.uk/rjk/bzr/disorder.dev/
+Vcs-Git: https://code.google.com/p/disorder/
 Homepage: http://www.greenend.org.uk/rjk/disorder/
 
 Package: disorder