X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=dh_installdeb;h=a3cd68ff2595724cfb0768a893b0261950fcfa3d;hb=967f2d7877a06e4868350b82df94a168dc2fccda;hp=69c66ddc15fbd536705302bf3812ff1a20e91c87;hpb=81a1cb9028b75304b0261dfd91ba04c0e6b07bb4;p=debhelper.git

diff --git a/dh_installdeb b/dh_installdeb
index 69c66dd..a3cd68f 100755
--- a/dh_installdeb
+++ b/dh_installdeb
@@ -29,14 +29,14 @@ the DEBIAN directory:
   package.conffiles
 
 The postinst, preinst, postrm, and prerm are handled specially: If a
-corresponding file named debian/script.debhelper exists, the contents of that
-file are merged into the script as follows: If the script exists, then
-anywhere in it that "#DEBHELPER#" appears, the text of the .debhelper file is
-inserted. If the script does not exist, then a script is generated from
-the .debhelper file. The .debhelper files are created by other debhelper
+corresponding file named debian/package.script.debhelper exists, the contents
+of that file are merged into the script as follows: If the script exists,
+then anywhere in it that "#DEBHELPER#" appears, the text of the .debhelper
+file is inserted. If the script does not exist, then a script is generated
+from the .debhelper file. The .debhelper files are created by other debhelper
 programs, such as L<dh_installmenu(1)>, and are shell script fragments.
 
-In V3 compatability mode and higher, all files in the etc/ directory in a
+In V3 compatibility mode and higher, all files in the etc/ directory in a
 package will automatically be flagged as conffiles by this program, so
 there is no need to list them manually in package.conffiles.
 
@@ -46,54 +46,39 @@ init();
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
 	my $tmp=tmpdir($package);
-	my $ext=pkgext($package);
 
 	if (! -d "$tmp/DEBIAN") {
 		doit("install","-o",0,"-g",0,"-d","$tmp/DEBIAN");
 	}
 
-	# Install debian install scripts.
-	# If any .debhelper files exist, add them into the scripts.
-	foreach my $file (qw{postinst preinst prerm postrm}) {
-		my $f=pkgfile($package,$file);
+	if (is_udeb($package)) {
+		# For udebs, only do the postinst, and no #DEBHELPER#.
+		my $f=pkgfile($package,"postinst");
 		if ($f) {
-			if (-f "debian/$ext$file.debhelper") {
-				# Add this into the script, where it has
-				# #DEBHELPER#
-				# TODO: do internally, no perl fork?
-				complex_doit("perl -pe 's~#DEBHELPER#~qx{cat debian/$ext$file.debhelper}~eg' < $f > $tmp/DEBIAN/$file");
-		        }
-			else {
-				# Just get rid of any #DEBHELPER# in the 
-				# script.
-				complex_doit("sed s/#DEBHELPER#// < $f > $tmp/DEBIAN/$file");
-			}
-			doit("chown","0.0","$tmp/DEBIAN/$file");
-			doit("chmod",755,"$tmp/DEBIAN/$file");
-		}
-		else {
-			# Auto-generate script header and add .debhelper
-			# content to it.
-			if (-f "debian/$ext$file.debhelper") {
-				complex_doit("printf '#!/bin/sh\nset -e\n' > $tmp/DEBIAN/$file");
-				complex_doit("cat debian/$ext$file.debhelper >> $tmp/DEBIAN/$file");
-				doit("chown","0.0","$tmp/DEBIAN/$file");
-				doit("chmod",755,"$tmp/DEBIAN/$file");
-			}
+			doit("install", "-o", 0, "-g", 0, "-m", 755, 
+			     $f, "$tmp/DEBIAN/postinst");
 		}
+		next;		
+	}
+	
+	# Install debian scripts.
+	foreach my $script (qw{postinst preinst prerm postrm}) {
+		debhelper_script_subst($package, $script);
 	}
 
-	# Install non-executable files
-	foreach my $file (qw{shlibs conffiles}) {
-		my $f=pkgfile($package,$file);
-		if ($f) {
-			doit("install","-o",0,"-g",0,"-m",644,"-p",$f,"$tmp/DEBIAN/$file");
+	if (! is_udeb($package)) {
+		# Install non-executable files
+		foreach my $file (qw{shlibs conffiles}) {
+			my $f=pkgfile($package,$file);
+			if ($f) {
+				doit("install","-o",0,"-g",0,"-m",644,"-p",$f,"$tmp/DEBIAN/$file");
+			}
 		}
 	}
 
 	# Automatic conffiles registration: If it is in /etc, it is a
 	# conffile.
-	if (! compat(2) && -d "$tmp/etc") {
+	if (! compat(2) && -d "$tmp/etc" && ! is_udeb($package)) {
 		complex_doit("find $tmp/etc -type f -printf '/etc/%P\n' >> $tmp/DEBIAN/conffiles");
 		# Anything found?
 		if (-z "$tmp/DEBIAN/conffiles") {
@@ -107,7 +92,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 
 =head1 SEE ALSO
 
-L<debhelper(1)>
+L<debhelper(7)>
 
 This program is a part of debhelper.