New upstream release
Simon McVittie
1 year, 8 months ago
|
0 |
libsdl2-mixer (2.6.1+dfsg-1) UNRELEASED; urgency=medium
|
|
1 |
|
|
2 |
* New upstream release, functionally equivalent to 2.6.0+dfsg-2
|
|
3 |
- d/p/configure.ac-Make-sure-to-set-VERSION.patch:
|
|
4 |
Drop, applied upstream
|
|
5 |
|
|
6 |
-- Simon McVittie <smcv@debian.org> Wed, 13 Jul 2022 12:00:26 +0100
|
|
7 |
|
0 | 8 |
libsdl2-mixer (2.6.0+dfsg-2) unstable; urgency=medium
|
1 | 9 |
|
2 | 10 |
* d/p/configure.ac-Make-sure-to-set-VERSION.patch:
|
debian/patches/configure.ac-Make-sure-to-set-VERSION.patch
less
more
0 | |
From: Simon McVittie <smcv@collabora.com>
|
1 | |
Date: Tue, 12 Jul 2022 11:54:16 +0100
|
2 | |
Subject: configure.ac: Make sure to set VERSION
|
3 | |
|
4 | |
Plain Autoconf only defines PACKAGE_NAME, PACKAGE_VERSION and similar
|
5 | |
substitution variables, to which Automake adds PACKAGE and VERSION.
|
6 | |
SDL_mixer doesn't use Automake, so it doesn't have the VERSION required
|
7 | |
by our SDL2_mixer.pc.in (and SDL2_mixer.spec.in) unless we set it
|
8 | |
explicitly.
|
9 | |
|
10 | |
Bug: https://github.com/libsdl-org/SDL_mixer/issues/421
|
11 | |
Fixes: 52d3f2c "Rewrite CMake build script"
|
12 | |
Signed-off-by: Simon McVittie <smcv@collabora.com>
|
13 | |
Forwarded: https://github.com/libsdl-org/SDL_mixer/pull/422
|
14 | |
---
|
15 | |
configure.ac | 5 ++++-
|
16 | |
1 file changed, 4 insertions(+), 1 deletion(-)
|
17 | |
|
18 | |
diff --git a/configure.ac b/configure.ac
|
19 | |
index 0b95ddf..a26eccf 100644
|
20 | |
--- a/configure.ac
|
21 | |
+++ b/configure.ac
|
22 | |
@@ -31,7 +31,10 @@ AC_SUBST(MINOR_VERSION)
|
23 | |
AC_SUBST(MICRO_VERSION)
|
24 | |
AC_SUBST(INTERFACE_AGE)
|
25 | |
AC_SUBST(BINARY_AGE)
|
26 | |
-AC_SUBST(VERSION)
|
27 | |
+# Automake defines VERSION to be the same as PACKAGE_VERSION, but we're
|
28 | |
+# not using Automake in SDL_mixer, so we need to set up the @VERSION@
|
29 | |
+# substitution for SDL2_mixer.pc ourselves
|
30 | |
+AC_SUBST([VERSION], [$PACKAGE_VERSION])
|
31 | |
|
32 | |
dnl libtool versioning
|
33 | |
LT_INIT([win32-dll])
|
0 | |
configure.ac-Make-sure-to-set-VERSION.patch
|