Browse Source

Import Debian version 4.24-3.1

Simon McVittie 16 years ago
parent
commit
b25d19d7db
2 changed files with 7 additions and 1 deletions
  1. 0 1
      debian/libmagic1.install
  2. 7 0
      debian/rules

+ 0 - 1
debian/libmagic1.install

@@ -1,3 +1,2 @@
 /usr/lib/*.so.*
-/usr/share/file
 /usr/share/man/man5

+ 7 - 0
debian/rules

@@ -113,9 +113,16 @@ install: build
 	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