# HG changeset patch
# User John Donoghue
# Date 1401396169 14400
# Node ID 4b4650c7bc4453fc7a0996d05c0cdefaefb6ebe8
# Parent  7d670ab6d6926f84a060e4581381c2b8e88c6efc
of-*: updated control=2.6.4, io=2.2.2, quaterion=2.2.1, fits=1.0.5, netcdf=1.0.4

* build_packages.m: update package numbers.

* dist-files.mk: remove f-fits-1-fixes.patch

* src/of-fits-1-fixes.patch: removed.

* src/of-control.mk: updated version 2.6.4.

* src/of-fits.mk: updated version to 1.0.5.

* src/of-io.mk: updated to 2.2.2.

* src/netcdf.mk: updated to 1.0.4.

* src/of-quaterion.mk: updated to 2.2.1.

diff -r 7d670ab6d692 -r 4b4650c7bc44 build_packages.m
--- a/build_packages.m	Thu May 29 15:22:15 2014 -0400
+++ b/build_packages.m	Thu May 29 16:42:49 2014 -0400
@@ -11,11 +11,11 @@
 pkg install struct-1.0.10.tar.gz
 pkg install optim-1.2.2.tar.gz
 pkg install specfun-1.1.0.tar.gz
-pkg install control-2.6.3.tar.gz
+pkg install control-2.6.4.tar.gz
 pkg install signal-1.3.0.tar.gz
 pkg install communications-1.2.0.tar.gz
 pkg install image-2.2.1.tar.gz
-pkg install io-2.2.1.tar.gz
+pkg install io-2.2.2.tar.gz
 pkg install statistics-1.2.3.tar.gz
 pkg install geometry-1.7.0.tar.gz
 pkg install windows-1.2.1.tar.gz
@@ -26,9 +26,9 @@
 pkg install actuarial-1.1.0.tar.gz
 pkg install data-smoothing-1.3.0.tar.gz
 pkg install fuzzy-logic-toolkit-0.4.2.tar.gz
-pkg install quaternion-2.2.0.tar.gz
-pkg install fits-1.0.3.tar.gz
+pkg install quaternion-2.2.1.tar.gz
+pkg install fits-1.0.5.tar.gz
 pkg install fl-core-1.0.0.tar.gz
 pkg install tsa-4.2.7.tar.gz
 pkg install dicom-0.1.1.tar.gz
-pkg install netcdf-1.0.2.tar.gz
+pkg install netcdf-1.0.4.tar.gz
diff -r 7d670ab6d692 -r 4b4650c7bc44 dist-files.mk
--- a/dist-files.mk	Thu May 29 15:22:15 2014 -0400
+++ b/dist-files.mk	Thu May 29 16:42:49 2014 -0400
@@ -416,7 +416,6 @@
   of-control.mk \
   of-data-smoothing.mk \
   of-dicom.mk \
-  of-fits-1-fixes.patch \
   of-fits.mk \
   of-fl-core-1-fixes.patch \
   of-fl-core.mk \
diff -r 7d670ab6d692 -r 4b4650c7bc44 src/of-control.mk
--- a/src/of-control.mk	Thu May 29 15:22:15 2014 -0400
+++ b/src/of-control.mk	Thu May 29 16:42:49 2014 -0400
@@ -3,8 +3,8 @@
 
 PKG             := of-control
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.6.3
-$(PKG)_CHECKSUM := f577c52dd7e9b71cdcef06b013a9736c72731209
+$(PKG)_VERSION  := 2.6.4
+$(PKG)_CHECKSUM := 8168b7a17753e5841662b3f5d32d0da1c3dad5dc
 $(PKG)_REMOTE_SUBDIR := 
 $(PKG)_SUBDIR   := control
 $(PKG)_FILE     := control-$($(PKG)_VERSION).tar.gz
diff -r 7d670ab6d692 -r 4b4650c7bc44 src/of-fits-1-fixes.patch
--- a/src/of-fits-1-fixes.patch	Thu May 29 15:22:15 2014 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-diff -ur fits.orig/src/Makefile fits/src/Makefile
---- fits.orig/src/Makefile	2014-01-12 00:19:31.000000000 -0500
-+++ fits/src/Makefile	2014-01-12 00:52:57.000000000 -0500
-@@ -1,4 +1,4 @@
--MKOCT_FLAGS = $(shell pkg-config --libs cfitsio)
-+MKOCT_FLAGS = $(shell pkg-config --libs --cflags cfitsio)
- 
- all: read_fits_image.oct save_fits_image.oct save_fits_image_multi_ext.oct
- 
-diff -ur fits.orig/src/read_fits_image.cc fits/src/read_fits_image.cc
---- fits.orig/src/read_fits_image.cc	2014-01-12 00:19:31.000000000 -0500
-+++ fits/src/read_fits_image.cc	2014-01-12 00:51:26.000000000 -0500
-@@ -136,7 +136,7 @@
-   }
-   //std::cerr << "read_sz: " << read_sz << std::endl;
- 
--  #if OCTAVE_API_VERSION_NUMBER >= 45 
-+  #if ! defined OCTAVE_API_VERSION_NUMBER || OCTAVE_API_VERSION_NUMBER >= 45 
-     MArray<double> image_data( dims ); // a octace double-type array
-   #else
-     MArrayN<double> image_data( dims ); // a octave double-type array
diff -r 7d670ab6d692 -r 4b4650c7bc44 src/of-fits.mk
--- a/src/of-fits.mk	Thu May 29 15:22:15 2014 -0400
+++ b/src/of-fits.mk	Thu May 29 16:42:49 2014 -0400
@@ -3,8 +3,8 @@
 
 PKG             := of-fits
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.0.3
-$(PKG)_CHECKSUM := 6aecd4611879acaae1918025148cc09e197e0e82
+$(PKG)_VERSION  := 1.0.5
+$(PKG)_CHECKSUM := 0803d815d83d82d1b906c3a00fb43f72afbf4362
 $(PKG)_REMOTE_SUBDIR := 
 $(PKG)_SUBDIR   := fits
 $(PKG)_FILE     := fits-$($(PKG)_VERSION).tar.gz
diff -r 7d670ab6d692 -r 4b4650c7bc44 src/of-io.mk
--- a/src/of-io.mk	Thu May 29 15:22:15 2014 -0400
+++ b/src/of-io.mk	Thu May 29 16:42:49 2014 -0400
@@ -3,8 +3,8 @@
 
 PKG             := of-io
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.2.1
-$(PKG)_CHECKSUM := 94d4433727e88144f36d3d34be204869eda8630e
+$(PKG)_VERSION  := 2.2.2
+$(PKG)_CHECKSUM := 6d9be1f1bef9d2be0c43b2090979e6fbd0d78d88
 $(PKG)_REMOTE_SUBDIR := 
 $(PKG)_SUBDIR   := io
 $(PKG)_FILE     := io-$($(PKG)_VERSION).tar.gz
diff -r 7d670ab6d692 -r 4b4650c7bc44 src/of-netcdf.mk
--- a/src/of-netcdf.mk	Thu May 29 15:22:15 2014 -0400
+++ b/src/of-netcdf.mk	Thu May 29 16:42:49 2014 -0400
@@ -3,8 +3,8 @@
 
 PKG             := of-netcdf
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.0.2
-$(PKG)_CHECKSUM := 5e90c5a5f4de45c200661b3a86fdb4e040bdc97b
+$(PKG)_VERSION  := 1.0.4
+$(PKG)_CHECKSUM := c16a2464e93c1fad16fe4a12652b3a698e36da4d
 $(PKG)_REMOTE_SUBDIR := 
 $(PKG)_SUBDIR   := netcdf
 $(PKG)_FILE     := netcdf-$($(PKG)_VERSION).tar.gz
diff -r 7d670ab6d692 -r 4b4650c7bc44 src/of-quaternion.mk
--- a/src/of-quaternion.mk	Thu May 29 15:22:15 2014 -0400
+++ b/src/of-quaternion.mk	Thu May 29 16:42:49 2014 -0400
@@ -3,8 +3,8 @@
 
 PKG             := of-quaternion
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.2.0
-$(PKG)_CHECKSUM := a0812bb1891913dc51e1285f18c4350f662799cf
+$(PKG)_VERSION  := 2.2.1
+$(PKG)_CHECKSUM := 781421949183bb37798d57b070cefddf468debf7
 $(PKG)_REMOTE_SUBDIR := 
 $(PKG)_SUBDIR   := quaternion
 $(PKG)_FILE     := quaternion-$($(PKG)_VERSION).tar.gz