From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Wed, 2 Apr 2025 15:17:35 +0000 (-0400)
Subject: Merge branch 'master' into no-queue-override
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1120%2Fhead;p=thirdparty%2Fcups.git

Merge branch 'master' into no-queue-override
---

119f46f3f5d52ffb84b637ef4eeba518bbbc834a
diff --cc CHANGES.md
index 305c71d7a0,e55ef187d6..82d9fb6259
--- a/CHANGES.md
+++ b/CHANGES.md
@@@ -126,8 -134,8 +134,10 @@@ Changes in CUPS v2.5b1 (YYYY-MM-DD
  - Fixed error handling when reading a mixed `1setOf` attribute.
  - Fixed how `ippeveprinter` responds to an unsupported request character set.
  - Fixed a recursion issue in `ippReadIO`.
 +- Fixed verbose listing of `lpstat -l -e` when permanent queue has the same name
-   as network discovered.
++  as network discovered (Issue #1120)
+ - Fixed validation of dateTime values with time zones more than UTC+11
+   (Issue #1201)
  - Removed hash support for SHA2-512-224 and SHA2-512-256.
  - Removed `mantohtml` script for generating html pages (use
    `https://www.msweet.org/mantohtml/`)