summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changes5
-rw-r--r--META.json24
-rw-r--r--META.yml22
-rw-r--r--Makefile.PL5
-rw-r--r--debian/changelog14
-rw-r--r--debian/control2
-rw-r--r--debian/copyright4
-rw-r--r--debian/source/lintian-overrides10
-rw-r--r--lib/File/MimeInfo.pm4
-rw-r--r--lib/File/MimeInfo/Applications.pm4
-rw-r--r--lib/File/MimeInfo/Cookbook.pod2
-rw-r--r--lib/File/MimeInfo/Magic.pm4
-rw-r--r--lib/File/MimeInfo/Rox.pm4
-rwxr-xr-xmimeopen4
-rwxr-xr-xmimetype4
15 files changed, 72 insertions, 40 deletions
diff --git a/Changes b/Changes
index dbc1ca8..b5eb77c 100644
--- a/Changes
+++ b/Changes
@@ -1,6 +1,9 @@
Revision history for Perl extension File::MimeInfo.
Versions up to 0.15 by Jaap Karssenberg <pardus@cpan.org>
-Versions starting 0.16 by Michiel Beijen <michiel.beijen@gmail.com>
+Versions starting 0.16 by Michiel Beijen <mb@x14.nl>
+
+0.31 2022-01-06
+ - Change BUILD_REQUIRES to PREREQ_PM (BooK)
0.30 2020-10-26
- Added function File::MimeInfo::has_mimeinfo_database() to test if
diff --git a/META.json b/META.json
index bb73959..7d5b2a5 100644
--- a/META.json
+++ b/META.json
@@ -4,7 +4,7 @@
"Jaap Karssenberg <pardus@cpan.org>"
],
"dynamic_config" : 1,
- "generated_by" : "ExtUtils::MakeMaker version 7.44, CPAN::Meta::Converter version 2.150010",
+ "generated_by" : "ExtUtils::MakeMaker version 7.62, CPAN::Meta::Converter version 2.150010",
"license" : [
"perl_5"
],
@@ -22,13 +22,7 @@
"prereqs" : {
"build" : {
"requires" : {
- "Carp" : "0",
- "Encode::Locale" : "0",
- "Exporter" : "0",
- "Fcntl" : "0",
- "File::BaseDir" : "0.03",
- "File::DesktopEntry" : "0.04",
- "Pod::Usage" : "0"
+ "ExtUtils::MakeMaker" : "0"
}
},
"configure" : {
@@ -38,6 +32,13 @@
},
"runtime" : {
"requires" : {
+ "Carp" : "0",
+ "Encode::Locale" : "0",
+ "Exporter" : "0",
+ "Fcntl" : "0",
+ "File::BaseDir" : "0.03",
+ "File::DesktopEntry" : "0.04",
+ "Pod::Usage" : "0",
"perl" : "5.006001"
}
},
@@ -56,7 +57,7 @@
"url" : "https://github.com/mbeijen/File-MimeInfo"
}
},
- "version" : "0.30",
+ "version" : "0.31",
"x_contributors" : [
"Bernhard Rosenkränzer <bero@lindev.ch>",
"Christian Ludwig <chrissicool@gmail.com>",
@@ -64,16 +65,17 @@
"Jitka Plesnikova <jplesnik@redhat.com>",
"Jonathan Dowland <jmtd@debian.org>",
"Martin Vassor <martin.vassor@alumni.epfl.ch>",
- "Michiel Beijen <michiel.beijen@gmail.com>",
+ "Michiel Beijen <mb@x14.nl>",
"Nikos Skalkotos <skalkoto@grnet.gr>",
"Nitish Bezzala <nbezzala@yahoo.com>",
"Oleg Kostyuk <cub.uanic@gmail.com>",
"Patrick Burroughs (Celti) <celti@celti.name>",
+ "Philippe Bruhat (BooK) <book@cpan.org>",
"Rudolf Leermakers <rudolf@hatsuseno.org>",
"Sean Smith <ssmith@ncsgraphics.com>",
"Stefan Seifert <nine@detonation.org>",
"brian m. carlson <sandals@crustytoothpaste.net>",
"gregor herrmann <gregoa@debian.org>"
],
- "x_serialization_backend" : "JSON::PP version 4.04"
+ "x_serialization_backend" : "JSON::PP version 4.06"
}
diff --git a/META.yml b/META.yml
index 51b00fc..b3c4e60 100644
--- a/META.yml
+++ b/META.yml
@@ -3,18 +3,12 @@ abstract: 'Determine file types'
author:
- 'Jaap Karssenberg <pardus@cpan.org>'
build_requires:
- Carp: '0'
- Encode::Locale: '0'
- Exporter: '0'
- Fcntl: '0'
- File::BaseDir: '0.03'
- File::DesktopEntry: '0.04'
- Pod::Usage: '0'
+ ExtUtils::MakeMaker: '0'
Test::More: '0.88'
configure_requires:
ExtUtils::MakeMaker: '6.30'
dynamic_config: 1
-generated_by: 'ExtUtils::MakeMaker version 7.44, CPAN::Meta::Converter version 2.150010'
+generated_by: 'ExtUtils::MakeMaker version 7.62, CPAN::Meta::Converter version 2.150010'
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -25,11 +19,18 @@ no_index:
- t
- inc
requires:
+ Carp: '0'
+ Encode::Locale: '0'
+ Exporter: '0'
+ Fcntl: '0'
+ File::BaseDir: '0.03'
+ File::DesktopEntry: '0.04'
+ Pod::Usage: '0'
perl: '5.006001'
resources:
bugtracker: https://github.com/mbeijen/File-MimeInfo/issues
repository: https://github.com/mbeijen/File-MimeInfo
-version: '0.30'
+version: '0.31'
x_contributors:
- 'Bernhard Rosenkränzer <bero@lindev.ch>'
- 'Christian Ludwig <chrissicool@gmail.com>'
@@ -37,11 +38,12 @@ x_contributors:
- 'Jitka Plesnikova <jplesnik@redhat.com>'
- 'Jonathan Dowland <jmtd@debian.org>'
- 'Martin Vassor <martin.vassor@alumni.epfl.ch>'
- - 'Michiel Beijen <michiel.beijen@gmail.com>'
+ - 'Michiel Beijen <mb@x14.nl>'
- 'Nikos Skalkotos <skalkoto@grnet.gr>'
- 'Nitish Bezzala <nbezzala@yahoo.com>'
- 'Oleg Kostyuk <cub.uanic@gmail.com>'
- 'Patrick Burroughs (Celti) <celti@celti.name>'
+ - 'Philippe Bruhat (BooK) <book@cpan.org>'
- 'Rudolf Leermakers <rudolf@hatsuseno.org>'
- 'Sean Smith <ssmith@ncsgraphics.com>'
- 'Stefan Seifert <nine@detonation.org>'
diff --git a/Makefile.PL b/Makefile.PL
index 511935b..eb578b6 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -13,7 +13,7 @@ WriteMakefile (
'VERSION_FROM' => 'lib/File/MimeInfo.pm',
'LICENSE' => 'perl',
'MIN_PERL_VERSION' => '5.6.1',
- 'BUILD_REQUIRES' => {
+ 'PREREQ_PM' => {
'Carp' => 0,
'Exporter' => 0,
'Encode::Locale' => 0,
@@ -52,11 +52,12 @@ WriteMakefile (
'Jitka Plesnikova <jplesnik@redhat.com>',
'Jonathan Dowland <jmtd@debian.org>',
'Martin Vassor <martin.vassor@alumni.epfl.ch>',
- 'Michiel Beijen <michiel.beijen@gmail.com>',
+ 'Michiel Beijen <mb@x14.nl>',
'Nikos Skalkotos <skalkoto@grnet.gr>',
'Nitish Bezzala <nbezzala@yahoo.com>',
'Oleg Kostyuk <cub.uanic@gmail.com>',
'Patrick Burroughs (Celti) <celti@celti.name>',
+ 'Philippe Bruhat (BooK) <book@cpan.org>',
'Rudolf Leermakers <rudolf@hatsuseno.org>',
'Sean Smith <ssmith@ncsgraphics.com>',
'Stefan Seifert <nine@detonation.org>',
diff --git a/debian/changelog b/debian/changelog
index bf24ad5..9151f38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+libfile-mimeinfo-perl (0.31-1) unstable; urgency=medium
+
+ [ Debian Janitor ]
+ * Update standards version to 4.5.1, no changes needed.
+
+ [ gregor herrmann ]
+ * Import upstream version 0.31.
+ * debian/copyright: update Upstream-Contact.
+ * Update years of packaging copyright.
+ * Declare compliance with Debian Policy 4.6.0.
+ * Override some new lintian false positives.
+
+ -- gregor herrmann <gregoa@debian.org> Mon, 10 Jan 2022 21:19:56 +0100
+
libfile-mimeinfo-perl (0.30-1) unstable; urgency=medium
[ Laurent Baillet ]
diff --git a/debian/control b/debian/control
index 8c5437a..8414fbb 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends-Indep: libencode-locale-perl <!nocheck>,
libtest-pod-perl <!nocheck>,
perl,
shared-mime-info <!nocheck>
-Standards-Version: 4.5.0
+Standards-Version: 4.6.0
Vcs-Browser: https://salsa.debian.org/perl-team/modules/packages/libfile-mimeinfo-perl
Vcs-Git: https://salsa.debian.org/perl-team/modules/packages/libfile-mimeinfo-perl.git
Homepage: https://metacpan.org/release/File-MimeInfo
diff --git a/debian/copyright b/debian/copyright
index 018fbd0..7dcda62 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: File-MimeInfo
-Upstream-Contact: Michiel Beijen <michiel.beijen@gmail.com>
+Upstream-Contact: Michiel Beijen <mb@x14.nl>
Source: https://metacpan.org/release/File-MimeInfo
Files: *
@@ -11,7 +11,7 @@ Files: debian/*
Copyright: 2005, 2006, Florian Ragwitz <rafl@debian.org>
2008, Damyan Ivanov <dmn@debian.org>
2009, Ryan Niebur <ryan@debian.org>
- 2011-2020, gregor herrmann <gregoa@debian.org>
+ 2011-2022, gregor herrmann <gregoa@debian.org>
License: Artistic or GPL-1+
License: Artistic
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index 8a156d2..23c4ab6 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -1,5 +1,15 @@
# just some empty test files
libfile-mimeinfo-perl source: source-is-missing t/default/binary_file
libfile-mimeinfo-perl source: source-is-missing t/magic/application_x-executable
+
+# just some empty test files
libfile-mimeinfo-perl source: source-contains-prebuilt-binary t/default/binary_file
libfile-mimeinfo-perl source: source-contains-prebuilt-binary t/magic/application_x-executable
+
+# just some empty test files
+libfile-mimeinfo-perl source: binary-with-bad-dynamic-table [t/magic/application_x-executable]
+
+# just some empty test files
+libfile-mimeinfo-perl source: elf-error In ELF header: Reading 1040 bytes extends past end of file for section headers [t/magic/application_x-executable]
+libfile-mimeinfo-perl source: elf-error In ELF header: Section headers are not available! [t/magic/application_x-executable]
+libfile-mimeinfo-perl source: elf-error In program headers: the dynamic segment offset + size exceeds the size of the file [t/magic/application_x-executable]
diff --git a/lib/File/MimeInfo.pm b/lib/File/MimeInfo.pm
index 23b149a..19db1bf 100644
--- a/lib/File/MimeInfo.pm
+++ b/lib/File/MimeInfo.pm
@@ -11,7 +11,7 @@ require Exporter;
our @ISA = qw(Exporter);
our @EXPORT = qw(mimetype);
our @EXPORT_OK = qw(extensions describe globs inodetype mimetype_canon mimetype_isa);
-our $VERSION = '0.30';
+our $VERSION = '0.31';
our $DEBUG;
our ($_hashed, $_hashed_aliases, $_hashed_subclasses, $_has_mimeinfo_database);
@@ -482,7 +482,7 @@ To install on macOS, you can install it like this:
=head1 AUTHOR
Jaap Karssenberg E<lt>pardus@cpan.orgE<gt>
-Maintained by Michiel Beijen E<lt>michiel.beijen@gmail.comE<gt>
+Maintained by Michiel Beijen E<lt>mb@x14.nlE<gt>
=head1 COPYRIGHT
diff --git a/lib/File/MimeInfo/Applications.pm b/lib/File/MimeInfo/Applications.pm
index 35279a8..d53c363 100644
--- a/lib/File/MimeInfo/Applications.pm
+++ b/lib/File/MimeInfo/Applications.pm
@@ -9,7 +9,7 @@ use File::MimeInfo qw/mimetype_canon mimetype_isa/;
use File::DesktopEntry;
require Exporter;
-our $VERSION = '0.30';
+our $VERSION = '0.31';
our @ISA = qw(Exporter);
our @EXPORT = qw(
@@ -306,7 +306,7 @@ F<$XDG_CONFIG_HOME/mimeapps.list>.
=head1 AUTHOR
Jaap Karssenberg E<lt>pardus@cpan.orgE<gt>
-Maintained by Michiel Beijen E<lt>michiel.beijen@gmail.comE<gt>
+Maintained by Michiel Beijen E<lt>mb@x14.nlE<gt>
=head1 COPYRIGHT
diff --git a/lib/File/MimeInfo/Cookbook.pod b/lib/File/MimeInfo/Cookbook.pod
index 07ff780..34e0f66 100644
--- a/lib/File/MimeInfo/Cookbook.pod
+++ b/lib/File/MimeInfo/Cookbook.pod
@@ -93,7 +93,7 @@ while leaving other XDG configuration stuff alone.
=head1 AUTHOR
Jaap Karssenberg E<lt>pardus@cpan.orgE<gt>
-Maintained by Michiel Beijen E<lt>michiel.beijen@gmail.comE<gt>
+Maintained by Michiel Beijen E<lt>mb@x14.nlE<gt>
=head1 COPYRIGHT
diff --git a/lib/File/MimeInfo/Magic.pm b/lib/File/MimeInfo/Magic.pm
index 23cac41..e4890be 100644
--- a/lib/File/MimeInfo/Magic.pm
+++ b/lib/File/MimeInfo/Magic.pm
@@ -17,7 +17,7 @@ BEGIN {
our @ISA = qw(Exporter File::MimeInfo);
our @EXPORT = qw(mimetype);
our @EXPORT_OK = qw(extensions describe globs inodetype magic);
-our $VERSION = '0.30';
+our $VERSION = '0.31';
our $DEBUG;
our $_hashed = 0;
@@ -343,7 +343,7 @@ and will cause a warning.
=head1 AUTHOR
Jaap Karssenberg E<lt>pardus@cpan.orgE<gt>
-Maintained by Michiel Beijen E<lt>michiel.beijen@gmail.comE<gt>
+Maintained by Michiel Beijen E<lt>mb@x14.nlE<gt>
=head1 COPYRIGHT
diff --git a/lib/File/MimeInfo/Rox.pm b/lib/File/MimeInfo/Rox.pm
index 22e06af..3ebf3f8 100644
--- a/lib/File/MimeInfo/Rox.pm
+++ b/lib/File/MimeInfo/Rox.pm
@@ -11,7 +11,7 @@ our @ISA = qw(Exporter);
our @EXPORT = qw(mime_exec mime_system);
our @EXPORT_OK = qw(suggest_script_name);
our %EXPORT_TAGS = (magic => \@EXPORT);
-our $VERSION = '0.30';
+our $VERSION = '0.31';
our @choicespath = (
config_home('rox.sourceforge.net'),
File::Spec->catdir($ENV{HOME}, 'Choices'),
@@ -163,7 +163,7 @@ The suggested dir doesn't need to exist.
=head1 AUTHOR
Jaap Karssenberg E<lt>pardus@cpan.orgE<gt>
-Maintained by Michiel Beijen E<lt>michiel.beijen@gmail.comE<gt>
+Maintained by Michiel Beijen E<lt>mb@x14.nlE<gt>
=head1 COPYRIGHT
diff --git a/mimeopen b/mimeopen
index 33ed359..23afbe9 100755
--- a/mimeopen
+++ b/mimeopen
@@ -2,7 +2,7 @@
use strict;
use warnings;
-our $VERSION = '0.30';
+our $VERSION = '0.31';
$|++;
# ########## #
@@ -354,7 +354,7 @@ for some limitations.
=head1 AUTHOR
Jaap Karssenberg E<lt>pardus@cpan.orgE<gt>
-Maintained by Michiel Beijen E<lt>michiel.beijen@gmail.comE<gt>
+Maintained by Michiel Beijen E<lt>mb@x14.nlE<gt>
=head1 COPYRIGHT
diff --git a/mimetype b/mimetype
index c58ba9c..198fe20 100755
--- a/mimetype
+++ b/mimetype
@@ -2,7 +2,7 @@
use strict;
use warnings;
-our $VERSION = '0.30';
+our $VERSION = '0.31';
$|++;
# ########## #
@@ -470,7 +470,7 @@ made for this one day.
=head1 AUTHOR
Jaap Karssenberg E<lt>pardus@cpan.orgE<gt>
-Maintained by Michiel Beijen E<lt>michiel.beijen@gmail.comE<gt>
+Maintained by Michiel Beijen E<lt>mb@x14.nlE<gt>
=head1 COPYRIGHT