Browse Source

Import Debian version 5.03-3

Daniel Baumann 14 years ago
parent
commit
044ba32d6d
4 changed files with 20 additions and 3 deletions
  1. 1 1
      debian/control
  2. 15 0
      debian/patches/123-magic-update-tgif.patch
  3. 2 0
      debian/patches/series
  4. 2 2
      debian/rules

+ 1 - 1
debian/control

@@ -6,7 +6,7 @@ Uploaders: Daniel Baumann <daniel@debian.org>
 Build-Depends: debhelper (>= 7), quilt, autotools-dev, python, python-all-dev, python-all-dbg, zlib1g-dev
 Standards-Version: 3.8.3
 Homepage: http://www.darwinsys.com/file/
-Vcs-Browser: http://git.debian-maintainers.org/git/daniel/file.git
+Vcs-Browser: http://git.debian-maintainers.org/?p=daniel/file.git
 Vcs-Git: git://git.debian-maintainers.org/git/daniel/file.git
 XS-Python-Version: all
 

+ 15 - 0
debian/patches/123-magic-update-tgif.patch

@@ -0,0 +1,15 @@
+Author: Hugo Graumann <graumann@ucalgary.ca>
+Description: Updating tgif magic (Closes: #549601).
+
+diff -Naurp file.orig/magic/Magdir/tgif file/magic/Magdir/tgif
+--- file.orig/magic/Magdir/tgif	2009-10-02 12:14:27.000000000 +0000
++++ file/magic/Magdir/tgif	2009-10-04 21:49:54.000000000 +0000
+@@ -1,6 +1,5 @@
+ #------------------------------------------------------------------------------
+ # file(1) magic for tgif(1) files
+ # From Hendrik Scholz <hendrik@scholz.net>
+-
+-0	string	%TGIF\ x 		Tgif file version %s
+-
++0	string	%TGIF\			Tgif file version
++>6	string	x			%s

+ 2 - 0
debian/patches/series

@@ -20,6 +20,7 @@
 119-magic-update-xwd.patch
 121-magic-update-utf.patch
 122-magic-update-spectrum.patch
+123-magic-update-tgif.patch
 200-magic-add-par2.patch
 201-magic-add-pe5.patch
 202-magic-add-pmenu.patch
@@ -42,6 +43,7 @@
 219-magic-add-selinux.patch
 220-magic-add-bzr.patch
 221-magic-add-git.patch
+222-magic-add-nut.patch
 223-magic-add-blcr.patch
 900-file-mgc.patch
 901-file-localmagic.patch

+ 2 - 2
debian/rules

@@ -77,13 +77,13 @@ install: build
 	for python in $(PYTHON_VERSIONS); \
 	do \
 		(cd python && $$python setup.py install --no-compile \
-			--root=$(CURDIR)/debian/python-magic); \
+			--root=$(CURDIR)/debian/python-magic --prefix=/usr); \
 	done
 
 	set -e; \
 	for python in $(PYTHON_VERSIONS); do \
 		(cd python && $$python-dbg setup.py install --no-compile \
-			--root=$(CURDIR)/debian/python-magic-dbg); \
+			--root=$(CURDIR)/debian/python-magic-dbg --prefix=/usr); \
 	done
 	find debian/python-*-dbg ! -type d ! -name '*.so' | xargs rm -f
 	find debian/python-*-dbg -depth -empty -exec rmdir {} \;