[Pkg-ocaml-maint-commits] [SCM] yojson packaging branch, master, updated. debian/1.0.2-1-9-g381ee1b

Fri Jun 14 08:21:36 UTC 2013

The following commit has been merged in the master branch:
commit 381ee1bf64f1b900516d32a40f9448dc892c72a3
Author: Hendrik Tews <hendrik at askra.de>
Date:   Fri Jun 14 10:17:49 2013 +0200

    update packaging

diff --git a/debian/changelog b/debian/changelog
index d9adfc4..dd93822 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,20 @@
-yojson (1.0.3-2) UNRELEASED; urgency=low
+yojson (1.1.7-1) unstable; urgency=low
 
+  [ Sylvain Le Gall ]
   * Remove Sylvain Le Gall from uploaders
 
- -- Sylvain Le Gall <gildor at debian.org>  Fri, 21 Sep 2012 01:26:20 +0000
+  [ Hendrik Tews ]
+  * updated watch
+  * new upstream version
+  * add myself as uploader
+  * renamed and adapt patch
+  * bump debhelper compat level and standards version
+  * update homepage, Vcs fields, package description and dependencies
+  * update copyright
+  * install api doc in /usr/share/doc/..../api/html
+  * update man page
+
+ -- Hendrik Tews <hendrik at askra.de>  Fri, 14 Jun 2013 10:14:02 +0200
 
 yojson (1.0.3-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 84ff889..79fcc58 100644
--- a/debian/control
+++ b/debian/control
@@ -2,38 +2,43 @@ Source: yojson
 Section: ocaml
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
+Uploaders: Hendrik Tews <hendrik at askra.de>
 Build-Depends:
   ocaml-nox (>= 3.11.1-3~),
+  ocaml-best-compilers,
   ocaml-findlib,
   dh-ocaml (>= 0.9~),
-  debhelper (>= 7.0.50~),
+  debhelper (>= 9),
   libeasy-format-ocaml-dev,
   cppo,
-  libbiniou-ocaml-dev (>= 1.0.0)
-Standards-Version: 3.9.2
-Homepage: http://martin.jambon.free.fr/yojson.html
-Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/yojson.git
-Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/yojson.git
+  libbiniou-ocaml-dev (>= 1.0.6)
+Standards-Version: 3.9.4
+Homepage: http://mjambon.com/yojson.html
+Vcs-Git: git://anonvcs.debian.org/pkg-ocaml-maint/packages/yojson.git
+Vcs-Browser: http://anonvcs.debian.org/gitweb/?p=pkg-ocaml-maint/packages/yojson.git
 
 Package: libyojson-ocaml-dev
 Architecture: any
 Depends: ${ocaml:Depends}, ${misc:Depends}, ${shlibs:Depends}
 Provides: ${ocaml:Provides}
 Recommends: ocaml-findlib
-Description: JSON library for OCaml
+Description: JSON library for OCaml - development package
  Yojson is an optimized parsing and printing library for the JSON format.
  It addresses a few shortcomings of json-wheel including 3x speed
  improvement, polymorphic variants and optional syntax for tuples and
  variants.
  .
  It is a replacement for json-wheel (libjson-wheel-ocaml-dev).
+ .
+ This package contain the development files needed for programming
+ with the library.
 
 Package: libyojson-ocaml
 Architecture: any
-Depends: ${ocaml:Depends}, ${misc:Depends}
+Depends: ${ocaml:Depends}, ${misc:Depends}, ${shlibs:Depends}
 Provides: ${ocaml:Provides}
 Recommends: ocaml-findlib
-Description: JSON library for OCaml
+Description: JSON library for OCaml - runtime package
  Yojson is an optimized parsing and printing library for the JSON format.
  It addresses a few shortcomings of json-wheel including 3x speed
  improvement, polymorphic variants and optional syntax for tuples and
diff --git a/debian/copyright b/debian/copyright
index ac77c7a..fb6e249 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,11 +1,11 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
-Name: yojson
-Maintainer: Sylvain Le Gall <gildor at debian.org>
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Yojson
+Upstream-Contact: Martin Jambon <martin at mjambon.com> 
+Source: http://mjambon.com/yojson.html
 
 Files: *
-Copyright: Copyright (c) 2010 Martin Jambon
-License: BSD3
-
+Copyright: Copyright (c) 2010 - 2012 Martin Jambon
+License: BSD-3-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
@@ -16,7 +16,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 +28,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 <gildor at debian.org>
+Copyright: 2010 Sylvain Le Gall <gildor at debian.org>
+           2013 Hendrik Tews <hendrik at 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/libyojson-ocaml-dev.docs b/debian/libyojson-ocaml-dev.docs
index 600e5dd..2f8cd7e 100644
--- a/debian/libyojson-ocaml-dev.docs
+++ b/debian/libyojson-ocaml-dev.docs
@@ -1,2 +1,2 @@
-README
-doc 
+README.md
+api
diff --git a/debian/libyojson-ocaml-dev.ocamldoc b/debian/libyojson-ocaml-dev.ocamldoc
index 40038c8..5143b80 100644
--- a/debian/libyojson-ocaml-dev.ocamldoc
+++ b/debian/libyojson-ocaml-dev.ocamldoc
@@ -1,2 +1 @@
--d doc
---doc-base-generate
+-d api/html --doc-base-generate
diff --git a/debian/patches/byte-code-compilation.patch b/debian/patches/byte-code-compilation.patch
new file mode 100644
index 0000000..4553975
--- /dev/null
+++ b/debian/patches/byte-code-compilation.patch
@@ -0,0 +1,15 @@
+Description: make rule for byte code version of ydump
+Author: Hendrik Tews <hendrik at askra.de>
+--- a/Makefile
++++ b/Makefile
+@@ -83,6 +83,10 @@
+ 	ocamlfind ocamlopt -o ydump$(EXE) $(FLAGS) -package $(PACKS) -linkpkg \
+ 		$(CMX) ydump.ml
+ 
++ydump.byte: yojson.cmo yojson_biniou.cmo ydump.ml
++	ocamlfind ocamlc -o ydump $(FLAGS) -package $(PACKS) -linkpkg \
++		$(CMO) ydump.ml
++
+ doc: doc/index.html
+ doc/index.html: yojson.mli yojson_biniou.mli
+ 	mkdir -p doc
diff --git a/debian/patches/debian-changes-0.8.1-1 b/debian/patches/debian-changes-0.8.1-1
deleted file mode 100644
index ba66fed..0000000
--- a/debian/patches/debian-changes-0.8.1-1
+++ /dev/null
@@ -1,48 +0,0 @@
-Description: Upstream changes introduced in version 0.8.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:
- .
- yojson (0.8.1-1) unstable; urgency=low
- .
-   * Initial release. (Closes: #605681)
- .
- The person named in the Author field signed this changelog entry.
-Author: Sylvain Le Gall <gildor at debian.org>
-Bug-Debian: http://bugs.debian.org/605681
-
----
-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>
-
---- yojson-0.8.1.orig/Makefile
-+++ yojson-0.8.1/Makefile
-@@ -7,7 +7,7 @@ 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,6 +60,10 @@ ydump: yojson.cmx ydump.ml
- 	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
diff --git a/debian/patches/series b/debian/patches/series
index 1d39e5a..23cfafd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-debian-changes-0.8.1-1
+byte-code-compilation.patch
diff --git a/debian/rules b/debian/rules
index a275cd2..e1fbe5d 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
 
@@ -13,8 +14,10 @@ export OCAMLFIND_DESTDIR
 OCAMLFIND_LDCONF=ignore
 export OCAMLFIND_LDCONF
 
+
 %:
-	dh --with ocaml $@
+	dh $@ --with ocaml
+
 
 .PHONY: override_dh_auto_build
 override_dh_auto_build:
@@ -25,19 +28,21 @@ else
 endif 
 	$(MAKE) doc
 
+
 .PHONY: override_dh_auto_install
 override_dh_auto_install:
 	mkdir -p '$(OCAMLFIND_DESTDIR)'
 	mkdir -p '$(DESTDIR)/usr/bin'
 	make install 'BINDIR=$(DESTDIR)/usr/bin'
 
+
 .PHONY: override_dh_install
 override_dh_install:
 	dh_install --fail-missing
 
-.PHONY: override_dh_auto_clean
-override_dh_auto_clean:
-	$(MAKE) clean
 
-debian/ydump.1: debian/ydump.mkd
-	pandoc -s -w man $^ -o $@
+.PHONY: override_dh_installdocs
+override_dh_installdocs:
+	mkdir api
+	mv doc api/html
+	dh_installdocs
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
diff --git a/debian/ydump.1 b/debian/ydump.1
index d615cd6..3c17225 100644
--- a/debian/ydump.1
+++ b/debian/ydump.1
@@ -1,47 +1,104 @@
-.TH YDUMP 1 "December 5, 2010" "ydump User Manual"
+.\" groff -man -Tascii ydump.1
+.\" ==========================================================================
+.\" ============= Synopsis ===================================================
+.\" ==========================================================================
+.TH YDUMP 1 "June 2013" YDUMP "User Manuals"
 .SH NAME
-.PP
-ydump - JSON pretty printer.
+ydump \- JSON pretty printer
 .SH SYNOPSIS
-.PP
-ydump [options] file
+.B ydump \fR[\fIOptions...\fR] [\fIfile\fR]
+.\" ==========================================================================
+.\" ============= Description ================================================
+.\" ==========================================================================
 .SH DESCRIPTION
-.PP
-JSON pretty printer using yojson and easy-format.
+.B ydump
+pretty prints data in the extended
+.B JSON
+format of the
+.B yojson
+library. 
+.B JSON
+stands for JavaScript Object Notation and is a lightweight
+data-interchange format.
+.\" ==========================================================================
+.P
+.B ydump
+reads from standard input if the
+.I file
+argument is omitted.
+.\"
+.\" ==========================================================================
+.\" ================ Options =================================================
+.\" ==========================================================================
+.\"
 .SH OPTIONS
+.\" ===================== -o <file> ============================================
 .TP
-.B -o 
-Output file
-.RS
-.RE
-.TP
-.B -std
-Convert tuples and variants into standard JSON, refuse to print NaN
-and infinities, require the root node to be either an object or an
-array.
-.RS
-.RE
-.TP
-.B -c
-Compact output (default: pretty-printed)
-.RS
-.RE
-.TP
-.B -s
-Streaming mode: read and write a sequence of JSON values instead of
-just one.
-.RS
-.RE
-.TP
-.B -ob
-Experimental
-.RS
-.RE
-.TP
-.B -help|--help
-Display list of options
-.RS
-.RE
-.SH AUTHORS
-Sylvain Le Gall.
+.B "-o <file>"
+pretty print to
+.I file
+instead of standard output
+.\" ===================== -std  ============================================
+.TP
+.B "-std"
+use
+.B JSON
+standard syntax only:
+Convert tuples and variants into standard
+.B JSON\fR,
+refuse to print
+NaN and infinities, require the root node to be either an object
+or an array.
+.\" ===================== -c  ============================================
+.TP
+.B "-c"
+compact output
+.\" ===================== -s  ============================================
+.TP
+.B "-s"
+streaming mode: read and write a sequence of
+.B JSON
+values instead of
+just one (this is the default).
+.\" ===================== -u  ============================================
+.TP
+.B "-u"
+disable streaming mode: A single
+.B JSON
+record is expected.
+.\" ===================== -sort  ============================================
+.TP
+.B "-sort"
+sort object fields (default: preserve internal field order)
+.\" ===================== -ob  ============================================
+.TP
+.B "-ob"
+convert to biniou format and pretty print that (experimental)
+.\" ===================== -version  ============================================
+.TP
+.B "-version"
+print version and exit
+.\" ===================== -help   ============================================
+.TP
+.B "-help | --help"
+print options
+.\"
+.\" ==========================================================================
+.\" ================ SEE ALSO ================================================
+.\" ==========================================================================
+.\"
+.SH SEE ALSO
+.TP
+the \fByojson\fR web site, \fIhttp://mjambon.com/yojson.html\fR
+.TP
+the \fBJSON\fR web site, \fIhttp://json.org/\fR
+.\"
+.\" ==========================================================================
+.\" ================ Author ==================================================
+.\" ==========================================================================
+.\"
+.SH AUTHOR
+This manual page was written by Sylvain Le Gall
+<gildor at debian.org> and Hendrik Tews <hendrik at askra.de>,
+specifically for the Debian project (and may be used by others).
 
diff --git a/debian/ydump.mkd b/debian/ydump.mkd
index fa3a454..8867fa5 100644
--- a/debian/ydump.mkd
+++ b/debian/ydump.mkd
@@ -1,3 +1,5 @@
+% old, currently unused source of the man page
+% convert with pandoc -s -w man $^ -o $@
 % YDUMP(1) ydump User Manual
 % Sylvain Le Gall 
 % December 5, 2010

-- 
yojson packaging

