[glpk-java] 01/03: Merge tag 'upstream/1.2.0'

[Sébastien Villemot]

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

sebastien pushed a commit to branch master
in repository glpk-java.

commit 3e500cdccf20077336f94a3ee43b7f0715c0a128
Merge: 7f65d6b 257785f
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Sun Oct 4 21:19:45 2015 +0200

    Merge tag 'upstream/1.2.0'
    
    Upstream version 1.2.0

 ChangeLog                                          |    6 +
 Makefile.in                                        |  343 +++----
 NEWS                                               |    6 +
 README                                             |    2 +-
 aclocal.m4                                         |  693 +++++--------
 compile                                            |  347 -------
 config.guess                                       |  346 ++++---
 configure                                          |  425 ++------
 configure.ac                                       |    6 +-
 doc/Makefile.am                                    |    1 -
 doc/Makefile.in                                    |   96 +-
 doc/glpk-java.pdf                                  |  Bin 403544 -> 404441 bytes
 doc/glpk-java.tex                                  |   29 +-
 doc/libglpk-java.3                                 |    2 +-
 examples/java/BranchDown.class                     |  Bin 5760 -> 0 bytes
 examples/java/ErrorDemo.class                      |  Bin 4248 -> 0 bytes
 examples/java/Gmpl.class                           |  Bin 3224 -> 0 bytes
 examples/java/Gmpl.java.orig                       |  111 ---
 examples/java/GmplSwing$1.class                    |  Bin 666 -> 0 bytes
 examples/java/GmplSwing$Diagram$1.class            |  Bin 570 -> 0 bytes
 examples/java/GmplSwing$Diagram.class              |  Bin 2754 -> 0 bytes
 examples/java/GmplSwing$EvaluateAction.class       |  Bin 712 -> 0 bytes
 examples/java/GmplSwing$EvaluateThread.class       |  Bin 525 -> 0 bytes
 examples/java/GmplSwing$ExitAction.class           |  Bin 630 -> 0 bytes
 examples/java/GmplSwing$ModelFileFilter.class      |  Bin 862 -> 0 bytes
 examples/java/GmplSwing$NewAction.class            |  Bin 635 -> 0 bytes
 examples/java/GmplSwing$OpenAction.class           |  Bin 637 -> 0 bytes
 examples/java/GmplSwing$Progress.class             |  Bin 899 -> 0 bytes
 examples/java/GmplSwing$SaveAction.class           |  Bin 773 -> 0 bytes
 examples/java/GmplSwing$SaveAsAction.class         |  Bin 641 -> 0 bytes
 examples/java/GmplSwing$Status.class               |  Bin 936 -> 0 bytes
 examples/java/GmplSwing$TopEtchedBorder.class      |  Bin 1231 -> 0 bytes
 .../java/GmplSwing$WindowClosingListener.class     |  Bin 953 -> 0 bytes
 examples/java/GmplSwing.class                      |  Bin 18309 -> 0 bytes
 examples/java/GmplSwing.java                       |    2 +-
 examples/java/GmplSwing.java.orig                  | 1037 --------------------
 examples/java/LinOrd.class                         |  Bin 6951 -> 0 bytes
 examples/java/Lp.class                             |  Bin 3447 -> 0 bytes
 examples/java/Lp.java                              |    2 +
 examples/java/MinimumCostFlow.class                |  Bin 3195 -> 0 bytes
 examples/java/MinimumCostFlow.java                 |    5 +-
 examples/java/Mip.class                            |  Bin 3349 -> 0 bytes
 examples/java/OutOfMemory.class                    |  Bin 1049 -> 0 bytes
 examples/java/Relax4.class                         |  Bin 2929 -> 0 bytes
 m4/libtool.m4                                      |   24 +-
 missing                                            |  414 +++++---
 swig/Makefile.am                                   |   24 +-
 swig/Makefile.in                                   |  132 +--
 swig/glpk.i                                        |    6 +-
 swig/glpk_java.h                                   |   18 +-
 swig/glpk_java.i                                   |   12 -
 swig/glpk_java_arrays.i                            |    2 +-
 swig/pom.xml                                       |    8 +-
 swig/src/site/apt/architecture.apt                 |    2 +-
 swig/src/site/apt/classes.apt                      |    4 +-
 swig/src/site/apt/index.apt.vm                     |   14 +-
 swig/src/site/apt/usage.apt.vm                     |    8 +-
 swig/src/site/site.xml                             |    4 +-
 ...th_VC10_DLL.bat => Build_JNI_with_VC14_DLL.bat} |    8 +-
 w32/Makefile_JNI_VC_DLL                            |    2 +-
 w32/check_jni.bat                                  |    2 +-
 w32/glpk_java_dll.rc                               |   14 +-
 ...th_VC10_DLL.bat => Build_JNI_with_VC14_DLL.bat} |    8 +-
 w64/Makefile_JNI_VC_DLL                            |    2 +-
 w64/check_jni.bat                                  |    2 +-
 w64/glpk_java_dll.rc                               |   14 +-
 66 files changed, 1193 insertions(+), 2990 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/glpk-java.git