[libhttp-browserdetect-perl] 01/03: Imported Upstream version 1.60

[Angel Abad]

This is an automated email from the git hooks/post-receive script.

angel pushed a commit to branch master
in repository libhttp-browserdetect-perl.

commit d53a0a4cca5dc58848dfdd28fd1254aace04db58
Author: Angel Abad <angelabad at gmail.com>
Date:   Sun Sep 1 22:33:35 2013 +0200

    Imported Upstream version 1.60
---
 Build.PL                  |    2 +-
 Changes                   |    4 ++++
 META.json                 |    2 +-
 Makefile.PL               |    2 +-
 README                    |    2 +-
 dist.ini                  |    2 +-
 lib/HTTP/BrowserDetect.pm |   11 ++++++-----
 t/01-detect.t             |   14 ++++----------
 t/useragents.json         |    1 +
 9 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/Build.PL b/Build.PL
index 9ff7f94..55254f9 100644
--- a/Build.PL
+++ b/Build.PL
@@ -20,7 +20,7 @@ my %module_build_args = (
     "Olaf Alders <olaf\@wundercounter.com> (current maintainer)"
   ],
   "dist_name" => "HTTP-BrowserDetect",
-  "dist_version" => "1.59",
+  "dist_version" => "1.60",
   "license" => "perl",
   "module_name" => "HTTP::BrowserDetect",
   "recommends" => {},
diff --git a/Changes b/Changes
index 632581a..4f10c0f 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,9 @@
 Revision history for Perl extension HTTP::BrowserDetect.
 
+1.60 2013-08-29 23:02:13 America/Toronto
+    - Fixes bug where "Linux" rather than "Android" was returned as os_string
+      for Android devices.
+
 1.59 2013-08-18 00:38:21 America/Toronto
     - Revert 1.57's behaviour of returning a robot name in browser_string.
     - Fix bug where OS X identied as just Mac in os_string.
diff --git a/META.json b/META.json
index 20163e2..95012c6 100644
--- a/META.json
+++ b/META.json
@@ -63,7 +63,7 @@
          "web" : "https://github.com/oalders/http-browserdetect"
       }
    },
-   "version" : "1.59",
+   "version" : "1.60",
    "x_contributors" : [
       "Aran Deltac <bluefeet at gmail.com>",
       "Douglas Christopher Wilson <doug at somethingdoug.com>",
diff --git a/Makefile.PL b/Makefile.PL
index 6fd68d0..71160ad 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -36,7 +36,7 @@ my %WriteMakefileArgs = (
     "Test::Most" => 0,
     "Test::NoWarnings" => 0
   },
-  "VERSION" => "1.59",
+  "VERSION" => "1.60",
   "test" => {
     "TESTS" => "t/*.t"
   }
diff --git a/README b/README
index 886a860..77a8030 100644
--- a/README
+++ b/README
@@ -3,7 +3,7 @@ NAME
     an HTTP user agent string
 
 VERSION
-    version 1.59
+    version 1.60
 
 SYNOPSIS
         use HTTP::BrowserDetect;
diff --git a/dist.ini b/dist.ini
index 73322c9..d9a818c 100644
--- a/dist.ini
+++ b/dist.ini
@@ -5,7 +5,7 @@ author  = Olaf Alders <olaf at wundercounter.com> (current maintainer)
 license = Perl_5
 copyright_holder = Lee Semel
 copyright_year   = 2013
-version = 1.59
+version = 1.60
 main_module = lib/HTTP/BrowserDetect.pm
 
 [GatherDir]
diff --git a/lib/HTTP/BrowserDetect.pm b/lib/HTTP/BrowserDetect.pm
index da7110b..dbfbafc 100755
--- a/lib/HTTP/BrowserDetect.pm
+++ b/lib/HTTP/BrowserDetect.pm
@@ -3,7 +3,7 @@ use warnings;
 
 package HTTP::BrowserDetect;
 {
-  $HTTP::BrowserDetect::VERSION = '1.59';
+  $HTTP::BrowserDetect::VERSION = '1.60';
 }
 
 use vars qw(@ALL_TESTS);
@@ -1053,17 +1053,18 @@ sub os_string {
     return 'Win8'                        if $self->win8;
     return 'WinNT'                       if $self->winnt;
     return 'Windows Phone'               if $self->winphone;
-    return 'Mac OS X'                    if $self->macosx;
     return 'Win3x'                       if $self->win3x;
-    return 'OS2'                         if $self->os2;
-    return 'Unix'                        if $self->unix && !$self->linux;
+    return 'Android'                     if $self->android;
     return 'Linux'                       if $self->linux;
+    return 'Unix'                        if $self->unix;
     return 'Firefox OS'                  if $self->firefoxos;
     return 'RIM Tablet OS'               if $self->rimtabletos;
     return 'Playstation 3 GameOS'        if $self->ps3gameos;
     return 'Playstation Portable GameOS' if $self->pspgameos;
     return 'iOS' if $self->iphone || $self->ipod || $self->ipad;
+    return 'Mac OS X'                    if $self->macosx;
     return 'Mac'                         if $self->mac;
+    return 'OS2'                         if $self->os2;
     return;
 }
 
@@ -1452,7 +1453,7 @@ HTTP::BrowserDetect - Determine Web browser, version, and platform from an HTTP
 
 =head1 VERSION
 
-version 1.59
+version 1.60
 
 =head1 SYNOPSIS
 
diff --git a/t/01-detect.t b/t/01-detect.t
index f3b0aac..4a587b3 100644
--- a/t/01-detect.t
+++ b/t/01-detect.t
@@ -3,22 +3,16 @@
 use strict;
 use warnings;
 
+use Test::Most;
+use Test::FailWarnings;
+
 use File::Slurp;
 use FindBin;
+use HTTP::BrowserDetect;
 use JSON::PP;
-use Test::Most;
-use Test::FailWarnings;
 
 bail_on_fail();
 
-# test that the module loads without errors
-my $w;
-{
-    local $SIG{__WARN__} = sub { $w = shift };
-    require_ok( 'HTTP::BrowserDetect' );
-}
-ok !$w;
-
 my $json = read_file( "$FindBin::Bin/useragents.json" );
 
 my $tests = JSON::PP->new->ascii->decode( $json );
diff --git a/t/useragents.json b/t/useragents.json
index f7bb617..8b3701b 100644
--- a/t/useragents.json
+++ b/t/useragents.json
@@ -2623,6 +2623,7 @@
          "mobile"
       ],
       "os" : "Android",
+      "os_string": "Android",
       "public_major" : "9",
       "public_minor" : "0.80",
       "public_version" : "9.80"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libhttp-browserdetect-perl.git