[Pkg-nagios-changes] [SCM] Packaging for icli in Debian branch, master, updated. 21664018862b0422b48f6d4175af385d1a8b5ca5

[Uli Martens]

The following commit has been merged in the master branch:
commit c437508b2a4c5b970cb85ce5f6b20883a2aba724
Author: Uli Martens <uli at youam.net>
Date:   Sat Jun 16 15:30:34 2012 +0200

    timezone output no longer checked

diff --git a/debian/changelog b/debian/changelog
index 433e4e6..331b478 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,10 @@ icli (0.42-1) UNRELEASED; urgency=low
     - MANIFEST.SKIP whitelist no longere in upstream package, so we'll
       just ignore the debian temp files in the output. Drop
       ignore-debian-files.diff
+    - tests checking for date-based output are now skipped by upstream
+      in other timezones. drop test-timezone.diff
+  * No patches left, we could drop the quilt dependency. We'll keep it
+    anyway to ease adding new patches in the future.
 
  -- Uli Martens <uli at youam.net>  Tue, 12 Jun 2012 07:24:01 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index cfa8ce8..1bb8bf6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-test-timezone.diff
+# empty
diff --git a/debian/patches/test-timezone.diff b/debian/patches/test-timezone.diff
deleted file mode 100644
index 6560987..0000000
--- a/debian/patches/test-timezone.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-# set the same timezone the output file was created in
-
---- a/t/50-icli.t
-+++ b/t/50-icli.t
-@@ -101,12 +101,12 @@
- $cmd->stdout_is_file('t/out/list_services_v');
- $cmd->stderr_is_eq($EMPTY);
- 
--$cmd = Test::Command->new(cmd => "$icli -lq");
-+$cmd = Test::Command->new(cmd => "TZ=Europe/Berlin $icli -lq");
- $cmd->exit_is_num(0);
- $cmd->stdout_is_file('t/out/list_queue');
- $cmd->stderr_is_eq($EMPTY);
- 
--$cmd = Test::Command->new(cmd => "$icli -lq -h aneurysm");
-+$cmd = Test::Command->new(cmd => "TZ=Europe/Berlin $icli -lq -h aneurysm");
- $cmd->exit_is_num(0);
- $cmd->stdout_is_file('t/out/list_queue_aneurysm');
- $cmd->stderr_is_eq($EMPTY);

-- 
Packaging for icli in Debian