X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=dh_gencontrol;h=c3698b56c20ccacb323e80f907d5ff3a6738234b;hb=8c9a7b69225a5dc4b97d03df01bd9f594a2870a1;hp=e2a4e701b223cb689d050ba8ae7605a38794d636;hpb=1e6dea44772a0c1f57e7cd50ff12e35a1cff0b96;p=debhelper.git

diff --git a/dh_gencontrol b/dh_gencontrol
index e2a4e70..c3698b5 100755
--- a/dh_gencontrol
+++ b/dh_gencontrol
@@ -9,11 +9,18 @@ for PACKAGE in $DH_DOPACKAGES; do
 	TMP=`tmpdir $PACKAGE`
 	EXT=`pkgext $PACKAGE`
 
+	changelog=`pkgfile $PACKAGE changelog`
+	if [ ! "$changelog" ]; then
+		changelog=debian/changelog
+	fi
+
 	if [ ! -d $TMP/DEBIAN ]; then
 		doit "install -o root -g root -d $TMP/DEBIAN"
 	fi
 
 	# Generate and install control file.
-	doit "dpkg-gencontrol -p$PACKAGE -Tdebian/${EXT}substvars -P$TMP $DH_U_PARAMS"
+	doit "dpkg-gencontrol -l$changelog -isp -p$PACKAGE -Tdebian/${EXT}substvars -P$TMP $DH_U_PARAMS"
+	# This chmod is only necessary if the user sets the umask to something odd.
+	doit "chmod 644 $TMP/DEBIAN/control"
 	doit "chown root.root $TMP/DEBIAN/control"
 done