[SCM] Packaging for dune-common: a toolbox for solving PDEs -- basic classes branch, master, updated. debian/2.2.svn6782-1

[Ansgar Burchardt]

The following commit has been merged in the master branch:
commit d00f49599cf1bee062eda8db08bfd7f3a8a93b3a
Author: Ansgar Burchardt <ansgar at debian.org>
Date:   Fri Jun 1 19:18:53 2012 +0200

    Install dunemodules.lib to /usr/lib.
    
    Bug: http://www.dune-project.org/flyspray/index.php?do=details&task_id=1117

diff --git a/debian/libdune-common-dev.install b/debian/libdune-common-dev.install
index 0e2057f..e5bc6cf 100644
--- a/debian/libdune-common-dev.install
+++ b/debian/libdune-common-dev.install
@@ -1,7 +1,7 @@
 usr/bin
 usr/include
 usr/lib/*/dunecontrol usr/lib
-usr/lib/*/dunemodules.lib
+usr/lib/*/dunemodules.lib usr/lib
 usr/lib/*/libdunecommon.a
 usr/lib/*/libdunecommon.so
 usr/lib/*/pkgconfig
diff --git a/debian/rules b/debian/rules
index cacb2b1..cdd0c99 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,6 @@ override_dh_auto_install-arch:
 	$(MAKE) -C doc/doxygen install-data-am DESTDIR="$(CURDIR)/debian/tmp"
 
 	mv debian/tmp/usr/bin/mpi-config debian/tmp/usr/bin/dune-mpi-config
-	sed -i "s,\$$PREFIX_DIR/lib,/usr/lib/$(DEB_HOST_MULTIARCH)," debian/tmp/usr/bin/dunecontrol
 	sed -i "s,/usr/lib/dunecontrol/,& /usr/lib/$(DEB_HOST_MULTIARCH)/dunecontrol/," debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/dunemodules.lib
 
 override_dh_auto_install-indep:

-- 
Packaging for dune-common: a toolbox for solving PDEs -- basic classes