From 376ed523cb84bdc5314aaebdb39502e0e0fd9701 Mon Sep 17 00:00:00 2001
From: Mathias Gumz <akira@fluxbox.org>
Date: Sat, 3 Jan 2015 14:07:34 +0100
Subject: [PATCH] Update release version

---
 doc/asciidoc/fbrun.txt          | 2 +-
 doc/asciidoc/fbsetbg.txt        | 2 +-
 doc/asciidoc/fbsetroot.txt      | 2 +-
 doc/asciidoc/fluxbox-apps.txt   | 2 +-
 doc/asciidoc/fluxbox-keys.txt   | 2 +-
 doc/asciidoc/fluxbox-remote.txt | 2 +-
 doc/asciidoc/fluxbox-style.txt  | 2 +-
 doc/asciidoc/fluxbox.txt        | 2 +-
 src/cli_options.cc              | 2 +-
 src/main.cc                     | 4 ++++
 util/fbrun/main.cc              | 2 +-
 util/fbsetroot.cc               | 2 +-
 12 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/doc/asciidoc/fbrun.txt b/doc/asciidoc/fbrun.txt
index 8ae75d04..c690f8c6 100644
--- a/doc/asciidoc/fbrun.txt
+++ b/doc/asciidoc/fbrun.txt
@@ -1,7 +1,7 @@
 fbrun(1)
 ========
 Jim Ramsay <i.am@jimramsay.com>
-v1.3.5, 13 February 2013
+v1.3.6, 03 January 2015
 :man source:   fbrun.txt
 :man version:  {revision}
 :man manual:   Fluxbox Manual  
diff --git a/doc/asciidoc/fbsetbg.txt b/doc/asciidoc/fbsetbg.txt
index 5c6510ad..c50f00b8 100644
--- a/doc/asciidoc/fbsetbg.txt
+++ b/doc/asciidoc/fbsetbg.txt
@@ -1,7 +1,7 @@
 fbsetbg(1)
 ==========
 Jim Ramsay <i.am@jimramsay.com>
-v1.3.5, 13 February 2013
+v1.3.6, 03 January 2015
 :man source:   fbsetbg.txt
 :man version:  {revision}
 :man manual:   Fluxbox Manual  
diff --git a/doc/asciidoc/fbsetroot.txt b/doc/asciidoc/fbsetroot.txt
index 7461ee75..73ba16b0 100644
--- a/doc/asciidoc/fbsetroot.txt
+++ b/doc/asciidoc/fbsetroot.txt
@@ -1,7 +1,7 @@
 fbsetroot(1)
 ============
 Jim Ramsay <i.am@jimramsay.com>
-v1.3.5, 13 February 2013
+v1.3.6, 03 January 2015
 :man source:   fbsetroot.txt
 :man version:  {revision}
 :man manual:   Fluxbox Manual  
diff --git a/doc/asciidoc/fluxbox-apps.txt b/doc/asciidoc/fluxbox-apps.txt
index 42694782..c4164cc1 100644
--- a/doc/asciidoc/fluxbox-apps.txt
+++ b/doc/asciidoc/fluxbox-apps.txt
@@ -1,7 +1,7 @@
 fluxbox-apps(5)
 ===============
 Jim Ramsay <i.am@jimramsay.com>
-v1.3.5, 13 February 2013
+v1.3.6, 03 January 2015
 :man source:   fluxbox-apps.txt
 :man version:  {revision}
 :man manual:   Fluxbox Manual
diff --git a/doc/asciidoc/fluxbox-keys.txt b/doc/asciidoc/fluxbox-keys.txt
index 4d92c439..6c5f9511 100644
--- a/doc/asciidoc/fluxbox-keys.txt
+++ b/doc/asciidoc/fluxbox-keys.txt
@@ -1,7 +1,7 @@
 fluxbox-keys(5)
 ===============
 Jim Ramsay <i.am@jimramsay.com>
-v1.3.5, 13 February 2013
+v1.3.6, 03 January 2015
 :man source:   fluxbox-keys.txt
 :man version:  {revision}
 :man manual:   Fluxbox Manual
diff --git a/doc/asciidoc/fluxbox-remote.txt b/doc/asciidoc/fluxbox-remote.txt
index d524c27d..b86ad8ff 100644
--- a/doc/asciidoc/fluxbox-remote.txt
+++ b/doc/asciidoc/fluxbox-remote.txt
@@ -1,7 +1,7 @@
 fluxbox-remote(1)
 =================
 Mark Tiefenbruck <mark@fluxbox.org>
-v1.3.5, 13 February 2013
+v1.3.6, 03 February 2015
 :man source: fluxbox-remote.txt
 :man version: {revision}
 :man manual: Fluxbox Manual
diff --git a/doc/asciidoc/fluxbox-style.txt b/doc/asciidoc/fluxbox-style.txt
index 290341f3..f70ed16e 100644
--- a/doc/asciidoc/fluxbox-style.txt
+++ b/doc/asciidoc/fluxbox-style.txt
@@ -1,7 +1,7 @@
 fluxbox-style(5)
 ================
 Henrik Kinnunen <fluxgen@fluxbox.org>
-v1.3.5, 13 February 2013
+v1.3.6, 03 January 2015
 :man source:   fluxbox-style.txt
 :man version:  {revision}
 :man manual:   Fluxbox Manual
diff --git a/doc/asciidoc/fluxbox.txt b/doc/asciidoc/fluxbox.txt
index c2e48158..23a73d91 100644
--- a/doc/asciidoc/fluxbox.txt
+++ b/doc/asciidoc/fluxbox.txt
@@ -1,7 +1,7 @@
 fluxbox(1)
 ==========
 Henrik Kinnunen <fluxgen@fluxbox.org>
-v1.3.5, 13 February 2013
+v1.3.6, 03 January 2015
 :man source:   fluxbox.txt
 :man version:  {revision}
 :man manual:   Fluxbox Manual  
diff --git a/src/cli_options.cc b/src/cli_options.cc
index 1455ea1e..6b24c228 100644
--- a/src/cli_options.cc
+++ b/src/cli_options.cc
@@ -137,7 +137,7 @@ int FluxboxCli::Options::parse(int argc, char** argv) {
                            "-help\t\t\t\tdisplay this help text and exit.\n\n",
 
                            "Main usage string. Please lay it out nicely. There is one %s that is given the version").c_str(),
-                   __fluxbox_version, "2001-2014");
+                   __fluxbox_version, "2001-2015");
             return EXIT_SUCCESS;
         } else if (arg == "-info" || arg == "-i" || arg == "--info") {
             FluxboxCli::showInfo(cout);
diff --git a/src/main.cc b/src/main.cc
index bff3be61..92d04ce3 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -53,6 +53,10 @@
 #include <sys/wait.h>
 #endif // HAVE_SYS_WAIT_H
 
+#ifdef HAVE_SIGNAL_H
+#include <signal.h>
+#endif
+
 
 #include <iostream>
 #include <stdexcept>
diff --git a/util/fbrun/main.cc b/util/fbrun/main.cc
index ba2d09d7..13da81a1 100644
--- a/util/fbrun/main.cc
+++ b/util/fbrun/main.cc
@@ -48,7 +48,7 @@ using std::endl;
 using std::string;
 
 void showUsage(const char *progname) {
-    cerr<<"fbrun 1.5 : (c) 2002-2014 Henrik Kinnunen"<<endl;
+    cerr<<"fbrun 1.5 : (c) 2002-2015 Henrik Kinnunen"<<endl;
     cerr<<"Usage: "<<
         progname<<" [arguments]"<<endl<<
         "Arguments: "<<endl<<
diff --git a/util/fbsetroot.cc b/util/fbsetroot.cc
index 3a2f2b90..c7876197 100644
--- a/util/fbsetroot.cc
+++ b/util/fbsetroot.cc
@@ -360,7 +360,7 @@ void fbsetroot::gradient() {
 */
 void fbsetroot::usage(int exit_code) {
     _FB_USES_NLS;
-    cout << m_app_name << " 2.3 : (c) 2003-2014 Fluxbox Development Team" << endl;
+    cout << m_app_name << " 2.3 : (c) 2003-2015 Fluxbox Development Team" << endl;
     cout << m_app_name << " 2.1 : (c) 2002 Claes Nasten" << endl;
     cout << m_app_name << " 2.0 : (c) 1997-2000 Brad Hughes\n" << endl;
     cout << _FB_CONSOLETEXT(fbsetroot, Usage,