ソースを参照

Import Debian version 4.26-1

Daniel Baumann 16 年 前
コミット
ceca240636
2 ファイル変更15 行追加15 行削除
  1. 2 2
      debian/control
  2. 13 13
      debian/patches/903-file-localmagic.dpatch

+ 2 - 2
debian/control

@@ -5,8 +5,8 @@ Maintainer: Daniel Baumann <daniel@debian.org>
 Build-Depends: debhelper (>= 7), dpatch, autotools-dev, autoconf, automake, libtool, python, python-all-dev, python-all-dbg, zlib1g-dev
 Build-Depends: debhelper (>= 7), dpatch, autotools-dev, autoconf, automake, libtool, python, python-all-dev, python-all-dbg, zlib1g-dev
 Standards-Version: 3.8.0
 Standards-Version: 3.8.0
 Homepage: http://www.darwinsys.com/file/
 Homepage: http://www.darwinsys.com/file/
-Vcs-Browser: http://git.debian.net/?p=file.git
-Vcs-Git: git://git.debian.net/git/file.git
+Vcs-Browser: http://git.debian.net/?p=debian/file.git
+Vcs-Git: git://git.debian.net/git/debian/file.git
 XS-Python-Version: all
 XS-Python-Version: all
 
 
 Package: file
 Package: file

+ 13 - 13
debian/patches/903-file-localmagic.dpatch

@@ -8,7 +8,7 @@
 
 
 diff -Naurp file.orig/magic/Header file/magic/Header
 diff -Naurp file.orig/magic/Header file/magic/Header
 --- file.orig/magic/Header	2000-08-05 17:36:46.000000000 +0000
 --- file.orig/magic/Header	2000-08-05 17:36:46.000000000 +0000
-+++ file/magic/Header	2008-07-15 13:51:04.000000000 +0000
++++ file/magic/Header	2008-09-08 11:53:44.000000000 +0000
 @@ -1,5 +1,5 @@
 @@ -1,5 +1,5 @@
 -# Magic
 -# Magic
  # Magic data for file(1) command.
  # Magic data for file(1) command.
@@ -21,32 +21,32 @@ diff -Naurp file.orig/magic/Header file/magic/Header
 +
 +
 diff -Naurp file.orig/magic/magic.local file/magic/magic.local
 diff -Naurp file.orig/magic/magic.local file/magic/magic.local
 --- file.orig/magic/magic.local	1970-01-01 00:00:00.000000000 +0000
 --- file.orig/magic/magic.local	1970-01-01 00:00:00.000000000 +0000
-+++ file/magic/magic.local	2008-07-15 13:51:04.000000000 +0000
++++ file/magic/magic.local	2008-09-08 11:53:44.000000000 +0000
 @@ -0,0 +1,3 @@
 @@ -0,0 +1,3 @@
 +# Magic local data for file(1) command.
 +# Magic local data for file(1) command.
 +# Insert here your local magic data. Format is described in magic(5).
 +# Insert here your local magic data. Format is described in magic(5).
 +
 +
 diff -Naurp file.orig/src/Makefile.am file/src/Makefile.am
 diff -Naurp file.orig/src/Makefile.am file/src/Makefile.am
---- file.orig/src/Makefile.am	2008-05-09 14:12:55.000000000 +0000
-+++ file/src/Makefile.am	2008-07-15 13:51:37.000000000 +0000
+--- file.orig/src/Makefile.am	2008-07-15 17:10:47.000000000 +0000
++++ file/src/Makefile.am	2008-09-08 11:52:51.000000000 +0000
 @@ -4,7 +4,7 @@ include_HEADERS = magic.h
 @@ -4,7 +4,7 @@ include_HEADERS = magic.h
  
  
  bin_PROGRAMS = file
  bin_PROGRAMS = file
  
  
 -AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
 -AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
 +AM_CPPFLAGS = -DMAGIC='"/etc/magic:$(MAGIC)"'
 +AM_CPPFLAGS = -DMAGIC='"/etc/magic:$(MAGIC)"'
- AM_CFLAGS = -Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith \
-     -Wmissing-declarations -Wredundant-decls -Wnested-externs \
-     -Wsign-compare -Wreturn-type -Wswitch -Wshadow \
+ AM_CFLAGS = @WARNINGS@
+ 
+ libmagic_la_SOURCES = magic.c apprentice.c softmagic.c ascmagic.c \
 diff -Naurp file.orig/src/Makefile.in file/src/Makefile.in
 diff -Naurp file.orig/src/Makefile.in file/src/Makefile.in
---- file.orig/src/Makefile.in	2008-07-02 15:24:28.000000000 +0000
-+++ file/src/Makefile.in	2008-07-15 13:52:00.000000000 +0000
-@@ -197,7 +197,7 @@ top_srcdir = @top_srcdir@
+--- file.orig/src/Makefile.in	2008-08-30 10:01:42.000000000 +0000
++++ file/src/Makefile.in	2008-09-08 11:53:21.000000000 +0000
+@@ -198,7 +198,7 @@ top_srcdir = @top_srcdir@
  MAGIC = $(pkgdatadir)/magic
  MAGIC = $(pkgdatadir)/magic
  lib_LTLIBRARIES = libmagic.la
  lib_LTLIBRARIES = libmagic.la
  include_HEADERS = magic.h
  include_HEADERS = magic.h
 -AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
 -AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
 +AM_CPPFLAGS = -DMAGIC='"/etc/magic:$(MAGIC)"'
 +AM_CPPFLAGS = -DMAGIC='"/etc/magic:$(MAGIC)"'
- AM_CFLAGS = -Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith \
-     -Wmissing-declarations -Wredundant-decls -Wnested-externs \
-     -Wsign-compare -Wreturn-type -Wswitch -Wshadow \
+ AM_CFLAGS = @WARNINGS@
+ libmagic_la_SOURCES = magic.c apprentice.c softmagic.c ascmagic.c \
+ 	compress.c is_tar.c readelf.c print.c fsmagic.c \