Merge branch 'release/debian/1.0-2'debian/1.0-2

3 files changed, 0 insertions, 105 deletions

diff --git a/debian/patches/01-usage_strings.diff b/debian/patches/01-usage_strings.diff
deleted file mode 100644
index e9c4cda..0000000
--- a/debian/patches/01-usage_strings.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-Description: Forgotten update of usage strings.
- The executables downtimed(8) and downtimes(1)
- have gained the ability to change format string
- in a command line option.  The executables' usage
- texts did not reflect this ability.
-Author: Mats Erik Andersson <debian@gisladisker.se>
-Forwarded: yes
-Last-Update: 2013-11-29
-
---- downtimed-0.6/downtimed.c.orig	2013-07-27 16:46:06.000000000 +0200
-+++ downtimed-0.6/downtimed.c	2013-11-29 09:08:13.000000000 +0100
-@@ -695,8 +695,8 @@ static void
- usage()
- {
- 
--	fputs("usage: " PROGNAME " [-DvS] [-d datadir] [-l log] [-p pidfile] "
--	    "[-s sleep]\n", stderr);
-+	fputs("usage: " PROGNAME " [-DvS] [-d datadir] [-f timefmt] "
-+	    "[-l log] [-p pidfile] [-s sleep]\n", stderr);
- 	exit(EX_USAGE);
- }
- 
---- downtimed-0.6/downtimes.c.orig	2013-07-27 16:46:21.000000000 +0200
-+++ downtimed-0.6/downtimes.c	2013-11-29 09:08:08.000000000 +0100
-@@ -194,8 +194,8 @@ static void
- usage()
- {
- 
--	fputs("usage: " PROGNAME " [-v] [-d downtimedbfile] [-n num] "
--	    "[-s sleep] [-u]\n", stderr);
-+	fputs("usage: " PROGNAME " [-v] [-d downtimedbfile] [-f timefmt] "
-+	    "[-n num] [-s sleep] [-u]\n", stderr);
- 	exit(EX_USAGE);
- }
- 
diff --git a/debian/patches/02-tell_about_downtime.diff b/debian/patches/02-tell_about_downtime.diff
deleted file mode 100644
index b551177..0000000
--- a/debian/patches/02-tell_about_downtime.diff
+++ /dev/null
@@ -1,68 +0,0 @@
-Description: Make the call downtime(1) visible.
- The upstream manpage downtimes(1) contains information
- on the alternate call downtime(1), but this text is
- escaped in the original source. Activate this text.
- .
- Two minor syntactical changes are made in passing.
-Author: Mats Erik Andersson <debian@gisladisker.se>
-Forwarded: yes
-Last-Update: 2013-11-28
-
---- downtimed-0.6/downtimes.1.orig	2013-07-27 16:53:13.000000000 +0200
-+++ downtimed-0.6/downtimes.1	2013-11-28 23:30:57.000000000 +0100
-@@ -21,22 +21,22 @@
- .IR sleep \|]
- .RB [\| \-u \|]
- .br
--.\".B downtime
--.\".RB [\| \-d
--.\".IR downtimedbfile \|]
--.\".RB [\| \-f
--.\".IR timefmt \|]
--.\".RB [\| \-n
--.\".IR num \|]
--.\".RB [\| \-s
--.\".IR sleep \|]
--.\".RB [\| \-u \|]
--.\".br
- .B downtimes
- .B \-v
--.\".br
--.\".B downtime
--.\".B \-v
-+.br
-+.B downtime
-+.RB [\| \-d
-+.IR downtimedbfile \|]
-+.RB [\| \-f
-+.IR timefmt \|]
-+.RB [\| \-n
-+.IR num \|]
-+.RB [\| \-s
-+.IR sleep \|]
-+.RB [\| \-u \|]
-+.br
-+.B downtime
-+.B \-v
- .SH DESCRIPTION
- The
- .B downtimes
-@@ -44,12 +44,12 @@
- format. The downtime database is maintained by
- .BR downtimed (8).
- .PP
--.\"The singular form
--.\".B downtime
--.\"displays only details about the last time the system was down where
--.\"as the plural form
--.\".B downtimes
--.\"displays all the records in the database.
-+The singular form
-+.B downtime
-+displays details only about the last time the system was down,
-+whereas the plural form
-+.B downtimes
-+displays all records in the database.
- The
- .B \-n
- option can be used to specify the number of downtime
diff --git a/debian/patches/series b/debian/patches/series
index ee19027..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +0,0 @@
-#01-usage_strings.diff
-#02-tell_about_downtime.diff