Merge commit 'sledge/master'

* commit 'sledge/master':
  Add depends on zip for the CD builder
  Merge branches 'master' and 'master' of git+ssh://git.debian.org/git/mirror/debian.org

Signed-off-by: Peter Palfrader <peter@palfrader.org>

diff --git a/debian/control b/debian/control
index 23e20df59116dff8082273d740968c5101b93f73..86f6ecec14c2fae41a774d05e32ebf17bd08a2d0 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -323,6 +323,7 @@ Depends: bittornado,
        jigit,
        m4,
        tofrodos,
+       zip,
        zsync,
        fakeroot
 Description: metapackage for cdbuilder