summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-08-05 09:09:07 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-08-05 09:09:07 +0000
commit35ddfe371464ada293ccb427138da0f88ca01281 (patch)
tree95853676f5c7d4898c2a1ffe492de343343c8f96
parentReleasing progress-linux version 5.6.2-1~progress7.99u1. (diff)
downloadxz-utils-35ddfe371464ada293ccb427138da0f88ca01281.tar.xz
xz-utils-35ddfe371464ada293ccb427138da0f88ca01281.zip
Merging debian version 5.6.2-2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r--debian/changelog8
-rw-r--r--debian/control2
-rwxr-xr-xdebian/rules2
-rw-r--r--debian/symbols4
4 files changed, 12 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index efee1ec..7bf1a42 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xz-utils (5.6.2-2) unstable; urgency=medium
+
+ * Increase symbol dependency on 5.6.0 symbols to 5.6.2 due to the revert.
+ Thanks to Ben Hutchings (Closes: #1074602).
+ * Correct the `terse' build. Thanks to Ben Hutchings (Closes: #1074604).
+
+ -- Sebastian Andrzej Siewior <sebastian@breakpoint.cc> Wed, 03 Jul 2024 21:51:43 +0200
+
xz-utils (5.6.2-1~progress7.99u1) graograman-backports; urgency=medium
* Uploading to graograman-backports, remaining changes:
diff --git a/debian/control b/debian/control
index 41eaad6..497a507 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Bugs: mailto:maintainers@lists.progress-linux.org
Build-Depends: debhelper-compat (= 13), dpkg-dev (>= 1.16.2),
autoconf (>= 2.64~), automake, libtool (>= 2.2),
gettext, autopoint | gettext (<< 0.18-1), autopoint | cvs, po4a
-Build-Depends-Indep: doxygen
+Build-Depends-Indep: doxygen, graphviz
Build-Conflicts: automake1.4
Standards-Version: 4.6.2
Vcs-Browser: https://git.progress-linux.org/packages/graograman-backports/xz-utils
diff --git a/debian/rules b/debian/rules
index c63b8d2..68f15b9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -98,7 +98,7 @@ ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
opt_optimize_small += --disable-assembler
endif
-ifneq (,$(findstring n,$(MAKEFLAGS)))
+ifneq (,$(findstring n,$(firstword -$(MAKEFLAGS))))
opt_no_act = --no-act
endif
diff --git a/debian/symbols b/debian/symbols
index d19cdc3..ee1e249 100644
--- a/debian/symbols
+++ b/debian/symbols
@@ -24,5 +24,5 @@ liblzma.so.5 liblzma5 #MINVER#
(arch=linux-any)lzma_stream_encoder_mt@XZ_5.2.2 5.2.2
(arch=linux-any)lzma_stream_encoder_mt_memusage@XZ_5.1.2alpha 5.4
(arch=linux-any)lzma_stream_encoder_mt_memusage@XZ_5.2.2 5.2.2
- XZ_5.6.0@XZ_5.6.0 5.6.0
- lzma_mt_block_size@XZ_5.6.0 5.6.0
+ XZ_5.6.0@XZ_5.6.0 5.6.2
+ lzma_mt_block_size@XZ_5.6.0 5.6.2