When looking if Provides match, OR them with the normal patches

[apt.git] / prepare-release

diff --git a/prepare-release b/prepare-release
index 67f4638d60327e7bd5af3d89ad71d53eb0ff14fe..91f65028d4bb202be4b4a3a162f4f5bb6dd1b173 100755 (executable)
--- a/prepare-release
+++ b/prepare-release
@@ -11,17 +11,18 @@ VERSION=$(dpkg-parsechangelog | sed -n -e '/^Version:/s/^Version: //p')
 DISTRIBUTION=$(dpkg-parsechangelog | sed -n -e '/^Distribution:/s/^Distribution: //p')
 
 LIBAPTPKGVERSION="$(awk -v ORS='.' '/^\#define APT_PKG_M/ {print $3}' apt-pkg/contrib/macros.h | sed 's/\.$//')"
-LIBAPTINSTVERSION="$(egrep '^MAJOR=' apt-inst/makefile |cut -d '=' -f 2)"
+LIBAPTINSTVERSION="$(grep '^MAJOR=' apt-inst/makefile |cut -d '=' -f 2)"
 
 librarysymbolsfromfile() {
        local MISSING="$(grep '^+#MISSING' "$1")"
+       local SYMVER="$2"
        echo '=== Missing optional symbols:'
        echo -n "$MISSING" | grep '|optional=' || true
        echo '=== Missing required symbols:'
        echo -n "$MISSING" | grep -v '|optional=' || true
        echo '=== New symbols:'
        grep '^+ ' "$1" | cut -d' ' -f 2 | cut -d'@' -f 1 | c++filt | while read line; do
-               echo " (c++)\"${line}@Base\" $VERSION"
+               echo " (c++)\"${line}@${SYMVER}\" $VERSION"
        done | sort -u
 }
 
@@ -52,14 +53,14 @@ if [ "$1" = 'pre-export' ]; then
                VERSION="$VERSION~$(date +%Y%m%d)"
        fi
 
+       sed -i -e "s/^PACKAGE_VERSION=\".*\"$/PACKAGE_VERSION=\"${VERSION}\"/" configure.ac
+       sed -i -e "s/^<!ENTITY apt-product-version \".*\">$/<!ENTITY apt-product-version \"${VERSION}\">/" doc/apt-verbatim.ent
+
        if [ "$(date +%Y-%m-%d)" != "$(grep --max-count=1 '^"POT-Creation-Date: .*\n"$' po/apt-all.pot | cut -d' ' -f 2)" -o \
             "$(date +%Y-%m-%d)" != "$(grep --max-count=1 '^"POT-Creation-Date: .*\n"$' doc/po/apt-doc.pot | cut -d' ' -f 2)" ]; then
                echo >&2 'POT files are not up-to-date. Execute »make update-po« for you…'
                make update-po
        fi
-
-       sed -i -e "s/^PACKAGE_VERSION=\".*\"$/PACKAGE_VERSION=\"${VERSION}\"/" configure.ac
-       sed -i -e "s/^<!ENTITY apt-product-version \".*\">$/<!ENTITY apt-product-version \"${VERSION}\">/" doc/apt-verbatim.ent
 elif [ "$1" = 'post-build' ]; then
        if [ "$DISTRIBUTION" != "UNRELEASED" ]; then
                echo >&2 "REMEMBER: Tag this release with »git tag ${VERSION}« if you are satisfied"
@@ -109,7 +110,7 @@ elif [ "$1" = 'library' ]; then
                echo "Checking $1 in version $2"
                local tmpfile=$(mktemp)
                dpkg-gensymbols -p${1}${2} -ebuild/bin/${1}.so.${2} -Idebian/${1}${2}.symbols -O/dev/null 2> /dev/null > $tmpfile || true
-               librarysymbolsfromfile "$tmpfile"
+               librarysymbolsfromfile "$tmpfile" "$(echo "${1}" | cut -c 4- | tr -d '-' | tr 'a-z' 'A-Z')_${2}"
                rm -f $tmpfile
        }
        librarysymbols 'libapt-pkg' "${LIBAPTPKGVERSION}"
@@ -117,7 +118,7 @@ elif [ "$1" = 'library' ]; then
        librarysymbols 'libapt-inst' "${LIBAPTINSTVERSION}"
 elif [ "$1" = 'buildlog' ]; then
        while [ -n "$2" ]; do
-               librarysymbolsfromfile "$2"
+               librarysymbolsfromfile "$2" 'UNKNOWN'
                shift
        done
 elif [ "$1" = 'travis-ci' ]; then