[Pkg-ocaml-maint-commits] [SCM] camlmix packaging branch, master, updated. debian/1.3.0-3-7-gf588587

2013-05-28 Thread Hendrik Tews 
The following commit has been merged in the master branch:
commit f58858780f8c7a511fcd5036d27ecdd922455205
Author: Hendrik Tews 
Date:   Tue May 28 11:33:27 2013 +0200

enable ocamlc.opt

diff --git a/debian/rules b/debian/rules
index 1ea34b6..293e8cb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,8 +2,8 @@
 # -*- makefile -*-
 
 # Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
-export DH_OPTIONS=-v
+#export DH_VERBOSE=1
+#export DH_OPTIONS=-v
 
 DESTDIR=$(CURDIR)/debian/camlmix
 
@@ -16,7 +16,7 @@ include /usr/share/ocaml/ocamlvars.mk
 .PHONY: override_dh_auto_build
 override_dh_auto_build:
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
-   make OCAMLOPT=ocamlopt.opt native
+   make OCAMLOPT=ocamlopt.opt OCAMLC=ocamlc.opt native
 else
make byte
 endif

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

[Pkg-ocaml-maint-commits] [SCM] camlmix packaging branch, master, updated. debian/1.3.0-3-7-gf588587

2013-05-28 Thread Hendrik Tews 
The following commit has been merged in the master branch:
commit cbc4dc357e591e96edf09347b4101e8f626f6ad1
Author: Hendrik Tews 
Date:   Mon May 27 23:41:48 2013 +0200

architecture any and other packaging fixes

diff --git a/debian/changelog b/debian/changelog
index 6588a16..b46ecee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-camlmix (1.3.0-4) UNRELEASED; urgency=low
+camlmix (1.3.1-1) unstable; urgency=low
 
   [ Sylvain La Gall ]
   * Remove Sylvain Le Gall from uploaders
@@ -7,8 +7,13 @@ camlmix (1.3.0-4) UNRELEASED; urgency=low
   * fix watch file
   * fix copyright file
   * added myself as uploader
+  * import new upstream version
+  * change to architecture any for native compilation and
+adapt rules and dependencies 
+  * bump standards version and debhelper compat level
+  * add patch fix-lintian-spelling-error to fix a spelling error
 
- -- Hendrik Tews   Mon, 27 May 2013 15:39:38 +0200
+ -- Hendrik Tews   Mon, 27 May 2013 23:49:26 +0200
 
 camlmix (1.3.0-3) 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 c122733..857cb16 100644
--- a/debian/control
+++ b/debian/control
@@ -4,19 +4,23 @@ Priority: optional
 Maintainer: Debian OCaml Maintainers 
 Uploaders:
  Hendrik Tews 
-Build-Depends-Indep:
+Build-Depends:
   ocaml-nox (>= 3.11.1-3~),
+  ocaml-best-compilers,
   ocaml-findlib,
   dh-ocaml (>= 0.9~),
-  debhelper (>= 7.0.50~)
-Standards-Version: 3.9.1
+  debhelper (>= 9)
+Standards-Version: 3.9.4
 Homepage: http://mjambon.com/camlmix/
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/camlmix.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/camlmix.git
 
 Package: camlmix
-Architecture: all
-Depends: ${ocaml:Depends}, ${misc:Depends}
+Architecture: any
+Depends: 
+ ${ocaml:Depends}, 
+ ${shlibs:Depends},
+ ${misc:Depends}
 Description: preprocessor which converts text with embedded OCaml
  Camlmix is a generic preprocessor which converts text with embedded OCaml into
  an OCaml program with embedded text. It produces text documents from one or
diff --git a/debian/patches/fix-lintian-spelling-error.patch 
b/debian/patches/fix-lintian-spelling-error.patch
new file mode 100644
index 000..679e2b9
--- /dev/null
+++ b/debian/patches/fix-lintian-spelling-error.patch
@@ -0,0 +1,13 @@
+Description: fix a lintian spelling error
+Author: Hendrik Tews 
+--- a/main.ml
 b/main.ml
+@@ -43,7 +43,7 @@
+ Advanced usage:
+ The OCaml program that is generated from the Camlmix files first defines
+ a module called Camlmix. This module contains several variables that are 
+-updated automatically and may be used explicitely by the user.
++updated automatically and may be used explicitly by the user.
+ 
+ module Camlmix :
+   sig
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000..d6ad538
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix-lintian-spelling-error.patch
diff --git a/debian/rules b/debian/rules
index 84f41ac..a32bc3f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,24 +2,31 @@
 # -*- makefile -*-
 
 # Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
+export DH_OPTIONS=-v
 
 DESTDIR=$(CURDIR)/debian/camlmix
 
 include /usr/share/ocaml/ocamlvars.mk
 
 %:
-   dh --with ocaml $@
+   dh $@ --with ocaml
+
 
 .PHONY: override_dh_auto_build
 override_dh_auto_build:
-   make all
+ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
+   make OCAMLOPT=ocamlopt.opt native
+else
+   make byte
+endif
+
 
 .PHONY: override_dh_auto_install
 override_dh_auto_install:
mkdir -p '$(DESTDIR)/usr/bin'
make install 'PREFIX=$(DESTDIR)/usr'
 
-debian/camlmix.1: debian/camlmix.mkd
-   pandoc -s -w man $^ -o $@
+# debian/camlmix.1: debian/camlmix.mkd
+#  pandoc -s -w man $^ -o $@
 

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

[Pkg-ocaml-maint-commits] [SCM] camlmix packaging branch, master, updated. debian/1.3.0-3-7-gf588587

2013-05-28 Thread Hendrik Tews 
The following commit has been merged in the master branch:
commit cf8089e281f19bf975a34ff6472f78f4b922ee4d
Author: Hendrik Tews 
Date:   Tue May 28 11:19:56 2013 +0200

rewrite man page

diff --git a/debian/camlmix.1 b/debian/camlmix.1
index 32869eb..06e26eb 100644
--- a/debian/camlmix.1
+++ b/debian/camlmix.1
@@ -1,173 +1,251 @@
-.TH CAMLMIX 1 "December 2, 2010" "camlmix User Manual"
+.\" groff -man -Tascii prooftree.1
+.\" ==
+.\" = Synopsis ===
+.\" ==
+.TH CAMLMIX 1 "May 2013" CAMLMIX "User Manuals"
 .SH NAME
-.PP
-camlmix - preprocessor which converts text with embedded OCaml.
+camlmix \- preprocessor which converts text with embedded OCaml
 .SH SYNOPSIS
-.PP
-camlmix [options] file1 file2 \&... fileN
-.PP
-A temporary file \[lq]fileN.ml\[rq] is created and then executed with
-ocaml.
+.B camlmix \fR[\fIOptions...\fR] \fIfiles\fR...
+.\" ==
+.\" = Description 
+.\" ==
 .SH DESCRIPTION
-.SS General rules
-.PP
-Text between ## and ## is considered as a block of code.
-A block of code is normally some OCaml code.
-It can be any kind of toplevel expressions such as definitions or
-application of printing functions:
-.IP
-.nf
-\f[C]
-This\ is\ ocaml\ version\ ##\ print\ Sys.ocaml\\_version\ ##
-\f[]
-.fi
-.PP
-If it starts with = the OCaml code is interpreted as an expression of
-type string that will printed like the rest of the text:
-.PP
-This is ocaml version ##= Sys.ocaml_version ##
-.PP
-The document blocks are printed by default on stdout using the
-\[lq]print\[rq] function.
-For ## to be printed, ### should be used.
-.PP
-White space introduced by OCaml can be controlled by ##.
-and .## symbols:
-.IP
-.nf
-\f[C]
-\ \ ##.\ causes\ any\ white\ space\ to\ the\ left\ of\ the\ symbol
-\ \ \ \ \ \ to\ be\ omitted\ from\ the\ output.\ Similarly
-\ \ .##\ causes\ any\ white\ space\ followed\ by\ one\ newline
-\ \ \ \ \ \ to\ be\ omitted\ from\ the\ output.
-\f[]
-.fi
-.SS \ Directives
-.PP
-Blocks of code that start with the \@ character (possibly preceded by
-spaces) are directives for Camlmix.
-The following directives are available:
-.IP
-.nf
-\f[C]
-include\ "somefile.mlx";\ (*\ inserts\ a\ camlmix\ file\ *)
-skip;\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ (*\ ignores\ the\ next\ block\ of\ 
text\ *)
-\f[]
-.fi
-.PP
-e.g.:
-.IP
-.nf
-\f[C]
-Hello\ ##\ \@include\ "world.mlx";\ skip\ .##\ ##\ let\ x\ =\ 123\ ##!
-\f[]
-.fi
-.SS Conversion into a \[lq]render\[rq] function for dynamic rendering
-.PP
-The -fun option, used in combination with -c and often -co produces an
-OCaml source file which provides a function with the following
-signature:
-.PP
-val render : ?print:(string -> unit) -> ANYTYPE -> unit
-.PP
-where ANYTYPE is the type the \[lq]param\[rq] object which is available
-in the template.
-\[lq]param\[rq] can be used to pass runtime arguments, such as CGI
-parameters if you are serving dynamic web pages.
-The \[lq]print\[rq] function is used to set the initial value of
-Camlmix.printer (see below) and should be used if you want to be able to
-put the output into some other container than stdout.
-It's default value is:
-.PP
-fun s -> print_string s; flush stdout
-.SS Advanced usage
-.PP
-The OCaml program that is generated from the Camlmix files first defines
-a module called Camlmix.
-This module contains several variables that are updated automatically
-and may be used explicitly by the user.
-.IP
-.nf
-\f[C]
-module\ Camlmix\ :
-\ \ sig
-\ \ \ \ val\ source\ :\ string\ ref
-\ \ \ \ val\ line\ \ \ :\ int\ ref
-\ \ \ \ val\ char\ \ \ :\ int\ ref
-\ \ \ \ \ \ \ \ (*\ source,\ line\ and\ char\ refer\ to\ the\ location\ of\ the
-\ \ \ \ \ \ \ \ \ \ \ first\ character\ of\ the\ current\ block\ in\ its\ 
source\ file
-\ \ \ \ \ \ \ \ \ \ \ (source\ file,\ line\ number\ starting\ from\ 1,\ 
position\ in
-\ \ \ \ \ \ \ \ \ \ \ the\ line\ starting\ from\ 1).\ They\ are\ updated
-\ \ \ \ \ \ \ \ \ \ \ automatically\ at\ the\ beginning\ of\ each\ (code\ or\ 
text)
-\ \ \ \ \ \ \ \ \ \ \ block.\ *)
-
-\ \ \ \ val\ printer\ :\ (string\ ->\ unit)\ ref
-\ \ \ \ \ \ \ \ (*\ the\ function\ that\ prints\ text\ blocks.\ It\ is\ 
initialized
-\ \ \ \ \ \ \ \ \ \ \ with\ the\ "print"\ function\ *)
-
-\ \ \ \ val\ print_with\ :\ (string\ ->\ unit)\ ->\ unit
-\ \ \ \ \ \ \ \ (*\ print_with\ f\ prints\ the\ next\ block\ of\ text\ using\ f
-\ \ \ \ \ \ \ \ \ \ \ instead\ of\ the\ current\ printer.\ Its\ behavior\ is
-\ \ \ \ \ \ \ \ \ \ \ undefined\ if\ it\ is\ called\ several\ times\ in\ the\ 
same
-\ \ \ \ \ \ \ \ \ \ \ OCaml\ block.\ *)
-
-\ \ \ \ val\ print_if\ :\ bool\ ->\ unit
-\ \ \ \ \ \ \ \ (*\ print_if\ cond\

[Pkg-ocaml-maint-commits] [SCM] camlmix packaging branch, master, updated. debian/1.3.0-3-7-gf588587

2013-05-28 Thread Hendrik Tews 
The following commit has been merged in the master branch:
commit 35149623af50315a2975876f6fcfea3e4690f0c1
Merge: 63534700a9e6a7a1f56c8e439dd694660a3fae72 
5ff4d0a478618b3578c440b53ddd72048b339aa1
Author: Hendrik Tews 
Date:   Mon May 27 16:24:16 2013 +0200

Merge tag 'upstream/1.3.1'

Upstream version 1.3.1


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

[Pkg-ocaml-maint-commits] [SCM] camlmix packaging branch, master, updated. debian/1.3.0-3-7-gf588587

2013-05-28 Thread Hendrik Tews 
The following commit has been merged in the master branch:
commit 63534700a9e6a7a1f56c8e439dd694660a3fae72
Author: Hendrik Tews 
Date:   Mon May 27 16:20:30 2013 +0200

update watch and copyright

diff --git a/debian/changelog b/debian/changelog
index 44b1b95..6588a16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
 camlmix (1.3.0-4) UNRELEASED; urgency=low
 
+  [ Sylvain La Gall ]
   * Remove Sylvain Le Gall from uploaders
 
- -- Sylvain Le Gall   Fri, 21 Sep 2012 01:11:30 +
+  [ Hendrik Tews ]
+  * fix watch file
+  * fix copyright file
+  * added myself as uploader
+
+ -- Hendrik Tews   Mon, 27 May 2013 15:39:38 +0200
 
 camlmix (1.3.0-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 5466067..c122733 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,15 @@ Source: camlmix
 Section: ocaml
 Priority: optional
 Maintainer: Debian OCaml Maintainers 
+Uploaders:
+ Hendrik Tews 
 Build-Depends-Indep:
   ocaml-nox (>= 3.11.1-3~),
   ocaml-findlib,
   dh-ocaml (>= 0.9~),
   debhelper (>= 7.0.50~)
 Standards-Version: 3.9.1
-Homepage: http://martin.jambon.free.fr/camlmix/
+Homepage: http://mjambon.com/camlmix/
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/camlmix.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/camlmix.git
 
diff --git a/debian/copyright b/debian/copyright
index 0ebaef2..97b0095 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,22 +1,25 @@
-Format-Specification: 
http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
-Name: mikmatch
-Maintainer: Sylvain Le Gall 
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Camlmix
+Upstream-Contact: Martin Jambon  
+Source: http://mjambon.com/camlmix/
 
 Files: *
-Copyright: Copyright (c) 2004, 2005 Martin Jambon
-License: BSD3
-
+Copyright: 2004, 2005 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:
+ .
  1. Redistributions of source code must retain the above copyright
 notice, this list of conditions and the following disclaimer.
+ .
  2. Redistributions in binary form must reproduce the above copyright
 notice, this list of conditions and the following disclaimer in the
 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 
+Copyright: 2010 Sylvain Le Gall 
+   2013 Hendrik Tews 
 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 .
+ .
+ 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/watch b/debian/watch
index fdfb7ba..96bf7b0 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
 version=3
-http://martin.jambon.free.fr/camlmix/ camlmix-(.*)\.tar\.gz
+http://mjambon.com/releases/camlmix \
+.*/camlmix/camlmix[\-\._](\d\S*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz)

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