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

8 files changed, 20 insertions, 118 deletions

diff --git a/debian/changelog b/debian/changelog
index 205a423..9f43bbe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-downtimed (1.0-2) UNRELEASED; urgency=medium
+downtimed (1.0-2) unstable; urgency=medium
 
   * Change to my new email address.
   * New README.source to explain the branching model used.
@@ -8,10 +8,19 @@ downtimed (1.0-2) UNRELEASED; urgency=medium
     - Remove --with=systemd from debian/rules.
     - Remove build depends dh-systemd from debian/control.
   * Declare compliance with Debian Policy 4.2.1 (No changes needed).
+  * Remove deprecated upstart file downtimed.upstart.
+  * Remove old unused patches.
   * debian/control:
     - Change Vcs-* to point to the new repository.
+    - Change Priority extra to optional.
+  * debian/copyright:
+    - Use secure URI for copyright format and source.
+    - Move paragraph for * to frist position.
+    - Refresh years for debian/*.
+  * debian/watch:
+    - Use secure URI.
 
- -- Jörg Frings-Fürst <debian@jff.email>  Sun, 09 Sep 2018 21:25:57 +0200
+ -- Jörg Frings-Fürst <debian@jff.email>  Sun, 09 Sep 2018 22:21:24 +0200
 
 downtimed (1.0-1) unstable; urgency=medium
 
@@ -27,7 +36,7 @@ downtimed (1.0-1) unstable; urgency=medium
   * debian/copyright:
     - Add year 2016.
     - Change copyright at * to Janne Snabb.
-      + Add debian/README.debian with a comment from Janne Snabb 
+      + Add debian/README.debian with a comment from Janne Snabb
         about the change.
     - Add tag for startup-scripts/downtimed.smf.xml.
     - Clarify license from FreeBSD to BSD-2-clause.
diff --git a/debian/control b/debian/control
index f0d0b7d..78201bc 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,6 @@
 Source: downtimed
 Section: admin
-Priority: extra
+Priority: optional
 Maintainer: Jörg Frings-Fürst <debian@jff.email>
 Build-Depends:
  debhelper (>= 11),
diff --git a/debian/copyright b/debian/copyright
index 79789a6..236a338 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,20 +1,19 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: downtimed
 Upstream-Contact: Janne Snabb
-Source: http://dist.epipe.com/downtimed/
+Source: https://dist.epipe.com/downtimed/
 
+Files: *
+Copyright: 2009-2016 Janne Snabb <opensource@epipe.com>
+License: BSD-2-clause
 
 Files: startup-scripts/downtimed.smf.xml
 Copyright: 2012      Mats Erik Andersson <debian@gisladisker.se>
 License: BSD-2-clause
 
-Files: *
-Copyright: 2009-2016 Janne Snabb <opensource@epipe.com>
-License: BSD-2-clause
-
 Files: debian/*
 Copyright: 2009-2014 Mats Erik Andersson <debian@gisladisker.se>
-           2014-2016 Jörg Frings-Fürst <debian@jff.email>
+           2014-2018 Jörg Frings-Fürst <debian@jff.email>
 License: BSD-2-clause
 
 License: BSD-2-clause
diff --git a/debian/downtimed.upstart b/debian/downtimed.upstart
deleted file mode 120000
index 015ccbe..0000000
--- a/debian/downtimed.upstart
+++ /dev/null
@@ -1 +0,0 @@
-../startup-scripts/upstart-startup.conf
\ No newline at end of file
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
diff --git a/debian/watch b/debian/watch
index 871e006..c16220b 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=4
-http://dist.epipe.com/downtimed/downtimed-([.0-9]+)\.tar\.gz
+https://dist.epipe.com/downtimed/downtimed-([.0-9]+)\.tar\.gz