From debdbe925d59a5c4be43d71e40200f7fd224a940 Mon Sep 17 00:00:00 2001 From: Thibaut Paumard Date: Mon, 31 Oct 2016 11:08:12 +0100 Subject: [PATCH] Releasing 1.1.1 --- ChangeLog | 106 +++++++++++++++++++++++++++++++++++++++++++++- NEWS | 12 +++++- README.Developers | 11 ++--- configure | 22 +++++----- configure.ac | 4 +- 5 files changed, 135 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index beaf53a2..696e6f63 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,110 @@ commit unknown Author: Thibaut Paumard -Date: Mon, 12 Sep 2016 19:12:25 +0200 +Date: Mon, 31 Oct 2016 10:08:00 +0100 + + Releasing 1.1.1 + +commit f4af3a5198d87ce4113a90fb7cf753b3731044ae +Author: Thibaut Paumard +Date: Mon Oct 31 10:02:08 2016 +0100 + + Update copyright years and other cosmetic changes for next release + +commit c28648aff060bbda5c9dce2588c8666d181fa98e +Author: Thibaut Paumard +Date: Sun Oct 30 10:03:30 2016 +0100 + + Use only major library version in GYOTO_PLUGDIR + + Up to know, the versioned directory for plug-ins used the full libtool + versinfo, changing with each new library soname revision. From know + onwards, it is only the major number, which is kept for + backward-compatible changes. Users will not need to recompile their + plug-ins when upgrading to a backwarsd-compatible version of Gyoto. + +commit aa6594aab69059bf72d38c79ee77c0a1e722d91c +Author: Thibaut Paumard +Date: Sat Oct 29 16:42:01 2016 +0200 + + Introduce localpkglibdir to install plug-ins + + - lib/Register.C: look for plug-ins in localpkglibdir; + - configure.ac: determine a sensible value for localpkglibdir; + - lib/gyoto.pc.in: store this information; + - plugins/null: examplify how to install there safely; + - doc/user_guide: document this change. + +commit 1a903a7440a529639bba80d10e9407ff40ad711c +Author: Thibaut Paumard +Date: Fri Oct 28 22:12:28 2016 +0200 + + plugins/null/configure: check for MPICXX and CXX from gyoto.pc + +commit 6e1c6aa8104cd11ef11982868bac63e785c3cf12 +Author: Thibaut Paumard +Date: Fri Oct 28 19:43:48 2016 +0200 + + Commit autoreconf products and update git-post-merge script + + (cherry picked from commit 63b5bf61f21d0e1b425795737ec1d2bd3cf570c8) + + Conflicts: + plugins/null/aclocal.m4 + +commit 988ebdb08d4ba4c2d6caaf39ff5719731c3519ec +Author: Thibaut Paumard +Date: Fri Oct 28 19:06:49 2016 +0200 + + Add CXX variable to gyoto*.pc + +commit a7ffea424d32afc247465c33900fe8a64f2ad93c +Author: Frédéric Vincent +Date: Thu Oct 27 18:00:44 2016 +0200 + + Fix copy constructor of Page-Thorne disk + +commit 4dde0a63601316839d433d4560ce15fb23c5f0c5 +Author: Thibaut Paumard +Date: Thu Oct 13 22:45:34 2016 +0200 + + Improve plug-in example in plugins/null and document it in the user manual. + +commit 6bbadeaa2af76014d83c99090af1271148adf49e +Author: Thibaut Paumard +Date: Thu Oct 13 18:15:26 2016 +0200 + + Add null plug-in as an example + +commit ece3df86a402d1c0d02d31706a344b32c32d5f88 +Author: Thibaut Paumard +Date: Mon Oct 3 11:27:05 2016 +0200 + + NEXT 2016/10/03 BUG + * Yorick: actually implement `picture' painter for the matte_paint + framework. Allow using any two or three-dimensional image or + stack of images in the `picture' and `panorama' painters. + +commit 22c8c78b2388b987ee5afca27706e2d54c4a3c0a +Author: Thibaut Paumard +Date: Thu Sep 15 22:22:29 2016 +0200 + + * configure --enable-hardening now also activates -fPIE and -pie for executables + +commit 633157529a837b21ee38373928f6c32a75554769 +Author: Thibaut Paumard +Date: Thu Sep 15 18:32:01 2016 +0200 + + * Use setuptools also in setup_lorene.py + +commit acbcd37ef3a83d609d36008029c6d50e2b9e02df +Author: Thibaut Paumard +Date: Thu Sep 15 18:27:42 2016 +0200 + + * Fix typos detected by lintian + +commit d53a546a2bea1799cf129405e8657dfb66c20e4b +Author: Thibaut Paumard +Date: Mon Sep 12 19:20:28 2016 +0200 Releasing 1.1.0 diff --git a/NEWS b/NEWS index d037477e..5eddeec9 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,17 @@ -NEXT 2016/10/03 BUG +1.1.1 2016/10/30 BUG + * When Gyoto is configured to be installed in another prefix than + /usr/local/, look into two additional directories when loading + plug-ins: /usr/local/lib/gyoto// and + /usr/local/lib/gyoto/. + * The name of the versioned directories for plug-ins ( + above) is now the major version of the library, so users don't + need to reinstall there plug-ins when ugrading Gyoto to a + binary-compatible release. + * --enable-hardening now also enables -fPIE. * Yorick: actually implement `picture' painter for the matte_paint framework. Allow using any two or three-dimensional image or stack of images in the `picture' and `panorama' painters. + * Include minimal plug-in example in plugins/null/. 1.1.0 2016/09/12 ABI 4 (5:0:0) * New functionality: provide a plug-in for writing new Metrics, diff --git a/README.Developers b/README.Developers index f40d65e4..cc2b516c 100644 --- a/README.Developers +++ b/README.Developers @@ -40,7 +40,7 @@ To make a new release: + update VERSINFO according to http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html Note that this VERSINFO has nothing to do with the Gyoto version. - + run autoreconf + + run autoreconf. * Edit NEWS + add a new entry (or change the one which has not been released yet) @@ -57,12 +57,13 @@ http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html release). Use "unknown" as commit identifier and the output of "LANG=C date --rfc-822" as date. -* Make clean, configure, make, make check again +* Make clean, configure, make, make check again. -* Commit the changes +* Commit the changes. -* Merge the released branch into stable, make sure the two branches - (stable and master) can be merged both ways and are identical. +* If releasing another branch than stable: merge this branch into + stable, make sure the two branches can be merged both ways and are + identical, merge stable into master. * Tag the release using the version as tag name. Use a signed tag: "git tag -s 1.0.0". diff --git a/configure b/configure index bee683f2..a69ba0a7 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Gyoto 1.1.0. +# Generated by GNU Autoconf 2.69 for Gyoto 1.1.1. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Gyoto' PACKAGE_TARNAME='gyoto' -PACKAGE_VERSION='1.1.0' -PACKAGE_STRING='Gyoto 1.1.0' +PACKAGE_VERSION='1.1.1' +PACKAGE_STRING='Gyoto 1.1.1' PACKAGE_BUGREPORT='gyoto@sympa.obspm.fr' PACKAGE_URL='' @@ -1457,7 +1457,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Gyoto 1.1.0 to adapt to many kinds of systems. +\`configure' configures Gyoto 1.1.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1528,7 +1528,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Gyoto 1.1.0:";; + short | recursive ) echo "Configuration of Gyoto 1.1.1:";; esac cat <<\_ACEOF @@ -1723,7 +1723,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Gyoto configure 1.1.0 +Gyoto configure 1.1.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2422,7 +2422,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Gyoto $as_me 1.1.0, which was +It was created by Gyoto $as_me 1.1.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3398,7 +3398,7 @@ fi # Define the identity of the package. PACKAGE='gyoto' - VERSION='1.1.0' + VERSION='1.1.1' cat >>confdefs.h <<_ACEOF @@ -15656,7 +15656,7 @@ ac_config_headers="$ac_config_headers config.h include/GyotoConfig.h" # C: current; R: revision; A: age # Linux library name is: libgyoto.so.(C-A).A.R VERSINFO_C=5 -VERSINFO_R=0 +VERSINFO_R=1 VERSINFO_A=0 VERSINFO=${VERSINFO_C}:${VERSINFO_R}:${VERSINFO_A} @@ -21319,7 +21319,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Gyoto $as_me 1.1.0, which was +This file was extended by Gyoto $as_me 1.1.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21385,7 +21385,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Gyoto config.status 1.1.0 +Gyoto config.status 1.1.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 4dcea298..050780b5 100644 --- a/configure.ac +++ b/configure.ac @@ -10,7 +10,7 @@ dnl without any warranty. AC_PREREQ([2.69]) -AC_INIT([Gyoto], [1.1.0], [gyoto@sympa.obspm.fr]) +AC_INIT([Gyoto], [1.1.1], [gyoto@sympa.obspm.fr]) gyoto_test_CXXFLAGS=${CXXFLAGS+set} gyoto_test_CPPFLAGS=${CPPFLAGS+set} AC_CANONICAL_SYSTEM @@ -27,7 +27,7 @@ AC_SUBST([VERBATIM], []) # C: current; R: revision; A: age # Linux library name is: libgyoto.so.(C-A).A.R VERSINFO_C=5 -VERSINFO_R=0 +VERSINFO_R=1 VERSINFO_A=0 VERSINFO=${VERSINFO_C}:${VERSINFO_R}:${VERSINFO_A} AC_SUBST([VERSINFO])