Skip to content

Commit

Permalink
Merge pull request #1694 from OCamlPro/first-1.2.0-rc
Browse files Browse the repository at this point in the history
Update version to 1.2.0 and CHANGES
  • Loading branch information
AltGr committed Sep 3, 2014
2 parents dd8444a + 333e314 commit d8e07c8
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 15 deletions.
23 changes: 18 additions & 5 deletions CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
* Much better internal parser. File locations in error messages (#1260, #1222)
* Removed dependency on camlp4 (#917)
* Fixed orphan packages handling (installed packages with no upstream) (#1198)
* Solver: optimize default preferences. New --criteria option (#1208)
* Solver: optimize default preferences, depending on the solver version. New
--criteria option (#1208)
* Better PATH modifications handling (#1189)
* Specify variable overrides with environment OPAMVAR_name (#1153)
* Much better overall failsafe behaviour. Error reports on interruption (#1202,
Expand All @@ -18,7 +19,7 @@
* Added option --show-actions, made --dry-run simulate actions (#1142)
* Now prints meaningful causes explaining the actions (#1174)
* Fixed the stats displayed after update (#1161)
* Added variables to query ocaml native tools (#979)
* Added variables to query ocaml native tools and arch (#979)
* Enable packagers to specify mirrors in url files (#807)
* Cleaned up the command-line interface (#1250, #1170, #1472). Incompatible
changes:
Expand Down Expand Up @@ -53,14 +54,26 @@
* Added option to query (recursive) (reverse) dependencies and external
dependencies to 'opam list
* Fixed opam init for some shells
* OPAM search now includes the 'syntax' and 'libs' fields in the search
* OPAM search now includes the 'syntax' and 'libs' fields in the search, as well
as 'findlib' files
* 'opam source' command to get the package archive or upstream source easily
* Added an 'install' field in opam files, to separate from build
* Added the 'build', 'test' and 'doc' dependency flags to limit the scope
of some dependencies
* Added Check for common dependencies at init time
* Pinning to a local git directory will now automatically select the pin kind to
'git' (#1555)
* Pinning to a local git directory pins as path, but advertises pinning as git
will now automatically select the pin kind to 'git' (#1555)
* Fixed init scripts for fish and csh (#952)
* More reliable and faster usage of git branches in the git backend
* Friendlier env variable handling (true/1/yes or false/0/no/"" for true and
false) (#1608)
* Specify what is not rather than 'already up-to-date' when some packages
couldn't be upgradedd (#1645)
* Override Make variables in sub-processes (#1617)
* 'opam update' no longer needed after 'opam repo add'
* Attempt to read files in 'permissive mode' when they claim a newer OPAM
version (#1662)
* Fixed ignore of SIGPIPE in sub-processes (#1681)
* Hundreds of smaller fixes and UI improvements

1.1.2
Expand Down
18 changes: 9 additions & 9 deletions configure
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for opam 1.2.0~beta4.
# Generated by GNU Autoconf 2.69 for opam 1.2.0.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
Expand Down Expand Up @@ -578,8 +578,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='opam'
PACKAGE_TARNAME='opam'
PACKAGE_VERSION='1.2.0~beta4'
PACKAGE_STRING='opam 1.2.0~beta4'
PACKAGE_VERSION='1.2.0'
PACKAGE_STRING='opam 1.2.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''

Expand Down Expand Up @@ -1219,7 +1219,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 opam 1.2.0~beta4 to adapt to many kinds of systems.
\`configure' configures opam 1.2.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
Expand Down Expand Up @@ -1280,7 +1280,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of opam 1.2.0~beta4:";;
short | recursive ) echo "Configuration of opam 1.2.0:";;
esac
cat <<\_ACEOF
Expand Down Expand Up @@ -1370,7 +1370,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
opam configure 1.2.0~beta4
opam configure 1.2.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
Expand Down Expand Up @@ -1427,7 +1427,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 opam $as_me 1.2.0~beta4, which was
It was created by opam $as_me 1.2.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
Expand Down Expand Up @@ -5043,7 +5043,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 opam $as_me 1.2.0~beta4, which was
This file was extended by opam $as_me 1.2.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -5096,7 +5096,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="\\
opam config.status 1.2.0~beta4
opam config.status 1.2.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
AC_INIT(opam,1.2.0~beta4)
AC_INIT(opam,1.2.0)
AC_COPYRIGHT(Copyright 2012-2014 OcamlPro SAS)

AC_CONFIG_MACRO_DIR([m4])
Expand Down

0 comments on commit d8e07c8

Please sign in to comment.