[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

lintian: r1261 - in trunk/testset: . etcfiles/debian foo++/debian maintainer-scripts/debian manpages/debian scripts/debian



Author: rra
Date: 2008-03-12 08:56:07 +0100 (Wed, 12 Mar 2008)
New Revision: 1261

Modified:
   trunk/testset/etcfiles/debian/rules
   trunk/testset/foo++/debian/rules
   trunk/testset/maintainer-scripts/debian/rules
   trunk/testset/manpages/debian/rules
   trunk/testset/runtests
   trunk/testset/scripts/debian/rules
Log:
Set the expected umask before running the test suite and use explicit
modes on install commands in the test suite in case someone unpacked
the source package with a restrictive umask.  Thanks,
H?\195?\165kon Stordahl.  (Closes: #469926)


Modified: trunk/testset/etcfiles/debian/rules
===================================================================
--- trunk/testset/etcfiles/debian/rules	2008-03-12 07:48:39 UTC (rev 1260)
+++ trunk/testset/etcfiles/debian/rules	2008-03-12 07:56:07 UTC (rev 1261)
@@ -18,7 +18,7 @@
 	ln $(tmp)/etc/improper $(tmp)/etc/improper-link
 	install -d $(tmp)/usr/share/doc/etcfiles
 	install -d $(tmp)/var/lib
-	cp proper $(tmp)/var/lib/foo
+	install -m 644 proper $(tmp)/var/lib/foo
 	install -m 644 debian/README.Debian $(tmp)/usr/share/doc/etcfiles
 	install -m 644 debian/changelog $(tmp)/usr/share/doc/etcfiles
 	#gzip -9 $(tmp)/usr/share/doc/etcfiles/changelog

Modified: trunk/testset/foo++/debian/rules
===================================================================
--- trunk/testset/foo++/debian/rules	2008-03-12 07:48:39 UTC (rev 1260)
+++ trunk/testset/foo++/debian/rules	2008-03-12 07:56:07 UTC (rev 1261)
@@ -10,9 +10,11 @@
 binary-indep:
 	install -d debian/$(foo)/DEBIAN
 	install -d debian/$(foo)/usr/share/doc/$(foo)
-	cp debian/changelog debian/$(foo)/usr/share/doc/$(foo)/changelog
+	install -m 644 debian/changelog \
+	  debian/$(foo)/usr/share/doc/$(foo)/changelog
 	gzip -9 debian/$(foo)/usr/share/doc/$(foo)/changelog
-	cp debian/README.Debian debian/$(foo)/usr/share/doc/$(foo)/README.Debian
+	install -m 644 debian/README.Debian \
+	  debian/$(foo)/usr/share/doc/$(foo)/README.Debian
 	gzip -9 debian/$(foo)/usr/share/doc/$(foo)/README.Debian
 	dpkg-gencontrol -isp -p$(foo) -Pdebian/$(foo)
 	dpkg --build debian/$(foo) ..

Modified: trunk/testset/maintainer-scripts/debian/rules
===================================================================
--- trunk/testset/maintainer-scripts/debian/rules	2008-03-12 07:48:39 UTC (rev 1260)
+++ trunk/testset/maintainer-scripts/debian/rules	2008-03-12 07:56:07 UTC (rev 1261)
@@ -6,17 +6,14 @@
 
 binary-indep:
 	install -d debian/tmp/DEBIAN
-	cp debian/config debian/tmp/DEBIAN
-	cp debian/preinst debian/tmp/DEBIAN
-	chmod +x debian/tmp/DEBIAN/preinst
-	cp debian/postinst debian/tmp/DEBIAN
-	chmod +x debian/tmp/DEBIAN/postinst
-	cp debian/prerm debian/tmp/DEBIAN
-	chmod +x debian/tmp/DEBIAN/prerm
-	cp debian/postrm debian/tmp/DEBIAN
-	chmod +x debian/tmp/DEBIAN/postrm
+	install -m 0644 debian/config debian/tmp/DEBIAN
+	install -m 0755 debian/preinst debian/tmp/DEBIAN
+	install -m 0755 debian/postinst debian/tmp/DEBIAN
+	install -m 0755 debian/prerm debian/tmp/DEBIAN
+	install -m 0755 debian/postrm debian/tmp/DEBIAN
 	install -d debian/tmp/usr/share/doc/maintainer-scripts
-	cp debian/changelog debian/tmp/usr/share/doc/maintainer-scripts/changelog
+	install -m 0644 debian/changelog \
+	  debian/tmp/usr/share/doc/maintainer-scripts/changelog
 	gzip -9 debian/tmp/usr/share/doc/maintainer-scripts/changelog
 	dpkg-gencontrol -isp
 	dpkg --build debian/tmp ..

Modified: trunk/testset/manpages/debian/rules
===================================================================
--- trunk/testset/manpages/debian/rules	2008-03-12 07:48:39 UTC (rev 1260)
+++ trunk/testset/manpages/debian/rules	2008-03-12 07:56:07 UTC (rev 1261)
@@ -69,7 +69,7 @@
 	mkdir -p $(tmp)/usr/lib/perl5
 
 	install -d $(tmp)/usr/share/doc/manpages
-	cp debian/changelog $(tmp)/usr/share/doc/manpages/changelog
+	install -m644 debian/changelog $(tmp)/usr/share/doc/manpages/changelog
 	gzip -9 $(tmp)/usr/share/doc/manpages/changelog
 	install -d $(tmp)/DEBIAN
 	install -m755 debian/postinst $(tmp)/DEBIAN/postinst

Modified: trunk/testset/runtests
===================================================================
--- trunk/testset/runtests	2008-03-12 07:48:39 UTC (rev 1260)
+++ trunk/testset/runtests	2008-03-12 07:56:07 UTC (rev 1261)
@@ -104,6 +104,10 @@
     delete $ENV{'LINTIAN_DIST'};
     delete $ENV{'LINTIAN_UNPACK_LEVEL'};
     $ENV{'LC_COLLATE'} = 'C';
+
+    # Set standard umask because many of the test packages rely on this
+    # when creating files from the debian/rules script.
+    umask(022);
 }
 
 my $LINTIAN_ROOT = $ENV{'LINTIAN_ROOT'};

Modified: trunk/testset/scripts/debian/rules
===================================================================
--- trunk/testset/scripts/debian/rules	2008-03-12 07:48:39 UTC (rev 1260)
+++ trunk/testset/scripts/debian/rules	2008-03-12 07:56:07 UTC (rev 1261)
@@ -77,11 +77,11 @@
 	dh_python
 
 	touch $(tmp)/usr/lib/python2.3/site-packages/test.pyc
-	cp debian/changelog $(tmp)/usr/share/doc/scripts/changelog
+	install -m 644 debian/changelog $(tmp)/usr/share/doc/scripts/changelog
 	gzip -9 $(tmp)/usr/share/doc/scripts/changelog
-	cp debian/copyright $(tmp)/usr/share/doc/scripts/copyright
+	install -m 644 debian/copyright $(tmp)/usr/share/doc/scripts/copyright
 
-	cp debian/scripts.conffiles $(tmp)/DEBIAN/conffiles
+	install -m 644 debian/scripts.conffiles $(tmp)/DEBIAN/conffiles
 	install -m 755 debian/preinst $(tmp)/DEBIAN/preinst
 	install -m 755 debian/postinst $(tmp)/DEBIAN/postinst
 	install -m 755 debian/postrm $(tmp)/DEBIAN/postrm


Reply to: