The following commit has been merged in the master branch:
commit a0bf1ce3b4811ab911ee862a04562115ca03c5ac
Author: Hendrik Tews <hend...@askra.de>
Date:   Sat Jun 15 14:48:18 2013 +0200

    update packaging and enable tests

diff --git a/debian/atdgen.1 b/debian/atdgen.1
index dfb8dd8..00b98b8 100644
--- a/debian/atdgen.1
+++ b/debian/atdgen.1
@@ -1,67 +1,281 @@
-.TH ATDGEN 1 "December 5, 2010" "atdgen User Manual"
+.\" groff -man -Tascii atdgen.1
+.\" ==========================================================================
+.\" ============= Synopsis ===================================================
+.\" ==========================================================================
+.TH ATDGEN 1 "May 2013" ATDGEN "User Manuals"
 .SH NAME
-.PP
-atdgen - generate OCaml serializers and deserializers.
+atdgen \- ATD compiler and code generator
 .SH SYNOPSIS
-.PP
-atdge [options] file.atd
+.B atdgen \fR[\fIoptions...\fR] [\fIatd-file\fR]
+.\" ==========================================================================
+.\" ============= Description ================================================
+.\" ==========================================================================
 .SH DESCRIPTION
-.PP
-Generate OCaml serializers and deserializers.
-Default serialization format is biniou.
+.B atdgen
+reads
+.B ATD
+type definitions and generates
+.B OCaml
+code (both ml and mli files) for
+.IP \(em 2
+type definitions (option
+.I -t\fR)
+.IP \(em
+serializers and deserializers for Biniou (option 
+.I -b\fR)
+.IP \(em
+serializers and deserializers for JSON (option
+.I -j\fR)
+.IP \(em
+record-creating functions supporting default fields (option
+.I -v\fR)
+.IP \(em
+user-specified data validators (option
+.I -v\fR)
+.\" ==========================================================================
+.P
+If no mode option
+(\fI-t\fR, \fI-b\fR, \fI-j\fR or \fI-v\fR)
+is given, then
+.I -t -b
+is assumed. Unless 
+.I -o
+is present, the
+.I <prefix>
+for the generated files is derived from the 
+.I atd-file
+argument. If the
+.I atd-file
+argument is omitted,
+.B atdgen
+reads
+.B ATD
+sources from standard input, if additionally
+.I -o
+is missing, it behaves as if
+.I -o -
+was given.
+.\"
+.\" ==========================================================================
+.\" ================ Options =================================================
+.\" ==========================================================================
+.\"
 .SH OPTIONS
+.\" ===================== -t  ================================================
 .TP
-.B -open Module1,Module2,\&...
-List of modules to open (comma-separated or space-separated)
-.RS
-.RE
+.B "-t"
+Produce files 
+.I <prefix>_t.mli
+and
+.I <prefix>_t.ml
+containing OCaml type definitions for the
+.B ATD
+input
+.\" ===================== -b  ================================================
 .TP
-.B -ntd
-Do not dump OCaml type definitions
-.RS
-.RE
+.B "-b"
+Produce files
+.I <prefix>_b.mli
+and
+.I <prefix>_b.ml
+containing
+.B OCaml
+serializers and deserializers for the 
+.B Biniou
+data format
+.\" ===================== -j  ================================================
 .TP
-.B -nfd
-Do not dump OCaml function definitions
-.RS
-.RE
+.B "-j"
+produce files
+.I <prefix>_j.mli
+and
+.I <prefix>_j.ml
+containing
+.B OCaml
+serializers and deserializers for the
+.B JSON
+data format
+.\" ===================== -v  ================================================
 .TP
-.B -rec
-Keep OCaml type definitions mutually recursive
-.RS
-.RE
+.B "-v"
+Produce files
+.I <prefix>_v.mli
+and
+.I <prefix>_v.ml
+containing OCaml functions for creating records and validators,
+see also option
+.I -validate\fR.
+.\" ===================== -dep  ==============================================
 .TP
-.B -o PREFIX
-Use this prefix for the generated files, e.g.\ `foo/bar' for
-foo/bar.ml and foo/bar.mli
-.RS
-.RE
+.B "-dep"
+Output dependencies in makefile-format for all possible
+.B atdgen
+output files and exit
+.\" ===================== -list  =============================================
 .TP
-.B -biniou
-Write serializers and deserializers for Biniou (default).
-.RS
-.RE
+.B "-list"
+Output a space-separated list of all possible
+.B atdgen
+output files and exit
+.\" ===================== -o [ PREFIX | - ] ==================================
 .TP
-.B -json
-Write serializers and deserializers for JSON.
+.B "-o <prefix>"
 .RS
-.RE
-.TP
-.B -std-json
-Convert tuples and variants into standard JSON and refuse to print
-NaN and infinities (implying -json).
+set the 
+.I <prefix>
+for the options
+.I -t\fR, \fI-b\fR and \fI-j\fR.
+If
+.I <prefix>
+is
+.I -\fR,
+.B atdgen
+writes code in the form of
+.P
 .RS
+struct ... end : sig ... end
 .RE
-.TP
-.B -version
-Print the version identifier of atdgen and exit.
-.RS
+.P
+to standard output.
 .RE
+.\" ===================== -biniou  ===========================================
 .TP
-.B -help|--help
-Display list of options
-.RS
-.RE
-.SH AUTHORS
-Sylvain Le Gall.
-
+.B "-biniou"
+[deprecated] same as 
+.I -t -b\fR,
+i.e., produce serializers and deserializers for Biniou and
+.B OCaml
+type definitions (default)
+.\" ===================== -json  =============================================
+.TP
+.B "-json"
+[deprecated] same as
+.I -t -j\fR,
+i.e., produce serializers and deserializers for JSON and
+.B OCaml
+type definitions.
+.\" ===================== -j-std  ============================================
+.TP
+.B "-j-std"
+standard
+.B JSON\fR:
+Convert tuples and variants into standard
+.B JSON
+and refuse to print NaN and infinities. This option implies
+.I -json
+unless another mode is specified.
+.\" ===================== -std-json  =========================================
+.TP
+.B "-std-json"
+[deprecated] same as
+.I -j-std
+.\" ===================== -j-pp <func> =======================================
+.TP
+.B "-j-pp <func>"
+Apply the
+.B OCaml
+function
+.I <func>
+of type (string -> string) to the input of each *_of_string
+function generated by atdgen (JSON mode). (This was intended for
+UTF-8 validation of the input which is not performed by atdgen.)
+.\" ===================== -j-defaults  =======================================
+.TP
+.B "-j-defaults"
+Output
+.B JSON
+record fields even if their value is known to be the default.
+.\" ===================== -j-strict-fields  ==================================
+.TP
+.B "-j-strict-fields"
+Call 
+.I !Ag_util.Json.unknown_field_handler
+for every unknown
+.B JSON
+field found in the input instead of simply skipping them. The
+initial value of this reference prints a message and raises a
+.I Failure
+exception.
+.\" ===================== -j-custom-fields FUNCTION ==========================
+.TP
+.B "-j-custom-fields <func>"
+Call function
+.I <func>
+of type (string -> unit) for every unknown
+.B JSON
+field found in the input instead of simply skipping them. See
+also
+.I -j-strict-fields\fR.
+.\" ===================== -validate  =========================================
+.TP
+.B "-validate"
+[deprecated] same as
+.I -t -v\fR,
+Produce data validators from <ocaml validator="x"> annotations
+where x is a user-written validator to be applied on a specific
+node. This is typically used in conjunction with 
+.I -extend
+because user-written validators depend on the type definitions.
+.\" ===================== -extend MODULE =====================================
+.TP
+.B "-extend MODULE"
+Assume that all type definitions are provided by the specified
+module unless otherwise annotated. Type aliases are created for
+each type, e.g. type t = Module.t
+.\" ===================== -open MODULE1,MODULE2,... ==========================
+.TP
+.B "-open MODULE1,MODULE2,..."
+List of modules to open (comma-separated or space-separated)
+.\" ===================== -nfd  ==============================================
+.TP
+.B "-nfd"
+Do not dump
+.B OCaml
+function definitions
+.\" ===================== -ntd  ==============================================
+.TP
+.B "-ntd"
+Do not dump
+.B OCaml
+type definitions
+.\" ===================== -pos-fname FILENAME ================================
+.TP
+.B "-pos-fname FILENAME"
+Source file name to use for error messages (default: input name)
+.\" ===================== -pos-lnum LINENUM ==================================
+.TP
+.B "-pos-lnum LINENUM"
+Source line number of the first line of the input (default: 1)
+.\" ===================== -rec  ==============================================
+.TP
+.B "-rec"
+Keep
+.B OCaml
+type definitions mutually recursive
+.\" ===================== -version  ==========================================
+.TP
+.B "-version"
+print version and exit
+.\" ===================== -help 
=================================================
+.TP
+.B "-help | --help"
+Display this list of options
+.\"
+.\" ==========================================================================
+.\" ================ SEE ALSO ================================================
+.\" ==========================================================================
+.\"
+.SH SEE ALSO
+.TP
+The \fBAtdgen\fR reference manual, 
\fI/usr/share/doc/libatdgen-ocaml-dev/atdgen-manual.{html,pdf}\fR
+.TP
+The \fBAtdgen\fR tutorial on the \fBAtdgen\fR website, 
\fIhttp://mjambon.com/atdgen\fR
+.\"
+.\" ==========================================================================
+.\" ================ Author ==================================================
+.\" ==========================================================================
+.\"
+.SH AUTHOR
+This manual page was written by Sylvain Le Gall
+<gil...@debian.org> and Hendrik Tews <hend...@askra.de>,
+specifically for the Debian project (and may be used by others).
diff --git a/debian/atdgen.mkd b/debian/atdgen.mkd
index 55e159e..25aea2b 100644
--- a/debian/atdgen.mkd
+++ b/debian/atdgen.mkd
@@ -1,3 +1,5 @@
+% this is the old, currently unused source of the man page
+% convert with pandoc -s -w man $^ -o $@
 % ATDGEN(1) atdgen User Manual
 % Sylvain Le Gall 
 % December 5, 2010
diff --git a/debian/changelog b/debian/changelog
index cc7134b..a76fc8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,23 @@
-atdgen (1.2.2-1.1) UNRELEASED; urgency=low
+atdgen (1.2.5-1) unstable; urgency=low
 
   [ Sylvain Le Gall ]
   * Remove Sylvain Le Gall from uploaders
 
   [ Hendrik Tews ]
   * fix watch file
-  * remove .gitignore
-
- -- Hendrik Tews <hend...@askra.de>  Thu, 06 Jun 2013 13:46:15 +0200
+  * new upstream version (Closes: #711524)
+  * bump debhelper compat level and standards version
+  * add myself as uploader
+  * update homepage, Vcs fields, package description and dependencies
+  * update copyright
+  * adapt rules and other packaging files
+  * delete old patch
+  * add new patch for installing ml files and byte-compiling the test
+  * install api doc in /usr/share/doc/..../api/html
+  * enable tests
+  * update man page
+
+ -- Hendrik Tews <hend...@askra.de>  Sat, 15 Jun 2013 14:41:24 +0200
 
 atdgen (1.2.2-1) unstable; urgency=low
 
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 110096a..83aaaf0 100644
--- a/debian/control
+++ b/debian/control
@@ -2,42 +2,55 @@ Source: atdgen
 Section: ocaml
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-ma...@lists.debian.org>
+Uploaders: Hendrik Tews <hend...@askra.de>
 Build-Depends:
   ocaml-nox (>= 3.11.1-3~),
+  ocaml-best-compilers,
   ocaml-findlib,
+  libfindlib-ocaml-dev,
   dh-ocaml (>= 0.9~),
-  debhelper (>= 7.0.50~),
+  debhelper (>= 9),
   menhir,
   libeasy-format-ocaml-dev,
   cppo,
-  libbiniou-ocaml-dev (>= 1.0.0),
-  libyojson-ocaml-dev (>= 1.0.0),
-  libatd-ocaml-dev (>= 1.0.0)
-Standards-Version: 3.9.2
-Homepage: http://oss.wink.com/atdgen/
-Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/atdgen.git
-Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/atdgen.git
+  camlmix,
+  libcaml2html-ocaml-dev,
+  libbiniou-ocaml-dev (>= 1.0.6),
+  libyojson-ocaml-dev,
+  libatd-ocaml-dev (>= 1.0.0),
+  hevea,
+  texlive-latex-extra
+Standards-Version: 3.9.4
+Homepage: http://mjambon.com/atdgen
+Vcs-Git: git://anonscm.debian.org/pkg-ocaml-maint/packages/atdgen.git
+Vcs-Browser: 
http://anonscm.debian.org/gitweb/?p=pkg-ocaml-maint/packages/atdgen.git
 
 Package: libatdgen-ocaml-dev
 Architecture: any
 Depends: ${ocaml:Depends}, ${misc:Depends}, ${shlibs:Depends}
 Provides: ${ocaml:Provides}
 Recommends: ocaml-findlib
-Description: code generator for biniou and JSON serialization in OCaml
+Description: OCaml code generator for biniou and JSON - executable and dev 
files
  Atdgen is a command-line program that takes as input type definitions in
  the ATD syntax and produces OCaml code suitable for data serialization
  and deserialization. Two data formats are currently supported, these are
  biniou and JSON.
+ .
+ This package contains the adtgen executable and the files necessary
+ for programming with the library.
 
 Package: libatdgen-ocaml
 Architecture: any
-Depends: ${ocaml:Depends}, ${misc:Depends}
+Depends: 
+ ${ocaml:Depends},
+ ${misc:Depends},
+ ${shlibs:Depends}
 Provides: ${ocaml:Provides}
 Recommends: ocaml-findlib
-Description: code generator for biniou and JSON serialization in OCaml
+Description: OCaml code generator for biniou and JSON - plugins
  Atdgen is a command-line program that takes as input type definitions in
  the ATD syntax and produces OCaml code suitable for data serialization
  and deserialization. Two data formats are currently supported, these are
  biniou and JSON.
  .
- This package contains the shared runtime libraries.
+ This package contains the shared runtime libraries (plugin).
diff --git a/debian/copyright b/debian/copyright
index bf9a3f7..3b281a8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,11 +1,14 @@
-Format-Specification: 
http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
-Name: atdgen
-Maintainer: Sylvain Le Gall <gil...@debian.org>
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Atdgen
+Upstream-Contact: Martin Jambon <mar...@mjambon.com>
+Source: http://mjambon.com/atdgen
 
 Files: *
-Copyright: Copyright (c) 2010 MyLife
-License: BSD3
-
+Copyright: 2010 MyLife
+License: BSD-3-clause
+ Copyright (c) 2010 MyLife
+ All rights reserved.
+ .
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
@@ -16,7 +19,7 @@ License: BSD3
     documentation and/or other materials provided with the distribution.
  3. The name of the author may not be used to endorse or promote products
     derived from this software without specific prior written permission.
- 
+ .
  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
@@ -28,8 +31,24 @@ License: BSD3
  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+
 Files: debian/*
-Copyright: (C) 2010 Sylvain Le Gall <gil...@debian.org>
+Copyright: 2010 Sylvain Le Gall <gil...@debian.org>
+          2013 Hendrik Tews <hend...@askra.de>
 License: GPL-3+
-
- See '/usr/share/common-licenses/GPL-3' for the full text.
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or (at
+ your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 3 can be found in the file
+ `/usr/share/common-licenses/GPL-3'.
diff --git a/debian/libatdgen-ocaml-dev.doc-base.manual 
b/debian/libatdgen-ocaml-dev.doc-base.manual
index 32c8fb2..8a50c3e 100644
--- a/debian/libatdgen-ocaml-dev.doc-base.manual
+++ b/debian/libatdgen-ocaml-dev.doc-base.manual
@@ -6,3 +6,6 @@ Section: Programming/OCaml
 Format: HTML
 Index: /usr/share/doc/libatdgen-ocaml-dev/atdgen-manual.html
 Files: /usr/share/doc/libatdgen-ocaml-dev/atdgen-manual.html
+
+Format: PDF
+Files: /usr/share/doc/libatdgen-ocaml-dev/atdgen-manual.pdf.gz
diff --git a/debian/libatdgen-ocaml-dev.docs b/debian/libatdgen-ocaml-dev.docs
index e503338..80a00ef 100644
--- a/debian/libatdgen-ocaml-dev.docs
+++ b/debian/libatdgen-ocaml-dev.docs
@@ -1,3 +1,4 @@
-README
+README.md
 manual/atdgen-manual.html
-odoc
+manual/atdgen-manual.pdf
+api
diff --git a/debian/libatdgen-ocaml-dev.install.in 
b/debian/libatdgen-ocaml-dev.install.in
index 25840b8..0db0b53 100644
--- a/debian/libatdgen-ocaml-dev.install.in
+++ b/debian/libatdgen-ocaml-dev.install.in
@@ -1,6 +1,6 @@
 @OCamlStdlibDir@/atdgen/*.cmo
 @OCamlStdlibDir@/atdgen/*.cmi
-@OCamlStdlibDir@/atdgen/*.mli
+@OCamlStdlibDir@/atdgen/*.ml*
 OPT: @OCamlStdlibDir@/atdgen/*.o
 OPT: @OCamlStdlibDir@/atdgen/*.cmxa
 OPT: @OCamlStdlibDir@/atdgen/*.a
diff --git a/debian/libatdgen-ocaml-dev.ocamldoc 
b/debian/libatdgen-ocaml-dev.ocamldoc
index 783bd53..5143b80 100644
--- a/debian/libatdgen-ocaml-dev.ocamldoc
+++ b/debian/libatdgen-ocaml-dev.ocamldoc
@@ -1,2 +1 @@
--d odoc
---doc-base-generate
+-d api/html --doc-base-generate
diff --git a/debian/patches/debian-changes-1.0.1-1 
b/debian/patches/debian-changes-1.0.1-1
deleted file mode 100644
index 3e8c073..0000000
--- a/debian/patches/debian-changes-1.0.1-1
+++ /dev/null
@@ -1,57 +0,0 @@
-Description: Upstream changes introduced in version 1.0.1-1
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- atdgen (1.0.1-1) unstable; urgency=low
- .
-   * Initial release. (Closes: #605671)
- .
- The person named in the Author field signed this changelog entry.
-Author: Sylvain Le Gall <gil...@debian.org>
-Bug-Debian: http://bugs.debian.org/605671
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- a/Makefile
-+++ b/Makefile
-@@ -263,9 +263,13 @@ clean:
-               test3j.mli test3j.ml \
-               test4.mli test4.ml test4j.mli test4j.ml \
-               ag_doc_lexer.ml
--      rm -rf odoc testdoc
-+      rm -f ag_version.ml META VERSION
-       cd manual && $(MAKE) clean
- 
-+.PHONY: distclean
-+distclean: clean
-+      -$(RM) -r odoc testdoc
-+
- 
- .PHONY: release
- release:
---- a/manual/Makefile
-+++ b/manual/Makefile
-@@ -40,6 +40,9 @@ atdgen-manual.pdf: $(TEXFILES)
- 
- clean:
-       rm -f *.aux *.toc *.log *.out *.haux *.htoc *.fls \
--              atdgen-body.tex atdgen-manual.tex atdgen-manual.pdf \
--              atdgen-manual.txt atdgen-manual.html \
-+              atdgen-body.tex atdgen-manual.tex \
-               *.mlx.ml
-+
-+.PHONY: distclean
-+distclean:
-+      rm -f atdgen-manual.pdf atdgen-manual.txt atdgen-manual.html
diff --git a/debian/patches/makefile.patch b/debian/patches/makefile.patch
new file mode 100644
index 0000000..40bd38b
--- /dev/null
+++ b/debian/patches/makefile.patch
@@ -0,0 +1,99 @@
+Description: install ml files for dangling cmi's and fix test compilation
+Author: Hendrik Tews <hend...@askra.de>
+--- a/Makefile
++++ b/Makefile
+@@ -98,8 +98,14 @@
+       test ! -f atdgen || cp atdgen $(BINDIR)/
+       test ! -f atdgen.exe || cp atdgen.exe $(BINDIR)/
+       ocamlfind install atdgen META \
+-               $(MLI) $(CMI) $(CMO) $(CMX) $(O) \
+-                      atdgen.cma atdgen.a atdgen.cmxa
++               $$(ls $(MLI) $(CMI) $(CMO) $(CMX) $(O) \
++                      atdgen.cma atdgen.a atdgen.cmxa ) \
++              ag_biniou.ml ag_doc_lexer.ml ag_doc_lexer.mll ag_error.ml \
++              ag_indent.ml ag_json.ml ag_mapping.ml ag_ob_emit.ml \
++              ag_ob_mapping.ml ag_ob_run.ml ag_ob_spe.ml ag_ocaml.ml \
++              ag_oj_emit.ml ag_oj_mapping.ml ag_oj_run.ml ag_ov_emit.ml \
++              ag_ov_mapping.ml ag_ov_run.ml ag_ox_emit.ml ag_validate.ml \
++              ag_xb_emit.ml ag_version.ml
+ 
+ uninstall:
+       test ! -f $(BINDIR)/atdgen.run || rm $(BINDIR)/atdgen.run
+@@ -163,7 +169,7 @@
+ 
+ 
+ .PHONY: doc
+-doc: odoc/index.html atdgen$(EXE)
++doc: odoc/index.html
+       cd manual; $(MAKE)
+ 
+ odoc/index.html: $(CMI)
+@@ -175,7 +181,7 @@
+ # Some testing
+ 
+ .PHONY: test really-test
+-test: opt
++test:
+       OCAMLPATH=..:$$OCAMLPATH $(MAKE) really-test
+ 
+ really-test:
+@@ -192,33 +198,33 @@
+       ./atdgen test4.atd
+       ./atdgen -json test4.atd -o test4j
+       ./atdgen -validate -extend Test test.atd -o testv
+-      ocamlfind ocamlopt -c -g test_lib.ml
+-      ocamlfind ocamlc -c -g test.mli -package atdgen
+-      ocamlfind ocamlopt -c -g test.ml -package atdgen
+-      ocamlfind ocamlc -c -g test2.mli -package atdgen
+-      ocamlfind ocamlopt -c -g test2.ml -package atdgen
+-      ocamlfind ocamlc -c -g test3b.mli -package atdgen
+-      ocamlfind ocamlopt -c -g test3b.ml -package atdgen
+-      ocamlfind ocamlc -c -g test3j.mli -package atdgen
+-      ocamlfind ocamlopt -c -g test3j.ml -package atdgen
+-      ocamlfind ocamlc -c -g test4.mli -package atdgen
+-      ocamlfind ocamlopt -c -g test4.ml -package atdgen
+-      ocamlfind ocamlc -c -g testj.mli -package atdgen
+-      ocamlfind ocamlopt -c -g testj.ml -package atdgen
+-      ocamlfind ocamlc -c -g testjstd.mli -package atdgen
+-      ocamlfind ocamlopt -c -g testjstd.ml -package atdgen
+-      ocamlfind ocamlc -c -g test2j.mli -package atdgen
+-      ocamlfind ocamlopt -c -g test2j.ml -package atdgen
+-      ocamlfind ocamlc -c -g test4j.mli -package atdgen
+-      ocamlfind ocamlopt -c -g test4j.ml -package atdgen
+-      ocamlfind ocamlc -c -g testv.mli -package atdgen
+-      ocamlfind ocamlopt -c -g testv.ml -package atdgen
+-      ocamlfind ocamlopt -c -g test_atdgen_main.ml -package atdgen
+-      ocamlfind ocamlopt -o test_atdgen$(EXE) -g -linkpkg -package atdgen \
+-              test_lib.cmx test.cmx test2.cmx testj.cmx testjstd.cmx \
+-              test2j.cmx test3b.cmx test3j.cmx testv.cmx test_atdgen_main.cmx
++      ocamlfind $(OCAMLOPT) -c -g test_lib.ml
++      ocamlfind ocamlc -c -g test.mli -package atd,yojson
++      ocamlfind $(OCAMLOPT) -c -g test.ml -package atd,yojson
++      ocamlfind ocamlc -c -g test2.mli -package atd,yojson
++      ocamlfind $(OCAMLOPT) -c -g test2.ml -package atd,yojson
++      ocamlfind ocamlc -c -g test3b.mli -package atd,yojson
++      ocamlfind $(OCAMLOPT) -c -g test3b.ml -package atd,yojson
++      ocamlfind ocamlc -c -g test3j.mli -package atd,yojson
++      ocamlfind $(OCAMLOPT) -c -g test3j.ml -package atd,yojson
++      ocamlfind ocamlc -c -g test4.mli -package atd,yojson
++      ocamlfind $(OCAMLOPT) -c -g test4.ml -package atd,yojson
++      ocamlfind ocamlc -c -g testj.mli -package atd,yojson
++      ocamlfind $(OCAMLOPT) -c -g testj.ml -package atd,yojson
++      ocamlfind ocamlc -c -g testjstd.mli -package atd,yojson
++      ocamlfind $(OCAMLOPT) -c -g testjstd.ml -package atd,yojson
++      ocamlfind ocamlc -c -g test2j.mli -package atd,yojson
++      ocamlfind $(OCAMLOPT) -c -g test2j.ml -package atd,yojson
++      ocamlfind ocamlc -c -g test4j.mli -package atd,yojson
++      ocamlfind $(OCAMLOPT) -c -g test4j.ml -package atd,yojson
++      ocamlfind ocamlc -c -g testv.mli -package atd,yojson
++      ocamlfind $(OCAMLOPT) -c -g testv.ml -package atd,yojson
++      ocamlfind $(OCAMLOPT) -c -g test_atdgen_main.ml -package atd,yojson
++      ocamlfind $(OCAMLOPT) -o test_atdgen$(EXE) -g -linkpkg -package 
atd,yojson $(LIBATDGEN) \
++              test_lib.$(OBJEXT) test.$(OBJEXT) test2.$(OBJEXT) 
testj.$(OBJEXT) testjstd.$(OBJEXT) \
++              test2j.$(OBJEXT) test3b.$(OBJEXT) test3j.$(OBJEXT) 
testv.$(OBJEXT) test_atdgen_main.$(OBJEXT)
+       mkdir -p testdoc
+-      ocamlfind ocamldoc -html -d testdoc -package atdgen \
++      ocamlfind ocamldoc -html -d testdoc -package atd,yojson \
+               test.mli test2.mli testj.mli test2j.mli test3b.mli \
+               test3j.mli test4.mli test4j.mli testv.mli
+       ./test_atdgen
diff --git a/debian/patches/series b/debian/patches/series
index f537d08..82374e5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-debian-changes-1.0.1-1
+makefile.patch
diff --git a/debian/rules b/debian/rules
index 3690b15..eecac07 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,7 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
+#export DH_OPTIONS=-v
 
 DESTDIR=$(CURDIR)/debian/tmp
 
@@ -14,38 +15,45 @@ OCAMLFIND_LDCONF=ignore
 export OCAMLFIND_LDCONF
 
 %:
-       dh --with ocaml $@
+       dh $@ --with ocaml
 
 .PHONY: override_dh_auto_build
 override_dh_auto_build:
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
        $(MAKE)
+       rm atdgen.run
 else
        $(MAKE) all
+       mv atdgen.run atdgen
 endif 
+       $(MAKE) doc
+       mkdir api
+       mv odoc api/html
+
 
 .PHONY: override_dh_auto_install
 override_dh_auto_install:
-       mkdir -p '$(OCAMLFIND_DESTDIR)'
        mkdir -p '$(DESTDIR)/usr/bin'
+       mkdir -p '$(OCAMLFIND_DESTDIR)'
        make install 'BINDIR=$(DESTDIR)/usr/bin'
-ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
-       $(RM) '$(DESTDIR)/usr/bin/atdgen.run'
-else
-       mv '$(DESTDIR)/usr/bin/atdgen.run' '$(DESTDIR)/usr/bin/atdgen'
-endif 
+
 
 .PHONY: override_dh_install
 override_dh_install:
        dh_install --fail-missing
 
+
 .PHONY: override_dh_auto_test
 override_dh_auto_test:
-       true
+ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
+       $(MAKE) OCAMLOPT=ocamlopt LIBATDGEN=atdgen.cmxa OBJEXT=cmx test
+else
+       $(MAKE) OCAMLOPT=ocamlc LIBATDGEN=atdgen.cma OBJEXT=cmo test
+endif 
+
 
+# override this to prevent dh_auto_clean to try make distclean, 
+# which creates atd_version.ml
 .PHONY: override_dh_auto_clean
 override_dh_auto_clean:
        $(MAKE) clean
-
-debian/atdgen.1: debian/atdgen.mkd
-       pandoc -s -w man $^ -o $@
diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644
index c4cf480..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1,2 +0,0 @@
-abort-on-upstream-changes
-unapply-patches

-- 
atdgen 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