reword !isatty() warning

[apt.git] / prepare-release

diff --git a/prepare-release b/prepare-release
index d422e386c86fe91cb56744e9fb658a4988842512..dfa37631bad7c2c0aa1b64a1792e9ef31b26ee79 100755 (executable)
--- a/prepare-release
+++ b/prepare-release
@@ -1,15 +1,18 @@
 #!/bin/sh
 #!/bin/sh

-

 set -e
 
 set -e
 

+dpkg-checkbuilddeps -d 'libxml2-utils'
+
+if [ -n "${GBP_BUILD_DIR}" ]; then
+   cd "$GBP_BUILD_DIR"
+fi
+

 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/init.h | sed 's/\.$//')"
 LIBAPTINSTVERSION="$(egrep '^MAJOR=' apt-inst/makefile |cut -d '=' -f 2)"
 
 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/init.h | sed 's/\.$//')"
 LIBAPTINSTVERSION="$(egrep '^MAJOR=' apt-inst/makefile |cut -d '=' -f 2)"
 

-dpkg-checkbuilddeps -d 'libxml2-utils'
-

 if [ "$1" = 'pre-export' ]; then
        libraryversioncheck() {
                local LIBRARY="$1"
 if [ "$1" = 'pre-export' ]; then
        libraryversioncheck() {
                local LIBRARY="$1"


@@ -47,7 +50,7 @@ if [ "$1" = 'pre-export' ]; then
        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
        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 »bzr tag ${VERSION}« if you are satisfied"
+               echo >&2 "REMEMBER: Tag this release with »git tag ${VERSION}« if you are satisfied"

        else
                echo >&2 'REMEMBER: Change to a valid distribution before release'
        fi
        else
                echo >&2 'REMEMBER: Change to a valid distribution before release'
        fi


@@ -59,9 +62,14 @@ elif [ "$1" = 'post-build' ]; then
                        echo >&2 "WARNING: original docbook manpages have errors with vendor ${DISTRO}!"
                fi
        done
                        echo >&2 "WARNING: original docbook manpages have errors with vendor ${DISTRO}!"
                fi
        done

-       # … but check the translations only with one vendor for translation-specific errors
-       if ! xmllint --nonet --valid --noout $(find doc/ -mindepth 2 -maxdepth 2 -name '*.xml'); then
-               echo >&2 "WARNING: translated docbook manpages have errors!"
+       # lets assume we will always have a german manpage translation
+       if [ -e 'doc/de/' ]; then
+               # … but check the translations only with one vendor for translation-specific errors
+               if ! xmllint --nonet --valid --noout $(find doc/ -mindepth 2 -maxdepth 2 -name '*.xml'); then
+                       echo >&2 "WARNING: translated docbook manpages have errors!"
+               fi
+       else
+               echo >&2 "ERROR: translated manpages need to be build before they can be checked!"

        fi
        rm -f doc/apt-vendor.ent
 
        fi
        rm -f doc/apt-vendor.ent
 


@@ -69,14 +77,14 @@ elif [ "$1" = 'library' ]; then
        librarysymbols() {
                echo "Checking $1 in version $2"
                local tmpfile=$(mktemp)
        librarysymbols() {
                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
+               dpkg-gensymbols -p${1}${2} -ebuild/bin/${1}.so.${2} -Idebian/${1}${2}.symbols -O/dev/null 2> /dev/null > $tmpfile || true

                echo '=== Missing symbols:'
                echo '=== Missing symbols:'

-               grep '^+#MISSING' $tmpfile
+               grep '^+#MISSING' $tmpfile || true

                echo '=== New symbols:'
                grep '^+ ' $tmpfile | cut -d' ' -f 2 | cut -d'@' -f 1 | c++filt | while read line; do
                        echo " (c++)\"${line}@Base\" $VERSION"
                done | sort -u
                echo '=== New symbols:'
                grep '^+ ' $tmpfile | cut -d' ' -f 2 | cut -d'@' -f 1 | c++filt | while read line; do
                        echo " (c++)\"${line}@Base\" $VERSION"
                done | sort -u

-               rm $tmpfile
+               rm -f $tmpfile

        }
        librarysymbols 'libapt-pkg' "${LIBAPTPKGVERSION}"
        echo
        }
        librarysymbols 'libapt-pkg' "${LIBAPTPKGVERSION}"
        echo


@@ -86,7 +94,7 @@ else
 \t$0 post-build
 \t$0 library
 
 \t$0 post-build
 \t$0 library
 

-If you use »bzr builddeb« you can leave this script alone as it will
+If you use »git buildpackage« you can leave this script alone as it will

 be run at the right places auto-magically. Otherwise you should use
 »pre-export« to update po and pot files as well as version numbering.
 »post-build« can be used to run some more or less useful checks later on.
 be run at the right places auto-magically. Otherwise you should use
 »pre-export« to update po and pot files as well as version numbering.
 »post-build« can be used to run some more or less useful checks later on.