diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2021-08-17 06:40:19 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2021-08-17 06:40:19 +0200 |
| commit | 591cbf5878b7d4105b275585b9db1324c9dfce56 (patch) | |
| tree | 93c01f69597c88a6b081dd00d6c56b42ff4c1108 | |
| parent | a0f0ec6aa5e10da258f48f3884ef269ba04361a6 (diff) | |
| parent | 3a82e472d5a2ec9ec172c07bd7ac00e3806e622a (diff) | |
Merge branch 'release/debian/0.9.10-6'debian/0.9.10-6
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/patches/0010-AC_INIT.patch | 30 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 38 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 4f60766..25b1c77 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libunistring (0.9.10-6) unstable; urgency=medium + + * New debian/patches/0010-AC_INIT.patch to fix AC_INIT handling + (Closes: #992281). + + -- Jörg Frings-Fürst <debian@jff.email> Mon, 16 Aug 2021 23:32:24 +0200 + libunistring (0.9.10-5) experimental; urgency=medium * New debian/patches/0005-fix_build_musl.patch (Closes: #987609): diff --git a/debian/patches/0010-AC_INIT.patch b/debian/patches/0010-AC_INIT.patch new file mode 100644 index 0000000..d967829 --- /dev/null +++ b/debian/patches/0010-AC_INIT.patch @@ -0,0 +1,30 @@ +Description: Fix AC_INIT handling +Author: Jörg Frings-Fürst <debian@jff.email> +Bug: <bug-libunistring@gnu.org> +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=992281 +Forwarded: yes +Last-Update: 2021-08-16 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/configure.ac +=================================================================== +--- trunk.orig/configure.ac ++++ trunk/configure.ac +@@ -16,12 +16,14 @@ dnl along with this program. If not, se + + dnl Process this file with autoconf to produce a configure script. + ++ ++ + AC_PREREQ([2.63]) +-AC_INIT ++. $srcdir/version.sh ++AC_INIT([libunistring],[m4_esyscmd_s([$VERSION_NUMBER])]) + AC_CONFIG_SRCDIR([lib/unistring/version.in.h]) + AC_CONFIG_AUX_DIR([build-aux]) +-. $srcdir/version.sh +-gl_INIT_PACKAGE([libunistring], [$VERSION_NUMBER]) ++dnl AM_INIT_AUTOMAKE + AM_INIT_AUTOMAKE([silent-rules dist-xz]) + AM_CONFIG_HEADER([config.h]) + diff --git a/debian/patches/series b/debian/patches/series index 746190b..d6c7caa 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ 0100-float-endian-detection.patch 0700-multiarch-libc.patch 0705-gcc-9.patch +0010-AC_INIT.patch |