merge patched-debian/experimental into debian/experimental

43 files changed, 286 insertions, 264 deletions

diff --git a/cups/adminutil.c b/cups/adminutil.c
index 5ecada44c..1a5067f1b 100644
--- a/cups/adminutil.c
+++ b/cups/adminutil.c
@@ -32,12 +32,6 @@ static http_status_t	get_cupsd_conf(http_t *http, _cups_globals_t *cg,
 			               time_t last_update, char *name,
 				       size_t namelen, int *remote);
 static void		invalidate_cupsd_cache(_cups_globals_t *cg);
-static void		write_option(cups_file_t *dstfp, int order,
-			             const char *name, const char *text,
-				     const char *attrname,
-		        	     ipp_attribute_t *suppattr,
-				     ipp_attribute_t *defattr, int defval,
-				     int valcount);
 
 
 /*
@@ -1331,88 +1325,6 @@ cupsAdminSetServerSettings(
 
 
 /*
- * 'do_samba_command()' - Do a SAMBA command.
- */
-
-static int				/* O - Status of command */
-do_samba_command(const char *command,	/* I - Command to run */
-                 const char *address,	/* I - Address for command */
-                 const char *subcmd,	/* I - Sub-command */
-		 const char *authfile,	/* I - Samba authentication file */
-		 FILE *logfile)		/* I - Optional log file */
-{
-#ifdef _WIN32
-  return (1);				/* Always fail on Windows... */
-
-#else
-  int		status;			/* Status of command */
-  int		pid;			/* Process ID of child */
-
-
-  if (logfile)
-    _cupsLangPrintf(logfile,
-                    _("Running command: %s %s -N -A %s -c \'%s\'"),
-        	    command, address, authfile, subcmd);
-
-  if ((pid = fork()) == 0)
-  {
-   /*
-    * Child goes here, redirect stdin/out/err and execute the command...
-    */
-
-    int fd = open("/dev/null", O_RDONLY);
-
-    if (fd > 0)
-    {
-      dup2(fd, 0);
-      close(fd);
-    }
-
-    if (logfile)
-      dup2(fileno(logfile), 1);
-    else if ((fd = open("/dev/null", O_WRONLY)) > 1)
-    {
-      dup2(fd, 1);
-      close(fd);
-    }
-
-    dup2(1, 2);
-
-    execlp(command, command, address, "-N", "-A", authfile, "-c", subcmd,
-           (char *)0);
-    exit(errno);
-  }
-  else if (pid < 0)
-  {
-    status = -1;
-
-    if (logfile)
-      _cupsLangPrintf(logfile, _("Unable to run \"%s\": %s"),
-                      command, strerror(errno));
-  }
-  else
-  {
-   /*
-    * Wait for the process to complete...
-    */
-
-    while (wait(&status) != pid);
-  }
-
-  if (logfile)
-    _cupsLangPuts(logfile, "");
-
-  DEBUG_printf(("9do_samba_command: status=%d", status));
-
-  if (WIFEXITED(status))
-    return (WEXITSTATUS(status));
-  else
-    return (-WTERMSIG(status));
-#endif /* _WIN32 */
-}
-
-
-/*
  * 'get_cupsd_conf()' - Get the current cupsd.conf file.
  */
 
@@ -1527,112 +1439,3 @@ invalidate_cupsd_cache(
   cg->cupsd_num_settings = 0;
   cg->cupsd_settings     = NULL;
 }
-
-
-/*
- * 'write_option()' - Write a CUPS option to a PPD file.
- */
-
-static void
-write_option(cups_file_t     *dstfp,	/* I - PPD file */
-             int             order,	/* I - Order dependency */
-             const char      *name,	/* I - Option name */
-	     const char      *text,	/* I - Option text */
-             const char      *attrname,	/* I - Attribute name */
-             ipp_attribute_t *suppattr,	/* I - IPP -supported attribute */
-	     ipp_attribute_t *defattr,	/* I - IPP -default attribute */
-	     int             defval,	/* I - Default value number */
-	     int             valcount)	/* I - Number of values */
-{
-  int	i;				/* Looping var */
-
-
-  cupsFilePrintf(dstfp, "*JCLOpenUI *%s/%s: PickOne\n"
-                        "*OrderDependency: %d JCLSetup *%s\n",
-                 name, text, order, name);
-
-  if (defattr->value_tag == IPP_TAG_INTEGER)
-  {
-   /*
-    * Do numeric options with a range or list...
-    */
-
-    cupsFilePrintf(dstfp, "*Default%s: %d\n", name,
-                   defattr->values[defval].integer);
-
-    if (suppattr->value_tag == IPP_TAG_RANGE)
-    {
-     /*
-      * List each number in the range...
-      */
-
-      for (i = suppattr->values[0].range.lower;
-           i <= suppattr->values[0].range.upper;
-	   i ++)
-      {
-        cupsFilePrintf(dstfp, "*%s %d: \"", name, i);
-
-        if (valcount == 1)
-	  cupsFilePrintf(dstfp, "%%cupsJobTicket: %s=%d\n\"\n*End\n",
-	                 attrname, i);
-        else if (defval == 0)
-	  cupsFilePrintf(dstfp, "%%cupsJobTicket: %s=%d\"\n", attrname, i);
-        else if (defval < (valcount - 1))
-	  cupsFilePrintf(dstfp, ",%d\"\n", i);
-        else
-	  cupsFilePrintf(dstfp, ",%d\n\"\n*End\n", i);
-      }
-    }
-    else
-    {
-     /*
-      * List explicit numbers...
-      */
-
-      for (i = 0; i < suppattr->num_values; i ++)
-      {
-        cupsFilePrintf(dstfp, "*%s %d: \"", name, suppattr->values[i].integer);
-
-        if (valcount == 1)
-	  cupsFilePrintf(dstfp, "%%cupsJobTicket: %s=%d\n\"\n*End\n", attrname,
-	          suppattr->values[i].integer);
-        else if (defval == 0)
-	  cupsFilePrintf(dstfp, "%%cupsJobTicket: %s=%d\"\n", attrname,
-	          suppattr->values[i].integer);
-        else if (defval < (valcount - 1))
-	  cupsFilePrintf(dstfp, ",%d\"\n", suppattr->values[i].integer);
-        else
-	  cupsFilePrintf(dstfp, ",%d\n\"\n*End\n", suppattr->values[i].integer);
-      }
-    }
-  }
-  else
-  {
-   /*
-    * Do text options with a list...
-    */
-
-    cupsFilePrintf(dstfp, "*Default%s: %s\n", name,
-                   defattr->values[defval].string.text);
-
-    for (i = 0; i < suppattr->num_values; i ++)
-    {
-      cupsFilePrintf(dstfp, "*%s %s: \"", name,
-                     suppattr->values[i].string.text);
-
-      if (valcount == 1)
-	cupsFilePrintf(dstfp, "%%cupsJobTicket: %s=%s\n\"\n*End\n", attrname,
-	        suppattr->values[i].string.text);
-      else if (defval == 0)
-	cupsFilePrintf(dstfp, "%%cupsJobTicket: %s=%s\"\n", attrname,
-	        suppattr->values[i].string.text);
-      else if (defval < (valcount - 1))
-	cupsFilePrintf(dstfp, ",%s\"\n", suppattr->values[i].string.text);
-      else
-	cupsFilePrintf(dstfp, ",%s\n\"\n*End\n",
-	               suppattr->values[i].string.text);
-    }
-  }
-
-  cupsFilePrintf(dstfp, "*JCLCloseUI: *%s\n\n", name);
-}
diff --git a/debian/.git-dpm b/debian/.git-dpm
index 6a3d9a0cd..c8609d5d6 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,6 +1,6 @@
 # see git-dpm(1) from git-dpm package
-0ca5b7fe16e50f03fe8c512f707b34388daf4d5a
-0ca5b7fe16e50f03fe8c512f707b34388daf4d5a
+2027027f1365aa6699e00c8c2376e71ed8af82f3
+2027027f1365aa6699e00c8c2376e71ed8af82f3
 c13e2f44eb15bcdbff9126df86d1ed9a5108e47c
 c13e2f44eb15bcdbff9126df86d1ed9a5108e47c
 cups_2.3~b6.orig.tar.gz
diff --git a/debian/patches/0001-Fix-compile-errors-not-sure-why-these-didn-t-show-up.patch b/debian/patches/0001-Fix-compile-errors-not-sure-why-these-didn-t-show-up.patch
new file mode 100644
index 000000000..430d5c46b
--- /dev/null
+++ b/debian/patches/0001-Fix-compile-errors-not-sure-why-these-didn-t-show-up.patch
@@ -0,0 +1,242 @@
+From 065632e2095bcb32f15a370633e60d6a6a3dd78e Mon Sep 17 00:00:00 2001
+From: Michael R Sweet <michael.r.sweet@gmail.com>
+Date: Sat, 8 Dec 2018 08:12:52 -0500
+Subject: Fix compile errors - not sure why these didn't show up before...
+
+---
+ cups/adminutil.c | 197 -----------------------------------------------
+ scheduler/main.c |   2 +-
+ 2 files changed, 1 insertion(+), 198 deletions(-)
+
+diff --git a/cups/adminutil.c b/cups/adminutil.c
+index 5ecada44c..1a5067f1b 100644
+--- a/cups/adminutil.c
++++ b/cups/adminutil.c
+@@ -32,12 +32,6 @@ static http_status_t	get_cupsd_conf(http_t *http, _cups_globals_t *cg,
+ 			               time_t last_update, char *name,
+ 				       size_t namelen, int *remote);
+ static void		invalidate_cupsd_cache(_cups_globals_t *cg);
+-static void		write_option(cups_file_t *dstfp, int order,
+-			             const char *name, const char *text,
+-				     const char *attrname,
+-		        	     ipp_attribute_t *suppattr,
+-				     ipp_attribute_t *defattr, int defval,
+-				     int valcount);
+ 
+ 
+ /*
+@@ -1330,88 +1324,6 @@ cupsAdminSetServerSettings(
+ }
+ 
+ 
+-/*
+- * 'do_samba_command()' - Do a SAMBA command.
+- */
+-
+-static int				/* O - Status of command */
+-do_samba_command(const char *command,	/* I - Command to run */
+-                 const char *address,	/* I - Address for command */
+-                 const char *subcmd,	/* I - Sub-command */
+-		 const char *authfile,	/* I - Samba authentication file */
+-		 FILE *logfile)		/* I - Optional log file */
+-{
+-#ifdef _WIN32
+-  return (1);				/* Always fail on Windows... */
+-
+-#else
+-  int		status;			/* Status of command */
+-  int		pid;			/* Process ID of child */
+-
+-
+-  if (logfile)
+-    _cupsLangPrintf(logfile,
+-                    _("Running command: %s %s -N -A %s -c \'%s\'"),
+-        	    command, address, authfile, subcmd);
+-
+-  if ((pid = fork()) == 0)
+-  {
+-   /*
+-    * Child goes here, redirect stdin/out/err and execute the command...
+-    */
+-
+-    int fd = open("/dev/null", O_RDONLY);
+-
+-    if (fd > 0)
+-    {
+-      dup2(fd, 0);
+-      close(fd);
+-    }
+-
+-    if (logfile)
+-      dup2(fileno(logfile), 1);
+-    else if ((fd = open("/dev/null", O_WRONLY)) > 1)
+-    {
+-      dup2(fd, 1);
+-      close(fd);
+-    }
+-
+-    dup2(1, 2);
+-
+-    execlp(command, command, address, "-N", "-A", authfile, "-c", subcmd,
+-           (char *)0);
+-    exit(errno);
+-  }
+-  else if (pid < 0)
+-  {
+-    status = -1;
+-
+-    if (logfile)
+-      _cupsLangPrintf(logfile, _("Unable to run \"%s\": %s"),
+-                      command, strerror(errno));
+-  }
+-  else
+-  {
+-   /*
+-    * Wait for the process to complete...
+-    */
+-
+-    while (wait(&status) != pid);
+-  }
+-
+-  if (logfile)
+-    _cupsLangPuts(logfile, "");
+-
+-  DEBUG_printf(("9do_samba_command: status=%d", status));
+-
+-  if (WIFEXITED(status))
+-    return (WEXITSTATUS(status));
+-  else
+-    return (-WTERMSIG(status));
+-#endif /* _WIN32 */
+-}
+-
+-
+ /*
+  * 'get_cupsd_conf()' - Get the current cupsd.conf file.
+  */
+@@ -1527,112 +1439,3 @@ invalidate_cupsd_cache(
+   cg->cupsd_num_settings = 0;
+   cg->cupsd_settings     = NULL;
+ }
+-
+-
+-/*
+- * 'write_option()' - Write a CUPS option to a PPD file.
+- */
+-
+-static void
+-write_option(cups_file_t     *dstfp,	/* I - PPD file */
+-             int             order,	/* I - Order dependency */
+-             const char      *name,	/* I - Option name */
+-	     const char      *text,	/* I - Option text */
+-             const char      *attrname,	/* I - Attribute name */
+-             ipp_attribute_t *suppattr,	/* I - IPP -supported attribute */
+-	     ipp_attribute_t *defattr,	/* I - IPP -default attribute */
+-	     int             defval,	/* I - Default value number */
+-	     int             valcount)	/* I - Number of values */
+-{
+-  int	i;				/* Looping var */
+-
+-
+-  cupsFilePrintf(dstfp, "*JCLOpenUI *%s/%s: PickOne\n"
+-                        "*OrderDependency: %d JCLSetup *%s\n",
+-                 name, text, order, name);
+-
+-  if (defattr->value_tag == IPP_TAG_INTEGER)
+-  {
+-   /*
+-    * Do numeric options with a range or list...
+-    */
+-
+-    cupsFilePrintf(dstfp, "*Default%s: %d\n", name,
+-                   defattr->values[defval].integer);
+-
+-    if (suppattr->value_tag == IPP_TAG_RANGE)
+-    {
+-     /*
+-      * List each number in the range...
+-      */
+-
+-      for (i = suppattr->values[0].range.lower;
+-           i <= suppattr->values[0].range.upper;
+-	   i ++)
+-      {
+-        cupsFilePrintf(dstfp, "*%s %d: \"", name, i);
+-
+-        if (valcount == 1)
+-	  cupsFilePrintf(dstfp, "%%cupsJobTicket: %s=%d\n\"\n*End\n",
+-	                 attrname, i);
+-        else if (defval == 0)
+-	  cupsFilePrintf(dstfp, "%%cupsJobTicket: %s=%d\"\n", attrname, i);
+-        else if (defval < (valcount - 1))
+-	  cupsFilePrintf(dstfp, ",%d\"\n", i);
+-        else
+-	  cupsFilePrintf(dstfp, ",%d\n\"\n*End\n", i);
+-      }
+-    }
+-    else
+-    {
+-     /*
+-      * List explicit numbers...
+-      */
+-
+-      for (i = 0; i < suppattr->num_values; i ++)
+-      {
+-        cupsFilePrintf(dstfp, "*%s %d: \"", name, suppattr->values[i].integer);
+-
+-        if (valcount == 1)
+-	  cupsFilePrintf(dstfp, "%%cupsJobTicket: %s=%d\n\"\n*End\n", attrname,
+-	          suppattr->values[i].integer);
+-        else if (defval == 0)
+-	  cupsFilePrintf(dstfp, "%%cupsJobTicket: %s=%d\"\n", attrname,
+-	          suppattr->values[i].integer);
+-        else if (defval < (valcount - 1))
+-	  cupsFilePrintf(dstfp, ",%d\"\n", suppattr->values[i].integer);
+-        else
+-	  cupsFilePrintf(dstfp, ",%d\n\"\n*End\n", suppattr->values[i].integer);
+-      }
+-    }
+-  }
+-  else
+-  {
+-   /*
+-    * Do text options with a list...
+-    */
+-
+-    cupsFilePrintf(dstfp, "*Default%s: %s\n", name,
+-                   defattr->values[defval].string.text);
+-
+-    for (i = 0; i < suppattr->num_values; i ++)
+-    {
+-      cupsFilePrintf(dstfp, "*%s %s: \"", name,
+-                     suppattr->values[i].string.text);
+-
+-      if (valcount == 1)
+-	cupsFilePrintf(dstfp, "%%cupsJobTicket: %s=%s\n\"\n*End\n", attrname,
+-	        suppattr->values[i].string.text);
+-      else if (defval == 0)
+-	cupsFilePrintf(dstfp, "%%cupsJobTicket: %s=%s\"\n", attrname,
+-	        suppattr->values[i].string.text);
+-      else if (defval < (valcount - 1))
+-	cupsFilePrintf(dstfp, ",%s\"\n", suppattr->values[i].string.text);
+-      else
+-	cupsFilePrintf(dstfp, ",%s\n\"\n*End\n",
+-	               suppattr->values[i].string.text);
+-    }
+-  }
+-
+-  cupsFilePrintf(dstfp, "*JCLCloseUI: *%s\n\n", name);
+-}
+diff --git a/scheduler/main.c b/scheduler/main.c
+index ce7df89c0..5b00efae2 100644
+--- a/scheduler/main.c
++++ b/scheduler/main.c
+@@ -155,7 +155,7 @@ main(int  argc,				/* I - Number of command-line args */
+   for (i = 1; i < argc; i ++)
+   {
+     if (!strcmp(argv[i], "--help"))
+-      usage();
++      usage(0);
+     else if (argv[i][0] == '-')
+     {
+       for (opt = argv[i] + 1; *opt != '\0'; opt ++)
diff --git a/debian/patches/0003-Install-root-backends-world-readable.patch b/debian/patches/0004-Install-root-backends-world-readable.patch
index f7f73df30..65d7a1332 100644
--- a/debian/patches/0003-Install-root-backends-world-readable.patch
+++ b/debian/patches/0004-Install-root-backends-world-readable.patch
@@ -1,4 +1,4 @@
-From 1e7ff333f260e1eb40a7eaf2e9b33b1936c1fdb9 Mon Sep 17 00:00:00 2001
+From 3f4a951bfba38fc7f590cace7a10aac7f8bab088 Mon Sep 17 00:00:00 2001
 From: Martin Pitt <mpitt@debian.org>
 Date: Tue, 9 Aug 2016 18:11:06 +0200
 Subject: Install root backends world-readable
diff --git a/debian/patches/0021-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch b/debian/patches/0022-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
index 7bf40ae12..5c7b08696 100644
--- a/debian/patches/0021-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
+++ b/debian/patches/0022-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
@@ -1,4 +1,4 @@
-From 6168f0f69586f74a762a013ce17621a4fe665cf3 Mon Sep 17 00:00:00 2001
+From f292b99ff050172fc859a7695ebd977012beb46f Mon Sep 17 00:00:00 2001
 From: Tim Waugh <twaugh@redhat.com>
 Date: Tue, 9 Aug 2016 18:11:30 +0200
 Subject: Let snmp backend also use manufacturer-specific MIBs
diff --git a/debian/patches/0037-Build-mantohtml-with-the-build-architecture-compiler.patch b/debian/patches/0038-Build-mantohtml-with-the-build-architecture-compiler.patch
index 6ed961e7e..b1afa8b49 100644
--- a/debian/patches/0037-Build-mantohtml-with-the-build-architecture-compiler.patch
+++ b/debian/patches/0038-Build-mantohtml-with-the-build-architecture-compiler.patch
@@ -1,4 +1,4 @@
-From 7477e87c930e61476098303bd3f43ff89136a938 Mon Sep 17 00:00:00 2001
+From 3260a87943de1028b3aec2628727f351e0618def Mon Sep 17 00:00:00 2001
 From: Helmut Grohne <helmut@subdivi.de>
 Date: Tue, 9 Aug 2016 18:11:49 +0200
 Subject: Build mantohtml with the build architecture compiler
diff --git a/debian/patches/0039-Fix-usage-int-usage-for-cupsd-help.patch b/debian/patches/0039-Fix-usage-int-usage-for-cupsd-help.patch
deleted file mode 100644
index 34c149489..000000000
--- a/debian/patches/0039-Fix-usage-int-usage-for-cupsd-help.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 0ca5b7fe16e50f03fe8c512f707b34388daf4d5a Mon Sep 17 00:00:00 2001
-From: Didier Raboud <odyx@debian.org>
-Date: Mon, 10 Dec 2018 09:32:14 +0100
-Subject: Fix usage(int) usage for cupsd --help
-
-Bug: https://github.com/apple/cups/issues/5453
----
- scheduler/main.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/scheduler/main.c b/scheduler/main.c
-index ce7df89c0..5b00efae2 100644
---- a/scheduler/main.c
-+++ b/scheduler/main.c
-@@ -155,7 +155,7 @@ main(int  argc,				/* I - Number of command-line args */
-   for (i = 1; i < argc; i ++)
-   {
-     if (!strcmp(argv[i], "--help"))
--      usage();
-+      usage(0);
-     else if (argv[i][0] == '-')
-     {
-       for (opt = argv[i] + 1; *opt != '\0'; opt ++)
diff --git a/debian/patches/airprint-support.patch b/debian/patches/airprint-support.patch
index a40b6af41..a5233cb32 100644
--- a/debian/patches/airprint-support.patch
+++ b/debian/patches/airprint-support.patch
@@ -1,4 +1,4 @@
-From 93f4827feb954f08ae341d4c63689b3e5ba59b3d Mon Sep 17 00:00:00 2001
+From b47d7b374623e38e365cda8e75eb556e21ce3708 Mon Sep 17 00:00:00 2001
 From: Till Kamppeter <till.kamppeter@gmail.com>
 Date: Tue, 9 Aug 2016 18:11:29 +0200
 Subject: Patch to support Apple AirPrint (printing from iPhone, iPad, iPod
diff --git a/debian/patches/confdirperms.patch b/debian/patches/confdirperms.patch
index 8b1d36d73..71c2ef301 100644
--- a/debian/patches/confdirperms.patch
+++ b/debian/patches/confdirperms.patch
@@ -1,4 +1,4 @@
-From 7a04295d8c2529453b9f8a63fa6d84c6d5b138d0 Mon Sep 17 00:00:00 2001
+From 7990e156df5bdf319caa8d88d0be0721d2decc5f Mon Sep 17 00:00:00 2001
 From: Martin Pitt <mpitt@debian.org>
 Date: Tue, 9 Aug 2016 18:11:41 +0200
 Subject: Do not mess with the permissions of cupsd.conf.
diff --git a/debian/patches/cups-deviced-allow-device-ids-with-newline.patch b/debian/patches/cups-deviced-allow-device-ids-with-newline.patch
index f718a9a9a..86444f3b5 100644
--- a/debian/patches/cups-deviced-allow-device-ids-with-newline.patch
+++ b/debian/patches/cups-deviced-allow-device-ids-with-newline.patch
@@ -1,4 +1,4 @@
-From b6bbdd4e1812c11c1438ec4cc89f3bddc2aeb05a Mon Sep 17 00:00:00 2001
+From 172a5fa1d4d2a660f210d4b04e6abf2c1e14cccd Mon Sep 17 00:00:00 2001
 From: Till Kamppeter <till.kamppeter@gmail.com>
 Date: Tue, 9 Aug 2016 18:11:28 +0200
 Subject: Some printers have broken device IDs with newline
diff --git a/debian/patches/cups-set-default-error-policy-retry-job.patch b/debian/patches/cups-set-default-error-policy-retry-job.patch
index 60341d406..e398d6dec 100644
--- a/debian/patches/cups-set-default-error-policy-retry-job.patch
+++ b/debian/patches/cups-set-default-error-policy-retry-job.patch
@@ -1,4 +1,4 @@
-From 2a2e04492117a70174668a5f4b19908b6a4c7101 Mon Sep 17 00:00:00 2001
+From af058563703c3fdfec2c28d464806fa074356a00 Mon Sep 17 00:00:00 2001
 From: Martin Pitt <martin.pitt@ubuntu.com>
 Date: Tue, 9 Aug 2016 18:11:47 +0200
 Subject: Set default job error policy to "retry-job", since it is less
diff --git a/debian/patches/cupsd-set-default-for-SyncOnClose-to-Yes.patch b/debian/patches/cupsd-set-default-for-SyncOnClose-to-Yes.patch
index 1156f0938..6f4f322cf 100644
--- a/debian/patches/cupsd-set-default-for-SyncOnClose-to-Yes.patch
+++ b/debian/patches/cupsd-set-default-for-SyncOnClose-to-Yes.patch
@@ -1,4 +1,4 @@
-From fcd3c4de9f1c2ffb91cc0dca381e83164144d6dd Mon Sep 17 00:00:00 2001
+From f3fa12bc4804fbfa22520ff9dfac650b37e57df2 Mon Sep 17 00:00:00 2001
 From: Tim Waugh <twaugh@redhat.com>
 Date: Tue, 9 Aug 2016 18:11:46 +0200
 Subject: Set the default for SyncOnClose to Yes
diff --git a/debian/patches/debianize_cups-config.patch b/debian/patches/debianize_cups-config.patch
index b05473f47..283b70910 100644
--- a/debian/patches/debianize_cups-config.patch
+++ b/debian/patches/debianize_cups-config.patch
@@ -1,4 +1,4 @@
-From 8ebedeeae3a5a4eade860a7918e2dfbbb8aa6f02 Mon Sep 17 00:00:00 2001
+From 8220ce73bda325aaecfe85eb9476db4eba30abc5 Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 9 Aug 2016 18:11:49 +0200
 Subject: Use dpkg-architecture in cups-config to make it
diff --git a/debian/patches/default_log_settings.patch b/debian/patches/default_log_settings.patch
index ae2b65a31..3ce9691d0 100644
--- a/debian/patches/default_log_settings.patch
+++ b/debian/patches/default_log_settings.patch
@@ -1,4 +1,4 @@
-From c38dafd69fa6175de4f55c208128f9bf87686443 Mon Sep 17 00:00:00 2001
+From f0fe53fb04ff810fe9fa47deb690912ca36bb0ff Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 9 Aug 2016 18:11:40 +0200
 Subject: Deactivate CUPS' own log rotating as the system already provides a
diff --git a/debian/patches/do-not-broadcast-with-hostnames.patch b/debian/patches/do-not-broadcast-with-hostnames.patch
index 6621871b5..0679c4c9b 100644
--- a/debian/patches/do-not-broadcast-with-hostnames.patch
+++ b/debian/patches/do-not-broadcast-with-hostnames.patch
@@ -1,4 +1,4 @@
-From f87f6b5d80d5933d25bc179a5eab5c1e2c1a28ba Mon Sep 17 00:00:00 2001
+From c6e33b4e1e62426cc334cb5073f1a3a5400e334a Mon Sep 17 00:00:00 2001
 From: Till Kampetter <till.kampetter@gmail.com>
 Date: Tue, 9 Aug 2016 18:11:35 +0200
 Subject: Do not use host names for broadcasting print queues and
diff --git a/debian/patches/drop_unnecessary_dependencies.patch b/debian/patches/drop_unnecessary_dependencies.patch
index b775a53d3..6843dad23 100644
--- a/debian/patches/drop_unnecessary_dependencies.patch
+++ b/debian/patches/drop_unnecessary_dependencies.patch
@@ -1,4 +1,4 @@
-From 7dfc8d94434d759443d724bce76e8b47fb8986e8 Mon Sep 17 00:00:00 2001
+From c660c65eb23219da660d11a65f5e043257482352 Mon Sep 17 00:00:00 2001
 From: Martin Pitt <mpitt@debian.org>
 Date: Tue, 9 Aug 2016 18:11:25 +0200
 Subject: Don't link libcups.so and libcupsimage.so against unnecessary
diff --git a/debian/patches/fixes-for-jobs-with-multiple-files-and-multiple-formats.patch b/debian/patches/fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
index f45581eb9..6555c278e 100644
--- a/debian/patches/fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
+++ b/debian/patches/fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
@@ -1,4 +1,4 @@
-From 016a2e073f491a42f3547b2dce2b2111eed119e2 Mon Sep 17 00:00:00 2001
+From 642cd5d5d0f64baa01f96691b3b934f03f292b5b Mon Sep 17 00:00:00 2001
 From: Tim Waugh <twaugh@redhat.com>
 Date: Tue, 9 Aug 2016 18:11:07 +0200
 Subject: Fix jobs with multiple files or multiple formats
diff --git a/debian/patches/log-debug-history-nearly-unlimited.patch b/debian/patches/log-debug-history-nearly-unlimited.patch
index bdca6ba8f..5e6bc24c0 100644
--- a/debian/patches/log-debug-history-nearly-unlimited.patch
+++ b/debian/patches/log-debug-history-nearly-unlimited.patch
@@ -1,4 +1,4 @@
-From 018e64b9781c9c1f6cd454197f8280d947ee5680 Mon Sep 17 00:00:00 2001
+From 703d8db84c39b9f5b305927f76923e4b5e32f72c Mon Sep 17 00:00:00 2001
 From: Till Kampetter <till.kampetter@gmail.com>
 Date: Tue, 9 Aug 2016 18:11:45 +0200
 Subject: Make log debug history nearly unlimited
diff --git a/debian/patches/logfiles_adm_readable.patch b/debian/patches/logfiles_adm_readable.patch
index a35eaafcc..71b8ca607 100644
--- a/debian/patches/logfiles_adm_readable.patch
+++ b/debian/patches/logfiles_adm_readable.patch
@@ -1,4 +1,4 @@
-From ba8db70c9122b50e57d9177239ea152ad5f59c3a Mon Sep 17 00:00:00 2001
+From c2ab617c02684d73c835ef1836ac8517c80ceb6d Mon Sep 17 00:00:00 2001
 From: Martin Pitt <mpitt@debian.org>
 Date: Tue, 9 Aug 2016 18:11:38 +0200
 Subject: Make log files readable to group "adm", if present.
diff --git a/debian/patches/man-cups-lpd-drop-dangling-references.patch b/debian/patches/man-cups-lpd-drop-dangling-references.patch
index e1124473e..38394c515 100644
--- a/debian/patches/man-cups-lpd-drop-dangling-references.patch
+++ b/debian/patches/man-cups-lpd-drop-dangling-references.patch
@@ -1,4 +1,4 @@
-From 6f02ec18a0ebd8fe9a62f4680bc9cdd434cbf7d3 Mon Sep 17 00:00:00 2001
+From 15349e00110d73703d0b1c8238443bb34c3c2a16 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <bastien.roucaries@u-cergy.fr>
 Date: Tue, 9 Aug 2016 18:11:48 +0200
 Subject: Drop dangling references from cups-lpd.man
diff --git a/debian/patches/manpage-hyphen-minus.patch b/debian/patches/manpage-hyphen-minus.patch
index 615adf890..af5dbf53c 100644
--- a/debian/patches/manpage-hyphen-minus.patch
+++ b/debian/patches/manpage-hyphen-minus.patch
@@ -1,4 +1,4 @@
-From b4da9302370e7375237c65637f7f84e34f3d1892 Mon Sep 17 00:00:00 2001
+From cecca9261c370d4536c23679bc13ce32b522f1cd Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 9 Aug 2016 18:11:05 +0200
 Subject: Fix hyphen-used-as-minus-sign manpage errors
diff --git a/debian/patches/manpage-translations.patch b/debian/patches/manpage-translations.patch
index a27e13180..bcb4f63b3 100644
--- a/debian/patches/manpage-translations.patch
+++ b/debian/patches/manpage-translations.patch
@@ -1,4 +1,4 @@
-From 6723bebdaecc55d645aa0fd404c2e71a8d027f36 Mon Sep 17 00:00:00 2001
+From 2027027f1365aa6699e00c8c2376e71ed8af82f3 Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 9 Aug 2016 18:11:50 +0200
 Subject: po4a infrastructure and translations for manpages.
diff --git a/debian/patches/move-cupsd-conf-default-to-share.patch b/debian/patches/move-cupsd-conf-default-to-share.patch
index c12ffab47..dd3fd21e0 100644
--- a/debian/patches/move-cupsd-conf-default-to-share.patch
+++ b/debian/patches/move-cupsd-conf-default-to-share.patch
@@ -1,4 +1,4 @@
-From 214b7f8c4afc165d1d542cd176fb80553845b311 Mon Sep 17 00:00:00 2001
+From f53d2e9ca5f89c92345e7252bc0e586228d1de8b Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 9 Aug 2016 18:11:24 +0200
 Subject: Move cupsd.conf.default from SERVERROOT to DATADIR
diff --git a/debian/patches/no-conffile-timestamp.patch b/debian/patches/no-conffile-timestamp.patch
index 20e2514e5..9f59d99dd 100644
--- a/debian/patches/no-conffile-timestamp.patch
+++ b/debian/patches/no-conffile-timestamp.patch
@@ -1,4 +1,4 @@
-From 8b7ff12e7fc2be79621d781fd60596182d872fb4 Mon Sep 17 00:00:00 2001
+From da3570784f210bd54f49ff4695db3bda45296820 Mon Sep 17 00:00:00 2001
 From: Joey Hess <joeyh@debian.org>
 Date: Tue, 9 Aug 2016 18:11:31 +0200
 Subject: Disable time stamps in conffiles, to avoid ever-changing files in
diff --git a/debian/patches/printer-filtering.patch b/debian/patches/printer-filtering.patch
index d7c148b43..0d413dc36 100644
--- a/debian/patches/printer-filtering.patch
+++ b/debian/patches/printer-filtering.patch
@@ -1,4 +1,4 @@
-From c989728130c4472a13c8a1e70cc8ed2a759a9f0c Mon Sep 17 00:00:00 2001
+From 0d3444224af088dad89ec3569f8ba70c869b65a2 Mon Sep 17 00:00:00 2001
 From: Julien Desfossez at Revolution Linux
  <Julien Desfossez at Revolution Linux>
 Date: Tue, 9 Aug 2016 18:11:42 +0200
diff --git a/debian/patches/pwg-raster-attributes.patch b/debian/patches/pwg-raster-attributes.patch
index cda9fcde1..210f719b6 100644
--- a/debian/patches/pwg-raster-attributes.patch
+++ b/debian/patches/pwg-raster-attributes.patch
@@ -1,4 +1,4 @@
-From 62b053eacca61a4b873f37bf54efaba60d9a4b9a Mon Sep 17 00:00:00 2001
+From 69170b606dba682883e626d14482b2d70b9f86b2 Mon Sep 17 00:00:00 2001
 From: Till Kamppeter <till.kamppeter@gmail.com>
 Date: Tue, 9 Aug 2016 18:11:04 +0200
 Subject: For PWG Raster, add required IPP attributes
diff --git a/debian/patches/reactivate_recommended_driver.patch b/debian/patches/reactivate_recommended_driver.patch
index 803e006fb..c9d2aa7dc 100644
--- a/debian/patches/reactivate_recommended_driver.patch
+++ b/debian/patches/reactivate_recommended_driver.patch
@@ -1,4 +1,4 @@
-From 3f98ba2830600a81186604ac26262315339f4f6f Mon Sep 17 00:00:00 2001
+From 2cead02cc0bad7db40678fec94c82495e6c4fc6b Mon Sep 17 00:00:00 2001
 From: Till Kampetter <till.kampetter@gmail.com>
 Date: Tue, 9 Aug 2016 18:11:36 +0200
 Subject: CUPS removes the "(recommended)" comments of the NickNames of
diff --git a/debian/patches/read-embedded-options-from-incoming-postscript-and-add-to-ipp-attrs.patch b/debian/patches/read-embedded-options-from-incoming-postscript-and-add-to-ipp-attrs.patch
index 23d0c1fd4..b65fc6ea5 100644
--- a/debian/patches/read-embedded-options-from-incoming-postscript-and-add-to-ipp-attrs.patch
+++ b/debian/patches/read-embedded-options-from-incoming-postscript-and-add-to-ipp-attrs.patch
@@ -1,4 +1,4 @@
-From 68c1a032cb4aded4830827761a3eea29b5b32eb9 Mon Sep 17 00:00:00 2001
+From 650a0e2983c8185dcc2715a7999bee58fefe8f89 Mon Sep 17 00:00:00 2001
 From: Till Kamppeter <till.kamppeter@gmail.com>
 Date: Tue, 9 Aug 2016 18:11:27 +0200
 Subject: Make CUPS reading all option settings in PostScript print
diff --git a/debian/patches/removecvstag.patch b/debian/patches/removecvstag.patch
index e57711903..5da7e79df 100644
--- a/debian/patches/removecvstag.patch
+++ b/debian/patches/removecvstag.patch
@@ -1,4 +1,4 @@
-From ae5c167695f4d4356788685a1503bc646e5387d3 Mon Sep 17 00:00:00 2001
+From fe47e0e0ed3977d08952a032d9b86ca0c3884a04 Mon Sep 17 00:00:00 2001
 From: Kenshi Muto <kmuto@debian.org>
 Date: Tue, 9 Aug 2016 18:11:33 +0200
 Subject: Do not write VCS tags into installed conffiles
diff --git a/debian/patches/rename-systemd-units.patch b/debian/patches/rename-systemd-units.patch
index 4340ec194..8e5bb1122 100644
--- a/debian/patches/rename-systemd-units.patch
+++ b/debian/patches/rename-systemd-units.patch
@@ -1,4 +1,4 @@
-From 2802c396f7a676e57fc04f44071500f29f0778fb Mon Sep 17 00:00:00 2001
+From 66c78f2c2940f4701f54e9fffafe1f13429b0ee3 Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 9 Aug 2016 18:11:34 +0200
 Subject: Rename the systemd service file from org.cups.cups.* to cups.*
diff --git a/debian/patches/series b/debian/patches/series
index d0e803e43..e93464693 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,7 @@
+0001-Fix-compile-errors-not-sure-why-these-didn-t-show-up.patch
 pwg-raster-attributes.patch
 manpage-hyphen-minus.patch
-0003-Install-root-backends-world-readable.patch
+0004-Install-root-backends-world-readable.patch
 fixes-for-jobs-with-multiple-files-and-multiple-formats.patch
 tests-ignore-warnings.patch
 tests-ignore-usb-crash.patch
@@ -18,7 +19,7 @@ drop_unnecessary_dependencies.patch
 read-embedded-options-from-incoming-postscript-and-add-to-ipp-attrs.patch
 cups-deviced-allow-device-ids-with-newline.patch
 airprint-support.patch
-0021-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
+0022-Let-snmp-backend-also-use-manufacturer-specific-MIBs.patch
 no-conffile-timestamp.patch
 removecvstag.patch
 rename-systemd-units.patch
@@ -34,6 +35,5 @@ cupsd-set-default-for-SyncOnClose-to-Yes.patch
 cups-set-default-error-policy-retry-job.patch
 man-cups-lpd-drop-dangling-references.patch
 debianize_cups-config.patch
-0037-Build-mantohtml-with-the-build-architecture-compiler.patch
+0038-Build-mantohtml-with-the-build-architecture-compiler.patch
 manpage-translations.patch
-0039-Fix-usage-int-usage-for-cupsd-help.patch
diff --git a/debian/patches/show-compile-command-lines.patch b/debian/patches/show-compile-command-lines.patch
index 6db215265..a0b1d8694 100644
--- a/debian/patches/show-compile-command-lines.patch
+++ b/debian/patches/show-compile-command-lines.patch
@@ -1,4 +1,4 @@
-From e3ae5e69f4af97fc37175ef6dd7e34a68eefb5bf Mon Sep 17 00:00:00 2001
+From 481be1cc8deef2117614c00d54b80138a1f319e7 Mon Sep 17 00:00:00 2001
 From: Till Kampetter <till.kampetter@gmail.com>
 Date: Tue, 9 Aug 2016 18:11:43 +0200
 Subject: Show compile command lines
diff --git a/debian/patches/test-i18n-nonlinux.patch b/debian/patches/test-i18n-nonlinux.patch
index 65ac8427f..add107616 100644
--- a/debian/patches/test-i18n-nonlinux.patch
+++ b/debian/patches/test-i18n-nonlinux.patch
@@ -1,4 +1,4 @@
-From 3d6cf1170d7b5a89d8e5127cdefb3e1ef2373f27 Mon Sep 17 00:00:00 2001
+From c2ca36deab43a03ea9eef4c6a553e0b5423cbdfa Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 9 Aug 2016 18:11:16 +0200
 Subject: Tests: Do not run the CUPS_EUC_JP test case on BSD/Hurd either, as
diff --git a/debian/patches/tests-fix-ppdLocalize-on-unclean-env.patch b/debian/patches/tests-fix-ppdLocalize-on-unclean-env.patch
index 14ebe9e97..b3bd4c9f7 100644
--- a/debian/patches/tests-fix-ppdLocalize-on-unclean-env.patch
+++ b/debian/patches/tests-fix-ppdLocalize-on-unclean-env.patch
@@ -1,4 +1,4 @@
-From ffb7abe8dbb9ee886fee43c1a26a31d53b2e6ffc Mon Sep 17 00:00:00 2001
+From d6e335a6254b8251e6ab334ed9ab6a05e915d4ca Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 9 Aug 2016 18:11:18 +0200
 Subject: Tests: Force LC_* environment variables when testing (non)
diff --git a/debian/patches/tests-ignore-ipv6-address-family-not-supported.patch b/debian/patches/tests-ignore-ipv6-address-family-not-supported.patch
index f3ff02ba8..fbc7d7932 100644
--- a/debian/patches/tests-ignore-ipv6-address-family-not-supported.patch
+++ b/debian/patches/tests-ignore-ipv6-address-family-not-supported.patch
@@ -1,4 +1,4 @@
-From 5f4c6f69611add1befcfdeee8d59df2b7473f928 Mon Sep 17 00:00:00 2001
+From 392c6e545d0da5f4105a49df2f9bc7bfb88e9ea5 Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 9 Aug 2016 18:33:56 +0200
 Subject: Tests: ignore errors triggered on ipv6-deprived hosts
diff --git a/debian/patches/tests-ignore-kfreebsd-amd64-not-a-pdf.patch b/debian/patches/tests-ignore-kfreebsd-amd64-not-a-pdf.patch
index 55c26a29e..ee4983171 100644
--- a/debian/patches/tests-ignore-kfreebsd-amd64-not-a-pdf.patch
+++ b/debian/patches/tests-ignore-kfreebsd-amd64-not-a-pdf.patch
@@ -1,4 +1,4 @@
-From c05fb1a90fd435cac476d88da4f8c3397a84a11e Mon Sep 17 00:00:00 2001
+From 07cb24bfcaeea2b23ad589a3f78df23af83ae4da Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 9 Aug 2016 18:30:48 +0200
 Subject: Tests: ignore loadFile failures
diff --git a/debian/patches/tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch b/debian/patches/tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
index 3b12602ae..54bd04eee 100644
--- a/debian/patches/tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
+++ b/debian/patches/tests-ignore-kfreebsd-unable-to-write-uncompressed-print-data.patch
@@ -1,4 +1,4 @@
-From 0cc5551359b622ed82dd21fe28aa14334d7446f6 Mon Sep 17 00:00:00 2001
+From be1140cafecb6f557c5c6436657407b120d01f80 Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 9 Aug 2016 18:36:02 +0200
 Subject: Tests: ignore the failure to write uncompressed data
diff --git a/debian/patches/tests-ignore-usb-crash.patch b/debian/patches/tests-ignore-usb-crash.patch
index 486d07491..feaf5f4e2 100644
--- a/debian/patches/tests-ignore-usb-crash.patch
+++ b/debian/patches/tests-ignore-usb-crash.patch
@@ -1,4 +1,4 @@
-From f24ffb2975c3298183b54fee9af5dffc30f8df9a Mon Sep 17 00:00:00 2001
+From 843dbc77b0b94602108bad6c1c539cf860bb8e56 Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 9 Aug 2016 18:11:10 +0200
 Subject: Tests: ignore usb & dnssd backend unexpected exits
diff --git a/debian/patches/tests-ignore-warnings.patch b/debian/patches/tests-ignore-warnings.patch
index 11eb63a10..ec59392ab 100644
--- a/debian/patches/tests-ignore-warnings.patch
+++ b/debian/patches/tests-ignore-warnings.patch
@@ -1,4 +1,4 @@
-From 4ff654398fdad0fe0c2d90edb76d651346420c92 Mon Sep 17 00:00:00 2001
+From 18ef20ac748cfa798a5142fc8529195c12725e0d Mon Sep 17 00:00:00 2001
 From: Martin Pitt <mpitt@debian.org>
 Date: Tue, 9 Aug 2016 18:11:09 +0200
 Subject: Tests: Ignore warnings from colord and Avahi
diff --git a/debian/patches/tests-make-lpstat-call-reproducible.patch b/debian/patches/tests-make-lpstat-call-reproducible.patch
index 115e9c01e..8b2cc8215 100644
--- a/debian/patches/tests-make-lpstat-call-reproducible.patch
+++ b/debian/patches/tests-make-lpstat-call-reproducible.patch
@@ -1,4 +1,4 @@
-From 01636706e18e626aef755239ef01aeaae1b9afa9 Mon Sep 17 00:00:00 2001
+From 8fb60550cb6d1b1703f7a08f8976a48920ced46c Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 9 Aug 2016 18:11:22 +0200
 Subject: Force LC_ALL=C environment variable when grepping the output of
diff --git a/debian/patches/tests-no-pdftourf.patch b/debian/patches/tests-no-pdftourf.patch
index 70912645e..665c664d7 100644
--- a/debian/patches/tests-no-pdftourf.patch
+++ b/debian/patches/tests-no-pdftourf.patch
@@ -1,4 +1,4 @@
-From 6bf40c7a4fb1082e9a1be7aadc3bc898ac4833a2 Mon Sep 17 00:00:00 2001
+From f7e327359d2e6133972782194cc9a6821d0e2572 Mon Sep 17 00:00:00 2001
 From: Michael Sweet <michael.r.sweet@gmail.com>
 Date: Tue, 9 Aug 2016 18:11:23 +0200
 Subject: revert commit 830cfed95a5349b008999eebd34f5233bc35829c
diff --git a/debian/patches/tests-use-ipv4-lo-address.patch b/debian/patches/tests-use-ipv4-lo-address.patch
index 676e337d2..91bdf0b7b 100644
--- a/debian/patches/tests-use-ipv4-lo-address.patch
+++ b/debian/patches/tests-use-ipv4-lo-address.patch
@@ -1,4 +1,4 @@
-From 5cc6de004fd00248653088183a81cf768b2f779b Mon Sep 17 00:00:00 2001
+From 021baaeb36d828afe4b859de983171e51eb0ee47 Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 9 Aug 2016 18:11:21 +0200
 Subject: Use 127.0.0.1 instead of localhost in the test-suite. This should
diff --git a/debian/patches/tests-wait-on-unfinished-jobs-everytime.patch b/debian/patches/tests-wait-on-unfinished-jobs-everytime.patch
index f622cb958..8282958a6 100644
--- a/debian/patches/tests-wait-on-unfinished-jobs-everytime.patch
+++ b/debian/patches/tests-wait-on-unfinished-jobs-everytime.patch
@@ -1,4 +1,4 @@
-From 8e8a7abc99bb3445919ec4bb2b77399c6fa9de09 Mon Sep 17 00:00:00 2001
+From 7e2254e5906c95d82d4823647a1a50441b27df70 Mon Sep 17 00:00:00 2001
 From: Didier Raboud <odyx@debian.org>
 Date: Tue, 9 Aug 2016 18:11:17 +0200
 Subject: Tests: Make sure that all scheduled jobs are finished before