Author: djpig
Date: 2005-08-15 00:27:36 +0200 (Mon, 15 Aug 2005)
New Revision: 476
Modified:
trunk/checks/binaries
trunk/debian/changelog
trunk/testset/binary/debian/rules
Log:
Also ignore static binaries in sub directories of /boot,
not only in /boot itself. Patch by Guillem Jover
(Closes: #320382)
Modified: trunk/checks/binaries
===================================================================
--- trunk/checks/binaries 2005-08-14 22:18:10 UTC (rev 475)
+++ trunk/checks/binaries 2005-08-14 22:27:36 UTC (rev 476)
@@ -211,8 +211,7 @@
} else {
# Some exceptions: files in /boot, /usr/lib/debug/*, named *-static
or
# *.static, or *-static as package-name.
- use File::Basename;
- next if (dirname($file) eq './boot');
+ next if ($file =~ m#^./boot/#);
# Location of debugging symbols:
next if ($file =~ m#^./usr/lib/debug/#);
next if ($file =~ /(\.|-)static$/);
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-08-14 22:18:10 UTC (rev 475)
+++ trunk/debian/changelog 2005-08-14 22:27:36 UTC (rev 476)
@@ -15,6 +15,9 @@
former isn't allowed in package names but occasionally used in
sonames
+ [FL] Remove trailing .so from SONAMEs
+ + [FL] Also ignore static binaries in sub directories of /boot,
+ not only in /boot itself. Patch by Guillem Jover
+ (Closes: #320382)
* checks/changelog-file:
+ [FL] Detect old FSF address additionally to the even older
one
Modified: trunk/testset/binary/debian/rules
===================================================================
--- trunk/testset/binary/debian/rules 2005-08-14 22:18:10 UTC (rev 475)
+++ trunk/testset/binary/debian/rules 2005-08-14 22:27:36 UTC (rev 476)
@@ -11,12 +11,14 @@
binary-arch: build
install -d $(tmp)/usr/bin
+ install -d $(tmp)/boot/hello
install -m 755 hello $(tmp)/usr/bin
touch $(tmp)/usr/bin/iminusrbin
chmod 755 $(tmp)/usr/bin/iminusrbin
install -s -m 755 hello-static $(tmp)/usr/bin
install -s -m 755 hello-static $(tmp)/usr/bin/hello.static
install -s -m 755 hello-static $(tmp)/usr/bin/static-hello
+ install -s -m 755 hello-static $(tmp)/boot/hello
install -d $(tmp)/usr/share/doc/binary
install -m 644 INSTALL $(tmp)/usr/share/doc/binary
install -d $(tmp)/usr/share/menu
@@ -38,7 +40,7 @@
echo boe > $(tmp)/usr/bar2
ln $(tmp)/usr/bar2 $(tmp)/usr/share/baz
- dd if=/dev/zero of=$(tmp)/usr/share/binary/largefile bs=1024 count=1500
+ dd if=/dev/zero of=$(tmp)/usr/share/binary/largefile bs=1024 count=2000
dpkg-shlibdeps $(tmp)/usr/bin/hello
dpkg-gencontrol -isp
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
