Merge branch 'master' of https://github.com/OCamlPro/opam

CHANGES

@@ -1,4 +1,10 @@
-0.7.5 (trunk)
+0.7.6 (trunk)
+* repositories are now versionned, and we try to auto-update when possible
+
+0.7.5 [Oct 2012]
+* dependencies can now be expressed by any formula (instead of just CNF)
+* It's easier to compose the value of environment variable (ie. to write %{lwt+ssl:enable}%)
+* Fix regression on init for rsync repositories
 
 0.7.4 [Oct 2012]
 * improve 'opam pin': the code is more robust and it is now possible to pin a package to a git repository

Makefile

@@ -72,7 +72,7 @@ uninstall:
 	rm -f $(mandir)/man1/opam*
 
 LIB =   opam-lib
-CMI =   file path file_format process globals repositories lexer run\
+CMI =   opamFile path file_format process globals repositories lexer run\
 	linelexer types parallel utils parser
 _FILES= $(LIB:%=%.a) $(LIB:%=%.cma) $(LIB:%=%.cmxa)\
 	$(CMI:%=%.cmi)

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for opam 0.7.5.
+# Generated by GNU Autoconf 2.61 for opam 0.7.6.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='opam'
 PACKAGE_TARNAME='opam'
-PACKAGE_VERSION='0.7.5'
-PACKAGE_STRING='opam 0.7.5'
+PACKAGE_VERSION='0.7.6'
+PACKAGE_STRING='opam 0.7.6'
 PACKAGE_BUGREPORT=''
 
 ac_subst_vars='SHELL
@@ -1149,7 +1149,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 0.7.5 to adapt to many kinds of systems.
+\`configure' configures opam 0.7.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1210,7 +1210,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of opam 0.7.5:";;
+     short | recursive ) echo "Configuration of opam 0.7.6:";;
    esac
   cat <<\_ACEOF
 
@@ -1291,7 +1291,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-opam configure 0.7.5
+opam configure 0.7.6
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1307,7 +1307,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 0.7.5, which was
+It was created by opam $as_me 0.7.6, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -4146,7 +4146,7 @@ exec 6>&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 0.7.5, which was
+This file was extended by opam $as_me 0.7.6, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -4189,7 +4189,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-opam config.status 0.7.5
+opam config.status 0.7.6
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT(opam,0.7.5)
+AC_INIT(opam,0.7.6)
 AC_COPYRIGHT(Copyright 2012 OcamlPro SAS)
 
 AC_CONFIG_MACRO_DIR([m4])

depends.ocp.in

@@ -1,50 +1,50 @@
 begin library "re"
-  dirname  += "%{lib}%/re"
+  dirname  = "%{lib}%/re"
   generated = true
 end
 
 begin library "re_perl"
-  dirname  += "%{lib}%/re"
+  dirname  = "%{lib}%/re"
   generated = true
   requires  = [ "re" ]
 end
 
 begin library "re_glob"
-  dirname  += "%{lib}%/re"
+  dirname  = "%{lib}%/re"
   generated = true
   requires  = [ "re" ]
 end
 
 begin library "re_pcre"
-  dirname  += "%{lib}%/re"
+  dirname  = "%{lib}%/re"
   generated = true
   requires  = [ "re_perl" ]
 end
 
 begin library "graph"
-  dirname  += "%{lib}%/ocamlgraph"
+  dirname  = "%{lib}%/ocamlgraph"
   generated = true
 end
 
 begin library "arg"
-  dirname  += "%{lib}%/ocaml-arg"
+  dirname  = "%{lib}%/ocaml-arg"
   generated = true
 end
 
 begin library "cudf"
-  dirname  += "%{lib}%/mancoosi-cudf"
+  dirname  = "%{lib}%/mancoosi-cudf"
   generated = true
   requires  = [ "extLib" ]
 end
 
 begin library "dose"
-  dirname  += "%{lib}%/mancoosi-dose"
+  dirname  = "%{lib}%/mancoosi-dose"
   generated = true
   requires  = [ "re_pcre" "extLib" "cudf" "graph" "unix" "str" ]
 end
 
 begin library "extLib"
-  dirname  += "%{lib}%/extlib"
+  dirname  = "%{lib}%/extlib"
   generated = true
 end