[libfile-desktopentry-perl] 03/10: Imported Upstream version 0.11
gregor herrmann
gregoa at debian.org
Thu Jun 18 23:03:53 UTC 2015
This is an automated email from the git hooks/post-receive script.
gregoa pushed a commit to branch master
in repository libfile-desktopentry-perl.
commit d2a6a2640ba710276860712a2aee7a88253fd53e
Author: gregor herrmann <gregoa at debian.org>
Date: Fri Jun 19 00:53:01 2015 +0200
Imported Upstream version 0.11
---
Changes | 11 +++
MANIFEST | 1 +
META.json | 7 +-
META.yml | 19 ++--
Makefile.PL | 51 +++++------
lib/File/DesktopEntry.pm | 4 +-
t/02_DesktopEntry.t | 10 ++-
t/applications/rt65394.desktop | 200 +++++++++++++++++++++++++++++++++++++++++
8 files changed, 264 insertions(+), 39 deletions(-)
diff --git a/Changes b/Changes
index c3a7a6e..768133e 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,14 @@
+0.11 2015-06-11
+ - Explicitly state minimum perl version as 5.8 in Makefile.PL.
+
+0.10 2015-06-09
+ - Include new test in MANIFEST
+ RT 105112 - SREZIC
+
+0.09 2015-06-09
+ - Exclude newlines from whitespace on either side of '='
+ RT 65394, fix by sdme.
+
0.08 2013-10-07
- Corrected build instructinos.
diff --git a/MANIFEST b/MANIFEST
index f42e47f..fabe532 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -12,3 +12,4 @@ t/04_pod_ok.t
t/05_pod_cover.t
t/06_changes.t
t/applications/foo.desktop
+t/applications/rt65394.desktop
diff --git a/META.json b/META.json
index 2d6a9f0..436f8c0 100644
--- a/META.json
+++ b/META.json
@@ -4,7 +4,7 @@
"Jaap Karssenberg <pardus at cpan.org>"
],
"dynamic_config" : 1,
- "generated_by" : "ExtUtils::MakeMaker version 6.78, CPAN::Meta::Converter version 2.132661",
+ "generated_by" : "ExtUtils::MakeMaker version 7.04, CPAN::Meta::Converter version 2.150001",
"license" : [
"perl_5"
],
@@ -41,9 +41,12 @@
},
"release_status" : "stable",
"resources" : {
+ "bugtracker" : {
+ "web" : "https://github.com/mbeijen/File-DesktopEntry/issues"
+ },
"repository" : {
"url" : "https://github.com/mbeijen/File-DesktopEntry"
}
},
- "version" : 0.08
+ "version" : "0.11"
}
diff --git a/META.yml b/META.yml
index 322e81f..a02a4e2 100644
--- a/META.yml
+++ b/META.yml
@@ -3,25 +3,26 @@ abstract: 'Module to handle .desktop files'
author:
- 'Jaap Karssenberg <pardus at cpan.org>'
build_requires:
- Carp: 0
- File::BaseDir: 0.03
- File::Path: 0
- File::Spec: 0
+ Carp: '0'
+ File::BaseDir: '0.03'
+ File::Path: '0'
+ File::Spec: '0'
configure_requires:
- ExtUtils::MakeMaker: 6.30
+ ExtUtils::MakeMaker: '6.30'
dynamic_config: 1
-generated_by: 'ExtUtils::MakeMaker version 6.78, CPAN::Meta::Converter version 2.132661'
+generated_by: 'ExtUtils::MakeMaker version 7.04, CPAN::Meta::Converter version 2.150001'
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
- version: 1.4
+ version: '1.4'
name: File-DesktopEntry
no_index:
directory:
- t
- inc
requires:
- perl: 5.008006
+ perl: '5.008006'
resources:
+ bugtracker: https://github.com/mbeijen/File-DesktopEntry/issues
repository: https://github.com/mbeijen/File-DesktopEntry
-version: 0.08
+version: '0.11'
diff --git a/Makefile.PL b/Makefile.PL
index 7078387..d8a8bed 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,40 +1,41 @@
use strict;
use warnings;
-use 5.006001;
+use 5.008_001;
use ExtUtils::MakeMaker;
WriteMakefile
- (
- 'NAME' => 'File::DesktopEntry',
- 'ABSTRACT' => 'Module to handle .desktop files',
- 'AUTHOR' => 'Jaap Karssenberg <pardus at cpan.org>',
- 'DISTNAME' => "File-DesktopEntry",
- 'VERSION_FROM' => 'lib/File/DesktopEntry.pm',
- 'LICENSE' => 'perl',
- 'MIN_PERL_VERSION' => '5.8.6',
- 'BUILD_REQUIRES' => {
- 'Carp' => 0,
- 'File::Spec' => 0,
- 'File::Path' => 0,
- 'File::BaseDir' => '0.03',
- ($^O eq 'MSWin32' ? ('Win32::Process' => 0) : ()),
- },
- 'CONFIGURE_REQUIRES' => {
- "ExtUtils::MakeMaker" => "6.30"
- },
- 'LIBS' => [''], # e.g., '-lm'
- 'dist' => {
- COMPRESS => "gzip -9f",
- SUFFIX => "gz",
- },
+(
+ 'NAME' => 'File::DesktopEntry',
+ 'ABSTRACT' => 'Module to handle .desktop files',
+ 'AUTHOR' => 'Jaap Karssenberg <pardus at cpan.org>',
+ 'DISTNAME' => "File-DesktopEntry",
+ 'VERSION_FROM' => 'lib/File/DesktopEntry.pm',
+ 'LICENSE' => 'perl',
+ 'MIN_PERL_VERSION' => '5.8.6',
+ 'BUILD_REQUIRES' => {
+ 'Carp' => 0,
+ 'File::Spec' => 0,
+ 'File::Path' => 0,
+ 'File::BaseDir' => '0.03',
+ ($^O eq 'MSWin32' ? ('Win32::Process' => 0) : ()),
+ },
+ 'CONFIGURE_REQUIRES' => {
+ "ExtUtils::MakeMaker" => "6.30"
+ },
+ 'LIBS' => [''],
+ 'dist' => {
+ COMPRESS => "gzip -9f",
+ SUFFIX => "gz",
+ },
'test' => {
'TESTS' => "t/*.t"
},
META_MERGE => {
resources => {
repository => 'https://github.com/mbeijen/File-DesktopEntry',
+ bugtracker => 'https://github.com/mbeijen/File-DesktopEntry/issues',
},
},
- );
+);
diff --git a/lib/File/DesktopEntry.pm b/lib/File/DesktopEntry.pm
index 4278e2a..c3d7c35 100644
--- a/lib/File/DesktopEntry.pm
+++ b/lib/File/DesktopEntry.pm
@@ -8,7 +8,7 @@ use Carp;
use File::Spec;
use File::BaseDir 0.03 qw/data_files data_home/;
-our $VERSION = 0.08;
+our $VERSION = '0.11';
our $VERBOSE = 0;
if ($^O eq 'MSWin32') {
@@ -465,7 +465,7 @@ sub get {
return undef unless defined $i;
my $lang = join('|', map quotemeta($_), @lang) || 'C';
my %matches = ( $$self{groups}[$i] =~
- /^(\Q$key\E\[(?:$lang)\]|\Q$key\E)\s*=\s*(.*?)\s*$/gm );
+ /^(\Q$key\E\[(?:$lang)\]|\Q$key\E)[^\S\n]*=[^\S\n]*(.*?)\s*$/gm );
return undef unless keys %matches;
# Find preferred value
diff --git a/t/02_DesktopEntry.t b/t/02_DesktopEntry.t
index a35204b..1e6db60 100644
--- a/t/02_DesktopEntry.t
+++ b/t/02_DesktopEntry.t
@@ -1,5 +1,6 @@
use strict;
-use Test::More tests => 30;
+use warnings;
+use Test::More;
use File::DesktopEntry;
$File::DesktopEntry::_locale = ''; # reset locale for testing
@@ -176,3 +177,10 @@ else {
ok($@, 'parse_Exec dies when multiple args not supported');
}
+$file = File::Spec->catfile(qw/t applications rt65394.desktop/);
+my $entry = File::DesktopEntry->new($file);
+is($entry->get('Name'), 'caja', 'new(FILE) works');
+is($entry->Name, 'caja', 'AUTOLOAD works');
+is($entry->Path, '', 'Path is empty string');
+
+done_testing;
diff --git a/t/applications/rt65394.desktop b/t/applications/rt65394.desktop
new file mode 100644
index 0000000..e264639
--- /dev/null
+++ b/t/applications/rt65394.desktop
@@ -0,0 +1,200 @@
+[Desktop Entry]
+Categories=Qt;KDE;System;FileTools;FileManager;X-MandrivaLinux-System-FileTools;
+Comment[en_US]=
+Comment=
+Exec=caja
+GenericName[en_US]=File Manager
+GenericName=File Manager
+GenericName[af]=Lﾃｪerbestuurder
+GenericName[ar]=ﾙ・ｯﾙ韓ｱ ﾙ・・・ｧﾘｪ
+GenericName[as]=爬ｨ爬･爬ｿ爬ｪ爬､爰財ｧｰ爰ｰ 爬ｪ爰ｰ爬ｿ爬壟ｦｾ爬ｲ爬・
+GenericName[ast]=Xestor de ficheros
+GenericName[be at latin]=Kiraﾅｭnik fajﾅＢﾅｭ
+GenericName[be]=ﾐ墫毛€ﾐｰﾑ榧ｽﾑ孟ｺ ﾑ・ｰﾐｹﾐｻﾐｰﾑ・
+GenericName[bg]=ﾐ､ﾐｰﾐｹﾐｻﾐｾﾐｲ ﾐｼﾐｵﾐｽﾐｸﾐｴﾐｶﾑ貫€
+GenericName[bn]=爬ｫ爬ｾ爬・ｦｲ 爬ｮ爰財ｦｯ爬ｾ爬ｨ爰・ｦ憫ｦｾ爬ｰ
+GenericName[bn_IN]=爬ｫ爬ｾ爬・ｦｲ 爬ｪ爬ｰ爬ｿ爬壟ｦｾ爬ｲ爬ｨ 爬ｬ爰財ｦｯ爬ｬ爬ｸ爰財ｦ･爬ｾ
+GenericName[bs]=Menadﾅｾer datoteka
+GenericName[ca at valencia]=Gestor de fitxers
+GenericName[ca]=Gestor de fitxers
+GenericName[cs]=Sprﾃ｡vce souborﾅｯ
+GenericName[csb]=Menadﾅｼera lopkﾃｳw
+GenericName[da]=Filhﾃ･ndtering
+GenericName[de]=Dateimanager
+GenericName[el]=ﾎ釆ｹﾎｱﾏ・ｵﾎｹﾏ∃ｹﾏρ・ｮﾏ・ﾎｱﾏ・・ｵﾎｯﾏ火ｽ
+GenericName[en_GB]=File Manager
+GenericName[eo]=Dosieradministrilo
+GenericName[es]=Gestor de archivos
+GenericName[et]=Failihaldur
+GenericName[eu]=Fitxategi-kudeatzailea
+GenericName[fa]=ﾙ・ｯﾛ鈷ｱ ﾙｾﾘｱﾙ異・ｯﾙ・
+GenericName[fi]=Tiedostonhallinta
+GenericName[fr]=Gestionnaire de fichiers
+GenericName[fy]=Triembehearder
+GenericName[ga]=Bainisteoir Comhad
+GenericName[gl]=Xestor de ficheiros
+GenericName[gu]=爼ｫ爼ｾ爼・ｪｲ 爼ｵ爿財ｪｯ爼ｵ爼ｸ爿財ｪ･爼ｾ爼ｪ爼・
+GenericName[he]=ﾗ槞ﾗ蕃・ﾗｧﾗ泰ｦﾗ燮・
+GenericName[hi]=爨ｫ爨ｼ爨ｾ爨・､ｲ 爨ｪ爭財､ｰ爨ｬ爨も､ｧ爨・
+GenericName[hne]=爨ｫ爨ｾ爨・､ｲ 爨ｪ爭財､ｰ爨ｬ爨も､ｧ爨・
+GenericName[hr]=Upravitelj datoteka
+GenericName[hsb]=Datajowy manager
+GenericName[hu]=Fﾃ｡jlkezelﾅ・
+GenericName[ia]=Gerente de file
+GenericName[id]=Manajer Berkas
+GenericName[is]=Skrﾃ｡astjﾃｳri
+GenericName[it]=Gestore dei file
+GenericName[ja]=繝輔ぃ繧､繝ｫ繝槭ロ繝ｼ繧ｸ繝｣
+GenericName[ka]=痺､痺雪・痺壯ヴ痺黛・痺｡ 痺帋・痺雪Β痺例ヵ痺批・痺・
+GenericName[kk]=ﾐ､ﾐｰﾐｹﾐｻ ﾐｼﾐｵﾐｽﾐｵﾐｴﾐｶﾐｵﾑ€ﾑ・
+GenericName[km]=癰€癰倔汳癰倔棡癰ｷ癰低楮窶吟桙癲低椢癰批沂癰ゃ汳癰壯桷窶吟椡癰€癰溂楔癰・
+GenericName[kn]=犂歩ｲ｡犂､ 犂ｵ犁財ｲｯ犂ｵ犂ｸ犁財ｲ･犂ｾ犂ｪ犂・
+GenericName[ko]=甯護攵 ・€・ｬ・・
+GenericName[ku]=Rﾃｪveberﾃｪ Pelan
+GenericName[lt]=Failﾅｳ tvarkyklﾄ・
+GenericName[lv]=Failu pﾄ〉valdnieks
+GenericName[mai]=爨ｫ爨ｾ爨・､ｲ 爨ｪ爭財､ｰ爨ｬ爨も､ｧ爨・
+GenericName[mk]=ﾐ慴ｵﾐｽﾐｰﾑ渙ｵﾑ€ ﾐｽﾐｰ ﾐｴﾐｰﾑひｾﾑひｵﾐｺﾐｸ
+GenericName[ml]=犇ｫ犇ｯ犇ｲ犒坂€・犇ｨ犇游ｴ､犒財ｴ､犇ｿ犇ｪ犒財ｴｪ犒≒ｴ歩ｴｾ犇ｰ犇ｨ犒坂€・
+GenericName[mr]=爨ｫ爨ｾ爨謂､ｲ 爨ｵ爭財､ｯ爨ｵ爨ｸ爭財､･爨ｾ爨ｪ爨・
+GenericName[ms]=Pengurus Fail
+GenericName[nb]=Filbehandler
+GenericName[nds]=Dateipleger
+GenericName[ne]=爨ｫ爨ｾ爨・､ｲ 爨ｪ爭財､ｰ爨ｬ爨ｨ爭財､ｧ爨・
+GenericName[nl]=Bestandsbeheerder
+GenericName[nn]=Filhandsamar
+GenericName[oc]=Gestionari de fichiﾃｨrs
+GenericName[or]=牀ｫ牀ｾ牀・ｬｲ 牀ｪ牀ｰ牀ｿ牀壟ｬｾ牀ｳ牀・
+GenericName[pa]=爲ｫ爲ｾ爲・ｨｲ 爲ｮ爻謂ｨｨ爻・ｨ憫ｨｰ
+GenericName[pl]=Zarzﾄ・zanie plikami
+GenericName[pt]=Gestor de Ficheiros
+GenericName[pt_BR]=Gerenciador de arquivos
+GenericName[ro]=Gestionar de fiﾈ冓ere
+GenericName[ru]=ﾐ頒ｸﾑ・ｿﾐｵﾑび・ｵﾑ€ ﾑ・ｰﾐｹﾐｻﾐｾﾐｲ
+GenericName[se]=Fiilagieﾄ疎halli
+GenericName[si]=犖憫ｷ憫ｶｱ犢・犖壟ｷ・ｶｸ犖ｱ犢鐘ｶ壟ｶｻ犢・
+GenericName[sk]=Sprﾃ｡vca sﾃｺborov
+GenericName[sl]=Upravljalnik datotek
+GenericName[sr at ijekavian]=ﾐ慴ｵﾐｽﾐｰﾑ渙ｵﾑ€ ﾑ・ｰﾑ侑ｻﾐｾﾐｲﾐｰ
+GenericName[sr at ijekavianlatin]=Menadﾅｾer fajlova
+GenericName[sr at latin]=Menadﾅｾer fajlova
+GenericName[sr]=ﾐ慴ｵﾐｽﾐｰﾑ渙ｵﾑ€ ﾑ・ｰﾑ侑ｻﾐｾﾐｲﾐｰ
+GenericName[sv]=Filhanterare
+GenericName[ta]=牋歩ｯ金ｮｪ牘財ｮｪ牘・牋ｮ牘・ｮｲ牋ｾ牋ｳ牋ｰ牘・
+GenericName[te]=牴ｦ牴ｸ牾財ｰ､牾財ｰｰ牴ｾ牴ｲ 牴・ｰｭ牴ｿ牴歩ｰｰ牾財ｰ､
+GenericName[tg]=ﾐ慯σｴﾐｸﾑ€ﾐｸ ﾑ・ｰﾐｹﾐｻﾒｳﾐｾ
+GenericName[th]=犹€犧・ｸ｣犧ｷ犹謂ｸｭ犧・ｸ｡犧ｷ犧ｭ犧謂ｸｱ犧扉ｸ≒ｸｲ犧｣犹≒ｸ游ｹ霞ｸ｡
+GenericName[tr]=Dosya Yﾃｶnetici
+GenericName[ug]=ﾚｾﾛ・ｬﾘｬﾛ娩ｪ ﾘｨﾘｧﾘｴﾙぽ・ｱﾘｺﾛ・
+GenericName[uk]=ﾐ慴ｵﾐｽﾐｵﾐｴﾐｶﾐｵﾑ€ ﾑ・ｰﾐｹﾐｻﾑ孟ｲ
+GenericName[uz at cyrillic]=ﾐ､ﾐｰﾐｹﾐｻ ﾐｱﾐｾﾑ惟嶢ｰﾑ€ﾑσｲﾑ・ｸﾑ・ｸ
+GenericName[uz]=Fayl boshqaruvchisi
+GenericName[vi]=B盻・qu蘯｣n lﾃｽ t蘯ｭp tin
+GenericName[wa]=Manaedjeu di fitchﾃｮs
+GenericName[x-test]=xxFile Managerxx
+GenericName[zh_CN]=譁・ｻｶ邂｡逅・勣
+GenericName[zh_TW]=讙疲｡育ｮ｡逅・藤
+Icon=system-file-manager
+InitialPreference=10
+MimeType=inode/directory;
+Name[en_US]=caja
+Name=caja
+Name[af]=Dolphin
+Name[ar]=ﾘｯﾙ異・・館・
+Name[as]=Dolphin
+Name[ast]=Dolphin
+Name[be at latin]=Dolphin
+Name[be]=Dolphin
+Name[bg]=Dolphin
+Name[bn]=爬｡爬ｲ爬ｫ爬ｿ爬ｨ
+Name[bn_IN]=Dolphin
+Name[bs]=Delfin
+Name[ca at valencia]=Dolphin
+Name[ca]=Dolphin
+Name[cs]=Dolphin
+Name[csb]=Dolphin
+Name[da]=Dolphin
+Name[de]=Dolphin
+Name[el]=Dolphin
+Name[en_GB]=Dolphin
+Name[eo]=Dolphin
+Name[es]=Dolphin
+Name[et]=Dolphin
+Name[eu]=Dolphin
+Name[fi]=Dolphin
+Name[fr]=Dolphin
+Name[fy]=Dolfyn
+Name[ga]=Dolphin
+Name[gl]=Dolphin
+Name[gu]=爼｡爿金ｪｲ爿財ｪｫ爼ｿ爼ｨ
+Name[he]=Dolphin
+Name[hi]=爨｡爭霞､ｲ爭財､ｫ爨ｼ爨ｿ爨ｨ
+Name[hne]=爨｡爨ｾ爨ｲ爭財､ｫ爨ｿ爨ｨ
+Name[hr]=Dolphin
+Name[hsb]=Dolphin
+Name[hu]=Dolphin
+Name[ia]=Dolphin
+Name[id]=Dolphin
+Name[is]=Dolphin
+Name[it]=Dolphin
+Name[ja]=Dolphin
+Name[ka]=Dolphin
+Name[kk]=Dolphin
+Name[km]=Dolphin
+Name[kn]=犂｡犂ｾ犂ｲ犁財ｲｫ犂ｿ犂ｨ犁・
+Name[ko]=Dolphin
+Name[ku]=Dolphin
+Name[lt]=Dolphin
+Name[lv]=Dolphin
+Name[mai]=爨｡爨ｾ爨ｲ爭財､ｫ爨ｿ爨ｨ
+Name[mk]=ﾐ頒ｵﾐｻﾑ・ｸﾐｽ
+Name[ml]=犇｡犒金ｴｳ犒坂€財ｴｫ犇ｿ犇ｨ犒坂€・
+Name[mr]=爨｡爭霞､ｲ爭財､ｫ爨ｿ爨ｨ
+Name[ms]=Dolphin
+Name[nb]=Dolphin
+Name[nds]=Dolphin
+Name[ne]=爨｡爨ｲ爭財､ｫ爨ｿ爨ｨ
+Name[nl]=Dolphin
+Name[nn]=Dolphin
+Name[oc]=Dolphin
+Name[or]=牀｡牀ｲ牀ｫ牀ｿ牀ｨ
+Name[pa]=爲｡爲ｾ爲ｲ爲ｫ爲ｿ爲ｨ
+Name[pl]=Dolphin
+Name[pt]=Dolphin
+Name[pt_BR]=Dolphin
+Name[ro]=Dolphin
+Name[ru]=Dolphin
+Name[se]=Dolphin
+Name[si]=犖ｩ犢憫ｶｽ犢癌ｷ・ｷ亭ｶｱ犢・
+Name[sk]=Dolphin
+Name[sl]=Dolphin
+Name[sr at ijekavian]=ﾐ頒ｵﾐｻﾑ・ｸﾐｽ
+Name[sr at ijekavianlatin]=Dolphin
+Name[sr at latin]=Dolphin
+Name[sr]=ﾐ頒ｵﾐｻﾑ・ｸﾐｽ
+Name[sv]=Dolphin
+Name[ta]=牋游ｮｾ牋ｲ牘財ｮｪ牋ｿ牋ｩ牘・
+Name[te]=牴｡牴ｾ牴ｲ牾財ｰｫ牴ｿ牴ｨ牾・
+Name[tg]=Dolphin
+Name[th]=犧扉ｸｭ犧･犧游ｸｴ犧・
+Name[tr]=Dolphin
+Name[ug]=Dolphin
+Name[uk]=Dolphin
+Name[uz at cyrillic]=Dolphin
+Name[uz]=Dolphin
+Name[vi]=Dolphin
+Name[wa]=Dolphin
+Name[x-test]=xxDolphinxx
+Name[zh_CN]=Dolphin
+Name[zh_TW]=Dolphin
+Path=
+StartupNotify=true
+Terminal=false
+TerminalOptions=
+Type=Application
+X-DBUS-ServiceName=
+X-DBUS-StartupType=
+X-Desktop-File-Install-Version=0.22
+X-DocPath=dolphin/index.html
+X-KDE-SubstituteUID=false
+X-KDE-Username=
\ No newline at end of file
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libfile-desktopentry-perl.git
More information about the Pkg-perl-cvs-commits
mailing list