Merge branch 'master' into release/2015.04

debian/control

@@ -35,18 +35,15 @@ Suggests: libopm-upscaling-doc
 Description: OPM upscaling library -- applications
  This module implements single-phase and steady-state upscaling methods.
 
-# Disabled until dune is bumped to 2.3.
-# No library built with 2.2.1 as elasticity code is excluded
-
-#Package: libopm-upscaling1
-#Section: libs
-#Pre-Depends: ${misc:Pre-Depends}, multiarch-support
-#Architecture: any
-#Multi-Arch: same
-#Depends: ${shlibs:Depends}, ${misc:Depends}
-#Provides: libopm-upscaling
-#Description: OPM upscaling library
-# This module implements single-phase and steady-state upscaling methods.
+Package: libopm-upscaling1
+Section: libs
+Pre-Depends: ${misc:Pre-Depends}, multiarch-support
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Provides: libopm-upscaling
+Description: OPM upscaling library
+ This module implements single-phase and steady-state upscaling methods.
 
 Package: libopm-upscaling1-doc
 Section: doc
@@ -61,6 +58,6 @@ Section: debug
 Architecture: any
 Multi-Arch: foreign
 Provides: libopm-upscaling-dbg
-Depends: libopm-upscaling1 (= ${binary:Version}), ${misc:Depends}
+Depends: libopm-upscaling1 (= ${binary:Version}), libopm-upscaling1-bin (=${binary:Version}), ${misc:Depends}
 Description: OPM upscaling library -- debug symbols
  This module implements single-phase and steady-state upscaling methods.

debian/libopm-upscaling1-dev.install

@@ -1,3 +1,4 @@
+usr/lib/*/*.so
 usr/include/*
 usr/lib/dunecontrol/*
 usr/share/cmake/*

debian/libopm-upscaling1.install

@@ -0,0 +1 @@
+usr/lib/*/*.so.*

debian/rules

@@ -29,4 +29,4 @@ override_dh_installdocs:
 	dh_installdocs --link-doc=libopm-upscaling1
 
 override_dh_strip:
-	dh_strip -plibopm-upscaling1-bin --dbg-package=libopm-upscaling1-dbg
+	dh_strip -plibopm-upscaling1 -plibopm-upscaling1-bin --dbg-package=libopm-upscaling1-dbg