Initialize git-dpm

1 files changed, 24 insertions, 14 deletions

diff --git a/debian/patches/syslog-level-silent.patch b/debian/patches/syslog-level-silent.patch
index f8be76c89..a1eaa7513 100644
--- a/debian/patches/syslog-level-silent.patch
+++ b/debian/patches/syslog-level-silent.patch
@@ -1,20 +1,30 @@
-Description: "LogLevel SILENT" compatibility
- "LogLevel SILENT" (-qq) was introduced in Debian openssh 1:3.0.1p1-1 to
- match the behaviour of non-free SSH, in which -q does not suppress fatal
- errors.  However, this was unintentionally broken in 1:4.6p1-2 and nobody
- complained, so we've dropped most of it.  The parts that remain are basic
- configuration file compatibility, and an adjustment to "Pseudo-terminal
- will not be allocated ..." which should be split out into a separate patch.
-Author: Jonathan David Amery <jdamery@ysolde.ucam.org>
+From bbddcd71a027a33919f859f35dae800335a2de6a Mon Sep 17 00:00:00 2001
+From: Jonathan David Amery <jdamery@ysolde.ucam.org>
+Date: Sun, 9 Feb 2014 16:09:54 +0000
+Subject: "LogLevel SILENT" compatibility
+
+"LogLevel SILENT" (-qq) was introduced in Debian openssh 1:3.0.1p1-1 to
+match the behaviour of non-free SSH, in which -q does not suppress fatal
+errors.  However, this was unintentionally broken in 1:4.6p1-2 and nobody
+complained, so we've dropped most of it.  The parts that remain are basic
+configuration file compatibility, and an adjustment to "Pseudo-terminal will
+not be allocated ..." which should be split out into a separate patch.
+
 Author: Matthew Vernon <matthew@debian.org>
 Author: Colin Watson <cjwatson@debian.org>
 Last-Update: 2013-09-14
 
-Index: b/log.c
-===================================================================
+Patch-Name: syslog-level-silent.patch
+---
+ log.c | 1 +
+ ssh.c | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/log.c b/log.c
+index 32e1d2e..53e7b65 100644
 --- a/log.c
 +++ b/log.c
-@@ -94,6 +94,7 @@
+@@ -94,6 +94,7 @@ static struct {
         LogLevel val;
  } log_levels[] =
  {
@@ -22,11 +32,11 @@ Index: b/log.c
         { "QUIET",      SYSLOG_LEVEL_QUIET },
         { "FATAL",      SYSLOG_LEVEL_FATAL },
         { "ERROR",      SYSLOG_LEVEL_ERROR },
-Index: b/ssh.c
-===================================================================
+diff --git a/ssh.c b/ssh.c
+index 567248d..219a466 100644
 --- a/ssh.c
 +++ b/ssh.c
-@@ -740,7 +740,7 @@
+@@ -740,7 +740,7 @@ main(int ac, char **av)
         /* Do not allocate a tty if stdin is not a tty. */
         if ((!isatty(fileno(stdin)) || stdin_null_flag) &&
             options.request_tty != REQUEST_TTY_FORCE) {