[SCM] Elmer -- Open Source Finite Element Software for Multiphysical Problems branch, master, updated. debian/6.1.0.svn.5396.dfsg2-1-36-g2f45e89

[Boris Pek]

The following commit has been merged in the master branch:
commit 2a8e3e153a493317f54aceea377e19374e5a53e1
Author: Boris Pek <tehnick-8 at yandex.ru>
Date:   Thu Mar 21 23:05:39 2013 +0200

    Fix lintian note package-contains-empty-directory.

diff --git a/debian/elmer.postinst b/debian/elmer.postinst
index cef24fa..4ef3dc9 100644
--- a/debian/elmer.postinst
+++ b/debian/elmer.postinst
@@ -11,6 +11,8 @@ PROVIDED_MODELS="helmholtz navier-stokes resultoutput heatequation linearelastic
 db_get elmer/models
 SELECTED_MODELS="$(echo $RET | sed -e 's/, / /g')"
 
+mkdir -p /usr/share/ElmerGUI/edf
+
 # Remove old symlinks, if any
 for model in $PROVIDED_MODELS; do
     rm -f /usr/share/ElmerGUI/edf/$model.xml;
diff --git a/debian/elmer.prerm b/debian/elmer.prerm
index 82fa627..c329f71 100644
--- a/debian/elmer.prerm
+++ b/debian/elmer.prerm
@@ -2,17 +2,13 @@
 
 set -e
 
-PROVIDED_MODELS="helmholtz navier-stokes resultoutput heatequation linearelasticity k-epsilon meshdeform advection-diffusion elasticplate electrostatics freesurface poissonboltzmann reynolds saveline savescalars statcurrent"
-
-# Remove all possible file symlinks before removing package files
 case "$1" in
     remove|purge)
-	for model in $PROVIDED_MODELS; do
-	    rm -f /usr/share/ElmerGUI/edf/$model.xml;
-	done
-	;;
+        rm -f /usr/share/ElmerGUI/edf/*.xml
+        rmdir /usr/share/ElmerGUI/edf
+    ;;
     *)
-    	;;
+    ;;
 esac
 
 #DEBHELPER#
diff --git a/debian/rules b/debian/rules
index 6375bc1..6d89af5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -213,7 +213,6 @@ binary-arch:
 	dh_testdir -a
 	dh_testroot -a
 	dh_installdirs -a
-	install -d debian/elmer/usr/share/ElmerGUI/edf
 	dh_movefiles -a
 	dh_installdebconf -a
 	dh_installdocs -a

-- 
Elmer -- Open Source Finite Element Software for Multiphysical Problems