Merge branch 'svnup' of http://netz.smurf.noris.de/git/git

diff --combined debian/control
index a77bb5d,d2a9234..3935e33
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -2,7 -2,7 +2,7 @@@ Source: git-cor
  Section: devel
  Priority: optional
  Maintainer: Junio C Hamano <junkio@cox.net>
 -Build-Depends-Indep: libz-dev, libssl-dev, libcurl3-dev|libcurl3-gnutls-dev|libcurl3-openssl-dev, asciidoc (>= 6.0.3), xmlto, debhelper (>= 4.0.0), bc
 +Build-Depends-Indep: libz-dev, libssl-dev, libcurl3-dev|libcurl3-gnutls-dev|libcurl3-openssl-dev, asciidoc (>= 6.0.3), xmlto, debhelper (>= 4.0.0), bc, libexpat1-dev
  Standards-Version: 3.6.1
  
  Package: git-core
@@@ -48,7 -48,7 +48,7 @@@ Description: The git content addressabl
  
  Package: git-cvs
  Architecture: all
- Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, git-core
+ Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, git-core, cvsps (>= 2.1)
  Suggests: cvs
  Description: The git content addressable filesystem, CVS interoperability
   This package contains 'git-cvsimport', to import development history from