The following commit has been merged in the master branch:
commit b501efee840d82a798c817b22891c747e7e3b93f
Merge: 131dbb6c0e7dc6e9e0118959f27005f369f74343 
fa5ac17a7ae8ac8afeb7be6bdf356c6429e18c04
Author: Stephane Glondu <st...@glondu.net>
Date:   Thu Jul 7 13:40:28 2011 +0200

    Merge commit 'upstream/1.0.2'

diff --combined Makefile
index 5e97a2b,5f37115..a9c31bd
--- a/Makefile
+++ b/Makefile
@@@ -1,13 -1,13 +1,13 @@@
- # $Id: Makefile 47 2010-09-13 20:24:29Z mjambon $
+ # $Id: Makefile 64 2011-04-28 00:12:54Z mjambon $
  
- VERSION = 0.8.1
+ VERSION = 1.0.2
  
  FLAGS = -dtypes
  PACKS = easy-format,biniou
  
  .PHONY: default all opt install doc
  default: META all opt
 -all: yojson.cmo
 +all: yojson.cmo 
  opt: yojson.cmx ydump
  
  ifndef PREFIX
@@@ -60,10 -60,6 +60,10 @@@ ydump: yojson.cmx ydump.m
        ocamlfind ocamlopt -o ydump -package $(PACKS) -linkpkg \
                yojson.cmx ydump.ml
  
 +ydump.byte: yojson.cmo ydump.ml
 +      ocamlfind ocamlc -o ydump -package $(PACKS) -linkpkg \
 +              yojson.cmo ydump.ml
 +
  doc: doc/index.html
  doc/index.html: yojson.mli
        mkdir -p doc
@@@ -81,7 -77,7 +81,7 @@@ clean
        rm -rf doc
  
  SUBDIRS = 
- SVNURL = svn://svn.forge.ocamlcore.org/svnroot/yojson/trunk/yojson
+ SVNURL = svn://scm.ocamlcore.org/svn/yojson/trunk/yojson
  
  .PHONY: archive
  archive:

-- 
yojson packaging

_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits

Reply via email to