summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2012-05-02 19:20:56 +0200
committerDavid Kalnischkies <kalnischkies@gmail.com>2012-05-02 19:20:56 +0200
commit154fd04e8870577626fa43546f40273f6edbc9f3 (patch)
treebd2f50e830664f142a61327576549f8dbcae8b08
parent99b4fefe0f303cf5ae5e8b9116404fc0fcc96e47 (diff)
* debian/libapt-inst1.5.symbols:
- use the correct library name the symbols header
-rw-r--r--debian/changelog4
-rw-r--r--debian/libapt-inst1.5.symbols2
-rwxr-xr-xprepare-release17
3 files changed, 21 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 34d6991b5..d77de1b3a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,8 +24,10 @@ apt (0.9.3) unstable; urgency=low
* edsp/edspsystem.cc:
- check with RealFileExists for scenario file as otherwise a directory
like one provided with RootDir triggers the usage of EDSP
+ * debian/libapt-inst1.5.symbols:
+ - use the correct library name the symbols header
- -- David Kalnischkies <kalnischkies@gmail.com> Mon, 23 Apr 2012 22:02:58 +0200
+ -- David Kalnischkies <kalnischkies@gmail.com> Wed, 02 May 2012 19:18:51 +0200
apt (0.9.2) unstable; urgency=low
diff --git a/debian/libapt-inst1.5.symbols b/debian/libapt-inst1.5.symbols
index cade0990d..8fcd29a3e 100644
--- a/debian/libapt-inst1.5.symbols
+++ b/debian/libapt-inst1.5.symbols
@@ -1,4 +1,4 @@
-libapt-inst.so.1.4 libapt-inst1.4 #MINVER#
+libapt-inst.so.1.5 libapt-inst1.5 #MINVER#
* Build-Depends-Package: libapt-pkg-dev
(c++)"ExtractTar::Done(bool)@Base" 0.8.0
(c++)"ExtractTar::Go(pkgDirStream&)@Base" 0.8.0
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