[SCM] kmidimon packaging branch, master, updated. debian/0.7.0-1

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 28 16:23:15 UTC 2009


The following commit has been merged in the master branch:
commit 762939baaa63b92e7147707f3399769a679b5d6b
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jun 28 17:45:10 2009 +0200

    avoid setting rpath in cmake invokation
    
    Setting an rpath can be avoided in cmake using a special flag called
    CMAKE_SKIP_RPATH. we can therefore avoid the extra dependency on chrpath
    by using cmake correctly. This flag is documented in the cmake wiki at
    http://www.cmake.org/Wiki/CMake_RPATH_handling

diff --git a/debian/control b/debian/control
index fec757c..8b41e51 100644
--- a/debian/control
+++ b/debian/control
@@ -8,8 +8,7 @@ Build-Depends: debhelper (>= 7),
 	       cmake,
 	       pkg-config,
 	       kdelibs5-dev,
-	       libasound2-dev,
-	       chrpath
+	       libasound2-dev
 Standards-Version: 3.8.2
 Homepage: http://kmetronome.sourceforge.net/kmidimon/
 Vcs-Git: git://git.debian.org/git/pkg-multimedia/kmidimon.git
diff --git a/debian/rules b/debian/rules
index 4c635e6..4c85baf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@ endif
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
-	cmake . -DWANT_PCH=YES -DCMAKE_INSTALL_PREFIX=/usr
+	cmake . -DWANT_PCH=YES -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_SKIP_RPATH=YES
 	touch configure-stamp
 
 build: build-stamp
@@ -37,8 +37,6 @@ install: build
 	dh_prep
 	dh_installdirs
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/kmidimon
-	chrpath -d $(CURDIR)/debian/kmidimon/usr/bin/kmidimon
-
 
 # Build architecture-independent files here.
 binary-indep: build install

-- 
kmidimon packaging



More information about the pkg-multimedia-commits mailing list