Merge pull request #1969 from OCamlPro/prepare-beta

Update the CHANGELOG, prepare for beta release

CHANGES

@@ -1,8 +1,28 @@
 1.2.1
-* Rewritten parallel command execution engine
-* Rewritten action resolution mechanism to be based on atomic actions
-* Stronger handling of compiler "base" packages
 * Non-system compiler definitions without source are now allowed
+* Stronger handling of compiler "base" packages, they can't be removed anymore
+* Rewritten action resolution mechanism to be based on atomic actions.
+  Actions are not aborted anymore on first failure when there is no
+  dependency.
+* Rewritten parallel command execution engine
+* Better display of actions, lots of improved messages
+* `opam upgrade pkg` now fails if no new version of `pkg` can be installed
+* fixed shell configuration for various shells
+* Updated Dose dependency to 3.3
+* Fixed behaviour of `opam switch` and related commands when a switch
+  is locally set in a shell (through `OPAMSWITCH`)
+* Better behaviour on failed `opam switch`
+* New pinning mode, set by default on local VC repos: use current file
+  tree, but limited to version-tracked files.
+* Faster and cleaner handling of downloads
+* Now compiles with --safe-string on OCaml 4.02, better compatibility handling
+* `opam unpin` now accepts multiple arguments
+* `opam pin add <pkg>.<version> <target>` is now allowed to specify
+  the advertised version
+* Fixed bug leading to a bad `CAML_LD_LIBRARY_PATH` when switching from system
+* Better `opam lint`, reporting warnings and errors, including format errors
+* `opam config setup` now takes `--shell=` instead of `--sh`, `--csh`, `--fish`, `--zsh`
+* Lots of bug-fixes
 
 1.2.0
 * Handle locally installed self-upgrade opam binary (#1257)

configure

@@ -9,7 +9,7 @@
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 #
-# Copyright 2012-2014 OcamlPro SAS
+# Copyright 2012-2015 OcamlPro SAS
 ## -------------------- ##
 ## M4sh Initialization. ##
 ## -------------------- ##
@@ -1379,7 +1379,7 @@ Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 
-Copyright 2012-2014 OcamlPro SAS
+Copyright 2012-2015 OcamlPro SAS
 _ACEOF
   exit
 fi

configure.ac

@@ -1,5 +1,5 @@
 AC_INIT(opam,1.2.1)
-AC_COPYRIGHT(Copyright 2012-2014 OcamlPro SAS)
+AC_COPYRIGHT(Copyright 2012-2015 OcamlPro SAS)
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_PROG_CC

doc/dev-manual/dev-manual.tex

@@ -15,7 +15,7 @@
 
 \title{
 OPAM: A Package Management System for OCaml\\
-Developer Manual (version 1.2)\\ ~\ \\
+Developer Manual (version 1.2.1)\\ ~\ \\
 ~\ \\}
 \author{Thomas GAZAGNAIRE\\
 \url{thomas@gazagnaire.org}\\

doc/pages/FAQ.md

@@ -275,7 +275,7 @@ until you committed them. Pinning the directory as a raw path isn't perfect
 either, because it makes OPAM register all files, including temporary files or
 build artifacts.
 
-The idea of "mixed mode", which is the default in upcoming OPAM 1.2.1, is to
+The idea of "mixed mode", which is the default in OPAM 1.2.1, is to
 take the best of both worlds: OPAM will synchronise only files under version
 control, but at their current state on the filesystem. You may just need to
 remember to register them if you added new files (e.g. `git add`).

doc/release/readme.md

@@ -2,16 +2,13 @@
 
 * Update version (and copyright year) in `configure.ac`, `shell/opam_installer.sh`
 * Run `make configure` to regenerate `./configure`
-* Run `make tests`
-* Run `opam-rt` (with and without aspcud)
+* Run `make tests`, `opam-rt` (with and without aspcud) -- now checked by travis
 * Run `make doc` to re-generate the API documetation
-* Check that 'make with-ocamlbuild install-with-ocamlbuild' works
-* Check that 'make libinstall-with-ocamlbuild' works (try to compile `opam-rt` and `opam2web` with it)
 
 --
 
 * update the CHANGELOG
-* tag the release
+* tag the release (git tag -a 1.2.1; git push origin 1.2.1)
 * create a release on github based on your tag (https://github.com/ocaml/opam/releases/new)
 
 --
@@ -29,7 +26,7 @@ bash -ue ./release.sh -t $VERSION
 
 --
 
-* Add some news about the release on opam2web
-* Update the installation instructions in [the Wiki](http://opam.ocaml.org/doc/Quick_Install.html)
+* Add some news about the release on the platform blog
+* Update the installation instructions in doc/pages
 * Update the opam-lib, opamfu, opam2web opam packages
 * Announce ! (platform-list, caml-list)

shell/opam_installer.sh

@@ -3,7 +3,7 @@
 set -ue
 
 # (c) Copyright Fabrice Le Fessant INRIA/OCamlPro 2013
-# (c) Copyright Louis Gesbert OCamlPro 2014
+# (c) Copyright Louis Gesbert OCamlPro 2014-2015
 
 VERSION='1.2.0'