X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=debian%2Frules;h=72619979bac326c5e620253f68caf00ade9df668;hb=563d4bf48eae9415e990ffbd84a72381232a2464;hp=4d7a850b25554cde84a7aa792aa3093084f44113;hpb=31d9d00812e0413bbc30c4ce095db211eb56a90b;p=pkg-rrdtool.git

diff --git a/debian/rules b/debian/rules
index 4d7a850..7261997 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,18 +4,14 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-Makefile.am:librrd_la_LDFLAGS         = -version-info 2:12:0
-Makefile.am:librrd_th_la_LDFLAGS         = $(MULTITHREAD_LDFLAGS) -version-info 2:11:0
-
-
 
 #library versions
 LIB_version := $(shell grep '^librrd_la_LDFLAGS' src/Makefile.am | \
-                           sed 's,^[^0-9]*,,g;s,:,.,g')
+                           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')
 LIB_TH_version := $(shell grep '^librrd_th_la_LDFLAGS' src/Makefile.am | \
-                           sed 's,^[^0-9]*,,g;s,:,.,g')
-LIB_major := $(shell echo $(LIB_th_version) | sed 's,\..*,,g')
+                           sed 's,^[^0-9]*,,g;s,\([0-9]*\):\([0-9]*\):\([0-9]*\),\1.\3.\2,g')
+LIB_TH_major := $(shell echo $(LIB_TH_version) | sed 's,\..*,,g')
 
 
 
@@ -85,7 +81,9 @@ build-arch-stamp: config.status
 	touch $@
 
 build-python%: build-arch-stamp
-	cd bindings/python && env BUILDLIBDIR=../../src/.libs LIBDIR=../../src/.libs python$* setup.py build
+	set -e ;\
+	 cd bindings/python ;\
+	 BUILDLIBDIR=../../src/.libs LIBDIR=../../src/.libs python$* setup.py build
 	touch $@
 
 build-indep: build-indep-stamp
@@ -118,18 +116,12 @@ endif
 	dh_clean
 
 clean-python%:
-	cd bindings/python && python$* setup.py clean
+	set -e ;\
+	 cd bindings/python ;\
+	 python$* setup.py clean
 	rm -f build-python$*
 
-install: install-indep install-arch
-install-indep:
-	dh_testdir
-	dh_testroot
-	dh_clean -k -ppython-rrd
-	dh_installdirs -s
-
-
-	dh_install -s
+install: install-arch
 
 install-arch: $(PY_VERS:%=install-python%)
 	dh_testdir
@@ -156,26 +148,27 @@ install-arch: $(PY_VERS:%=install-python%)
 install-python%:
 	dh_testdir
 	dh_testroot
-	dh_clean -k -s
-	cd bindings/python && python$* setup.py install --root=$(CURDIR)/debian/python-rrd
+	set -e ;\
+	 cd bindings/python ;\
+	 python$* setup.py install --root=$(CURDIR)/debian/python-rrd
 
 
 binary-indep:
 	dh_testdir
 	dh_testroot
-	echo 'rubydefault:Depends=librrd-ruby$(RUBY_DEFAULT_VERS)' >> debian/librrd-ruby.substvars
+	dh_clean -k -i
 	dh_link -plibrrd-ruby /usr/share/doc/librrd-ruby$(RUBY_DEFAULT_VERS) /usr/share/doc/librrd-ruby
 	dh_link -plibrrd2-dev /usr/share/doc/librrd-dev /usr/share/doc/librrd2-dev
 	dh_installchangelogs
-	dh_installdocs -s -Nlibrrd-ruby -Nlibrrd2-dev
-	dh_link -s -Nlibrrd-ruby -Nlibrrd2-dev
-	dh_perl -s
-	dh_compress -s
-	dh_fixperms -s
-	dh_installdeb -s
-	dh_gencontrol -s
-	dh_md5sums -s
-	dh_builddeb -s
+	dh_installdocs -i -Nlibrrd-ruby -Nlibrrd2-dev
+	dh_link -i -Nlibrrd-ruby -Nlibrrd2-dev
+	dh_perl -i
+	dh_compress -i
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
 	
 
 binary-arch: build-arch install-arch
@@ -187,6 +180,11 @@ binary-arch: build-arch install-arch
 	dh_pysupport -ppython-rrd
 	dh_perl -a
 	dh_installman -a
+	echo 'rubydefault:Depends=librrd-ruby$(RUBY_DEFAULT_VERS)' >> debian/librrd-ruby.substvars
+	dh_link -plibrrd-dev /usr/lib/librrd.so.$(LIB_version) /usr/lib/librrd.so
+	dh_link -plibrrd-dev /usr/lib/librrd_th.so.$(LIB_TH_version) /usr/lib/librrd_th.so
+	dh_link -plibrrd$(LIB_major) /usr/lib/librrd.so.$(LIB_version) /usr/lib/librrd.so.$(LIB_major)
+	dh_link -plibrrd$(LIB_major) /usr/lib/librrd_th.so.$(LIB_TH_version) /usr/lib/librrd_th.so.$(LIB_TH_major)
 	dh_link -a
 	dh_strip -a
 	dh_compress -a
@@ -202,5 +200,5 @@ binary-arch: build-arch install-arch
 binary: binary-arch binary-indep
 .PHONY: build clean configure \
         binary-indep binary-arch binary \
-        install install-arch install-indep \
+        install install-arch \
         install-python% clean-python%