--- camlp5-5.07.orig/debian/docs
+++ camlp5-5.07/debian/docs
@@ -0,0 +1,4 @@
+README
+DEVEL
+UPGRADING
+doc/html
--- camlp5-5.07.orig/debian/control
+++ camlp5-5.07/debian/control
@@ -0,0 +1,31 @@
+Source: camlp5
+Section: devel
+Priority: extra
+Maintainer: Debian OCaml Maintainers <debian-ocaml-maint@lists.debian.org>
+Uploaders: Stefano Zacchiroli <zack@debian.org>
+Build-Depends: cdbs, debhelper (>= 5), dpatch, ocaml-nox (>= 3.10.1), ocaml-compiler-libs (>= 3.10.1)
+Standards-Version: 3.7.3
+Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/camlp5/trunk
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/camlp5/trunk/
+Homepage: http://pauillac.inria.fr/~ddr/camlp5/
+
+Package: camlp5
+Architecture: any
+Depends: ocaml-nox-${F:OCamlABI}, ocaml-compiler-libs (>= 3.10.1), ${shlibs:Depends}, ${misc:Depends}
+Conflicts: ocaml-nox (<< 3.10.0)
+Description: Pre Processor Pretty Printer for OCaml - classical version
+ Objective Caml (OCaml) is an implementation of the ML language,
+ based on the Caml Light dialect extended with a complete
+ class-based object system and a powerful module system in the
+ style of Standard ML.
+ .
+ CamlP4 is a Pre-Processor-Pretty-Printer for Objective Caml. It
+ offers tools for syntax (Stream Parsers and Grammars) and the
+ ability to modify the concrete syntax of the language
+ (Quotations, Syntax Extensions).
+ .
+ This package contains the "classical" version of CamlP4
+ executables and libraries for pre-processing and pretty-printing
+ OCaml sources both interactively and in a batch fashion. The
+ "classical" version is the implementation of CamlP4 which used
+ to be distributed with OCaml before the release of version 3.10.
--- camlp5-5.07.orig/debian/rules
+++ camlp5-5.07/debian/rules
@@ -0,0 +1,38 @@
+#!/usr/bin/make -f
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/makefile.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/class/ocaml.mk
+
+PKGNAME = camlp5
+OCAML_OCAMLDOC_PACKAGES = $(PKGNAME)
+OCAML_OCAMLDOC_FLAGS += -pp debian/camlp5r_w_macro.sh
+OCAML_OCAMLDOC_FLAGS += -I +compiler-libs/parsing/
+
+CONFIGURE_FLAGS =
+CONFIGURE_FLAGS += -name $(PKGNAME)
+CONFIGURE_FLAGS += -mandir /usr/share/man
+
+DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(CURDIR)/debian/tmp
+ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
+DEB_MAKE_BUILD_TARGET = world.opt
+else
+DEB_MAKE_BUILD_TARGET = world
+endif
+
+configure/$(PKGNAME):: debian/configure-stamp
+debian/configure-stamp:
+	./configure $(CONFIGURE_FLAGS)
+	touch debian/configure-stamp
+clean::
+	rm -f debian/configure-stamp
+
+pre-build:: debian/META
+debian/META: debian/META.src
+	sed 's/@NAME@/$(PKGNAME)/g' < $< > $@
+clean::
+	rm -f debian/META
+
+build/$(PKGNAME)::
+	$(MAKE) -C doc/htmlp/
+	chmod +x debian/camlp5r_w_macro.sh
--- camlp5-5.07.orig/debian/watch
+++ camlp5-5.07/debian/watch
@@ -0,0 +1,8 @@
+# See uscan(1) for format
+
+# Compulsory line, this is a version 3 file
+version=3
+
+# <Webpage URL> <string match>
+http://pauillac.inria.fr/~ddr/camlp5/ .*camlp5-([\d.]*)\.tgz
+
--- camlp5-5.07.orig/debian/svn-deblayout
+++ camlp5-5.07/debian/svn-deblayout
@@ -0,0 +1 @@
+tagsUrl=svn+ssh://svn.debian.org/svn/pkg-ocaml-maint/tags/packages/camlp5
--- camlp5-5.07.orig/debian/changelog
+++ camlp5-5.07/debian/changelog
@@ -0,0 +1,88 @@
+camlp5 (5.07-1~bpo40+3) etch-backports; urgency=low
+
+  * Versioned binary-dep on ocaml-compiler-libs as 
+    needed to buildd using camlp5 on backports.org
+
+ -- Romain Beauxis <toots@rastageeks.org>  Tue, 20 May 2008 12:18:48 +0200
+
+camlp5 (5.07-1~bpo40+2) etch-backports; urgency=low
+
+  * Added versioned build dependency against ocaml-compiler-libs
+    to force build dependency resolution against ocaml from backports.org
+
+ -- Romain Beauxis <toots@rastageeks.org>  Tue, 13 May 2008 01:01:29 +0200
+
+camlp5 (5.07-1~bpo40+1) etch-backports; urgency=low
+
+  * Rebuild for etch-backports against caml 3.10.1 (no changes)
+
+ -- Romain Beauxis <toots@rastageeks.org>  Fri, 25 Apr 2008 05:48:16 +0200
+
+camlp5 (5.07-1) unstable; urgency=low
+
+  * new upstream release
+  * rebuild against ocaml 3.10.1
+
+ -- Stefano Zacchiroli <zack@debian.org>  Sat, 09 Feb 2008 18:08:41 +0100
+
+camlp5 (5.06-2) unstable; urgency=low
+
+  * debian/control: fix out of date vcs-urls
+
+ -- Stefano Zacchiroli <zack@debian.org>  Mon, 31 Dec 2007 13:28:25 +0100
+
+camlp5 (5.06-1) unstable; urgency=low
+
+  * new upstream release
+  * update standards version, no changes needed
+  * debian/rules: enable generation of ocamldoc api reference, adding to this
+    end debian/camlp5r_w_macro.sh (a camlp5 filter to preprocess sources
+    before passing them to ocamldoc)
+  * add build-dep and dep on ocaml-compiler-libs, as some parts of camlp5 rely
+    on the Parsetree module
+
+ -- Stefano Zacchiroli <zack@debian.org>  Sun, 30 Dec 2007 12:04:50 +0100
+
+camlp5 (5.04-1) unstable; urgency=low
+
+  * new upstream release
+
+ -- Stefano Zacchiroli <zack@debian.org>  Thu, 29 Nov 2007 10:38:51 +0100
+
+camlp5 (5.03-1) unstable; urgency=low
+
+  * new upstream release
+    - ship native code objects (closes: #441921)
+
+ -- Stefano Zacchiroli <zack@debian.org>  Tue, 20 Nov 2007 11:08:09 +0100
+
+camlp5 (5.02-1) unstable; urgency=low
+
+  * new upstream release
+  * uploading to unstable
+  * better debian/watch line: account for tarballs in subdirs and skip docs
+  * install HTML version of the documentation and register it with doc-base
+
+ -- Stefano Zacchiroli <zack@debian.org>  Sat, 17 Nov 2007 16:16:37 +0100
+
+camlp5 (5.00-1) experimental; urgency=low
+
+  * new upstream release
+  * add Homepage field to debian/control
+  * remove patch install_destdir (no longer needed since now upstream Makefile
+    support vanilla DESTDIR passing)
+
+ -- Stefano Zacchiroli <zack@debian.org>  Thu, 27 Sep 2007 22:13:32 +0200
+
+camlp5 (4.08-1) unstable; urgency=low
+
+  * new upstream release
+
+ -- Stefano Zacchiroli <zack@debian.org>  Sun, 02 Sep 2007 15:57:39 +0200
+
+camlp5 (4.05-1) experimental; urgency=low
+
+  * Initial release (Closes: #432587)
+
+ -- Stefano Zacchiroli <zack@debian.org>  Sun, 22 Jul 2007 19:31:53 +0200
+
--- camlp5-5.07.orig/debian/camlp5r_w_macro.sh
+++ camlp5-5.07/debian/camlp5r_w_macro.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+./boot/camlp5r ./boot/pa_macro.cmo "$@"
--- camlp5-5.07.orig/debian/install.in
+++ camlp5-5.07/debian/install.in
@@ -0,0 +1,2 @@
+debian/tmp/usr/			/
+debian/META			/@OCamlStdlibDir@/camlp5/
--- camlp5-5.07.orig/debian/compat
+++ camlp5-5.07/debian/compat
@@ -0,0 +1 @@
+5
--- camlp5-5.07.orig/debian/README.Debian
+++ camlp5-5.07/debian/README.Debian
@@ -0,0 +1,25 @@
+CamlP4s for Debian
+------------------
+
+CamlP4s is the "old" (or "classical" if you want) implementation of CamlP4 by
+Daniel de Rauglaudre which used to be distributed together with OCaml until
+version 3.09.3. The corresponding Debian binary package, available until Debian
+4.0 Etch, was "ocaml-nox".
+
+Starting from Debian Lenny, a version of OCaml >= 3.10.0 is shipped in Debian
+including the "new" (and official, according to upstream choices) CamlP4
+implementation by Nicolas Pouillard. The corrisponding Debian binary packages
+are "camlp4" and "camlp4-extra".
+
+The new CamlP4 is not backward compatible with the old one, for this reason
+Daniel de Rauglaudre made available the classical version renaming the product
+to "CamlP4s". To avoid name conflicts with the official CamlP4, CamlP4s has a
+name mangling build option enabling to change the base name of the tool. In
+Debian the name has been mangled to "CamlP5".
+
+The present binary package, namely "camlp5", hence ships CamlP4s.  All the
+binaries and libraries of the old CamlP4 are available via mangled names (e.g.
+/usr/bin/camlp4 is /usr/bin/camlp5, /usr/lib/ocaml/*/camlp4/ is
+/usr/lib/ocaml/*/camlp5/ and so forth).
+
+ -- Stefano Zacchiroli <zack@debian.org>  Tue, 10 Jul 2007 20:05:45 +0200
--- camlp5-5.07.orig/debian/META.src
+++ camlp5-5.07/debian/META.src
@@ -0,0 +1,95 @@
+# Specifications for the "@NAME@" preprocessor:
+requires = ""
+version = "[distributed with Ocaml]"
+description = "Base for @NAME@ syntax extensions"
+directory = "+@NAME@"
+
+# For the toploop:
+archive(byte,toploop,@NAME@o) = "@NAME@o.cma"
+archive(byte,toploop,@NAME@r) = "@NAME@r.cma"
+
+# Scheme-like syntax:
+# Do #predicates "syntax,@NAME@scheme", followed by #require "@NAME@"
+archive(byte,toploop,@NAME@scheme) = "@NAME@sch.cma"
+
+# Standard ML-like syntax:
+# Do #predicates "syntax,@NAME@sml", followed by #require "@NAME@"
+archive(byte,toploop,@NAME@sml) = "gramlib.cma @NAME@_top.cma pa_sml.cmo"
+
+# Lisp-like syntax:
+# Do #predicates "syntax,@NAME@lisp", followed by #require "@NAME@"
+archive(byte,toploop,@NAME@lisp) = "gramlib.cma @NAME@_top.cma pa_lisp.cmo"
+
+# For the preprocessor itself:
+archive(syntax,preprocessor,@NAME@o) = "pa_o.cmo pa_op.cmo pr_dump.cmo"
+archive(syntax,preprocessor,@NAME@r) = "pa_r.cmo pa_rp.cmo pr_dump.cmo"
+archive(syntax,preprocessor,@NAME@sml) = "pa_sml.cmo pr_dump.cmo"
+archive(syntax,preprocessor,@NAME@scheme) = "pa_scheme.cmo pr_dump.cmo"
+archive(syntax,preprocessor,@NAME@lisp) = "pa_lisp.cmo pr_dump.cmo"
+preprocessor = "@NAME@ -nolib"
+
+package "gramlib" (
+  requires(toploop) = "@NAME@"
+  version = "[distributed with Ocaml]"
+  description = "Grammar library to create syntax extensions"
+  archive(byte) = "gramlib.cma"
+  archive(byte,toploop) = ""  # already contained in @NAME@*.cma
+  archive(native) = "gramlib.cmxa"
+)
+
+package "quotations" (
+  requires = "@NAME@"
+  version = "[distributed with Ocaml]"
+  description = "Syntax extension: Quotations to create AST nodes"
+  archive(syntax,preprocessor) = "q_MLast.cmo"
+  archive(syntax,toploop) = "q_MLast.cmo"
+)
+
+package "phony_quotations" (
+  requires = "@NAME@"
+  version = "[distributed with Ocaml]"
+  description = "Syntax extension: Phony quotations"
+  archive(syntax,preprocessor) = "q_phony.cmo"
+  archive(syntax,toploop) = "q_phony.cmo"
+)
+
+package "extend" (
+  requires = "@NAME@"
+  version = "[distributed with Ocaml]"
+  description = "Syntax extension: EXTEND the @NAME@ grammar"
+  archive(syntax,preprocessor) = "pa_extend.cmo"
+  archive(syntax,toploop) = "pa_extend.cmo"
+)
+
+package "extfun" (
+  requires = "@NAME@"
+  version = "[distributed with Ocaml]"
+  description = "Syntax extension: Extensible functions"
+  archive(syntax,preprocessor) = "pa_extfun.cmo"
+  archive(syntax,toploop) = "pa_extfun.cmo"
+)
+
+package "fstream" (
+  requires = "@NAME@"
+  version = "[distributed with Ocaml]"
+  description = "Syntax extension: Functional stream parsers"
+  archive(syntax,preprocessor) = "pa_fstream.cmo"
+  archive(syntax,toploop) = "pa_fstream.cmo"
+)
+
+package "macro" (
+  requires = "@NAME@"
+  version = "[distributed with Ocaml]"
+  description = "Syntax extension: Conditional compilation"
+  archive(syntax,preprocessor) = "pa_macro.cmo"
+  archive(syntax,toploop) = "pa_macro.cmo"
+)
+
+package "unit_constraints" (
+  requires = "@NAME@"
+  version = "[distributed with Ocaml]"
+  description = "Syntax extension: Type constraints of type unit (revised syntax only)"
+  archive(syntax,preprocessor,@NAME@r) = "pa_ru.cmo"
+  archive(syntax,toploop,@NAME@r) = "pa_ru.cmo"
+  error(syntax,-@NAME@r) = "Not available"
+)
--- camlp5-5.07.orig/debian/patches/00dpatch.conf
+++ camlp5-5.07/debian/patches/00dpatch.conf
@@ -0,0 +1,2 @@
+conf_debianonly=1
+conf_origtargzpath=../tarballs
--- camlp5-5.07.orig/debian/copyright
+++ camlp5-5.07/debian/copyright
@@ -0,0 +1,135 @@
+This package was debianized by Stefano Zacchiroli <zack@debian.org> on
+Tue, 10 Jul 2007 20:57:36 +0200.
+
+It was downloaded from http://cristal.inria.fr/~ddr/camlp5/
+
+Upstream Author: 
+
+    Daniel de Rauglaudre <daniel.de_rauglaudre@inria.fr>
+
+Copyright: 
+
+    Copyright (c) 1996-2007, INRIA (Institut National de Recherches en Informatique et Automatique)
+
+License:
+
+    CamlP5 (everything except the stuff located under ocaml_stuff/) is licensed
+    under the BSD license (with the exception of the copyright, which is by
+    INRIA), see `/usr/share/common-licenses/BSD'.
+
+    The stuff located under ocaml_stuff/ is distributed under the terms of the
+    Q Public License version 1.0 with a change to choice of law (included
+    below). Moreover, as a special exception to the Q Public Licence, you may
+    develop application programs, reusable components and other software items
+    that link with the original or modified versions of the code and are not
+    made available to the general public, without any of the additional
+    requirements listed in clause 6c of the Q Public licence.
+
+The Debian packaging is (C) 2007, Stefano Zacchiroli <zack@debian.org> and
+is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+
+----------------------------------------------------------------------
+
+                   THE Q PUBLIC LICENSE version 1.0
+
+              Copyright (C) 1999 Troll Tech AS, Norway.
+                  Everyone is permitted to copy and
+                  distribute this license document.
+
+The intent of this license is to establish freedom to share and change
+the software regulated by this license under the open source model.
+
+This license applies to any software containing a notice placed by the
+copyright holder saying that it may be distributed under the terms of
+the Q Public License version 1.0. Such software is herein referred to
+as the Software. This license covers modification and distribution of
+the Software, use of third-party application programs based on the
+Software, and development of free software which uses the Software.
+
+                            Granted Rights
+
+1. You are granted the non-exclusive rights set forth in this license
+provided you agree to and comply with any and all conditions in this
+license. Whole or partial distribution of the Software, or software
+items that link with the Software, in any form signifies acceptance of
+this license.
+
+2. You may copy and distribute the Software in unmodified form
+provided that the entire package, including - but not restricted to -
+copyright, trademark notices and disclaimers, as released by the
+initial developer of the Software, is distributed.
+
+3. You may make modifications to the Software and distribute your
+modifications, in a form that is separate from the Software, such as
+patches. The following restrictions apply to modifications:
+
+      a. Modifications must not alter or remove any copyright notices
+      in the Software.
+
+      b. When modifications to the Software are released under this
+      license, a non-exclusive royalty-free right is granted to the
+      initial developer of the Software to distribute your
+      modification in future versions of the Software provided such
+      versions remain available under these terms in addition to any
+      other license(s) of the initial developer.
+
+4. You may distribute machine-executable forms of the Software or
+machine-executable forms of modified versions of the Software,
+provided that you meet these restrictions:
+
+      a. You must include this license document in the distribution.
+
+      b. You must ensure that all recipients of the machine-executable
+      forms are also able to receive the complete machine-readable
+      source code to the distributed Software, including all
+      modifications, without any charge beyond the costs of data
+      transfer, and place prominent notices in the distribution
+      explaining this.
+
+      c. You must ensure that all modifications included in the
+      machine-executable forms are available under the terms of this
+      license.
+
+5. You may use the original or modified versions of the Software to
+compile, link and run application programs legally developed by you or
+by others.
+
+6. You may develop application programs, reusable components and other
+software items that link with the original or modified versions of the
+Software. These items, when distributed, are subject to the following
+requirements:
+
+      a. You must ensure that all recipients of machine-executable
+      forms of these items are also able to receive and use the
+      complete machine-readable source code to the items without any
+      charge beyond the costs of data transfer.
+
+      b. You must explicitly license all recipients of your items to
+      use and re-distribute original and modified versions of the
+      items in both machine-executable and source code forms. The
+      recipients must be able to do so without any charges whatsoever,
+      and they must be able to re-distribute to anyone they choose.
+
+      c. If the items are not available to the general public, and the
+      initial developer of the Software requests a copy of the items,
+      then you must supply one.
+
+                       Limitations of Liability
+
+In no event shall the initial developers or copyright holders be
+liable for any damages whatsoever, including - but not restricted to -
+lost revenue or profits or other direct, indirect, special, incidental
+or consequential damages, even if they have been advised of the
+possibility of such damages, except to the extent invariable law, if
+any, provides otherwise.
+
+                             No Warranty
+
+The Software and this license document are provided AS IS with NO
+WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN,
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+
+                            Choice of Law
+
+This license is governed by the Laws of France.
+
--- camlp5-5.07.orig/debian/doc-base
+++ camlp5-5.07/debian/doc-base
@@ -0,0 +1,9 @@
+Document: camlp5
+Title: Camlp5 Manual
+Author: Daniel de Rauglaudre
+Abstract: Manual for the Camlp5 preprocessor and pretty-printer for OCaml programs
+Section: Applications/Programming
+
+Format: HTML
+Index: /usr/share/doc/camlp5/html/index.html
+Files: /usr/share/doc/camlp5/html/*.html
