tags 481247 + patch
thanks

Hi,

Attached is the diff for my file 4.24-3.1 NMU.
diffstat for file_4.24-3 file_4.24-3.1

 changelog         |   10 ++++++++++
 libmagic1.install |    1 -
 rules             |    7 +++++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff -u file-4.24/debian/rules file-4.24/debian/rules
--- file-4.24/debian/rules
+++ file-4.24/debian/rules
@@ -113,9 +113,16 @@
 	cat magic/Localstuff >> debian/libmagic1/usr/share/file/magic
 	set -e; for FILE in magic/Magdir/*; \
 	do \
+		echo "Reading magic from $$FILE"; \
 		grep -v "^!:" $$FILE >> debian/libmagic1/usr/share/file/magic; \
 	done
 
+	# Instead of the installed magic.mgc use the compiled form of the
+	# plain magic file, as a workaround for #488562 (avoiding RC bug
+	# #481247).
+	rm -f debian/libmagic1/usr/share/file/magic.mgc
+	( cd debian/libmagic1/usr/share/file && ../../../../../src/file -m magic -C )
+
 	# Installing bug congtrols
 	install -D -m 0644 debian/bug/presubj debian/file/usr/share/bug/file/presubj
 	install -D -m 0644 debian/bug/control debian/libmagic1/usr/share/bug/libmagic1/control
diff -u file-4.24/debian/libmagic1.install file-4.24/debian/libmagic1.install
--- file-4.24/debian/libmagic1.install
+++ file-4.24/debian/libmagic1.install
@@ -1,3 +1,2 @@
 /usr/lib/*.so.*
-/usr/share/file
 /usr/share/man/man5
diff -u file-4.24/debian/changelog file-4.24/debian/changelog
--- file-4.24/debian/changelog
+++ file-4.24/debian/changelog
@@ -1,3 +1,13 @@
+file (4.24-3.1) unstable; urgency=low
+
+  * Non-maintainer upload from the Cambridge BSP.
+  * Work around bug #488562, that file assumes readdir() will return sorted
+    names - instead of compiling magic.mgc from Magdir directly, use the logic
+    already in debian/rules to build (the file that will become)
+    /usr/share/file/magic, then compile magic.mgc from that. (Closes: #481247)
+
+ -- Simon McVittie <[EMAIL PROTECTED]>  Sun, 29 Jun 2008 19:32:24 +0000
+
 file (4.24-3) unstable; urgency=medium
 
   * Rewriting copyright file in machine-interpretable format.

Attachment: signature.asc
Description: Digital signature

Reply via email to