Merge branch 'hotfix/v1.6.2'

ICGC-TCGA-PanCancer · Mar 19, 2015 · c31c68a · c31c68a
2 parents 2f9dd1c + 6c3ec2c
commit c31c68a
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 31 deletions.
diff --git a/MYMETA.json b/MYMETA.json
@@ -4,7 +4,7 @@
       "unknown"
    ],
    "dynamic_config" : 0,
-   "generated_by" : "ExtUtils::MakeMaker version 6.68, CPAN::Meta::Converter version 2.142690",
+   "generated_by" : "ExtUtils::MakeMaker version 6.68, CPAN::Meta::Converter version 2.131560",
    "license" : [
       "gpl_2"
    ],
@@ -57,5 +57,5 @@
       }
    },
    "release_status" : "stable",
-   "version" : "v1.6.1"
+   "version" : "v1.6.2"
 }
diff --git a/MYMETA.yml b/MYMETA.yml
@@ -3,40 +3,40 @@ abstract: unknown
 author:
   - unknown
 build_requires:
-  ExtUtils::MakeMaker: '0'
+  ExtUtils::MakeMaker: 0
 configure_requires:
-  ExtUtils::MakeMaker: '0'
+  ExtUtils::MakeMaker: 0
 dynamic_config: 0
-generated_by: 'ExtUtils::MakeMaker version 6.68, CPAN::Meta::Converter version 2.142690'
+generated_by: 'ExtUtils::MakeMaker version 6.68, CPAN::Meta::Converter version 2.131560'
 license: gpl
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
-  version: '1.4'
+  version: 1.4
 name: PCAP
 no_index:
   directory:
     - t
     - inc
 requires:
-  Bio::DB::Sam: '1.39'
-  Bio::Root::Version: '1.006923'
-  Capture::Tiny: '0.24'
-  Config::IniFiles: '2.83'
-  Const::Fast: '0.014'
-  Data::UUID: '1.219'
-  Devel::Cover: '1.09'
-  File::Which: '0.05'
-  GD: '2.52'
-  IPC::System::Simple: '1.25'
-  List::Util: '1.38'
-  Math::Gradient: '0.04'
-  Module::Build: '0.42'
-  Pod::Coverage: '0.23'
-  Proc::PID::File: '1.27'
-  Proc::ProcessTable: '0.5'
-  Sub::Exporter::Progressive: '0.001011'
-  Term::UI: '0.42'
-  Test::Fatal: '0.013'
-  Try::Tiny: '0.19'
-  XML::Simple: '2.2'
-version: v1.6.1
+  Bio::DB::Sam: 1.39
+  Bio::Root::Version: 1.006923
+  Capture::Tiny: 0.24
+  Config::IniFiles: 2.83
+  Const::Fast: 0.014
+  Data::UUID: 1.219
+  Devel::Cover: 1.09
+  File::Which: 0.05
+  GD: 2.52
+  IPC::System::Simple: 1.25
+  List::Util: 1.38
+  Math::Gradient: 0.04
+  Module::Build: 0.42
+  Pod::Coverage: 0.23
+  Proc::PID::File: 1.27
+  Proc::ProcessTable: 0.5
+  Sub::Exporter::Progressive: 0.001011
+  Term::UI: 0.42
+  Test::Fatal: 0.013
+  Try::Tiny: 0.19
+  XML::Simple: 2.2
+version: v1.6.2
diff --git a/c/Makefile b/c/Makefile
@@ -1,4 +1,4 @@
-VERSION=1.6.0
+VERSION=1.6.2
 
 #Compiler
 CC = gcc -O3 -DVERSION='"$(VERSION)"' -g

diff --git a/docs.tar.gz b/docs.tar.gz
diff --git a/lib/PCAP.pm b/lib/PCAP.pm
@@ -24,7 +24,7 @@ use strict;
 use Const::Fast qw(const);
 use base 'Exporter';
 
-our $VERSION = '1.6.1';
+our $VERSION = '1.6.2';
 our @EXPORT = qw($VERSION);
 
 const my $LICENSE =>
@@ -61,6 +61,7 @@ const my %UPGRADE_PATH => ( '0.1.0'  => 'biobambam,bwa,samtools',
                             '1.5.4'  => '',
                             '1.6.0'  => '',
                             '1.6.1'  => '',
+                            '1.6.2'  => '',
                           );
 
 sub license {

diff --git a/setup.sh b/setup.sh
@@ -118,7 +118,7 @@ if [ -e $SETUP_DIR/jkentUtils.success ]; then
   echo -n " previously installed ...";
 else
   cd $SETUP_DIR
-  if [[ $MACHTYPE == x86_64 ]] ; then
+  if [[ `uname -m` == x86_64 ]] ; then
     (
     get_file $INST_PATH/bin/wigToBigWig $SOURCE_JKENT_BIN/wigToBigWig
     chmod +x $INST_PATH/bin/wigToBigWig