From 254368f21a2dc057dfbd651f262fe3e585e72fba Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 13 Apr 2024 12:14:39 +0200 Subject: Merging upstream version 2.7.13. Signed-off-by: Daniel Baumann --- prepare-release | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'prepare-release') diff --git a/prepare-release b/prepare-release index 988ccab..fe9628f 100755 --- a/prepare-release +++ b/prepare-release @@ -11,6 +11,7 @@ VERSION=$(dpkg-parsechangelog -S 'Version') DISTRIBUTION=$(dpkg-parsechangelog -S 'Distribution') LIBAPTPKGVERSION="$(awk -v ORS='.' '/^#define APT_PKG_M/ {print $3}' apt-pkg/contrib/macros.h | sed 's/\.$//')" +LIBSUFFIX="t64" librarysymbolsfromfile() { local MISSING="$(grep '^+#MISSING' "$1")" @@ -29,12 +30,12 @@ if [ "$1" = 'pre-export' ]; then libraryversioncheck() { local LIBRARY="$1" local VERSION="$2" - if [ ! -e "debian/${LIBRARY}${VERSION}.symbols" ]; then + if [ ! -e "debian/${LIBRARY}${VERSION}${LIBSUFFIX}.symbols" ]; then echo >&2 "Library ${LIBRARY} in version ${VERSION} has no symbols file! (maybe forgot to rename?)" exit 1 fi - if [ "$(head -n1 "debian/${LIBRARY}${VERSION}.symbols")" != "${LIBRARY}.so.${VERSION} ${LIBRARY}${VERSION} #MINVER#" ]; then - echo >&2 "Library ${LIBRARY}${VERSION} has incorrect version in symbol header! (»$(head -n1 "debian/${LIBRARY}${VERSION}.symbols")«)" + if [ "$(head -n1 "debian/${LIBRARY}${VERSION}${LIBSUFFIX}.symbols")" != "${LIBRARY}.so.${VERSION} ${LIBRARY}${VERSION}${LIBSUFFIX} #MINVER#" ]; then + echo >&2 "Library ${LIBRARY}${VERSION} has incorrect version in symbol header! (»$(head -n1 "debian/${LIBRARY}${VERSION}${LIBSUFFIX}.symbols")«)" exit 2 fi } @@ -166,7 +167,7 @@ elif [ "$1" = 'library' ]; then fi echo "Checking $1 in version $2 build at $(stat -L -c '%y' "$buildlib")" local tmpfile=$(mktemp) - dpkg-gensymbols -p${1}${2} -e${buildlib} -Idebian/${1}${2}.symbols -O/dev/null 2> /dev/null > $tmpfile || true + dpkg-gensymbols -p${1}${2} -e${buildlib} -Idebian/${1}${2}${LIBSUFFIX}.symbols -O/dev/null 2> /dev/null > $tmpfile || true librarysymbolsfromfile "$tmpfile" "$(echo "${1}" | cut -c 4- | tr -d '-' | tr 'a-z' 'A-Z')_${2}" rm -f $tmpfile } @@ -178,7 +179,7 @@ elif [ "$1" = 'buildlog' ]; then shift done elif [ "$1" = 'travis-ci' ]; then - apt-get build-dep -qy . + apt-get build-dep -P pkg.apt.ci -qy . apt-get install -qy --no-install-recommends dctrl-tools for t in $(grep '^Tests: ' debian/tests/control | cut -d':' -f 2- | tr ',' '\n'); do apt-get satisfy -qy --no-install-recommends "base-files,$(grep-dctrl -ns Depends -F Tests $t ./debian/tests/control | sed -e 's#@[^,<>()@]*@\s*,\s*##g' -e 's#@\s*,\s*##g')" -- cgit v1.2.3