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

diff --git a/debian/rules b/debian/rules
index 128f3ed..7261997 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,11 +7,11 @@
 
 #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_TH_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')
 
 
 
@@ -121,15 +121,7 @@ clean-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,7 +148,6 @@ install-arch: $(PY_VERS:%=install-python%)
 install-python%:
 	dh_testdir
 	dh_testroot
-	dh_clean -k -s
 	set -e ;\
 	 cd bindings/python ;\
 	 python$* setup.py install --root=$(CURDIR)/debian/python-rrd
@@ -165,19 +156,19 @@ install-python%:
 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
@@ -189,10 +180,11 @@ binary-arch: build-arch install-arch
 	dh_pysupport -ppython-rrd
 	dh_perl -a
 	dh_installman -a
-	dh_link -plibrrd-dev librrd.so.$(LIB_version) /usr/lib/librrd.so
-	dh_link -plibrrd-dev librrd_th.so.$(LIB_TH_version) /usr/lib/librrd_th.so
-	dh_link -plibrrd$(LIB_major) librrd.so.$(LIB_version) /usr/lib/librrd.so.$(LIB_major)
-	dh_link -plibrrd$(LIB_major) librrd_th.so.$(LIB_TH_version) /usr/lib/librrd_th.so.$(LIB_TH_major)
+	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
@@ -208,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%