The branch, master has been updated
via cd75fb460656f4b6057255984f96fc8bdb256b43 (commit)
via 8ef0764aacf913cb70ea90bb6d33910d92280a51 (commit)
via f7509a5532ad7496b7d96765caac9e7adc2f9395 (commit)
from fb99f579d58d360b85942d81f069a028f78f3344 (commit)
- Shortlog ------------------------------------------------------------
cd75fb4 THANKS: Convert to UTF-8
8ef0764 s-s-d: Move version output from --help to --version
f7509a5 Update TODO list
Summary of changes:
ChangeLog | 10 ++++++++++
THANKS | 2 +-
TODO | 8 +-------
utils/start-stop-daemon.c | 16 ++++++++++------
4 files changed, 22 insertions(+), 14 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit cd75fb460656f4b6057255984f96fc8bdb256b43
Author: Guillem Jover <[EMAIL PROTECTED]>
Date: Thu Jan 17 06:28:50 2008 +0200
THANKS: Convert to UTF-8
diff --git a/ChangeLog b/ChangeLog
index 73293e6..84470a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2008-01-17 Guillem Jover <[EMAIL PROTECTED]>
+ * THANKS: Convert to UTF-8.
+
+2008-01-17 Guillem Jover <[EMAIL PROTECTED]>
+
* utils/start-stop-daemon.c (do_help): Move version printing to ...
(do_version): ... here. New function.
(main): Call do_version instead of printf.
diff --git a/THANKS b/THANKS
index 3720554..f1284a3 100644
--- a/THANKS
+++ b/THANKS
@@ -47,7 +47,7 @@ Michael Alan Dorman <[EMAIL PROTECTED]>
Michael Shields <[EMAIL PROTECTED]>
Michael Sobolev <[EMAIL PROTECTED]>
Miquel van Smoorenburg <[EMAIL PROTECTED]>
-Nicolás Lichtmaier <[EMAIL PROTECTED]>
+Nicolás Lichtmaier <[EMAIL PROTECTED]>
Nils Rennebarth <[EMAIL PROTECTED]>
Peter Karlsson <[EMAIL PROTECTED]>
Petr Cech <[EMAIL PROTECTED]>
commit 8ef0764aacf913cb70ea90bb6d33910d92280a51
Author: Guillem Jover <[EMAIL PROTECTED]>
Date: Thu Jan 17 06:14:43 2008 +0200
s-s-d: Move version output from --help to --version
diff --git a/ChangeLog b/ChangeLog
index acc6ee1..73293e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-17 Guillem Jover <[EMAIL PROTECTED]>
+
+ * utils/start-stop-daemon.c (do_help): Move version printing to ...
+ (do_version): ... here. New function.
+ (main): Call do_version instead of printf.
+
2008-01-17 Raphael Hertzog <[EMAIL PROTECTED]>
* scripts/dpkg-genchanges.pl: Reinstate support of the ${Format}
diff --git a/utils/start-stop-daemon.c b/utils/start-stop-daemon.c
index c384031..7994b5b 100644
--- a/utils/start-stop-daemon.c
+++ b/utils/start-stop-daemon.c
@@ -338,9 +338,6 @@ static void
do_help(void)
{
printf(
-"start-stop-daemon %s for Debian - small and fast C version written by\n"
-"Marek Michalkiewicz <[EMAIL PROTECTED]>, public domain.\n"
-"\n"
"Usage: start-stop-daemon [<option> ...] <command>\n"
"\n"
"Commands:\n"
@@ -379,8 +376,15 @@ 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",
- VERSION);
+" 3 = trouble 2 = with --retry, processes wouldn't die\n");
+}
+
+static void
+do_version(void)
+{
+ printf("start-stop-daemon %s for Debian\n\n", VERSION)
+
+ printf("Written by Marek Michalkiewicz, public domain.\n");
}
static void
@@ -597,7 +601,7 @@ parse_options(int argc, char * const *argv)
start = 1;
break;
case 'V': /* --version */
- printf("start-stop-daemon " VERSION "\n");
+ do_version();
exit(0);
case 'a': /* --startas <pathname> */
startas = optarg;
commit f7509a5532ad7496b7d96765caac9e7adc2f9395
Author: Guillem Jover <[EMAIL PROTECTED]>
Date: Thu Jan 17 06:07:38 2008 +0200
Update TODO list
diff --git a/TODO b/TODO
index 867fedc..0ab1196 100644
--- a/TODO
+++ b/TODO
@@ -29,8 +29,6 @@ lenny
* Start exposing libdpkg.
- * Convert controllib.pl to a new style perl module(s).
-
* Fix tied field enum with its dselect description (pkgdisplay.cc).
* Add example to dpkg-scanfoo manpages?
@@ -54,14 +52,10 @@ lenny
* Remove conffile background support? (#38334)
- * Make dpkg-build --build check for duped conffiles. (#131633)
+ * Make dpkg-deb --build check for duped conffiles. (#131633)
* Make update-alternatives --display support --quiet. (#336091)
- * Make dpkg-checkbuilddeps check build-essential. (#402901)
-
- * Fix pointless use of strdup. (#379027)
-
* Propagate --admindir to programs run from maintainer scritpts. (#97076)
* Fix quotes? <http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html>
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
