Browse Source

Import Debian version 5.04-2

Daniel Baumann 14 years ago
parent
commit
8d3260008a

+ 15 - 14
debian/control

@@ -3,7 +3,9 @@ Section: utils
 Priority: standard
 Maintainer: Daniel Baumann <daniel@lists.debian-maintainers.org>
 Uploaders: Daniel Baumann <daniel@debian.org>
-Build-Depends: debhelper (>= 7), quilt, autotools-dev, python, python-all-dev, python-all-dbg, zlib1g-dev
+Build-Depends:
+ debhelper (>= 7.4.3~), autotools-dev, python, python-all-dev, python-all-dbg,
+ quilt (>= 0.46-7), zlib1g-dev
 Standards-Version: 3.8.4
 Homepage: http://www.darwinsys.com/file/
 Vcs-Browser: http://git.debian-maintainers.org/?p=daniel/file.git
@@ -14,21 +16,19 @@ Package: file
 Section: utils
 Priority: standard
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libmagic1 (= ${binary:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, libmagic1 (= ${binary:Version})
 Description: Determines file type using "magic" numbers
  File tests each argument in an attempt to classify it. There are three sets of
  tests, performed in this order: filesystem tests, magic number tests, and
  language tests. The first test that succeeds causes the file type to be
  printed.
- .
- Starting with version 4, the file command is not much more than a wrapper
- around the "magic" library.
 
 Package: libmagic1
 Section: libs
 Priority: standard
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Conflicts: file (<< 5.04-2)
 Suggests: file
 Description: File type determination library using "magic" numbers
  This library can be used to classify files according to magic number tests. It
@@ -38,7 +38,7 @@ Package: libmagic-dev
 Section: libdevel
 Priority: optional
 Architecture: any
-Depends: libmagic1 (= ${binary:Version}), zlib1g-dev
+Depends: ${misc:Depends}, libmagic1 (= ${binary:Version})
 Suggests: file
 Description: File type determination library using "magic" numbers (development)
  This library can be used to classify files according to magic number tests. It
@@ -50,7 +50,7 @@ Package: python-magic
 Section: python
 Priority: extra
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}
 Provides: ${python:Provides}
 Suggests: python-magic-dbg
 XB-Python-Version: ${python:Versions}
@@ -58,17 +58,18 @@ Description: File type determination library using "magic" numbers (Python bindi
  This library can be used to classify files according to magic number tests. It
  implements the core functionality of the file command.
  .
- This package contains the Python bindings to query /etc/magic information for a
- given file in Python.
+ This package contains the Python bindings.
 
 Package: python-magic-dbg
 Section: debug
-Architecture: any
 Priority: extra
-Depends: python-magic (= ${binary:Version}), python-dbg, ${shlibs:Depends}
+Architecture: any
+Depends:
+ ${misc:Depends}, ${shlibs:Depends}, python-magic (= ${binary:Version}),
+ python-dbg
 Description: File type determination library using "magic" numbers (Python bindings/debug)
  This library can be used to classify files according to magic number tests. It
  implements the core functionality of the file command.
  .
- This package contains the Python bindings to query /etc/magic information for a
- given file in Python, built for the Python debug interpreter.
+ This package contains the Python bindings, built for the Python debug
+ interpreter.

+ 5 - 3
debian/copyright

@@ -1,10 +1,12 @@
-Author: Christos Zoulas <christos@zoulas.com>
-Download: ftp://ftp.astron.com/pub/file/
+Upstream-Contact: Christos Zoulas <christos@zoulas.com>
+Upstream-Homepage: http://www.darwinsys.com/file/
+Maintainer-Contact: Daniel Baumann <daniel@lists.debian-maintainers.org>
+Maintainer-Homepage: http://daniel.debian-maintainers.org/
 
 Files: *
 Copyright:
  (C) 1985-1995 Ian F. Darwin
- (C) 1994-2009 Christos Zoulas <christos@zoulas.com>
+ (C) 1994-2010 Christos Zoulas <christos@zoulas.com>
 License: BSD
  This software is not subject to any export provision of the United States
  Department of Commerce, and may be exported to any country or planet.

+ 26 - 0
debian/file.README.Debian

@@ -0,0 +1,26 @@
+file for Debian
+---------------
+
+How users can inject their own magics for fun:
+
+  1. open /etc/magic and /etc/magic.mime with a text editor, as root,
+     and add your own magics.
+
+  2. have fun.
+
+
+How package maintainers can inject their own magics for profit:
+
+  1. place your magics as plain text files in
+     /usr/share/file/${binary_package_name}.
+
+  2. call 'file --compile ${binary_package_name}' from /usr/share/file
+     in your postinst script (maybe we should have a trigger for that
+     at some point). this will produce the binary magics
+     /usr/share/file/${binary_package_name}.mgc.
+
+  3. remove the binary magics in your postrm script.
+
+  4. profit.
+
+ -- Daniel Baumann <daniel@debian.org>  Sat, 27 Mar 2010 11:22:58 +0100

+ 0 - 1
debian/file.install

@@ -1,3 +1,2 @@
-/etc
 /usr/bin
 /usr/share/man/man1

+ 0 - 1
debian/libmagic-dev.install

@@ -1,5 +1,4 @@
 /usr/include
 /usr/lib/*.a
-/usr/lib/*.la
 /usr/lib/*.so
 /usr/share/man/man3

+ 1 - 0
debian/libmagic1.install

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

+ 0 - 2
debian/libmagic1.links

@@ -1,3 +1 @@
-/usr/share/file/magic		/usr/share/misc/magic
 /usr/share/file/magic.mgc	/usr/share/misc/magic.mgc
-/usr/share/file/magic.mime	/usr/share/misc/magic.mime

File diff suppressed because it is too large
+ 0 - 1027
debian/local/magic.mime


+ 0 - 96
debian/patches/900-file-mgc.patch

@@ -1,96 +0,0 @@
-Author: Daniel Baumann <daniel@debian.org>
-Description: Reverting upstream change of stopping to build plain magic file (Closes: #481247).
-
-diff -Naurp file.orig/magic/Makefile.am file/magic/Makefile.am
---- file.orig/magic/Makefile.am	2010-02-01 12:16:29.000000000 +0000
-+++ file/magic/Makefile.am	2010-02-01 12:21:54.000000000 +0000
-@@ -5,7 +5,7 @@ MAGIC_FRAGMENT_BASE = Magdir
- MAGIC_DIR = $(top_srcdir)/magic
- MAGIC_FRAGMENT_DIR = $(MAGIC_DIR)/$(MAGIC_FRAGMENT_BASE)
- 
--pkgdata_DATA = magic.mgc
-+pkgdata_DATA = magic.mgc magic
- 
- EXTRA_DIST = \
- $(MAGIC_DIR)/Header \
-@@ -229,8 +229,20 @@ $(MAGIC_FRAGMENT_DIR)/xwindows \
- $(MAGIC_FRAGMENT_DIR)/zilog \
- $(MAGIC_FRAGMENT_DIR)/zyxel 
- 
-+RAW   = magic
- MAGIC = magic.mgc
--CLEANFILES = ${MAGIC} $(MAGIC_FRAGMENT_DIR)/Localstuff
-+CLEANFILES = ${RAW} ${MAGIC} $(MAGIC_FRAGMENT_DIR)/Localstuff
-+
-+${RAW}: Header Localstuff $(EXTRA_DIST)
-+	cat /dev/null > $@
-+	for frag in $(EXTRA_DIST); do \
-+	  if test -f $(srcdir)/$$frag; then \
-+	    f=$(srcdir)/$$frag; \
-+	  else \
-+	    f=$$frag; \
-+	  fi; \
-+	  cat $$f; \
-+	done >> $@
- 
- # FIXME: Build file natively as well so that it can be used to compile
- # the target's magic file
-@@ -242,7 +254,5 @@ FILE_COMPILE = $(top_builddir)/src/file
- FILE_COMPILE_DEP = $(FILE_COMPILE)
- endif
- 
--${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP)
--	@mkdir magic && cp -p $(EXTRA_DIST) magic
--	$(FILE_COMPILE) -C -m magic
--	@rm -fr magic
-+${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP) $(RAW)
-+	$(FILE_COMPILE) -C -m $(RAW)
-diff -Naurp file.orig/magic/Makefile.in file/magic/Makefile.in
---- file.orig/magic/Makefile.in	2010-02-01 12:16:29.000000000 +0000
-+++ file/magic/Makefile.in	2010-02-01 12:24:46.000000000 +0000
-@@ -171,7 +171,7 @@ top_srcdir = @top_srcdir@
- MAGIC_FRAGMENT_BASE = Magdir
- MAGIC_DIR = $(top_srcdir)/magic
- MAGIC_FRAGMENT_DIR = $(MAGIC_DIR)/$(MAGIC_FRAGMENT_BASE)
--pkgdata_DATA = magic.mgc
-+pkgdata_DATA = magic.mgc magic
- EXTRA_DIST = \
- $(MAGIC_DIR)/Header \
- $(MAGIC_DIR)/Localstuff \
-@@ -394,10 +394,22 @@ $(MAGIC_FRAGMENT_DIR)/xwindows \
- $(MAGIC_FRAGMENT_DIR)/zilog \
- $(MAGIC_FRAGMENT_DIR)/zyxel 
- 
-+RAW = magic
- MAGIC = magic.mgc
- CLEANFILES = ${MAGIC} $(MAGIC_FRAGMENT_DIR)/Localstuff
- @IS_CROSS_COMPILE_FALSE@FILE_COMPILE = $(top_builddir)/src/file
- 
-+${RAW}: Header Localstuff $(EXTRA_DIST)
-+	cat /dev/null > $@
-+	for frag in $(EXTRA_DIST); do \
-+	  if test -f $(srcdir)/$$frag; then \
-+	    f=$(srcdir)/$$frag; \
-+	  else \
-+	    f=$$frag; \
-+	  fi; \
-+	  cat $$f; \
-+	done >> $@
-+
- # FIXME: Build file natively as well so that it can be used to compile
- # the target's magic file
- @IS_CROSS_COMPILE_TRUE@FILE_COMPILE = file
-@@ -591,11 +603,8 @@ uninstall-am: uninstall-pkgdataDATA
- 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- 	uninstall uninstall-am uninstall-pkgdataDATA
- 
--
--${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP)
--	@mkdir magic && cp -p $(EXTRA_DIST) magic
--	$(FILE_COMPILE) -C -m magic
--	@rm -fr magic
-+${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP) $(RAW)
-+	$(FILE_COMPILE) -C -m $(RAW)
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:

+ 0 - 1
debian/patches/series

@@ -58,7 +58,6 @@
 235-magic-add-hdr.patch
 236-magic-add-foveon-x3f.patch
 237-magic-add-paint-net.patch
-900-file-mgc.patch
 901-file-localmagic.patch
 902-file-make.patch
 904-doc-manpages.patch

+ 0 - 3
debian/rules

@@ -93,9 +93,6 @@ install: build
 	mkdir -p debian/libmagic-dev/usr/include/file
 	cp src/file.h src/patchlevel.h debian/libmagic-dev/usr/include/file
 
-	# Installing plain magic.mime for compatibility
-	install -D -m 0644 debian/local/magic.mime debian/libmagic1/usr/share/file/magic.mime
-
 binary: binary-arch
 
 binary-arch: install