r47: Initial Import

1 files changed, 8 insertions, 6 deletions

diff --git a/dh_installdeb b/dh_installdeb
index d9e1e7b3..dd1a23fb 100755
--- a/dh_installdeb
+++ b/dh_installdeb
@@ -16,15 +16,16 @@ for PACKAGE in $DH_DOPACKAGES; do
 	# Install debian install scripts.
 	# If any .debhelper files exist, add them into the scripts.
 	for file in postinst preinst prerm postrm; do
-		if [ -f debian/$EXT$file ]; then
+		f=`pkgfile $PACKAGE $file`
+		if [ "$f" ]; then
 			if [ -f debian/$EXT$file.debhelper ]; then
 				# Add this into the script, where it has
 				# #DEBHELPER#
-				complex_doit "perl -pe 's~#DEBHELPER#~qx{cat debian/$EXT$file.debhelper}~eg' < debian/$EXT$file > $TMP/DEBIAN/$file"
+				complex_doit "perl -pe 's~#DEBHELPER#~qx{cat debian/$EXT$file.debhelper}~eg' < $f > $TMP/DEBIAN/$file"
 			else
-				# Just get rid of any #DEBHELOPER# in the 
+				# Just get rid of any #DEBHELPER# in the 
 				# script.
-				complex_doit "sed s/#DEBHELPER#// < debian/$EXT$file > $TMP/DEBIAN/$file"
+				complex_doit "sed s/#DEBHELPER#// < $f > $TMP/DEBIAN/$file"
 			fi
 			doit "chown root.root $TMP/DEBIAN/$file"
 			doit "chmod 755 $TMP/DEBIAN/$file"
@@ -42,8 +43,9 @@ for PACKAGE in $DH_DOPACKAGES; do
 
 	# Install non-executable files
 	for file in shlibs conffiles; do
-		if [ -f debian/$EXT$file ]; then
-			doit "install -o root -g root -m 644 -p debian/$EXT$file $TMP/DEBIAN/$file"
+		f=`pkgfile $PACKAGE $file`
+		if [ "$f" ]; then
+			doit "install -o root -g root -m 644 -p $f $TMP/DEBIAN/$file"
 		fi                                               
 	done
 done