[Pkg-ocaml-maint-commits] [ocaml-debian-formats] 06/06: Merge branch 'build-fix' of https://github.com/edwintorok/ocaml-debian-formats

[Sylvain LE GALL]

This is an automated email from the git hooks/post-receive script.

gildor pushed a commit to branch master
in repository ocaml-debian-formats.

commit b260c58901654bf3438f369265bb6d22b9ffdc7f
Merge: a2053c6 a9f5ae3
Author: Sylvain Le Gall <sylvain at le-gall.net>
Date:   Mon May 11 02:22:58 2015 +0200

    Merge branch 'build-fix' of https://github.com/edwintorok/ocaml-debian-formats
    
    Conflicts:
    	INSTALL.txt
    	_tags
    	configure
    	myocamlbuild.ml
    	setup.ml
    	src/debian-formats.mllib

 AUTHORS.txt                                        |    9 +-
 INSTALL.txt                                        |    8 +-
 Makefile                                           |   11 +-
 README.txt                                         |   14 +-
 _oasis                                             |    6 +-
 _tags                                              |   69 +-
 configure                                          |    4 +-
 myocamlbuild.ml                                    |  368 ++--
 opam/descr                                         |    1 +
 opam/findlib                                       |    1 +
 opam/opam                                          |   33 +
 setup.ml                                           | 1876 ++++++++++++++------
 src/DFChangelog.mli                                |   30 +
 src/DFWatch.mli                                    |    4 +
 ...debian-formats.mllib => debian-formats.mldylib} |    6 +-
 src/debian-formats.mllib                           |    6 +-
 16 files changed, 1758 insertions(+), 688 deletions(-)

diff --cc _oasis
index 6326970,6068db9..885e59c
--- a/_oasis
+++ b/_oasis
@@@ -14,11 -14,9 +14,9 @@@ Library "debian-formats
    InternalModules: DF822_lexer,
                     DF822_parser,
                     DF822,
-                    DFUtils,
-                    DFChangelog,
-                    DFWatch
+                    DFUtils
    BuildDepends: extlib, str, mikmatch_pcre
 -  
 +
  Document "api-debian-formats"
    Title:   API reference for DebianFormats
    InstallDir: $htmldir/debian-formats

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-debian-formats.git