build system: debian packaging improvements

diff --git a/debian/changelog b/debian/changelog
index 3bceeb80a6888a98247937a2b0b8079f760d5880..9f164bbfb52d2ef4be4160653c96213743aed89a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,10 @@ secnet (0.3.0~beta1) unstable; urgency=low
    - make-secnet-sites made more sophisticated to support two vpns on chiark.
    - Documentation improvements.
    - Build system improvements.
    - make-secnet-sites made more sophisticated to support two vpns on chiark.
    - Documentation improvements.
    - Build system improvements.

+  * Debian packaging improvements:
+   - Native package.
+   - Maintainer / uploaders.
+   - init script requires $remove_fs since we're in /usr.

 
  -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Thu, 12 Jul 2012 20:18:16 +0100
 
 
  -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Thu, 12 Jul 2012 20:18:16 +0100
 

diff --git a/debian/control b/debian/control
index 8c95f71dbe25fdf12c3ba5fb28779e1e8d42b065..eba2515692560296d9ee24a3b102d2f78c82138e 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,13 +1,15 @@
 Source: secnet
 Section: net
 Priority: extra
 Source: secnet
 Section: net
 Priority: extra

-Maintainer: Stephen Early <steve@greenend.org.uk>
-Build-Depends: debhelper,libgmp3-dev,libadns1-dev,bison,flex
+Maintainer: Ian Jackson <ijackson@chiark.greenend.org.uk>
+Uploaders: Stephen Early <steve@greenend.org.uk>,
+           Richard Kettlewell <rjk@terraraq.org.uk>
+Build-Depends: debhelper (>= 5), libgmp3-dev, libadns1-dev, bison, flex

 Standards-Version: 3.0.1
 
 Package: secnet
 Architecture: any
 Standards-Version: 3.0.1
 
 Package: secnet
 Architecture: any

-Depends: ${shlibs:Depends} ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}

 Recommends: python
 Description: VPN software for distributed networks
  secnet allows multiple private networks, each 'hidden' behind a single
 Recommends: python
 Description: VPN software for distributed networks
  secnet allows multiple private networks, each 'hidden' behind a single

diff --git a/debian/init b/debian/init
index 5b37f23864bfc6b8a66a7b9b3acc3ebc6ccdc85c..8df268bee25265bb98f5a2977ab1170f22cf6751 100644 (file)
--- a/debian/init
+++ b/debian/init
@@ -13,8 +13,8 @@
 
 ### BEGIN INIT INFO
 # Provides:          secnet
 
 ### BEGIN INIT INFO
 # Provides:          secnet

-# Required-Start:    $network $local_fs
-# Required-Stop:     $network $local_fs
+# Required-Start:    $network $local_fs $remote_fs
+# Required-Stop:     $network $local_fs $remote_fs

 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: Start and stop secnet
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: Start and stop secnet