packaging: consolidate control

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/debian/control b/debian/control
index af738d75a4dcb48a028c22eaa6ace1317c139393..f0d8ab9c20a253c6c1e483c5715d94e45ee9e0d4 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,21 +2,26 @@ Source: hippotat
 Maintainer: Ian Jackson <ijackson@chiark.greenend.org.uk>
 Section: network
 Priority: optional
+Build-Depends: debhelper (>= 10), cargo, rustc
 
 Package: hippotat-client
 Architecture: any
 Depends: ${misc:Depends}
-Recommends: hippotat-doc, userv-utils
-Description: Asinine IP Over HTTP - client
+Recommends: hippotat-doc, userv, userv-utils (>= 0.6.0~~iwj4)
+Description: IP Over HTTP (Asinine) - client
+ IP-over-HTTP client.
 
 Package: hippotat-server
 Architecture: any
 Depends: ${misc:Depends}
-Recommends: hippotat-doc, userv-utils
-Description: Asinine IP Over HTTP - server
+Recommends: hippotat-doc, userv, userv-utils (>= 0.6.0~~iwj4)
+Suggests: authbind
+Description: IP Over HTTP (Asinine) - server
+ IP-over-HTTP server.
 
 Package: hippotat-doc
 Architecture: any
 Depends: ${misc:Depends}
 Recommends: userv-utils
-Description: Asinine IP Over HTTP - documentation
+Description: IP Over HTTP (Asinine) - documentation
+ IP-over-HTTP system documentation.

diff --git a/old-python/debian/control b/old-python/debian/control
deleted file mode 100644 (file)
index b5e5935..0000000
--- a/old-python/debian/control
+++ /dev/null
@@ -1,11 +0,0 @@
-Source: hippotat
-Build-Depends: debhelper (>= 9), dh-python, python3
-Maintainer: Ian Jackson <ijackson@chiark.greenend.org.uk>
-
-Package: hippotat
-Depends: python3, ${python3:Depends}
-Recommends: userv, userv-utils (>= 0.6.0~~iwj4), cpio
-Suggests: authbind
-Architecture: all
-Description: IP Over HTTP (Asinine)
- IP-over-HTTP client and server.