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 <gre...@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 <par...@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 <par...@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 <par...@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 <par...@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@latin]=Kiraナュnik fajナBナュ
+GenericName[be]=ミ墫毛€ミーム榧スム孟コ ム・ーミケミサミーム・
+GenericName[bg]=ミ、ミーミケミサミセミイ ミシミオミスミクミエミカム貫€
+GenericName[bn]=爬ォ爬セ爬・ヲイ 爬ョ爰財ヲッ爬セ爬ィ爰・ヲ憫ヲセ爬ー
+GenericName[bn_IN]=爬ォ爬セ爬・ヲイ 爬ェ爬ー爬ソ爬壟ヲセ爬イ爬ィ 爬ャ爰財ヲッ爬ャ爬ク爰財ヲ・爬セ
+GenericName[bs]=Menadナセer datoteka
+GenericName[ca@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@ijekavian]=ミ慴オミスミーム渙オム€ ム・ーム侑サミセミイミー
+GenericName[sr@ijekavianlatin]=Menadナセer fajlova
+GenericName[sr@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@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@latin]=Dolphin
+Name[be]=Dolphin
+Name[bg]=Dolphin
+Name[bn]=爬。爬イ爬ォ爬ソ爬ィ
+Name[bn_IN]=Dolphin
+Name[bs]=Delfin
+Name[ca@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@ijekavian]=ミ頒オミサム・クミス
+Name[sr@ijekavianlatin]=Dolphin
+Name[sr@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@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

_______________________________________________
Pkg-perl-cvs-commits mailing list
Pkg-perl-cvs-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits

Reply via email to