diff options
| author | Didier Raboud <odyx@debian.org> | 2018-12-14 15:47:11 +0100 |
|---|---|---|
| committer | Didier Raboud <odyx@debian.org> | 2018-12-14 15:47:21 +0100 |
| commit | d9d600f800d6919a928681ed2e51d314654c0303 (patch) | |
| tree | 620d8a57c903b6fae9f7806d4fd638646cbb5a58 | |
| parent | a07dd841b966a21638feb3cc57996e42361e3b4a (diff) | |
| parent | aca9838965b5bcd00e3c8b2ccca0a36c99d0c35f (diff) | |
merge patched-debian/experimental into debian/experimental
| -rw-r--r-- | debian/.git-dpm | 4 | ||||
| -rw-r--r-- | debian/patches/0036-Fix-service_idle_exit-build-issue-with-Werror-maybe-.patch | 22 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rw-r--r-- | scheduler/main.c | 2 |
4 files changed, 26 insertions, 3 deletions
diff --git a/debian/.git-dpm b/debian/.git-dpm index 1781b9484..03dc7cf36 100644 --- a/debian/.git-dpm +++ b/debian/.git-dpm @@ -1,6 +1,6 @@ # see git-dpm(1) from git-dpm package -6c690f9ccb35e762e79b469e4632e25cdc8308bd -6c690f9ccb35e762e79b469e4632e25cdc8308bd +aca9838965b5bcd00e3c8b2ccca0a36c99d0c35f +aca9838965b5bcd00e3c8b2ccca0a36c99d0c35f c13e2f44eb15bcdbff9126df86d1ed9a5108e47c c13e2f44eb15bcdbff9126df86d1ed9a5108e47c cups_2.3~b6.orig.tar.gz diff --git a/debian/patches/0036-Fix-service_idle_exit-build-issue-with-Werror-maybe-.patch b/debian/patches/0036-Fix-service_idle_exit-build-issue-with-Werror-maybe-.patch new file mode 100644 index 000000000..e0df008d3 --- /dev/null +++ b/debian/patches/0036-Fix-service_idle_exit-build-issue-with-Werror-maybe-.patch @@ -0,0 +1,22 @@ +From aca9838965b5bcd00e3c8b2ccca0a36c99d0c35f Mon Sep 17 00:00:00 2001 +From: Didier Raboud <odyx@debian.org> +Date: Fri, 14 Dec 2018 15:46:56 +0100 +Subject: Fix service_idle_exit build issue with -Werror=maybe-unitialized + +--- + scheduler/main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/scheduler/main.c b/scheduler/main.c +index 5b00efae2..3b258a70a 100644 +--- a/scheduler/main.c ++++ b/scheduler/main.c +@@ -129,7 +129,7 @@ main(int argc, /* I - Number of command-line args */ + time_t netif_time = 0; /* Time since last network update */ + #endif /* __APPLE__ */ + #if defined(HAVE_ONDEMAND) +- int service_idle_exit; ++ int service_idle_exit = 0; + /* Idle exit on select timeout? */ + #endif /* HAVE_ONDEMAND */ + diff --git a/debian/patches/series b/debian/patches/series index ec684eccb..d948073db 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -33,3 +33,4 @@ man-cups-lpd-drop-dangling-references.patch debianize_cups-config.patch 0034-Build-mantohtml-with-the-build-architecture-compiler.patch manpage-translations.patch +0036-Fix-service_idle_exit-build-issue-with-Werror-maybe-.patch diff --git a/scheduler/main.c b/scheduler/main.c index 5b00efae2..3b258a70a 100644 --- a/scheduler/main.c +++ b/scheduler/main.c @@ -129,7 +129,7 @@ main(int argc, /* I - Number of command-line args */ time_t netif_time = 0; /* Time since last network update */ #endif /* __APPLE__ */ #if defined(HAVE_ONDEMAND) - int service_idle_exit; + int service_idle_exit = 0; /* Idle exit on select timeout? */ #endif /* HAVE_ONDEMAND */ |