From d2306427b0f3e7048526612b2821f91dfc3dc296 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Sun, 24 Feb 2008 20:49:43 +0100 Subject: [PATCH] Use dh_install instead dh_link to install library symlinks. --- debian/librrd2-dev.install | 2 ++ debian/librrd2.install | 4 ++-- debian/rules | 9 +-------- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/debian/librrd2-dev.install b/debian/librrd2-dev.install index 7188652..dccee1a 100644 --- a/debian/librrd2-dev.install +++ b/debian/librrd2-dev.install @@ -3,3 +3,5 @@ usr/lib/librrd.a usr/lib/librrd_th.a usr/lib/librrd.la usr/lib/librrd_th.la +usr/lib/librrd.so +usr/lib/librrd_th.so diff --git a/debian/librrd2.install b/debian/librrd2.install index e791aaf..e24cfc5 100644 --- a/debian/librrd2.install +++ b/debian/librrd2.install @@ -1,3 +1,3 @@ -usr/lib/librrd.so.2.* -usr/lib/librrd_th.so.2.* +usr/lib/librrd.so.* +usr/lib/librrd_th.so.* ../../src/DejaVuSansMono-Roman.ttf usr/share/rrdtool/librrd2 diff --git a/debian/rules b/debian/rules index feda997..af70113 100755 --- a/debian/rules +++ b/debian/rules @@ -10,11 +10,8 @@ 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') + 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,\([0-9]*\):\([0-9]*\):\([0-9]*\),\1.\3.\2,g') -LIB_TH_major := $(shell echo $(LIB_TH_version) | sed 's,\..*,,g') @@ -199,10 +196,6 @@ binary-arch: build-arch install-arch dh_pysupport -ppython-rrdtool dh_perl -a dh_installman -a - dh_link -plibrrd2-dev /usr/lib/librrd.so.$(LIB_version) /usr/lib/librrd.so - dh_link -plibrrd2-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 -- 2.30.2