The following commit has been merged in the master branch:
commit 3ab0c1c003f14887d46956b86dd25f7b2f321957
Author: Hendrik Tews <hend...@askra.de>
Date:   Sun Jun 2 23:03:54 2013 +0200

    various packaging changes

diff --git a/debian/changelog b/debian/changelog
index 42fe498..801e408 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,20 @@
-cppo (0.9.2-2) UNRELEASED; urgency=low
+cppo (0.9.3-1) unstable; urgency=low
 
   [ Sylvain Le Gall]
   * Remove Sylvain Le Gall from uploaders
 
   [ Hendrik Tews ]
-  * update watch file
-
- -- Hendrik Tews <hend...@askra.de>  Sat, 01 Jun 2013 22:23:55 +0200
+  * update watch file (thanks to Bart Martens)
+  * bump standards version and debhelper compat level
+  * update homepage
+  * update Vcs fields
+  * change to architecture any (Closes: 664200)
+  * update dependencies
+  * fix copyright
+  * add myself as uploader
+  * update man page
+
+ -- Hendrik Tews <hend...@askra.de>  Sun, 02 Jun 2013 23:12:27 +0200
 
 cppo (0.9.2-1) unstable; urgency=low
 
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index c72d1a0..34b1b7d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,19 +2,23 @@ Source: cppo
 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-findlib,
   dh-ocaml (>= 0.9~),
-  debhelper (>= 8)
-Standards-Version: 3.9.2
-Homepage: http://martin.jambon.free.fr/cppo.html
-Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/cppo.git
-Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/cppo.git
+  debhelper (>= 9)
+Standards-Version: 3.9.4
+Homepage: http://mjambon.com/cppo.html
+Vcs-Git: git://anonscm.debian.org/pkg-ocaml-maint/packages/cppo.git
+Vcs-Browser: 
http://anonscm.debian.org/gitweb/?p=pkg-ocaml-maint/packages/cppo.git
 
 Package: cppo
-Architecture: all
-Depends: ${ocaml:Depends}, ${misc:Depends}
+Architecture: any
+Depends:
+ ${ocaml:Depends}, 
+ ${shlibs:Depends},
+ ${misc:Depends}
 Description: cpp for OCaml
  Cppo is an OCaml-friendly implementation of cpp, the C preprocessor.
  It can replace camlp4 for preprocessing OCaml files, using cpp style and
diff --git a/debian/copyright b/debian/copyright
index d07827b..5b919d6 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: cppo
-Maintainer: Sylvain Le Gall <gil...@debian.org>
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Cppo
+Upstream-Contact: Martin Jambon <mar...@mjambon.com> 
+Source: http://mjambon.com/cppo.html
 
 Files: *
 Copyright: Copyright (c) 2009-2011 Martin Jambon
-License: BSD3
-
+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 <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/cppo.1 b/debian/cppo.1
index a96cd36..48eaf48 100644
--- a/debian/cppo.1
+++ b/debian/cppo.1
@@ -1,69 +1,134 @@
-.TH CPPO 1 "December 4, 2010" "cppo User Manual"
+.\" groff -man -Tascii cppo.1
+.\" ==========================================================================
+.\" ============= Synopsis ===================================================
+.\" ==========================================================================
+.TH CPPO 1 "June 2013" CPPO "User Manuals"
 .SH NAME
-.PP
-cppo - cpp for OCaml.
+cppo \- lightweight cpp-like preprocessor for OCaml
 .SH SYNOPSIS
-.PP
-cppo [options] file*
+.B cppo \fR[\fIOptions...\fR] \fIfiles\fR...
+.\" ==========================================================================
+.\" ============= Description ================================================
+.\" ==========================================================================
 .SH DESCRIPTION
-.PP
-Cppo is an OCaml-friendly implementation of cpp, the C
-preprocessor.
-It can replace camlp4 for preprocessing OCaml files, using cpp
-style and syntax.
-It allows defining simple macros and file inclusion.
+.B cppo
+is the equivalent of the C preprocessor for OCaml. It permits the
+definition and expansion of simple (in comparison with 
+.B camlp4\fR)
+macros and file inclusion. 
+.B cppo
+supports functional macros, conditionals, boolean and arithmetic
+expressions, stringification, and calling different, external
+preprocessors. For a precise description of the features, see 
+.I /usr/share/doc/cppo/README.gz\fR.
+.\"
+.\" ==========================================================================
+.\" ================ Options =================================================
+.\" ==========================================================================
+.\"
 .SH OPTIONS
+.\" ===================== -D DEF =============================================
 .TP
-.B -D \f[I]DEF\f[]
-Equivalent of interpreting `#define DEF' before processing the
-input
-.RS
-.RE
+.B "-D IDENT"
+define 
+.I IDENT
+.\" ===================== -U IDENT ===========================================
 .TP
-.B -U \f[I]IDENT\f[]
-Equivalent of interpreting `#undef IDENT' before processing the
-input
-.RS
-.RE
+.B "-U IDENT"
+undefine
+.I IDENT
+.\" ===================== -I DIR =============================================
 .TP
-.B -I \f[B]DIR\f[]
-Add directory DIR to the search path for included files
-.RS
-.RE
+.B "-I DIR"
+add
+.I DIR
+to the search path for included files
+.\" ===================== -o FILE ============================================
 .TP
-.B -o \f[B]FILE\f[]
-Output file
-.RS
-.RE
+.B "-o FILE"
+write output to
+.I FILE
+.\" ===================== -q  ================================================
 .TP
-.B -q
+.B "-q"
 Identify and preserve camlp4 quotations
-.RS
-.RE
+.\" ===================== -s  ================================================
 .TP
-.B -s
+.B "-s"
 Output line directives pointing to the exact source location of
 each token, including those coming from the body of macro
-definitions.
-This behavior is off by default.
-.RS
-.RE
+definitions. This behavior is off by default.
+.\" ===================== -n  ================================================
+.TP
+.B "-n"
+Do not output any line directive other than those found in the 
+input (overrides 
+.B -s\fR).
+.\" ===================== -version  ==========================================
+.TP
+.B "-version "
+print version and exit
+.\" ===================== -x NAME:CMD_TEMPLATE ===============================
 .TP
-.B -n
-Do not output any line directive other than those found in the
-input (overrides -s).
+.B "-x NAME:CMD_TEMPLATE"
 .RS
+Define a custom preprocessor target section starting with:
+.P
+.RS
+#ext "NAME"
 .RE
-.TP
-.B -version
-Print the version of the program and exit.
+.P
+and ending with:
+.P
 .RS
+#endext
 .RE
-.TP
-.B -help|--help
-Display this list of options
+.P
+.I NAME
+must be a lowercase identifier of the form [a-z][A-Za-z0-9_]*
+.P
+.I CMD_TEMPLATE
+is a command template supporting the following special sequences:
 .RS
+.HP
+%F  file name (unescaped; beware of potential scripting attacks)
+.HP
+%B  number of the first line
+.HP
+%E  number of the last line
+.HP
+%%  a single percent sign
+.RE
+.P
+The filename, the first line number and the last line number are
+available to the external preprocessor via the environment
+variables
+.I CPPO_FILE\fR, \fICPPO_FIRST_LINE\fR, \fICPPO_LAST_LINE\fR.
+.P
+The command is expected to read from stdin and to write to
+stdout.
 .RE
-.SH AUTHORS
-Sylvain Le Gall.
+.\" ===================== -help 
=================================================
+.TP
+.B "-help | --help"
+Display options and exit
+.\"
+.\" ==========================================================================
+.\" ================ SEE ALSO ================================================
+.\" ==========================================================================
+.\"
+.SH SEE ALSO
+.TP
+the \fBcppo\fR web page, \fIhttp://mjambon.com/cppo.html\fR
+.TP
+the text manual in \fI/usr/share/doc/cppo/README.gz
+.\"
+.\" ==========================================================================
+.\" ================ 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/cppo.mkd b/debian/cppo.mkd
index 92f3885..a7e33dc 100644
--- a/debian/cppo.mkd
+++ b/debian/cppo.mkd
@@ -1,3 +1,5 @@
+% this is the old source for the man page
+% process with pandoc -s -w man $^ -o $@
 % CPPO(1) cppo User Manual
 % Sylvain Le Gall
 % December 4, 2010
diff --git a/debian/rules b/debian/rules
index cbf1006..b3e6c7d 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/cppo
 
@@ -13,15 +14,12 @@ include /usr/share/ocaml/ocamlvars.mk
 
 .PHONY: override_dh_auto_build
 override_dh_auto_build:
+ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
+       $(MAKE) opt
+else
        $(MAKE) all
+endif 
 
 .PHONY: override_dh_auto_install
 override_dh_auto_install:
        make install 'BINDIR=$(DESTDIR)/usr/bin'
-
-.PHONY: override_dh_auto_clean
-override_dh_auto_clean:
-       $(MAKE) clean
-
-debian/cppo.1: debian/cppo.mkd
-         pandoc -s -w man $^ -o $@

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