Make start-stop-daemon print the proper version instead of 'VERSION'.

diff --git a/ChangeLog b/ChangeLog
index 20298e95002523be12ab6d0f90dcfd50473f6a72..6ed025c860ca1718cbb8c711f15fba6cde01643e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-29  Guillem Jover  <guillem@debian.org>
+
+       * utils/start-stop-daemon.c (do_help): Print the proper version giving
+       it as an argument to printf, instead of printing 'VERSION'.
+
 2006-01-29  Guillem Jover  <guillem@debian.org>
 
        * configure.ac: Bump version to 1.13.14~.

diff --git a/debian/changelog b/debian/changelog
index 651519c6f66095f8c973bd91206b4e4d5211154a..e8786453a3eb7cf4cad066a59772fac1b8ffb559 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 dpkg (1.13.14~) UNRELEASED; urgency=low
 
+  [ Guillem Jover ]
+  * Make start-stop-daemon print the proper version instead of 'VERSION'.
 
  -- Guillem Jover <guillem@debian.org>  Sun, 29 Jan 2006 06:02:58 +0200
 

diff --git a/utils/start-stop-daemon.c b/utils/start-stop-daemon.c
index a03196a61d97bfbb3e7e9cb76b2ddb7febbaaf77..824b3333fd1c28756ea8c4d41c776152fd8387c1 100644 (file)
--- a/utils/start-stop-daemon.c
+++ b/utils/start-stop-daemon.c
@@ -284,7 +284,7 @@ static void
 do_help(void)
 {
        printf(
-"start-stop-daemon VERSION for Debian - small and fast C version written by\n"
+"start-stop-daemon %s for Debian - small and fast C version written by\n"
 "Marek Michalkiewicz <marekm@i17linuxb.ists.pwr.wroc.pl>, public domain.\n"
 "\n"
 "Usage:\n"
@@ -319,7 +319,8 @@ do_help(void)
 "or <schedule> may be just <timeout>, meaning <signal>/<timeout>/KILL/<timeout>\n"
 "\n"
 "Exit status:  0 = done      1 = nothing done (=> 0 if --oknodo)\n"
-"              3 = trouble   2 = with --retry, processes wouldn't die\n");
+"              3 = trouble   2 = with --retry, processes wouldn't die\n",
+              VERSION);
 }