diff -Nru libdaemon-generic-perl-0.84/Changes libdaemon-generic-perl-0.85/Changes --- libdaemon-generic-perl-0.84/Changes 2013-10-05 01:19:52.000000000 +0000 +++ libdaemon-generic-perl-0.85/Changes 2017-07-15 21:16:33.000000000 +0000 @@ -1,5 +1,8 @@ Revision history for Perl module Daemon::Generic +0.85 2017/07/17 + + - Fixed a race condition in test. Bug 117927. 0.84 2013/10/04 diff -Nru libdaemon-generic-perl-0.84/debian/changelog libdaemon-generic-perl-0.85/debian/changelog --- libdaemon-generic-perl-0.84/debian/changelog 2016-09-17 21:47:32.000000000 +0000 +++ libdaemon-generic-perl-0.85/debian/changelog 2017-07-16 12:46:32.000000000 +0000 @@ -1,3 +1,14 @@ +libdaemon-generic-perl (0.85-1) unstable; urgency=medium + + * Add debian/upstream/metadata. + * Import upstream version 0.85. + * Drop 0001-Fix-a-race-condition-in-the-test-suite-waiting-for-d.patch + (merged upstream). + * Update years of packaging copyright. + * Declare compliance with Debian Policy 4.0.0. + + -- gregor herrmann Sun, 16 Jul 2017 14:46:32 +0200 + libdaemon-generic-perl (0.84-2) unstable; urgency=medium [ Salvatore Bonaccorso ] diff -Nru libdaemon-generic-perl-0.84/debian/control libdaemon-generic-perl-0.85/debian/control --- libdaemon-generic-perl-0.84/debian/control 2016-09-17 21:47:32.000000000 +0000 +++ libdaemon-generic-perl-0.85/debian/control 2017-07-16 12:46:32.000000000 +0000 @@ -11,7 +11,7 @@ libfile-flock-perl (>= 2013.06), libfile-slurp-perl, perl -Standards-Version: 3.9.8 +Standards-Version: 4.0.0 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-perl/packages/libdaemon-generic-perl.git Vcs-Git: https://anonscm.debian.org/git/pkg-perl/packages/libdaemon-generic-perl.git Homepage: https://metacpan.org/release/Daemon-Generic diff -Nru libdaemon-generic-perl-0.84/debian/copyright libdaemon-generic-perl-0.85/debian/copyright --- libdaemon-generic-perl-0.84/debian/copyright 2016-09-17 21:47:32.000000000 +0000 +++ libdaemon-generic-perl-0.85/debian/copyright 2017-07-16 12:46:32.000000000 +0000 @@ -9,7 +9,7 @@ License: Artistic or GPL-1+ Files: debian/* -Copyright: 2014-2016, gregor herrmann +Copyright: 2014-2017, gregor herrmann License: Artistic or GPL-1+ License: Artistic diff -Nru libdaemon-generic-perl-0.84/debian/patches/0001-Fix-a-race-condition-in-the-test-suite-waiting-for-d.patch libdaemon-generic-perl-0.85/debian/patches/0001-Fix-a-race-condition-in-the-test-suite-waiting-for-d.patch --- libdaemon-generic-perl-0.84/debian/patches/0001-Fix-a-race-condition-in-the-test-suite-waiting-for-d.patch 2016-09-17 21:47:32.000000000 +0000 +++ libdaemon-generic-perl-0.85/debian/patches/0001-Fix-a-race-condition-in-the-test-suite-waiting-for-d.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,34 +0,0 @@ -From 96209b5ba3df009a495da31bee8e2540c3365ec5 Mon Sep 17 00:00:00 2001 -From: Niko Tyni -Date: Sat, 17 Sep 2016 21:16:16 +0300 -Subject: [PATCH] Fix a race condition in the test suite waiting for daemon log - output - -There's a window where the daemon has created a log file but not yet -written anything into it. Wait for the file to become nonempty before -reading it to make sure we're past that window. - -Bug-Debian: https://bugs.debian.org/834960 -Forwarded: https://rt.cpan.org/Ticket/Display.html?id=117927 -Bug: https://rt.cpan.org/Ticket/Display.html?id=117927 - ---- - t/daemon.t | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/t/daemon.t b/t/daemon.t -index 30763df..548af21 100644 ---- a/t/daemon.t -+++ b/t/daemon.t -@@ -200,7 +200,7 @@ sub do_test - chomp($counter1); - like($counter1, qr/^\d+$/, "counter1 - $name"); - -- expect { -e "$tmp/log" }; -+ expect { -s "$tmp/log" }; - like(read_file("$tmp/log"), qr/START LOG/, "logged output"); - - expect { my @l = read_file("$tmp/log"); @l > 1 }; --- -2.9.3 - diff -Nru libdaemon-generic-perl-0.84/debian/patches/series libdaemon-generic-perl-0.85/debian/patches/series --- libdaemon-generic-perl-0.84/debian/patches/series 2016-09-17 21:47:32.000000000 +0000 +++ libdaemon-generic-perl-0.85/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -0001-Fix-a-race-condition-in-the-test-suite-waiting-for-d.patch diff -Nru libdaemon-generic-perl-0.84/debian/upstream/metadata libdaemon-generic-perl-0.85/debian/upstream/metadata --- libdaemon-generic-perl-0.84/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000 +++ libdaemon-generic-perl-0.85/debian/upstream/metadata 2017-07-16 12:46:32.000000000 +0000 @@ -0,0 +1,5 @@ +--- +Archive: CPAN +Contact: David Muir Sharnoff +Name: Daemon-Generic +Repository: https://github.com/muir/Daemon-Generic diff -Nru libdaemon-generic-perl-0.84/lib/Daemon/Generic.pm libdaemon-generic-perl-0.85/lib/Daemon/Generic.pm --- libdaemon-generic-perl-0.84/lib/Daemon/Generic.pm 2013-10-05 01:10:54.000000000 +0000 +++ libdaemon-generic-perl-0.85/lib/Daemon/Generic.pm 2017-07-15 21:15:38.000000000 +0000 @@ -12,7 +12,7 @@ our @ISA = qw(Exporter); our @EXPORT = qw(newdaemon); -our $VERSION = 0.84; +our $VERSION = 0.85; our $force_quit_delay = 15; our $package = __PACKAGE__; diff -Nru libdaemon-generic-perl-0.84/META.json libdaemon-generic-perl-0.85/META.json --- libdaemon-generic-perl-0.84/META.json 2013-10-05 01:20:22.000000000 +0000 +++ libdaemon-generic-perl-0.85/META.json 2017-07-15 21:16:48.000000000 +0000 @@ -4,7 +4,7 @@ "David Muir Sharnoff " ], "dynamic_config" : 1, - "generated_by" : "ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.112150", + "generated_by" : "ExtUtils::MakeMaker version 6.98, CPAN::Meta::Converter version 2.142690", "license" : [ "unknown" ], @@ -22,25 +22,25 @@ "prereqs" : { "build" : { "requires" : { - "AnyEvent" : 0, - "Eval::LineNumbers" : 0, - "Event" : 0, - "Time::HiRes" : 0 + "AnyEvent" : "0", + "Eval::LineNumbers" : "0", + "Event" : "0", + "Time::HiRes" : "0" } }, "configure" : { "requires" : { - "ExtUtils::MakeMaker" : 0 + "ExtUtils::MakeMaker" : "0" } }, "runtime" : { "requires" : { - "Cwd" : 0, - "File::Basename" : 0, + "Cwd" : "0", + "File::Basename" : "0", "File::Flock" : "2013.06", - "File::Slurp" : 0, - "Getopt::Long" : 0, - "Text::Wrap" : 0 + "File::Slurp" : "0", + "Getopt::Long" : "0", + "Text::Wrap" : "0" } } }, @@ -50,5 +50,5 @@ "url" : "http://github.com/muir/Daemon-Generic" } }, - "version" : "0.84" + "version" : 0.85 } diff -Nru libdaemon-generic-perl-0.84/META.yml libdaemon-generic-perl-0.85/META.yml --- libdaemon-generic-perl-0.84/META.yml 2013-10-05 01:20:22.000000000 +0000 +++ libdaemon-generic-perl-0.85/META.yml 2017-07-15 21:16:48.000000000 +0000 @@ -3,30 +3,30 @@ author: - 'David Muir Sharnoff ' build_requires: - AnyEvent: 0 - Eval::LineNumbers: 0 - Event: 0 - Time::HiRes: 0 + AnyEvent: '0' + Eval::LineNumbers: '0' + Event: '0' + Time::HiRes: '0' configure_requires: - ExtUtils::MakeMaker: 0 + ExtUtils::MakeMaker: '0' dynamic_config: 1 -generated_by: 'ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.112150' +generated_by: 'ExtUtils::MakeMaker version 6.98, CPAN::Meta::Converter version 2.142690' license: unknown meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html - version: 1.4 + version: '1.4' name: Daemon-Generic no_index: directory: - t - inc requires: - Cwd: 0 - File::Basename: 0 - File::Flock: 2013.06 - File::Slurp: 0 - Getopt::Long: 0 - Text::Wrap: 0 + Cwd: '0' + File::Basename: '0' + File::Flock: '2013.06' + File::Slurp: '0' + Getopt::Long: '0' + Text::Wrap: '0' resources: repository: http://github.com/muir/Daemon-Generic -version: 0.84 +version: 0.85 diff -Nru libdaemon-generic-perl-0.84/t/daemon.t libdaemon-generic-perl-0.85/t/daemon.t --- libdaemon-generic-perl-0.84/t/daemon.t 2013-02-12 18:22:50.000000000 +0000 +++ libdaemon-generic-perl-0.85/t/daemon.t 2017-07-15 17:59:11.000000000 +0000 @@ -200,7 +200,7 @@ chomp($counter1); like($counter1, qr/^\d+$/, "counter1 - $name"); - expect { -e "$tmp/log" }; + expect { -s "$tmp/log" }; like(read_file("$tmp/log"), qr/START LOG/, "logged output"); expect { my @l = read_file("$tmp/log"); @l > 1 };