From 3a496cd2c06bf00d8386ff9c56e2fd26eb61ec5a Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 22 Mar 2012 19:29:53 +0100 Subject: * debian/rules: - do not sed in configure.in to set the version-number * prepare-release: - add as a small script to lazy check and prepare releases --- prepare-release | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100755 prepare-release (limited to 'prepare-release') diff --git a/prepare-release b/prepare-release new file mode 100755 index 000000000..e02157b24 --- /dev/null +++ b/prepare-release @@ -0,0 +1,37 @@ +#!/bin/sh + +VERSION=$(dpkg-parsechangelog | sed -n -e '/^Version:/s/^Version: //p') +DISTRIBUTION=$(dpkg-parsechangelog | sed -n -e '/^Distribution:/s/^Distribution: //p') + +if [ "$1" = 'pre-export' ]; then + if [ "$DISTRIBUTION" = 'sid' ]; then + echo >&2 '»sid« is not a valid distribution. Replace it with »unstable« for you' + sed -i -e 's/) sid; urgency=/) unstable; urgency=/' debian/changelog + DISTRIBUTION='unstable' + elif [ "$DISTRIBUTION" = 'UNRELEASED' ]; then + echo >&2 'WARNING: Remember to change to a valid distribution for release' + VERSION="$VERSION~$(date +%Y%m%d)" + fi + + 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.in +elif [ "$1" = 'post-build' ]; then + if [ "$DISTRIBUTION" != "UNRELEASED" ]; then + echo >&2 "REMEMBER: Tag this release with »bzr tag ${VERSION}« if you are satisfied" + else + echo >&2 'REMEMBER: Change to a valid distribution before release' + fi +else + echo >&1 "Usage:\t$0 pre-export +\t$0 post-build + +If you use »bzr builddeb« 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." +fi -- cgit v1.2.3 From 154fd04e8870577626fa43546f40273f6edbc9f3 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 2 May 2012 19:20:56 +0200 Subject: * debian/libapt-inst1.5.symbols: - use the correct library name the symbols header --- prepare-release | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'prepare-release') diff --git a/prepare-release b/prepare-release index e02157b24..fd98c489f 100755 --- a/prepare-release +++ b/prepare-release @@ -4,6 +4,23 @@ VERSION=$(dpkg-parsechangelog | sed -n -e '/^Version:/s/^Version: //p') DISTRIBUTION=$(dpkg-parsechangelog | sed -n -e '/^Distribution:/s/^Distribution: //p') if [ "$1" = 'pre-export' ]; then + libraryversioncheck() { + LIBRARY="$1" + VERSION="$2" + if [ ! -e "debian/${LIBRARY}${VERSION}.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")«)" + exit 2 + fi + } + + libraryversioncheck 'libapt-pkg' "$(awk -v ORS='.' '/^\#define APT_PKG_M/ {print $3}' apt-pkg/init.h | sed 's/\.$//')" + libraryversioncheck 'libapt-inst' "$(egrep '^MAJOR=' apt-inst/makefile |cut -d '=' -f 2)" + + if [ "$DISTRIBUTION" = 'sid' ]; then echo >&2 '»sid« is not a valid distribution. Replace it with »unstable« for you' sed -i -e 's/) sid; urgency=/) unstable; urgency=/' debian/changelog -- cgit v1.2.3 From 5ca28ebd7445774963d59b35f83c649e1ff61ca0 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 11 May 2012 06:49:19 +0200 Subject: add a manually runable library action to help in maintaining the symbols files --- prepare-release | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) (limited to 'prepare-release') diff --git a/prepare-release b/prepare-release index fd98c489f..821726ae2 100755 --- a/prepare-release +++ b/prepare-release @@ -3,6 +3,9 @@ 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)" + if [ "$1" = 'pre-export' ]; then libraryversioncheck() { LIBRARY="$1" @@ -17,8 +20,8 @@ if [ "$1" = 'pre-export' ]; then fi } - libraryversioncheck 'libapt-pkg' "$(awk -v ORS='.' '/^\#define APT_PKG_M/ {print $3}' apt-pkg/init.h | sed 's/\.$//')" - libraryversioncheck 'libapt-inst' "$(egrep '^MAJOR=' apt-inst/makefile |cut -d '=' -f 2)" + libraryversioncheck 'libapt-pkg' "$LIBAPTPKGVERSION" + libraryversioncheck 'libapt-inst' "$LIBAPTINSTVERSION" if [ "$DISTRIBUTION" = 'sid' ]; then @@ -43,12 +46,32 @@ elif [ "$1" = 'post-build' ]; then else echo >&2 'REMEMBER: Change to a valid distribution before release' fi +elif [ "$1" = 'library' ]; then + librarysymbols() { + echo "Checking $1 in version $2" + tmpfile=$(mktemp) + dpkg-gensymbols -p${1}${2} -ebuild/bin/${1}.so.${2} -Idebian/${1}${2}.symbols -O/dev/null 2> /dev/null > $tmpfile + echo '=== Missing symbols:' + grep '^+#MISSING' $tmpfile + 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 + } + librarysymbols 'libapt-pkg' "${LIBAPTPKGVERSION}" + echo + librarysymbols 'libapt-inst' "${LIBAPTINSTVERSION}" else echo >&1 "Usage:\t$0 pre-export \t$0 post-build +\t$0 library If you use »bzr builddeb« 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." +»post-build« can be used to run some more or less useful checks later on. + +»library« isn't run automatically but can be useful for maintaining the +(more or less experimental) symbols files we provide" fi -- cgit v1.2.3 From 58921d7d062257d6165d51b44712140daef01ec8 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 12 May 2012 00:40:36 +0200 Subject: * prepare-release: - apt-inst version isn't apt versions, so don't override variable --- prepare-release | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'prepare-release') diff --git a/prepare-release b/prepare-release index 821726ae2..477d638c7 100755 --- a/prepare-release +++ b/prepare-release @@ -8,8 +8,8 @@ LIBAPTINSTVERSION="$(egrep '^MAJOR=' apt-inst/makefile |cut -d '=' -f 2)" if [ "$1" = 'pre-export' ]; then libraryversioncheck() { - LIBRARY="$1" - VERSION="$2" + local LIBRARY="$1" + local VERSION="$2" if [ ! -e "debian/${LIBRARY}${VERSION}.symbols" ]; then echo >&2 "Library ${LIBRARY} in version ${VERSION} has no symbols file! (maybe forgot to rename?)" exit 1 @@ -49,7 +49,7 @@ elif [ "$1" = 'post-build' ]; then elif [ "$1" = 'library' ]; then librarysymbols() { echo "Checking $1 in version $2" - tmpfile=$(mktemp) + local tmpfile=$(mktemp) dpkg-gensymbols -p${1}${2} -ebuild/bin/${1}.so.${2} -Idebian/${1}${2}.symbols -O/dev/null 2> /dev/null > $tmpfile echo '=== Missing symbols:' grep '^+#MISSING' $tmpfile -- cgit v1.2.3 From 372c2a2d4bf8539ada10e11dc1f2541680b5e24c Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Mon, 21 May 2012 05:13:13 +0200 Subject: print warnings in release script if xml-linting fails The build was successful, so it doesn't seem to be a problem per-se, but it is a good idea to correct these errors non-the-less. --- prepare-release | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'prepare-release') diff --git a/prepare-release b/prepare-release index 477d638c7..c5e28edc3 100755 --- a/prepare-release +++ b/prepare-release @@ -46,6 +46,11 @@ elif [ "$1" = 'post-build' ]; then else echo >&2 'REMEMBER: Change to a valid distribution before release' fi + if ! xmllint --nonet --valid --noout $(find doc/ -maxdepth 1 -name '*.xml'); then + echo >&2 'WARNING: original docbook manpages have errors!' + elif ! xmllint --nonet --valid --noout $(find doc/ -mindepth 2 -maxdepth 2 -name '*.xml'); then + echo >&2 'WARNING: translated docbook manpages have errors, but originals are okay!' + fi elif [ "$1" = 'library' ]; then librarysymbols() { echo "Checking $1 in version $2" -- cgit v1.2.3 From aa9de3cd97897b269d61031082d1039a242d8b4a Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 25 May 2012 14:11:34 +0200 Subject: * doc/apt-verbatim.ent: - APT doesn't belong to the product 'Linux', so use 'APT' instead as after all APT is a big suite of applications --- prepare-release | 1 + 1 file changed, 1 insertion(+) (limited to 'prepare-release') diff --git a/prepare-release b/prepare-release index c5e28edc3..73c0be602 100755 --- a/prepare-release +++ b/prepare-release @@ -40,6 +40,7 @@ if [ "$1" = 'pre-export' ]; then fi sed -i -e "s/^PACKAGE_VERSION=\".*\"$/PACKAGE_VERSION=\"${VERSION}\"/" configure.in + sed -i -e "s/^$//" 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" -- cgit v1.2.3