Merge branch 'ubuntu'

This imports the single change from 1.0.6ubuntu1

Conflicts:
	.gitignore
	debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 2456a73bca92ff2cdb55661d6ee7280aca5f9312..30cf4706784978cd4a0309d7ecf4fea8aa6a5487 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,14 @@ userv (1.0.7~~iwj) unstable; urgency=low
 
  -- 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 --git a/debian/control b/debian/control
index 15bd7386069ee30bc745fa64ae6b295c9e842bdc..58c28fa7829bc18d9c70780e4b1ab8d3e62abea5 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: userv
 Section: admin
 Priority: optional
 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