* gnu/packages/version-control.scm (git): Switch back to Python 2.
* gnu/packages/version-control.scm (subversion): Switch back to Python 2.
* gnu/packages/version-control.scm (bazaar): Switch back to Python 2.
* gnu/packages/{gdb.scm (gdb), cryptsetup.scm (cryptsetup), ghostscript.scm (ghostscript), glib.scm (glib), gnupg.scm (pius), gtk.scm (cairo, harfbuzz), libevent.scm (libevent), netpbm.scm (netpbm), oggvorbis.scm (libkate), qemu.scm (qemu), samba.scm (samba), texlive.scm (rubber, texlive), version-control.scm (subversion), xml.scm (libxml2, libxslt), xorg.scm (libxcb, mesa, xcb-proto, xorg-server), yasm.scm (yasm), zip.scm (zziplib)}: Replace input python by python-wrapper.
* gnu/packages/version-control.scm (git): New variable.
* gnu/packages/apr.scm: Rename file from libapr.scm. * gnu/packages/patches/apr-skip-getservbyname-test.patch: Rename file from libapr-skip-getservbyname-test.patch. * gnu-system.am (GNU_SYSTEM_MODULES): Rename module libapr to apr. * gnu-system.am (dist_patch_DATA): Rename patch file. * gnu/packages/apr.scm (apr): Rename from libapr. * gnu/packages/apr.scm (apr-util): Rename from libaprutil, change input name. * gnu/packages/version-control.scm (subversion): Change input name.
* gnu/packages/version-control.scm (subversion): Use the http:// URL to work around <http://bugs.gnu.org/14884>. Reported by Mark Weaver and Andreas Enge.
* gnu/packages/version-control.scm (vc-dwim): New variable.
* gnu/packages/subversion.scm: Remove file. * gnu/packages/version-control.scm (subversion): New variable. * Makefile.am (MODULES): remove subversion.scm.
* gnu/packages/version-control.scm (cvs): New variable.
* gnu/packages/bazaar.scm: Rename to... * gnu/packages/version-control.scm: ... this. (rcs): New variable. * Makefile.am (MODULES): Adjust accordingly.
Andreas Enge