ソースを参照

Import Debian version 5.12-1

Daniel Baumann 12 年 前
コミット
d2fdaf0803
5 ファイル変更15 行追加16 行削除
  1. 1 1
      debian/control
  2. 2 2
      debian/copyright
  3. 10 10
      debian/patches/01-file-localmagic.patch
  4. 2 2
      debian/rules
  5. 0 1
      debian/source/options

+ 1 - 1
debian/control

@@ -6,7 +6,7 @@ Uploaders: Judit Foglszinger <fgrfgr@freenet.de>
 Build-Depends:
  debhelper (>= 9), autotools-dev, python, python-all-dev,
  python-all-dbg, zlib1g-dev
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Homepage: http://www.darwinsys.com/file/
 
 Package: file

+ 2 - 2
debian/copyright

@@ -5,7 +5,7 @@ Source: ftp://ftp.astron.com/pub/file/
 
 Files: *
 Copyright: 1985-1995 Ian F. Darwin
-           1994-2011 Christos Zoulas <christos@zoulas.com>
+           1994-2012 Christos Zoulas <christos@zoulas.com>
 License: BSD (2 Clause)
 
 Files: magic/Magdir/os9
@@ -13,7 +13,7 @@ Copyright: 1996 Ignatios Souvatzis
 License: BSD (4 Clause)
 
 Files: debian/*
-Copyright: 2007-2012 Daniel Baumann <daniel.baumann@progress-technologies.net>
+Copyright: 2007-2013 Daniel Baumann <daniel.baumann@progress-technologies.net>
 License: BSD (2 Clause)
 
 License: BSD (2 Clause)

+ 10 - 10
debian/patches/01-file-localmagic.patch

@@ -6,8 +6,8 @@ Description:
  should go to /etc/magic.
 
 diff -Naurp file.orig/magic/Header file/magic/Header
---- file.orig/magic/Header	2011-09-08 17:23:06.845387845 +0200
-+++ file/magic/Header	2011-09-08 17:33:03.984889688 +0200
+--- file.orig/magic/Header	2013-03-10 19:46:42.457963082 +0100
++++ file/magic/Header	2013-03-10 20:11:47.926322134 +0100
 @@ -1,5 +1,6 @@
  # Magic data for file(1) command.
 -# Format is described in magic(files), where:
@@ -20,32 +20,32 @@ diff -Naurp file.orig/magic/Header file/magic/Header
 +# as a wishlist bug against file (using the reportbug utility).
 diff -Naurp file.orig/magic/magic.local file/magic/magic.local
 --- file.orig/magic/magic.local	1970-01-01 01:00:00.000000000 +0100
-+++ file/magic/magic.local	2011-09-08 17:38:44.420889203 +0200
++++ file/magic/magic.local	2013-03-10 20:11:47.926322134 +0100
 @@ -0,0 +1,3 @@
 +# Magic local data for file(1) command.
 +# Insert here your local magic data. Format is described in magic(5).
 +
 diff -Naurp file.orig/src/Makefile.am file/src/Makefile.am
---- file.orig/src/Makefile.am	2011-09-08 17:23:06.884893668 +0200
-+++ file/src/Makefile.am	2011-09-08 17:33:03.988392256 +0200
+--- file.orig/src/Makefile.am	2013-03-10 19:46:42.465962763 +0100
++++ file/src/Makefile.am	2013-03-10 20:11:36.598767226 +0100
 @@ -4,7 +4,7 @@ include_HEADERS = magic.h
  
  bin_PROGRAMS = file
  
 -AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
 +AM_CPPFLAGS = -DMAGIC='"/etc/magic:$(MAGIC)"'
- AM_CFLAGS = @WARNINGS@
+ AM_CFLAGS = $(CFLAG_VISIBILITY) @WARNINGS@
  
  libmagic_la_SOURCES = magic.c apprentice.c softmagic.c ascmagic.c \
 diff -Naurp file.orig/src/Makefile.in file/src/Makefile.in
---- file.orig/src/Makefile.in	2011-09-08 17:23:06.884893668 +0200
-+++ file/src/Makefile.in	2011-09-08 17:33:03.988392256 +0200
-@@ -243,7 +243,7 @@ top_srcdir = @top_srcdir@
+--- file.orig/src/Makefile.in	2013-03-10 19:46:42.465962763 +0100
++++ file/src/Makefile.in	2013-03-10 20:11:42.946517820 +0100
+@@ -246,7 +246,7 @@ top_srcdir = @top_srcdir@
  MAGIC = $(pkgdatadir)/magic
  lib_LTLIBRARIES = libmagic.la
  include_HEADERS = magic.h
 -AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
 +AM_CPPFLAGS = -DMAGIC='"/etc/magic:$(MAGIC)"'
- AM_CFLAGS = @WARNINGS@
+ AM_CFLAGS = $(CFLAG_VISIBILITY) @WARNINGS@
  libmagic_la_SOURCES = magic.c apprentice.c softmagic.c ascmagic.c \
  	encoding.c compress.c is_tar.c readelf.c print.c fsmagic.c \

+ 2 - 2
debian/rules

@@ -41,7 +41,7 @@ override_dh_auto_build:
 	done
 
 override_dh_auto_configure:
-	dh_auto_configure -- $(CROSS) --prefix=/usr --datadir=\$${prefix}/share --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) --mandir=\$${prefix}/share/man --enable-fsect-man5 CFLAGS="$(CFLAGS)"
+	dh_auto_configure -- $(CROSS) --prefix=/usr --datadir=\$${prefix}/share --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) --mandir=\$${prefix}/share/man --enable-fsect-man5 --enable-static CFLAGS="$(CFLAGS)"
 
 override_dh_auto_install:
 	dh_auto_install
@@ -73,7 +73,7 @@ override_dh_auto_install:
 	rm -f debian/tmp/usr/lib/*/*.la
 
 override_dh_builddeb:
-	dh_builddeb -- -Zxz -z9
+	dh_builddeb -- -Zxz
 
 override_dh_install:
 	dh_install --fail-missing

+ 0 - 1
debian/source/options

@@ -1,2 +1 @@
 compression = xz
-compression-level = 9