Import Debian version 4.26-2

debian/patches/00list

@@ -12,6 +12,10 @@
 213-magic-update-ocaml.dpatch
 214-magic-update-linuxswap.dpatch
 215-magic-update-linuxext.dpatch
+216-magic-update-llvm.dpatch
+217-magic-update-ruby.dpatch
+218-magic-update-gimp.dpatch
+219-magic-update-wav.dpatch
 320-magic-add-par2.dpatch
 321-magic-add-pe5.dpatch
 322-magic-add-pmenu.dpatch

debian/patches/216-magic-update-llvm.dpatch

@@ -0,0 +1,24 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 216-magic-update-llvm.dpatch by Toeroek Edwin <edwintorok@gmail.com>
+##
+## DP: Updating llvm magic (Closes: #505805).
+
+@DPATCH@
+
+diff -Naurp file.orig/magic/Magdir/llvm file/magic/Magdir/llvm
+--- file.orig/magic/Magdir/llvm	2008-10-19 14:31:15.000000000 +0000
++++ file/magic/Magdir/llvm	2008-11-15 19:15:51.000000000 +0000
+@@ -1,10 +1,12 @@
+ 
+ #------------------------------------------------------------------------------
+ # llvm:  file(1) magic for LLVM byte-codes
+-# URL:  http://llvm.cs.uiuc.edu/docs/BytecodeFormat.html#signature
++# URL:  http://llvm.org/docs/BitCodeFormat.html
+ # From: Al Stone <ahs3@fc.hp.com>
+ 
+ 0	string	llvm	LLVM byte-codes, uncompressed
+ 0	string	llvc0	LLVM byte-codes, null compression
+ 0	string	llvc1	LLVM byte-codes, gzip compression
+ 0	string	llvc2	LLVM byte-codes, bzip2 compression
++0	string	\xde\xc0\x17\x0b	LLVM bitcode, wrapper
++0       string	BC\xc0\xde	LLVM bitcode

debian/patches/217-magic-update-ruby.dpatch

@@ -0,0 +1,21 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 217-magic-update-ruby.dpatch by Daniel Baumann <daniel@debian.org>
+##
+## DP: Adding mime entries for ruby (Closes: #502201).
+
+@DPATCH@
+
+diff -Naurp file.orig/magic/Magdir/ruby file/magic/Magdir/ruby
+--- file.orig/magic/Magdir/ruby	2008-10-19 14:31:15.000000000 +0000
++++ file/magic/Magdir/ruby	2008-11-15 19:28:44.000000000 +0000
+@@ -5,6 +5,10 @@
+ 
+ # Ruby scripts
+ 0	search/1/b	#!\ /usr/bin/ruby	Ruby script text executable
++!:mime	application/x-ruby
+ 0	search/1/b	#!\ /usr/local/bin/ruby	Ruby script text executable
++!:mime	application/x-ruby
+ 0	search/1	#!/usr/bin/env\ ruby	Ruby script text executable
++!:mime	application/x-ruby
+ 0	search/1	#!\ /usr/bin/env\ ruby	Ruby script text executable
++!:mime	application/x-ruby

debian/patches/218-magic-update-gimp.dpatch

@@ -0,0 +1,18 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 218-magic-update-gimp.dpatch by Ori Avtalion <ori@avtalion.name>
+##
+## DP: Adding mime entries for gimp (Closes: #501200).
+
+@DPATCH@
+
+diff -Naurp file.orig/magic/Magdir/gimp file/magic/Magdir/gimp
+--- file.orig/magic/Magdir/gimp	2008-10-19 14:31:15.000000000 +0000
++++ file/magic/Magdir/gimp	2008-11-15 19:32:22.000000000 +0000
+@@ -10,6 +10,7 @@
+ #       ('Bucky' LaDieu, nega@vt.edu)
+ 
+ 0	string		gimp\ xcf	GIMP XCF image data,
++!:mime	image/x-xcf
+ >9	string		file		version 0,
+ >9	string		v		version
+ >>10	string		>\0		%s,

debian/patches/219-magic-update-wav.dpatch

@@ -0,0 +1,25 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 219-magic-update-wav.dpatch by Adam Buchbinder <adam.buchbinder@gmail.com>
+##
+## DP: Updating wav magics (Closes: #508174).
+
+@DPATCH@
+
+diff -Naurp file.orig/magic/Magdir/riff file/magic/Magdir/riff
+--- file.orig/magic/Magdir/riff	2008-12-05 17:28:11.000000000 -0500
++++ file/magic/Magdir/riff	2008-12-05 17:33:48.000000000 -0500
+@@ -39,12 +39,14 @@
+ >>20	leshort		2		\b, Microsoft ADPCM
+ >>20	leshort		6		\b, ITU G.711 A-law
+ >>20	leshort		7		\b, ITU G.711 mu-law
++>>20	leshort		8		\b, Microsoft DTS
+ >>20	leshort		17		\b, IMA ADPCM
+ >>20	leshort		20		\b, ITU G.723 ADPCM (Yamaha)
+ >>20	leshort		49		\b, GSM 6.10
+ >>20	leshort		64		\b, ITU G.721 ADPCM
+ >>20	leshort		80		\b, MPEG
+ >>20	leshort		85		\b, MPEG Layer 3
++>>20	leshort		0x2001		\b, DTS
+ >>22	leshort		=1		\b, mono
+ >>22	leshort		=2		\b, stereo
+ >>22	leshort		>2		\b, %d channels

debian/patches/324-magic-add-scummvm.dpatch

@@ -1,7 +1,7 @@
 #!/bin/sh /usr/share/dpatch/dpatch-run
 ## 322-magic-add-scummvm.dpatch by Sven Hartge <debian@ds9.argh.org>
 ##
-## DP: New magic for scummVM savegame files (Closes: #263488).
+## DP: New magic for ScummVM savegame files (Closes: #263488).
 
 @DPATCH@
 
@@ -14,5 +14,5 @@ diff -Naurp file-4.23.orig/magic/Magdir/console file-4.23/magic/Magdir/console
  
 +# Type: scummVM savegame files
 +# From: Sven Hartge <debian@ds9.argh.org>
-+0	string	SCVM	scummVM savegame
++0	string	SCVM	ScummVM savegame
 +>12	string	>\0	"%s"

debian/rules

@@ -30,7 +30,7 @@ endif
 
 PYTHON_VERSIONS=$(shell pyversions -r debian/control)
 
-config.status: configure patch
+config.status: configure patch-stamp
 	dh_testdir
 
 	rm -f ltmain.sh
@@ -83,7 +83,7 @@ clean: unpatch
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
 
 	# Installing package