Merge branch 'ubuntu'

This imports the single change from 1.0.6ubuntu1

Conflicts:
	.gitignore
	debian/changelog

diff --cc debian/changelog
index 2456a73bca92ff2cdb55661d6ee7280aca5f9312,e1f5319bd2da14934e9fb8bdbd7a492b7f515432..30cf4706784978cd4a0309d7ecf4fea8aa6a5487
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,11 +1,20 @@@
 +userv (1.0.7~~iwj) unstable; urgency=low
 +
 +  * Remove /var/run/userv from the .deb.
 +    (Along with the change in 1.0.6, Closes: #630528.)
 +  * Remove spec.html from revision control.
 +  * Revision control switched from cvs to git.
 +
 + -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sat, 02 Jun 2012 15:44:16 +0100
 +
+ userv (1.0.6ubuntu1) lucid; urgency=low
+ 
+   * Change tetex-bin with texlive and tetex-extra with texlive-latex-extra
+     in Build-Depends for tetex transition. Cherry-picked from Debian,
+     Thanks to Jari Aalto.
+ 
+  -- James Westby <james.westby@ubuntu.com>  Thu, 15 Apr 2010 12:03:52 +0100
+ 
  userv (1.0.6) unstable; urgency=low
  
    Packaging fix:

diff --cc debian/control
index 15bd7386069ee30bc745fa64ae6b295c9e842bdc,71c547f2ef108f4118949d3f87482b27fba0ff7e..58c28fa7829bc18d9c70780e4b1ab8d3e62abea5
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -1,8 -1,9 +1,8 @@@
  Source: userv
  Section: admin
  Priority: optional
 -Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 -XSBC-Original-Maintainer: Ian Jackson <ian@davenant.greenend.org.uk>
 +Maintainer: Ian Jackson <ian@davenant.greenend.org.uk>
- Build-Depends: debiandoc-sgml, tetex-bin, tetex-extra
+ Build-Depends: debiandoc-sgml, texlive, texlive-latex-extra
  Standards-Version: 3.6.1
  
  Package: userv