diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2024-11-13 13:40:14 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2024-11-13 13:40:14 +0100 |
| commit | b45478c1f9b58d4b031d31de6abc4743707e3a17 (patch) | |
| tree | e24bbe0276374f5122738e553944638f599cb5c4 | |
| parent | d27baab88a8a13bfb5932b410d581eddba0378a9 (diff) | |
| parent | cb12394d9cb9e4a7aa2320f1c27bc60c34757ec7 (diff) | |
Merge branch 'release/debian/1.14-22'debian/1.14-22
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/patches/0100-new_syslog_format.patch | 2 | ||||
| -rw-r--r-- | debian/patches/series | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index b9a3ad2..dc81e50 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +mailgraph (1.14-22) unstable; urgency=medium + + * Refresh debian/patches/0100-new_syslog_format.patch: + - Full takeover from (Closes: #1051496) + https://gist.github.com/mdklapwijk/4f8d2fc39f09f4aa615cbf8ffae0379a + + -- Jörg Frings-Fürst <debian@jff.email> Sun, 30 Jun 2024 19:29:48 +0200 + mailgraph (1.14-21.1) unstable; urgency=medium * Non-maintainer upload. diff --git a/debian/patches/0100-new_syslog_format.patch b/debian/patches/0100-new_syslog_format.patch index f3fc9a0..e094eca 100644 --- a/debian/patches/0100-new_syslog_format.patch +++ b/debian/patches/0100-new_syslog_format.patch @@ -72,7 +72,7 @@ Index: trunk/mailgraph.pl + } + else { + my($montxt); -+ ($montxt, $day, $hour, $min, $sec, $host, $text) = $str =~ /^ ++ ($mon, $day, $hour, $min, $sec, $host, $text) = $str =~ /^ + (\S{3})\s+(\d+) # date + \s + (\d+):(\d+):(\d+) # time diff --git a/debian/patches/series b/debian/patches/series index 578c8c7..4bc9277 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -0100-new_syslog_format.patch 001_default-rrd-location.diff 002_script-name.diff 003_web-bug.diff @@ -8,3 +7,4 @@ #103_postfix-long-queue-IDs.diff #105_postscreen.diff #110_mailgraph.cgi.patch +0100-new_syslog_format.patch |