From d01bf74343f8b7ff7f60a9fe041df6225f7e11a7 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Wed, 21 May 2008 23:49:53 +0200 Subject: [PATCH] Fixed soname major detection. Unfortunately, the soname major does not equal the first part of the "-version-info" argument value. Now, we get that information from the .la file generated by libtool after compiling the package... :-/ --- debian/rules | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/debian/rules b/debian/rules index cca0d82..da42604 100755 --- a/debian/rules +++ b/debian/rules @@ -8,13 +8,6 @@ include /usr/share/quilt/quilt.make -#library versions -LIB_version := $(shell grep '^librrd_la_LDFLAGS' src/Makefile.am | \ - sed 's,^[^0-9]*,,g;s,\([0-9]*\):\([0-9]*\):\([0-9]*\),\1.\3.\2,g') -LIB_major := $(shell echo $(LIB_version) | sed 's,\..*,,g') - - - #Ruby versions to build for RUBY_VERS := 1.8 1.9 RUBY_DEFAULT_VERS := 1.8 @@ -88,6 +81,11 @@ build-arch-stamp: config.status make TCL_INC_DIR=/usr/include/tcl #Fix library path to tcl bindings sed -i -e 's|lib/|lib/tcltk/rrdtool-tcl/|' bindings/tcl/pkgIndex.tcl + #sanity check if debian/control lists the right package name + LIB_major=`grep '^dlname=' src/librrd.la \ + | sed -e "s/^dlname='librrd\.so\.\\([0-9]\+\\)'\$$/\\1/"` \ + && test -n "$$LIB_major" \ + && grep -q "^Package: librrd$$LIB_major\\>" debian/control touch $@ build-python%: build-arch-stamp @@ -103,8 +101,6 @@ clean: clean-patched clean-patched: unpatch $(PY_VERS:%=clean-python%) dh_testdir dh_testroot - #sanity check if debian/control lists the right package name - grep -q '^Package: librrd$(LIB_major)' debian/control [ ! -f Makefile ] || make distclean -- 2.30.2