--- findlib-1.2.5+debian.orig/debian/source.lintian-overrides
+++ findlib-1.2.5+debian/debian/source.lintian-overrides
@@ -0,0 +1 @@
+findlib source: dpatch-index-references-non-existent-patch stddirs.dpatch
--- findlib-1.2.5+debian.orig/debian/libfindlib-ocaml.install.in
+++ findlib-1.2.5+debian/debian/libfindlib-ocaml.install.in
@@ -0,0 +1,4 @@
+etc/ocamlfind.conf
+@OCamlStdlibDir@/METAS
+@OCamlStdlibDir@/findlib/META
+@OCamlStdlibDir@/findlib/findlib.cma
--- findlib-1.2.5+debian.orig/debian/libfindlib-ocaml-dev.docs
+++ findlib-1.2.5+debian/debian/libfindlib-ocaml-dev.docs
@@ -0,0 +1,2 @@
+doc/guide-html
+doc/ref-html
--- findlib-1.2.5+debian.orig/debian/README.source
+++ findlib-1.2.5+debian/debian/README.source
@@ -0,0 +1,22 @@
+Debian source package for Findlib
+=================================
+
+Patching upstream sources
+-------------------------
+
+This package uses dpatch for patching the source. Please consider
+reading dpatch manpage to patch the source.
+
+Repackaging upstream sources
+----------------------------
+
+At least db2man (from the same author) is missing to compile the
+documentation from source, but the official upstream tarball already
+provides compiled documentation, without sources. For the Debian
+source package, upstream sources have been repackaged with the sources
+of the documentation, taken from SVN.
+
+The file tools/make-package-macosx has different copyright and
+license, and is useless to Debian; it has been removed.
+
+ -- Stéphane Glondu <glondu@debian.org>, Sat, 26 Sep 2009 10:13:52 +0200
--- findlib-1.2.5+debian.orig/debian/libfindlib-ocaml-dev.links
+++ findlib-1.2.5+debian/debian/libfindlib-ocaml-dev.links
@@ -0,0 +1,2 @@
+/usr/share/doc/libfindlib-ocaml-dev/ref-html /usr/share/doc/ocaml-findlib/ref-html
+/usr/share/doc/libfindlib-ocaml-dev/guide-html /usr/share/doc/ocaml-findlib/guide-html
--- findlib-1.2.5+debian.orig/debian/changelog
+++ findlib-1.2.5+debian/debian/changelog
@@ -0,0 +1,550 @@
+findlib (1.2.5+debian-1) unstable; urgency=low
+
+ [ Stéphane Glondu ]
+ * New upstream release:
+ - remove install_missing_cmi.dpatch (merged upstream)
+ - repackage upstream with documentation sources:
+ + add explanations to README.source
+ + take it into account in debian/watch
+ * Add new binary packages:
+ - ocaml-findlib: keep there executables not depending on X
+ - ocaml-findlib-wizard: make_wizard (which depends on X)
+ - libfindlib-ocaml{,-dev}: the remaining files, dispatched as usual
+ * debian/control:
+ - build-depends on ocaml-nox (>= 3.11.1-3~)
+ - update e-mail addresses
+ - move to section ocaml
+ - update Standards-Version to 3.8.3
+ * Update debian/copyright
+
+ [ Mehdi Dogguy ]
+ * Add myself to uploaders
+ * Use dh_ocaml in the build process
+ - Modify debian/control accordingly
+ * Build-depend on dh-ocaml 0.9
+
+ -- Stéphane Glondu <glondu@debian.org> Sat, 26 Sep 2009 10:14:54 +0200
+
+findlib (1.2.4-2) unstable; urgency=low
+
+ * add back "directory" directive to site_lib_metas patch, fixes FTBFS of
+ reverse dependent packages which need the "num" findlib package
+ (revert "simplify site_lib_metas" change in -1)
+
+ -- Stefano Zacchiroli <zack@debian.org> Sat, 28 Feb 2009 23:33:44 +0100
+
+findlib (1.2.4-1) unstable; urgency=low
+
+ [ Stephane Glondu ]
+ * New Upstream Version
+ * Update patches:
+ - remove natdynlink (merged upstream)
+ - simplify site_lib_metas
+ - update install_missing_cmi
+ * Remove versioned dependencies on ocaml
+ * Bump debhelper compatibility to 7 (no changes)
+
+ [ Stefano Zacchiroli ]
+ * uploading to unstable
+ - bump ocaml build-dep to (>= 3.11) to entail proper dep-waits
+ * debian/rules: invoke ocaml.mk as a "rules" snippet
+ * debian/control: version build-dep on dh-ocaml to 0.4.1 (to avoid the
+ "remove heading white spaces" bug for debian/patches/*.in)
+ * debian/svn-deblayout: remove no longer needed SVN setting
+ * debian/source.lintian-overrides: fix typo in the tag name (which
+ inhibited the override to work)
+
+ -- Stefano Zacchiroli <zack@debian.org> Tue, 24 Feb 2009 13:54:26 +0100
+
+findlib (1.2.3-1) experimental; urgency=low
+
+ * New Upstream Version
+ * Add README.source
+ * Update Standards-Version to 3.8.0
+ * Add myself to Uploaders
+ * Update versioned dependencies to OCaml
+
+ -- Stephane Glondu <steph@glondu.net> Fri, 05 Dec 2008 19:59:13 +0100
+
+findlib (1.2.1-6) experimental; urgency=low
+
+ [ Stefano Zacchiroli ]
+ * make Vcs-* fields point to the new git repository
+
+ [ Stephane Glondu ]
+ * Add natdynlink.dpatch, to add dynlink.cmxa to META.dynlink, if
+ available.
+
+ [ Romain Beauxis ]
+ * Added build-dep on dh-ocaml
+ * Upload and build against ocaml 3.11 in experimental
+ * Versioned ocaml-related build-dep to avoid confusion
+
+ -- Romain Beauxis <toots@rastageeks.org> Fri, 28 Nov 2008 01:08:26 +0100
+
+findlib (1.2.1-5) unstable; urgency=low
+
+ [ Stephane Glondu ]
+ * Update Homepage, fix watch file.
+
+ [ Ralf Treinen ]
+ * Changed doc-base section to Programming/OCaml
+
+ -- Stefano Zacchiroli <zack@debian.org> Wed, 04 Jun 2008 13:55:33 +0200
+
+findlib (1.2.1-4.1) experimental; urgency=low
+
+ * Rebuild with ocaml 3.10.2, NMU to experimental with maintainer's blessing.
+ * Install docs into section Programming instead of Apps/Programming.
+
+ -- Ralf Treinen <treinen@debian.org> Sat, 22 Mar 2008 20:23:22 +0100
+
+findlib (1.2.1-4) unstable; urgency=low
+
+ * fix vcs-svn field to point just above the debian/ dir
+ * reword long description, also mentioning "ocamlfind" (Closes: #460669)
+ * bump build dep to ocaml 3.10.1
+
+ -- Stefano Zacchiroli <zack@debian.org> Sat, 09 Feb 2008 17:31:24 +0100
+
+findlib (1.2.1-3) unstable; urgency=low
+
+ * update standards-version, no changes needed
+ * setting me as an uploader, d-o-m as the maintainer
+ * avoid installing empty /usr/share/ocaml-findlib/, it will be created by
+ packages shipping stuff there (fixes lintian warning)
+ * avoid installing empty /usr/share/man/man3/ (fixes lintian warning)
+ * add lintian override for missing stddirs.dpatch patch in 00list; the patch
+ is automatically generated from stddirs.dpatch.in
+ * debian/patches/install_missing_cmi.dpatch: new patch to install some
+ missing .cmi-s (spotted by ocamldoc while generating the api reference)
+
+ -- Stefano Zacchiroli <zack@debian.org> Sat, 29 Dec 2007 12:17:21 +0100
+
+findlib (1.2.1-2) unstable; urgency=low
+
+ * added back parts of patch site_lib_metas.dpatch which are in fact still
+ needed and fix loading of "num" and "num-top" packages (closes: #451901)
+
+ -- Stefano Zacchiroli <zack@debian.org> Mon, 19 Nov 2007 15:26:44 +0100
+
+findlib (1.2.1-1) unstable; urgency=low
+
+ * new upstream release (closes: #450933)
+ - add support for CamlP4 3.10 (with improved META setting for it)
+ - remove patches from debian/patches/: usr_bin_install.dpatch (integrated
+ upstream), site_lib_metas.dpatch (no longer needed)
+ * add Homepage field to debian/control
+ * debian/rules:
+ - remove a no longer needed hook for getting rid of 0-sized timestamps
+
+ -- Stefano Zacchiroli <zack@debian.org> Sat, 17 Nov 2007 17:49:47 +0100
+
+findlib (1.1.2pl1-4) unstable; urgency=low
+
+ * debian/control
+ - bump dependency on ocaml-nox to 3.10.0-8 to ensure we build against a
+ fixed version of the CDBS class wrt ocamldoc generation
+
+ -- Stefano Zacchiroli <zack@debian.org> Sun, 02 Sep 2007 23:15:33 +0200
+
+findlib (1.1.2pl1-3) unstable; urgency=low
+
+ * debian/control
+ - add build-dep on camlp4, which is now in a separate package
+ * debian/rules
+ - enable creation of ocamldoc-generated API reference
+ * bump debhelper compatibility level and dependency to 5
+
+ -- Stefano Zacchiroli <zack@debian.org> Fri, 31 Aug 2007 11:59:09 +0200
+
+findlib (1.1.2pl1-2) experimental; urgency=low
+
+ * rebuilding against ocaml 3.10 and uploading to experimental
+ * debian/watch
+ - add watch file
+ * debian/rules
+ - ensure via OCAML_IN_FILES that stddirs.dpatch.in is instantiated at
+ build-time
+ * debian/patches/
+ - remove numbers from patch names: 00list is enough for the ordering
+ - remove the non-.in version of stddirs.dpatch from the source package
+ * debian/control
+ - bump build-dep on ocaml to >= 3.10.0-4, as we need a fixed ocaml.mk CDBS
+ class wrt dpatch
+
+ -- Stefano Zacchiroli <zack@debian.org> Wed, 04 Jul 2007 10:46:37 +0000
+
+findlib (1.1.2pl1-1) unstable; urgency=low
+
+ * new upstream release (closes: #389758)
+ * debian/patches/13_usr_bin_install.dpatch
+ - new patch for installing safe_camlp4 under $(prefix)/usr/bin
+
+ -- Stefano Zacchiroli <zack@debian.org> Sat, 11 Nov 2006 09:35:02 +0100
+
+findlib (1.1.1-7) unstable; urgency=low
+
+ * debian/rules
+ - use the ocaml.mk cdbs class
+ * debian/control
+ - bumped ocaml-nox build dependency to >= 3.09.2-7 since we use ocaml.mk
+
+ -- Stefano Zacchiroli <zack@debian.org> Sat, 28 Oct 2006 18:07:40 +0200
+
+findlib (1.1.1-6) unstable; urgency=low
+
+ * debian/rules
+ - removed no longer needed workaround for cdbs + dpatch
+ - avoid to create debian/control from debian/control.in on ocamlinit
+ * debian/control.in
+ - file removed, no longer needed
+
+ -- Stefano Zacchiroli <zack@debian.org> Tue, 5 Sep 2006 22:45:17 +0200
+
+findlib (1.1.1-5) unstable; urgency=low
+
+ * debian/patches/17_stddirs.dpatch:
+ - switched to .in form so that on 'ocamlinit' the patch is
+ instantiated to the current version of the OCaml ABI
+ (fixes wrong paths in /etc/ocamlfind.conf)
+
+ -- Stefano Zacchiroli <zack@debian.org> Fri, 16 Jun 2006 14:04:22 +0200
+
+findlib (1.1.1-4) unstable; urgency=low
+
+ * Upload to unstable.
+
+ -- Stefano Zacchiroli <zack@debian.org> Tue, 16 May 2006 19:46:14 +0000
+
+findlib (1.1.1-3) experimental; urgency=low
+
+ * Rebuilt against OCaml 3.09.2, bumped deps accordingly.
+ * Bumped Standards-Version to 3.7.2 (no changes needed).
+
+ -- Stefano Zacchiroli <zack@debian.org> Thu, 11 May 2006 22:00:50 +0000
+
+findlib (1.1.1-2) unstable; urgency=low
+
+ * Rebuilt against OCaml 3.09.1, bumped deps accordingly.
+
+ -- Stefano Zacchiroli <zack@debian.org> Sat, 7 Jan 2006 11:29:15 +0100
+
+findlib (1.1.1-1) unstable; urgency=low
+
+ * new upstream release
+ - integrated a patch of mine which fixes sourcing of additional
+ configuration files. In Debian this broke the native compilers
+ settings inherited by the ocaml-native-compilers package
+ * avoid stripping <stdlib>/findlib/make_wizard on non-native archs
+
+ -- Stefano Zacchiroli <zack@debian.org> Sun, 27 Nov 2005 23:00:55 +0100
+
+findlib (1.1-4) unstable; urgency=low
+
+ * avoid stripping findlib executable on non-native archs, fixes FTBFS
+ of dependent packages on non-native archs (thanks to Julien Cristau
+ for the patch) (closes: #338932, #338935)
+
+ -- Stefano Zacchiroli <zack@debian.org> Mon, 14 Nov 2005 17:08:13 +0100
+
+findlib (1.1-3) unstable; urgency=low
+
+ * debian/*
+ - use cdbs
+ * removed ancient symlink <stdlib>/findlib/topfind -> ../topfind
+ * debian/rules
+ - removed old bugfix for missed install of num-top printers
+ * debian/rules vs debian/patches/29_no_itest.dpatch
+ - removed patch, avoid invoking ./itest in debian/rules is easier
+
+ -- Stefano Zacchiroli <zack@debian.org> Sat, 12 Nov 2005 13:06:42 +0100
+
+findlib (1.1-2) unstable; urgency=low
+
+ * debian/patches/29_no_itest.dpatch
+ - disable itest at build ends, not really needed in debian, hangs
+ on hppa
+
+ -- Stefano Zacchiroli <zack@debian.org> Thu, 10 Nov 2005 10:14:03 +0100
+
+findlib (1.1-1) unstable; urgency=low
+
+ * New usptream release
+ * Rebuilt with ocaml 3.09
+ * debian/patches/23_include.dpatch
+ - ported to this new upstream release
+ * debian/{rules,*.in}
+ - no more hardcoding of ocaml ABI version anywhere
+ * debian/rules
+ - findlib now detect at compile time if native code compilation is
+ available, if so it adds ocamlc/opt/... definition to
+ /etc/ocamlfind.conf. Grep-ed them away from debian configuration file
+ since native code compilers are not installed everywhere
+
+ -- Stefano Zacchiroli <zack@debian.org> Tue, 8 Nov 2005 09:16:00 +0000
+
+findlib (1.0.4-4) unstable; urgency=low
+
+ * debian/patches/23_include.dpatch
+ - added support for including configuration files stored in
+ /usr/share/ocaml-findlib/
+ * debian/bash_completion/ocamlfind
+ debian/ocamlfind.install
+ - added ocamlfind bash completion for bash, it gets installed under
+ /etc/bash_completion.d/
+ * debian/control
+ - bumped Standards-Version
+
+ -- Stefano Zacchiroli <zack@debian.org> Thu, 1 Sep 2005 08:13:10 +0200
+
+findlib (1.0.4-3) unstable; urgency=medium
+
+ * rebuilt against ocaml 3.08.3, changed dependencies and destdir
+ accordingly
+
+ -- Stefano Zacchiroli <zack@debian.org> Tue, 22 Mar 2005 02:29:19 +0100
+
+findlib (1.0.4-2) unstable; urgency=low
+
+ * depends on ocaml-nox-3.08 instead of ocaml-3.08
+
+ -- Stefano Zacchiroli <zack@debian.org> Tue, 27 Jul 2004 14:27:46 +0200
+
+findlib (1.0.4-1) unstable; urgency=low
+
+ * New upstream release
+ * Rebuilt with/for ocaml 3.08 (Closes: Bug#261427)
+ * debian/control
+ - bumped ocaml deps
+ - removed no longer needed dep on libnums
+ - bumped standards-version to 3.6.1.1
+ - changed awk dep to "gawk | awk"
+ * debian/patches/17_stddirs.dpatch, debian/ocaml-findlib.dirs
+ - ported to ocaml 3.08
+
+ -- Stefano Zacchiroli <zack@debian.org> Mon, 26 Jul 2004 14:08:36 +0200
+
+findlib (1.0.3-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Stefano Zacchiroli <zack@debian.org> Fri, 30 Jan 2004 18:13:35 +0100
+
+findlib (1.0.2-1) unstable; urgency=low
+
+ * New upstream release
+ - added support for subpackages
+ - improved META files' language
+ - new ocamldoc documentation
+ * debian/patches
+ - added site_lib_metas which fixes a bug in META.num and use a
+ relative path in META.camlp4 instead of an absolute one
+ - removed ancient "skip_comments" patch
+ - removed ancient "num_top" patch
+ * debian/control
+ - ships also ocamlfind's toolbox
+ * debian/rules
+ - uses /usr/bin/ocamlopt to decide whether to strip ocamlfind or not
+ - bugfix: ships also num-top's META
+ * Shipped some new documentation from doc/ dir
+ * Better cleanup when invoking "debian/rules clean"
+ * Added build dependency on libnums-ocaml-dev | ocaml (>= 3.08)
+ (Closes: Bug#224871
+ Please note that this dependency should close the bug, but is not
+ yet fullfillable by the autobuilders since ocaml-nums is still in
+ the NEW queue waiting for manual processing by the ftp masters.
+ Please be patient or download manually the ocaml-nums package from
+ Sven Luther's (ocaml-nums maintainer) page at
+ http://people.debian.org/~luther/ocaml)
+
+ -- Stefano Zacchiroli <zack@debian.org> Sun, 11 Jan 2004 15:27:26 +0100
+
+findlib (0.9-2) unstable; urgency=low
+
+ * Renamed META directory to /usr/lib/ocaml/3.07/METAS
+
+ -- Stefano Zacchiroli <zack@debian.org> Fri, 21 Nov 2003 09:37:02 +0100
+
+findlib (0.9-1) unstable; urgency=low
+
+ * New upstream release
+ * debian/patches/00list
+ - removed num_top patch since it was accepted upstream (removed
+ therefore also README.Debian, no longer needed)
+ * Removed debconf template about libdir transition because it's
+ annoying and not really useful
+ (removed debian/{templates,postinst,preinst,config} and some
+ dependencies)
+ * debian/control
+ - bumped standards version to 3.6.1.0
+ * debian/patches/17_stddirs.dpatch
+ - added <ocaml_libdir>/META to the findlib path
+ * debian/rules
+ - use dh_install
+ - moved METAs from empty directories to META/ directory
+
+ -- Stefano Zacchiroli <zack@debian.org> Tue, 11 Nov 2003 15:56:24 +0100
+
+findlib (0.8-5) unstable; urgency=low
+
+ * Rebuilt with ocaml 3.07
+
+ -- Stefano Zacchiroli <zack@debian.org> Wed, 1 Oct 2003 13:29:22 +0200
+
+findlib (0.8-4) unstable; urgency=low
+
+ * Rebuilt with ocaml 3.07beta2
+
+ -- Stefano Zacchiroli <zack@debian.org> Mon, 22 Sep 2003 16:43:30 +0200
+
+findlib (0.8-3) unstable; urgency=low
+
+ * Apply changes other than the "debian/" directory using dpatch
+ * Added homemade patch that installs printers for types defined in the
+ "num" library and load them then "num" library is loaded in the
+ toplevel using findlib's #require directive
+ * Added debian/README.Debian mentioning the above patch
+ * debian/control
+ - added Build-Dependency on dpatch
+ - bumped Standards-Version to 3.5.10
+ - added Dependency on ${misc:Depends} variable
+ - s/modules/libraries/ in Description field
+ * debian/rules
+ - moved DH_COMPAT value to debian/compat
+ - added dpatch support (included dpatch.make; added patch-stamp,
+ patch, clean1, unpatch targets)
+ - aesthetic changes
+ - better test before dh_stripping
+
+ -- Stefano Zacchiroli <zack@debian.org> Mon, 7 Jul 2003 22:29:39 +0200
+
+findlib (0.8-2) unstable; urgency=low
+
+ * Libdir transition to /usr/lib/ocaml/3.06
+ * Added debconf note about upgrading /etc/ocamlfind.conf
+ * Changed depends and build depends to ocaml-3.06-1
+ * Bumped Standards-Version to 3.5.8
+ * Removed useless binary-indep target
+
+ -- Stefano Zacchiroli <zack@debian.org> Mon, 16 Dec 2002 11:34:29 +0100
+
+findlib (0.8-1) unstable; urgency=low
+
+ * New upstream release
+ * Added NAME section to manpages (Closes: Bug#159578)
+ * Better test for presence of ocamlopt compiler
+
+ -- Stefano Zacchiroli <zack@debian.org> Wed, 25 Sep 2002 10:30:51 +0200
+
+findlib (0.7.2-2) unstable; urgency=low
+
+ * Remove some *.cm[io] files never removed by upstream Makefiles
+ directly from debian/rules "clean" target
+
+ -- Stefano Zacchiroli <zack@debian.org> Thu, 29 Aug 2002 11:36:34 +0200
+
+findlib (0.7.2-1) unstable; urgency=low
+
+ * New upstream release
+ * Changed deps and build-deps to ocaml-3.06
+ * Switched to debhelper 4
+ * Rebuilt with ocaml 3.06
+ * Fixed broken symlink /usr/lib/ocaml/findlib/topfind
+ (Closes: Bug#155010)
+ * Suppressed spurious warnings for comments in /usr/lib/ocaml/ld.conf
+ (Closes: Bug#155704)
+ * Changed "destdir" in ocamlfind.conf, now defaults to
+ /usr/local/lib/ocaml/<ocaml-version>/
+ * Changed "path" in ocamlfind.conf, now includes
+ /usr/local/lib/ocaml/<ocaml-version>/ _and_ /usr/lib/ocaml, in this
+ order
+
+ -- Stefano Zacchiroli <zack@debian.org> Mon, 26 Aug 2002 13:45:45 +0200
+
+findlib (0.7.1-1) unstable; urgency=low
+
+ * New upstream release
+ * Swtiched from dh_installmanpages to dh_installman
+ * Adopted upstream script name to load findlib in toploop
+ (from now on s/#use ocamlfind;;/#use topfind/)
+ * Switched to debhelper 4
+ * Removed useless debian/conffiles (ocamlfind.conf resides in /etc)
+
+ -- Stefano Zacchiroli <zack@debian.org> Sun, 7 Jul 2002 12:13:05 +0200
+
+findlib (0.6.2-4) unstable; urgency=low
+
+ * Respelled a warning message that may be misinterpreted.
+ (Closes: Bug#139707, Bug#139708).
+
+ -- Stefano Zacchiroli <zack@debian.org> Tue, 26 Mar 2002 14:05:36 +0100
+
+findlib (0.6.2-3) unstable; urgency=low
+
+ * Registered findlib with doc-base.
+
+ -- Stefano Zacchiroli <zack@debian.org> Tue, 26 Mar 2002 13:22:28 +0100
+
+findlib (0.6.2-2) unstable; urgency=low
+
+ * Now build depends on ocaml >= 3.04-3, hopefully will compile also on
+ ia64 and powerpc
+
+ -- Stefano Zacchiroli <zack@debian.org> Fri, 11 Jan 2002 08:08:51 +0100
+
+findlib (0.6.2-1) unstable; urgency=low
+
+ * New upstream release
+ * Built with ocaml 3.04
+
+ -- Stefano Zacchiroli <zack@debian.org> Sun, 16 Dec 2001 22:06:53 +0100
+
+findlib (0.5.4-1) unstable; urgency=low
+
+ * New upstream release
+ * Fixed bug in ocamlmktop option. (closes: Bug#111051)
+
+ -- Stefano Zacchiroli <zack@debian.org> Tue, 4 Sep 2001 21:49:09 +0200
+
+findlib (0.5.1-5) unstable; urgency=low
+
+ * Rebuilt with ocaml 3.02
+ * Fixed serious problem that cause ocamlfind not to work on
+ architecture that does not have a native code compiler. Stripping of
+ "ocamlfind" executable is now done only if "ocamlfind" is a native
+ code executable. (closes: Bug#96254, Bug#104703, Bug#104710)
+
+ -- Stefano Zacchiroli <zack@debian.org> Tue, 21 Aug 2001 14:36:15 +0200
+
+findlib (0.5.1-4) unstable; urgency=low
+
+ * Marked /etc/ocamlfind.conf as a configuration file (closes: Bug#103679)
+
+ -- Stefano Zacchiroli <zack@debian.org> Fri, 6 Jul 2001 18:58:12 +0200
+
+findlib (0.5.1-3) unstable; urgency=low
+
+ * Added findlib manual in HTML format (closes: Bug#102900).
+
+ -- Stefano Zacchiroli <zack@debian.org> Sat, 30 Jun 2001 23:58:44 +0200
+
+findlib (0.5.1-2) unstable; urgency=low
+
+ * DH_COMPAT = 2 for backward compatibility with potato
+ * Optionally building of native code, for platform that does not have
+ native code compiler (like m68k) (closes: Bug# 93376).
+
+ -- Stefano Zacchiroli <zack@debian.org> Tue, 10 Apr 2001 12:56:15 +0200
+
+findlib (0.5.1-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Stefano Zacchiroli <zack@debian.org> Thu, 29 Mar 2001 15:50:21 +0200
+
+findlib (0.5-1) unstable; urgency=low
+
+ * Initial Release.
+
+ -- Stefano Zacchiroli <zack@debian.org> Wed, 28 Feb 2001 14:21:26 +0100
--- findlib-1.2.5+debian.orig/debian/ocaml-findlib.docs
+++ findlib-1.2.5+debian/debian/ocaml-findlib.docs
@@ -0,0 +1,2 @@
+doc/QUICKSTART
+doc/README
--- findlib-1.2.5+debian.orig/debian/copyright
+++ findlib-1.2.5+debian/debian/copyright
@@ -0,0 +1,48 @@
+Packaged-By: Stefano Zacchiroli <zack@debian.org>
+Packaged-Date: Wed, 28 Feb 2001 14:21:26 +0100
+Original-Source-Location: http://projects.camlcity.org/projects/findlib.html
+Upstream-Author: Gerd Stolpmann <gerd@gerd-stolpmann.de>
+
+Files: *
+Copyright: © 1999-2009 Gerd Stolpmann
+License: other
+
+ Copyright 1999 by Gerd Stolpmann
+
+ The package "findlib" is copyright by Gerd Stolpmann.
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this document and the "findlib" software (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+
+ The Software is provided ``as is'', without warranty of any kind, express
+ or implied, including but not limited to the warranties of
+ merchantability, fitness for a particular purpose and noninfringement.
+ In no event shall Gerd Stolpmann be liable for any claim, damages or
+ other liability, whether in an action of contract, tort or otherwise,
+ arising from, out of or in connection with the Software or the use or
+ other dealings in the software.
+
+Files: src/findlib/num_top*
+Copyright: © 2003 Stefano Zacchiroli <zack@debian.org>
+License: LGPL-2.1+
+
+ This is free software! you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of the
+ License, or (at your option) any later version.
+
+ On Debian systems, the complete text of the GNU Lesser General
+ Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
+
+Files: debian/*
+Copyright: © 2001-2009 Stefano Zacchiroli <zack@debian.org>
+ © 2009 Stéphane Glondu <glondu@debian.org>
+License: LGPL-2.1+
--- findlib-1.2.5+debian.orig/debian/watch
+++ findlib-1.2.5+debian/debian/watch
@@ -0,0 +1,3 @@
+version=3
+opts=dversionmangle=s/\+debian\d*$// \
+http://download.camlcity.org/download/findlib-(\d+.*)\.tar\.gz
--- findlib-1.2.5+debian.orig/debian/ocaml-findlib.install
+++ findlib-1.2.5+debian/debian/ocaml-findlib.install
@@ -0,0 +1,4 @@
+usr/bin/ocamlfind
+usr/bin/safe_camlp4
+usr/share/man
+debian/bash_completion/* /etc/bash_completion.d/
--- findlib-1.2.5+debian.orig/debian/control
+++ findlib-1.2.5+debian/debian/control
@@ -0,0 +1,107 @@
+Source: findlib
+Section: ocaml
+Priority: optional
+Maintainer: Debian OCaml Maintainers <debian-ocaml-maint@lists.debian.org>
+Uploaders:
+ Stefano Zacchiroli <zack@debian.org>,
+ Mehdi Dogguy <mehdi@debian.org>,
+ Stéphane Glondu <glondu@debian.org>
+Build-Depends:
+ debhelper (>= 7),
+ ocaml (>= 3.11.1-3~),
+ camlp4,
+ m4,
+ gawk | awk,
+ dpatch,
+ cdbs,
+ dh-ocaml (>= 0.9)
+Standards-Version: 3.8.3
+Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/findlib.git
+Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/findlib.git
+Homepage: http://projects.camlcity.org/projects/findlib.html
+
+Package: ocaml-findlib
+Architecture: any
+Depends:
+ libfindlib-ocaml-dev,
+ ${ocaml:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
+Suggests:
+ camlp4,
+ ocaml-findlib-wizard
+Provides: ${ocaml:Provides}
+Description: management tool for OCaml libraries
+ The "findlib" OCaml library provides a scheme to manage reusable
+ software components (packages), and includes tools that support this
+ scheme. Packages are collections of OCaml modules for which
+ metainformation can be stored. The packages are kept in the
+ filesystem hierarchy, but with strict directory structure. The
+ library contains functions to look the directory up that stores a
+ package, to query metainformation about a package, and to retrieve
+ dependency information about multiple packages.
+ .
+ This package contains a tool (ocamlfind) that allows the user to
+ enter queries on the command-line. In order to simplify compilation
+ and linkage, there are new frontends, all driven by ocamlfind, for
+ the various OCaml compilers that can directly deal with packages.
+
+Package: libfindlib-ocaml-dev
+Architecture: any
+Depends:
+ ${ocaml:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
+Recommends: ocaml-findlib
+Provides: ${ocaml:Provides}
+Replaces: ocaml-findlib (<< 1.2.4-3)
+Conflicts: ocaml-findlib (<< 1.2.4-3)
+Description: library for managing OCaml libraries (development files)
+ The "findlib" OCaml library provides a scheme to manage reusable
+ software components (packages), and includes tools that support this
+ scheme. Packages are collections of OCaml modules for which
+ metainformation can be stored. The packages are kept in the
+ filesystem hierarchy, but with strict directory structure. The
+ library contains functions to look the directory up that stores a
+ package, to query metainformation about a package, and to retrieve
+ dependency information about multiple packages.
+ .
+ This package contains development files needed to compile programs
+ using findlib.
+
+Package: libfindlib-ocaml
+Architecture: any
+Depends:
+ ${ocaml:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
+Provides: ${ocaml:Provides}
+Replaces: ocaml-findlib (<< 1.2.4-3)
+Conflicts: ocaml-findlib (<< 1.2.4-3)
+Description: library for managing OCaml libraries (runtime)
+ The "findlib" OCaml library provides a scheme to manage reusable
+ software components (packages), and includes tools that support this
+ scheme. Packages are collections of OCaml modules for which
+ metainformation can be stored. The packages are kept in the
+ filesystem hierarchy, but with strict directory structure. The
+ library contains functions to look the directory up that stores a
+ package, to query metainformation about a package, and to retrieve
+ dependency information about multiple packages.
+ .
+ This packages contains files that are or may be needed at runtime by
+ programs using findlib (META files and dynamically-loadable files).
+
+Package: ocaml-findlib-wizard
+Architecture: any
+Depends:
+ ${ocaml:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
+Provides: ${ocaml:Provides}
+Replaces: ocaml-findlib (<< 1.2.4-3)
+Conflicts: ocaml-findlib (<< 1.2.4-3)
+Description: Makefile and META wizard for OCaml libraries
+ This wizard helps you creating Makefiles and META files for simple
+ OCaml library projects. It generates a Makefile, and the Makefile
+ produces the META file. This generated build system is a starting
+ point and can be later fine-tuned.
--- findlib-1.2.5+debian.orig/debian/gbp.conf
+++ findlib-1.2.5+debian/debian/gbp.conf
@@ -0,0 +1,5 @@
+# Configuration file for git-buildpackage and friends
+
+[DEFAULT]
+# use pristine-tar:
+pristine-tar = True
--- findlib-1.2.5+debian.orig/debian/ocaml-findlib-wizard.install.in
+++ findlib-1.2.5+debian/debian/ocaml-findlib-wizard.install.in
@@ -0,0 +1 @@
+@OCamlStdlibDir@/findlib/make_wizard*
--- findlib-1.2.5+debian.orig/debian/rules
+++ findlib-1.2.5+debian/debian/rules
@@ -0,0 +1,46 @@
+#!/usr/bin/make -f
+include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/ocaml.mk
+include /usr/share/cdbs/1/class/makefile.mk
+
+PKGNAME = ocaml-findlib
+DEB_MAKE_INSTALL_TARGET = install prefix=$(CURDIR)/debian/tmp
+OCAML_IN_FILES += debian/patches/stddirs.dpatch
+
+configure/$(PKGNAME)::
+ rm -f README # just a symlink, the good one is doc/README
+ ./configure \
+ -config /etc/ocamlfind.conf \
+ -bindir /usr/bin \
+ -sitelib $(OCAML_STDLIB_DIR) \
+ -mandir /usr/share/man \
+ -with-toolbox
+ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
+build/$(PKGNAME)::
+ $(MAKE) opt
+else
+DEB_STRIP_EXCLUDE += usr/bin/ocamlfind
+DEB_STRIP_EXCLUDE += $(OCAML_STDLIB_DIR)/findlib/make_wizard
+endif
+install/$(PKGNAME)::
+ # rm ocamlc.opt and similar settings, they're not avail everywhere in debian
+ grep -v \\.opt debian/tmp/etc/ocamlfind.conf > debian/ocamlfind.conf.new
+ mv debian/ocamlfind.conf.new debian/tmp/etc/ocamlfind.conf
+ # mv METAs from empty directories to the /META directory
+ mkdir -p $(CURDIR)/debian/tmp$(OCAML_STDLIB_DIR)/METAS
+ for p in `ls site-lib-src/`; do \
+ mv $(CURDIR)/debian/tmp$(OCAML_STDLIB_DIR)/$$p/META \
+ $(CURDIR)/debian/tmp$(OCAML_STDLIB_DIR)/METAS/META.$$p; \
+ rmdir $(CURDIR)/debian/tmp$(OCAML_STDLIB_DIR)/$$p/; \
+ done
+ # rm empty man3 dir
+ test -d $(CURDIR)/debian/tmp/usr/share/man/man3 && \
+ rmdir $(CURDIR)/debian/tmp/usr/share/man/man3
+
+clean::
+ ln -sf doc/README README
+ -find . -name META -delete
+ -rm -f src/findlib/depend src/findlib/fl_metascanner.ml
+ -rm -f Makefile.config ocargs.log src/findlib/ocaml_args.ml
+ -rm -Rf site-lib-src/camlp4/
--- findlib-1.2.5+debian.orig/debian/libfindlib-ocaml-dev.doc-base.guide
+++ findlib-1.2.5+debian/debian/libfindlib-ocaml-dev.doc-base.guide
@@ -0,0 +1,9 @@
+Document: ocaml-findlib-guide
+Title: OCaml findlib User's Guide
+Author: Gerd Stolpmann
+Abstract: User manual for OCaml findlib, a module manager for OCaml
+Section: Programming/OCaml
+
+Format: HTML
+Index: /usr/share/doc/libfindlib-ocaml-dev/guide-html/index.html
+Files: /usr/share/doc/libfindlib-ocaml-dev/guide-html/*
--- findlib-1.2.5+debian.orig/debian/libfindlib-ocaml-dev.install.in
+++ findlib-1.2.5+debian/debian/libfindlib-ocaml-dev.install.in
@@ -0,0 +1,8 @@
+@OCamlStdlibDir@/topfind
+@OCamlStdlibDir@/findlib/Makefile.config
+@OCamlStdlibDir@/findlib/findlib_top.cma
+@OCamlStdlibDir@/findlib/*.cmi
+@OCamlStdlibDir@/findlib/*.mli
+@OCamlStdlibDir@/num-top/*
+OPT: @OCamlStdlibDir@/findlib/*.a
+OPT: @OCamlStdlibDir@/findlib/*.cmxa
--- findlib-1.2.5+debian.orig/debian/compat
+++ findlib-1.2.5+debian/debian/compat
@@ -0,0 +1 @@
+7
--- findlib-1.2.5+debian.orig/debian/libfindlib-ocaml-dev.doc-base.refman
+++ findlib-1.2.5+debian/debian/libfindlib-ocaml-dev.doc-base.refman
@@ -0,0 +1,9 @@
+Document: ocaml-findlib-reference
+Title: OCaml findlib Reference Manual
+Author: Gerd Stolpmann
+Abstract: Reference Manual for OCaml findlib, a module manager for OCaml
+Section: Programming/OCaml
+
+Format: HTML
+Index: /usr/share/doc/libfindlib-ocaml-dev/ref-html/index.html
+Files: /usr/share/doc/libfindlib-ocaml-dev/ref-html/*
--- findlib-1.2.5+debian.orig/debian/bash_completion/ocamlfind
+++ findlib-1.2.5+debian/debian/bash_completion/ocamlfind
@@ -0,0 +1,92 @@
+# Debian GNU/Linux ocamlfind(1) completion
+# Copyright 2005
+# Stefano Zacchiroli <zack@debian.org>
+# License: GNU GPL v2 or later
+
+# inter function communication is achieved via the $_ocamlfind_reply environment
+# variable, it will be unset each time the completion is used
+
+have ocamlfind &&
+_ocamlfind_add()
+{
+ _ocamlfind_reply="$_ocamlfind_reply $1"
+}
+
+[ "$have" ] &&
+_ocamlfind_flags()
+{
+ local cmd res
+ cmd="$1"
+ res="$( ocamlfind $cmd --help 2>/dev/null | \
+ grep '^ -' | sed 's/ *//;s/ .*//' )"
+ _ocamlfind_add "$res"
+}
+
+[ "$have" ] &&
+_ocamlfind_packages()
+{
+ local pkglist oldpkglist res
+ oldpkglist="$1"
+ pkglist=$( ocamlfind list | cut -f 1 -d' ' )
+ if echo "$oldpkglist" | grep -q ','; then
+ oldpkglist=$(echo $oldpkglist | sed 's/\(.*,\).*/\1/')
+ res=""
+ for pkg in $pkglist; do
+ res="$res $oldpkglist$pkg"
+ done
+ else
+ res="$pkglist"
+ fi
+ _ocamlfind_add "$res"
+}
+
+[ "$have" ] &&
+_ocamlfind()
+{
+ local cmd cur prev
+
+ COMPREPLY=()
+ cmd=${COMP_WORDS[1]}
+ cur=${COMP_WORDS[COMP_CWORD]}
+ prev=${COMP_WORDS[COMP_CWORD-1]}
+ _ocamlfind_reply=""
+
+ if [ $COMP_CWORD -eq 1 ]; then
+ _ocamlfind_add "query ocamlc ocamlcp ocamlmktop ocamlopt ocamldep \
+ ocamlbrowser ocamldoc install remove printconf list opt --help"
+ # TODO missing "pkg/cmd arg ..." completion
+ elif [ $COMP_CWORD -gt 1 ]; then
+ [ "$prev" = "-package" ] || _ocamlfind_flags "$cmd"
+ case "$cmd" in
+ ocamlc|ocamlcp|ocamlmktop|ocamlopt|ocamldep|ocamldoc|opt)
+ if [ "$prev" = "-package" ]; then
+ _ocamlfind_packages "$cur"
+ fi
+ ;;
+ esac
+ case "$cmd" in
+ ocamlc|ocamlcp)
+ _ocamlfind_add "$( ls *.mli *.ml *.cmo *.cma *.c *.o *.a 2> /dev/null )"
+ ;;
+ ocamlopt|opt)
+ _ocamlfind_add "$( ls *.mli *.ml *.cmx *.cmxa *.c *.o *.a 2> /dev/null )"
+ ;;
+ ocamlmktop)
+ _ocamlfind_add "$( ls *.cmo *.cma *.o *.a 2> /dev/null )"
+ ;;
+ esac
+ if [ "$cmd" = "query" ]; then _ocamlfind_packages ""; fi
+ if [ "$cmd" = "printconf" -a $COMP_CWORD -eq 2 ]; then
+ _ocamlfind_add "$( ocamlfind printconf --help | grep '|' | \
+ sed 's/.*(//;s/)//;s/|/ /g' )"
+ fi
+ fi
+ COMPREPLY=( $(compgen -W "$_ocamlfind_reply" -- $cur) )
+ unset _ocamlfind_reply
+ return 0
+}
+
+[ "$have" ] &&
+complete -F _ocamlfind ocamlfind
+
+# vim:set ft=sh:
--- findlib-1.2.5+debian.orig/debian/patches/include.dpatch
+++ findlib-1.2.5+debian/debian/patches/include.dpatch
@@ -0,0 +1,50 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 23_include.dpatch by Stefano Zacchiroli <zack@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: support for an extra, debian-specific, dir where to look for
+## DP: configuration file snippets (namely /usr/share/ocaml-findlib/)
+
+@DPATCH@
+diff -urNad trunk~/src/findlib/findlib_config.mlp trunk/src/findlib/findlib_config.mlp
+--- trunk~/src/findlib/findlib_config.mlp 2005-11-01 01:36:35.000000000 +0100
++++ trunk/src/findlib/findlib_config.mlp 2005-11-27 22:57:44.000000000 +0100
+@@ -4,6 +4,7 @@
+ *)
+
+ let config_file = "@CONFIGFILE@";;
++let extra_configd_file = "/usr/share/ocaml-findlib/";; (* Debian specific *)
+
+ let ocaml_stdlib = "@STDLIB@";;
+
+diff -urNad trunk~/src/findlib/findlib.ml trunk/src/findlib/findlib.ml
+--- trunk~/src/findlib/findlib.ml 2005-11-01 01:36:35.000000000 +0100
++++ trunk/src/findlib/findlib.ml 2005-11-27 22:58:07.000000000 +0100
+@@ -99,6 +99,8 @@
+ let configd_file =
+ config_file ^ ".d" in
+
++ let extra_configd_file = Findlib_config.extra_configd_file in
++
+ let vars_of_file f =
+ let ch = open_in config_file in
+ try
+@@ -136,12 +138,17 @@
+ vars_of_file config_file
+ else
+ [] in
++ let extra_configd_vars = (* Debian specific *)
++ if Sys.file_exists extra_configd_file then
++ vars_of_dir extra_configd_file
++ else
++ [] in
+ let configd_vars =
+ if Sys.file_exists configd_file then
+ vars_of_dir configd_file
+ else
+ [] in
+- let vars = config_vars @ configd_vars in
++ let vars = extra_configd_vars @ config_vars @ configd_vars in
+ if vars <> [] then (
+ let lookup name default =
+ try Fl_metascanner.lookup name config_preds vars
--- findlib-1.2.5+debian.orig/debian/patches/site_lib_metas.dpatch
+++ findlib-1.2.5+debian/debian/patches/site_lib_metas.dpatch
@@ -0,0 +1,30 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## site_lib_metas.dpatch by Stefano Zacchiroli <zack@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: META.num*: bugfix, moved "directory" directive outside "core" subpackage
+
+@DPATCH@
+diff -urNad trunk~/site-lib-src/num/META.in trunk/site-lib-src/num/META.in
+--- trunk~/site-lib-src/num/META.in 2004-01-11 16:05:51.000000000 +0100
++++ trunk/site-lib-src/num/META.in 2004-01-11 16:05:52.000000000 +0100
+@@ -4,8 +4,8 @@
+ `requires(toploop) = "num.core,num-top"'
+ `version = "[distributed with Ocaml]"'
+ `description = "Arbitrary-precision rational arithmetic"'
++`directory = "^"'
+ `package "core" ('
+-` directory = "^"'
+ ` version = "[internal]"'
+ ` browse_interfaces = "'interfaces`"'
+ ` archive(byte) = "nums.cma"'
+diff -urNad trunk~/site-lib-src/num-top/META.in trunk/site-lib-src/num-top/META.in
+--- trunk~/site-lib-src/num-top/META.in 2004-01-11 16:05:51.000000000 +0100
++++ trunk/site-lib-src/num-top/META.in 2004-01-11 16:05:52.000000000 +0100
+@@ -3,5 +3,6 @@
+ `requires = "num.core"'
+ `version = "'findlib_version`"'
+ `description = "Add-on for num inside toploops"'
++`directory = "+num-top"'
+ `archive(byte,toploop) = "num_top.cma"'
+
--- findlib-1.2.5+debian.orig/debian/patches/stddirs.dpatch.in
+++ findlib-1.2.5+debian/debian/patches/stddirs.dpatch.in
@@ -0,0 +1,34 @@
+#! /bin/sh -e
+## 17_stddirs.dpatch by Stefano Zacchiroli <zack@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Patch upstream findlib.conf.in so that:
+## DP: - default "manual" installation dir is /usr/local/lib/ocaml/3.08
+## DP: - findlib path look first in /usr/local/lib... and then in the
+## DP: standard ocaml library this permit local overrides of libraries
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+if [ $# -ne 1 ]; then
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1
+fi
+case "$1" in
+ -patch) patch $patch_opts -p1 < $0;;
+ -unpatch) patch $patch_opts -E -p1 -R < $0;;
+ *)
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1;;
+esac
+
+exit 0
+@DPATCH@
+diff -urNad trunk~/findlib.conf.in trunk/findlib.conf.in
+--- trunk~/findlib.conf.in 2005-11-01 00:36:34.000000000 +0000
++++ trunk/findlib.conf.in 2005-11-12 18:12:11.000000000 +0000
+@@ -1,2 +1,2 @@
+-destdir="@SITELIB@"
+-path="@SITELIB@"
++destdir="/usr/local/lib/ocaml/@OCamlABI@"
++path="/usr/local/lib/ocaml/@OCamlABI@:@SITELIB@:@SITELIB@/METAS"
--- findlib-1.2.5+debian.orig/debian/patches/00list
+++ findlib-1.2.5+debian/debian/patches/00list
@@ -0,0 +1,3 @@
+stddirs.dpatch
+include.dpatch
+site_lib_metas.dpatch