[1.5] update version in configure.ac and NEWS, README, LICENSE files

diff --git a/LICENSE b/LICENSE
index 48469dff45e2f8b5a4b743e6d6850ad558b7c12f..f7b3b66286d9293fafdd23d28496384058841a36 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -1,7 +1,7 @@
 /*
 /*

- * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
- * Copyright (c) 2002-2011, Professor Benoit Macq
- * Copyright (c) 2003-2011, Antonin Descampe
+ * Copyright (c) 2002-2012, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
+ * Copyright (c) 2002-2012, Professor Benoit Macq
+ * Copyright (c) 2003-2012, Antonin Descampe

  * Copyright (c) 2003-2009, Francois-Olivier Devaux
  * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * Copyright (c) 2002-2003, Yannick Verschueren
  * Copyright (c) 2003-2009, Francois-Olivier Devaux
  * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * Copyright (c) 2002-2003, Yannick Verschueren


@@ -28,4 +28,4 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.

- */
\ No newline at end of file
+ */

diff --git a/NEWS b/NEWS
index 3cd9071c0db7fa884f51f8491b4220a216203dc9..462ff2db35e71a7241801af18b5bfb5e2908ea37 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -31,4 +31,4 @@ Misc:
      - images are located in 'http://openjpeg.googlecode.com/svn/data' folder.
      - configuration files and utilities are located in 'tests' folder.
     * OPJViewer re-activated (need wxWidgets)
      - images are located in 'http://openjpeg.googlecode.com/svn/data' folder.
      - configuration files and utilities are located in 'tests' folder.
     * OPJViewer re-activated (need wxWidgets)

-    * Many bug fixes. See CHANGES for details.
+    * Huge amount of bug fixes. See CHANGES for details.

diff --git a/README b/README
index 05a280c29ebe64301cecd48bc6066b4f2e8346b5..018ba2dadedd784299c7b2f7df1057503b36e2c9 100644 (file)
--- a/README
+++ b/README
@@ -13,7 +13,7 @@ Details on folders hierarchy:
     * JavaOpenJPEG: java jni to use openjpeg in a java program
     * jpip: complete client-server architecture for remote browsing of jpeg 2000 images. See corresponding README for more details.
     * OPJViewer: gui for displaying j2k files (based on wxWidget)
     * JavaOpenJPEG: java jni to use openjpeg in a java program
     * jpip: complete client-server architecture for remote browsing of jpeg 2000 images. See corresponding README for more details.
     * OPJViewer: gui for displaying j2k files (based on wxWidget)

-* thirdparty: thirdparty libraries used by some applications. These libraries will be build only if there are not found on the system. Note that libopenjpeg itself does not have any dependency.
+* thirdparty: thirdparty libraries used by some applications. These libraries will be built only if there are not found on the system. Note that libopenjpeg itself does not have any dependency.

 * doc: doxygen documentation setup file and man pages
 * tests: configuration files and utilities for the openjpeg test suite. All test images are located in 'http://openjpeg.googlecode.com/svn/data' folder.
 * CMake: cmake related files
 * doc: doxygen documentation setup file and man pages
 * tests: configuration files and utilities for the openjpeg test suite. All test images are located in 'http://openjpeg.googlecode.com/svn/data' folder.
 * CMake: cmake related files


@@ -22,4 +22,4 @@ Details on folders hierarchy:
 see LICENSE for license and copyright information.
 see INSTALL for installation procedures.
 see NEWS for user visible changes in successive releases.
 see LICENSE for license and copyright information.
 see INSTALL for installation procedures.
 see NEWS for user visible changes in successive releases.

-see CHANGES for per-revision changes.
\ No newline at end of file
+see CHANGES for per-revision changes.

diff --git a/configure.ac b/configure.ac
index c0ea8c51eda31a51cff9ddb8eb5e75f4ab1307e3..317ffa236a62f4872a2b70ffb977203908fe8449 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -6,8 +6,8 @@
 # 3) if API or ABI is broken (this case should (must) never happen as it's very bad for a library), or a new designed library, increase MAJOR and set MINOR and MICRO to 0
 
 m4_define([OPJ_MAJOR], [1])
 # 3) if API or ABI is broken (this case should (must) never happen as it's very bad for a library), or a new designed library, increase MAJOR and set MINOR and MICRO to 0
 
 m4_define([OPJ_MAJOR], [1])

-m4_define([OPJ_MINOR], [4])
-m4_define([OPJ_MICRO], [99])
+m4_define([OPJ_MINOR], [5])
+m4_define([OPJ_MICRO], [0])

 
 m4_define([lt_cur], m4_eval(OPJ_MAJOR + OPJ_MINOR))
 m4_define([lt_rev], OPJ_MICRO)
 
 m4_define([lt_cur], m4_eval(OPJ_MAJOR + OPJ_MINOR))
 m4_define([lt_rev], OPJ_MICRO)