--- otags-3.09.3.orig/debian/svn-deblayout +++ otags-3.09.3/debian/svn-deblayout @@ -0,0 +1,3 @@ +origDir=../upstream +origUrl=svn+ssh://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/otags/upstream +tagsUrl=svn+ssh://svn.debian.org/svn/pkg-ocaml-maint/tags/packages/otags --- otags-3.09.3.orig/debian/update-otags +++ otags-3.09.3/debian/update-otags @@ -0,0 +1,8 @@ +#!/bin/sh +OTAGS="/usr/bin/otags" +test -x "$OTAGS" || exit 0 +OCAMLDIR=`ocamlc -where 2> /dev/null` +test -d "$OCAMLDIR" || exit 0 +rm -f /var/lib/otags/vi/TAGS /var/lib/otags/emacs/TAGS +$OTAGS -r -vi -o /var/lib/otags/vi/TAGS $OCAMLDIR 2>/dev/null +$OTAGS -r -emacs -o /var/lib/otags/emacs/TAGS $OCAMLDIR 2>/dev/null --- otags-3.09.3.orig/debian/otags.1 +++ otags-3.09.3/debian/otags.1 @@ -0,0 +1,71 @@ +.TH otags 1 "Date: June 2004" "otags" +.SH NAME + +otags \- generage TAGS files for emacs/vi + +.SH SYNOPIS + +otags [\-v] [\-o ] [\-sc] [\-sa ] [\-sr ] [\-r] [\-f] [\-vi] +[\-emacs] [\-camlp4 ] [\-pa ] [\-q] [\-version] [\-help] [\-\-help] +files + +.SH DESCRIPTION +otags is a tool for building +.I TAGS +files for emacs and vi. +.I TAGS +files provide the editor with an index table, mapping important symbol +names to locations in source files. This allows the developer to +quickly jump to a function in a different file than the one he is +currently visiting in the buffer. +.P +otags parses a set of O'Caml source files, in either the standard or +revised syntax, and creates a TAGS file with the locations of +functions, type declarations, record fields, sum type constructors, +etc... + +.SH OPTIONS +.IP -v +display debug messages +.IP "-o " +output tags file (default: TAGS) (use \- for standard output) +.IP -sc +suffix list: clear (default: [.mli; .ml]) +.IP "-sa " +suffix list: add target +.IP "-sr " +suffix list: remove target +.IP -r +enable recursive directory search +.IP -f +disable recursive directory search (default) +.IP -vi +generate vi tags +.IP -emacs +generate emacs tags (default) +.IP "-camlp4 " +camlp4 command (default: camlp4) +.IP "-pa " +add camlp4 parser (default: pa_o.cmo; pa_op.cmo) +.IP -q +accept quotations in input +.IP -version +display otags version number +.IP -help +Display list of options +.IP --help +Display list of options + +.SH AUTHORS +otags was written by + Cuihtlauac Alvarado +and + Jean-Francois Monin +.P +This man page was written by Mike Furr . + +.SH "SEE ALSO" +.BR ocaml (1), +.BR emacs (1), +.BR vi (1) + --- otags-3.09.3.orig/debian/docs +++ otags-3.09.3/debian/docs @@ -0,0 +1 @@ +README --- otags-3.09.3.orig/debian/watch +++ otags-3.09.3/debian/watch @@ -0,0 +1,4 @@ +# Site Directory Pattern Version Script +version=2 +http://perso.rd.francetelecom.fr/alvarado/soft/otags-(.*)\.tar\.gz + --- otags-3.09.3.orig/debian/README.Debian +++ otags-3.09.3/debian/README.Debian @@ -0,0 +1,20 @@ +otags for Debian +---------------- + +QUICKSTART: +First run otags on the files you wish to add to the TAGS file('tags' +for -vi mode). Then + +emacs: Run M-x visit-tags-table and select the TAGS file. Then do +'M-.' to jump to symbol. + +vi: Move the cursor to a symbol and press ^] to jump to that symbol's +declaration. Vi also supports a powerful tag stack mechanism whose +explanation is outside the scope of the this README. Consult your +favorite vi resource for more information. + +Also, new in 3.09.0-2, the entire contents of `ocamlc -where` is now +tagged and store in /var/lib/otags/[vi|emacs]/TAGS. This is updated +once a day via a cron job. + + -- Mike Furr , Sat Jan 7 17:43:28 2006 --- otags-3.09.3.orig/debian/changelog +++ otags-3.09.3/debian/changelog @@ -0,0 +1,112 @@ +otags (3.09.3-3) unstable; urgency=low + + [ Stefano Zacchiroli ] + * fix vcs-svn field to point just above the debian/ dir + + [ Mehdi Dogguy ] + * Move maintainers to uploaders and mark d-o-m as maintainer + * Remove usage of old Ocaml's Standard library location + * Add dh-ocaml as a build dependency + * Bump compat to 5 + * Updated to policy 3.8.2 (no changes needed) + * Added homepage field + * Add a copyright notice in debian/copyright + * Add a manpage for update-otags + + -- Mehdi Dogguy Wed, 01 Jul 2009 09:10:15 +0000 + +otags (3.09.3-2) unstable; urgency=low + + * Added runtime dep on camlp5 (Closes: #443435) + * Ack previous NMU (Closes: #441929) + + -- Mike Furr Mon, 24 Sep 2007 13:04:11 -0400 + +otags (3.09.3-1.1) unstable; urgency=low + + * added camlp5 to build-depends + * NMU to fix the FTBFS acknowledged by the maintainer (Closes: #441929) + + -- Enrico Tassi Fri, 14 Sep 2007 15:56:57 +0100 + +otags (3.09.3-1) unstable; urgency=low + + * New upstream release + * Add camlp5 patch to build with legacy preprocessor + * Added a status message during postinst so the user knows that it might + take a minute to run update-otags + + -- Mike Furr Tue, 11 Sep 2007 16:52:52 -0400 + +otags (3.09.0-5) unstable; urgency=low + + * Fixed typo in long description. Thanks to Simon Waters. + (Closes: 390246) + + -- Mike Furr Mon, 6 Nov 2006 14:45:00 -0500 + +otags (3.09.0-4) unstable; urgency=low + + * Removed control.in as per new policy + * Moved to svn-buildpackage layout in SVN + * Updated to policy 3.7.2 (no changes needed) + * Added dep in Makefile to ensure dirs.in gets reprocessed with binNMU's + (Closes: #372592) + + -- Mike Furr Fri, 8 Sep 2006 16:30:53 -0400 + +otags (3.09.0-3) unstable; urgency=low + + * Oops, redirect otags output to /dev/null in update-otags + + -- Mike Furr Sun, 8 Jan 2006 14:19:57 -0500 + +otags (3.09.0-2) unstable; urgency=low + + * Stefano: added otagging of `ocamlc -where` (Closes: 341939) + - mfurr: added a few fixups, like a prerm script + * Removed hard-coded OCaml version numbers + * Changed dep on ocaml-nox to ocaml-base-nox + * Rebuild for 3.09.1 + + -- Mike Furr Sat, 7 Jan 2006 17:44:36 -0500 + +otags (3.09.0-1) unstable; urgency=low + + * New upstream release + + -- Mike Furr Tue, 8 Nov 2005 20:24:27 -0500 + +otags (3.08.0.2-3) unstable; urgency=medium + + * Rebuild against 3.08.3 (and updated deps) + + -- Mike Furr Wed, 23 Mar 2005 13:34:49 -0500 + +otags (3.08.0.2-2) unstable; urgency=low + + * Rebuild against ocaml 3.08.2 + + -- Mike Furr Tue, 30 Nov 2004 15:29:48 -0500 + +otags (3.08.0.2-1) unstable; urgency=low + + * New upstream release + * Build with ocaml 3.08 + * Update deps to -nox + + -- Mike Furr Thu, 29 Jul 2004 12:09:26 -0400 + +otags (3.07.1-2) unstable; urgency=low + + * Added support to compile a bytecode version where native code + is not supported. + + -- Mike Furr Wed, 7 Jul 2004 22:04:55 -0400 + +otags (3.07.1-1) unstable; urgency=low + + * Initial Release(Closes: 256062) + + -- Mike Furr Thu, 24 Jun 2004 16:33:50 -0400 + --- otags-3.09.3.orig/debian/control +++ otags-3.09.3/debian/control @@ -0,0 +1,25 @@ +Source: otags +Section: devel +Priority: optional +Maintainer: Debian OCaml Maintainers +Uploaders: Mike Furr , Mehdi Dogguy +Build-Depends: ocaml-nox (>= 3.10.0), debhelper (>= 5.0.0), dh-ocaml (>= 0.4.1), dpatch, camlp5 +Standards-Version: 3.8.2 +Homepage: http://www.cs.ru.nl/~tews/otags/ +Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/otags/trunk +Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/otags/trunk/ + +Package: otags +Architecture: any +Depends: ocaml-base-nox-${F:OCamlABI}, camlp5, ${shlibs:Depends} +Description: tool for building TAGS files from OCaml sources + otags is a tool for building "TAGS" files for emacs and vi. TAGS + files provide the editor with an index table, mapping important + symbol names to locations in source files. This allows the developer + to quickly jump to a function in a different file than the one he is + currently visiting in the buffer. + . + otags parses a set of OCaml source files in either the standard or + revised syntax, and creates a TAGS file with the locations + of functions, type declarations, record fields, sum type constructors, + etc... --- otags-3.09.3.orig/debian/rules +++ otags-3.09.3/debian/rules @@ -0,0 +1,73 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +PACKAGE=otags +include /usr/share/ocaml/ocamlvars.mk +include /usr/share/ocaml/ocamlinit.mk +include /usr/share/dpatch/dpatch.make + +configure-stamp: patch-stamp configure + dh_testdir + ./configure --prefix /usr --libdir $(OCAML_STDLIB_DIR)/otags/ --bytecode + touch configure-stamp + +build: build-stamp + +build-stamp: ocamlinit configure-stamp + dh_testdir + + $(MAKE) depend + $(MAKE) + + touch build-stamp + +clean: patch clean1 unpatch ocamlinit-clean +clean1: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp patch-stamp + + -$(MAKE) clean + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + $(MAKE) install DESTDIR=$(CURDIR)/debian/otags + + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs + dh_installexamples + dh_installman debian/otags.1 debian/update-otags.8 + dh_install + dh_installcron + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol -- -VF:OCamlABI="$(OCAML_ABI)" + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- otags-3.09.3.orig/debian/prerm +++ otags-3.09.3/debian/prerm @@ -0,0 +1,16 @@ +#!/bin/sh -e + +case "$1" in + remove) + rm -f /var/lib/otags/vi/TAGS + rm -f /var/lib/otags/emacs/TAGS + ;; + + upgrade) + rm -f /var/lib/otags/vi/TAGS + rm -f /var/lib/otags/emacs/TAGS + ;; + +esac + +#DEBHELPER# --- otags-3.09.3.orig/debian/dirs.in +++ otags-3.09.3/debian/dirs.in @@ -0,0 +1,4 @@ +usr/bin +@OCamlStdlibDir@/otags +var/lib/otags/emacs +var/lib/otags/vi --- otags-3.09.3.orig/debian/update-otags.8 +++ otags-3.09.3/debian/update-otags.8 @@ -0,0 +1,49 @@ +'\" t +.\" Title: update-otags +.\" Author: Mehdi Dogguy +.\" Generator: DocBook XSL Stylesheets v1.75.1 +.\" Date: Jul 1, 2009 +.\" Manual: System administration commands +.\" Source: otags +.\" Language: English +.\" +.TH "UPDATE\-OTAGS" "8" "Jul 1, 2009" "otags" "System administration commands" +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" +update-otags \- Update otags database +.SH "SYNOPSIS" +.HP \w'\fBupdate\-otags\fR\ 'u +\fBupdate\-otags\fR +.SH "DESCRIPTION" +.PP +This manual page documents briefly the +\fBupdate\-otags\fR +command\&. +.PP +This command updates the otags database (for vi and emacs)\&. The result can be found at: /var/lib/otags\&. +.SH "LICENSE" +.PP +This manual page was written by +Mehdi Dogguy +dogguy@pps\&.jussieu\&.fr +for the Debian GNU/Linux system (but may be used by others)\&. Permission is granted to copy, distribute and/or modify this document under the terms of the +GNU +General Public License, Version 2 or any later version published by the Free Software Foundation; considering as source code all the file that enable the production of this manpage\&. +.SH "AUTHOR" +.PP +\fBMehdi Dogguy\fR <\&dogguy@pps\&.jussieu\&.fr\&> +.RS 4 +.RE +.SH "COPYRIGHT" +.br +Copyright \(co 2009 Mehdi Dogguy +.br --- otags-3.09.3.orig/debian/compat +++ otags-3.09.3/debian/compat @@ -0,0 +1 @@ +5 --- otags-3.09.3.orig/debian/otags.install +++ otags-3.09.3/debian/otags.install @@ -0,0 +1 @@ +debian/update-otags usr/sbin/ --- otags-3.09.3.orig/debian/postinst +++ otags-3.09.3/debian/postinst @@ -0,0 +1,11 @@ +#!/bin/sh -e + +case "$1" in + configure) + echo -n "Updating otags cache...(this may take a minute) " + update-otags 2> /dev/null + echo "done." + ;; +esac + +#DEBHELPER# --- otags-3.09.3.orig/debian/copyright +++ otags-3.09.3/debian/copyright @@ -0,0 +1,15 @@ +This package was debianized by Mike Furr on +Thu, 24 Jun 2004 16:33:50 -0400. + +It was downloaded from http://perso.rd.francetelecom.fr/alvarado/soft/ + +Upstream Authors: Cuihtlauac Alvarado + Jean-Francois Monin + +Copyright: ® 1999-2004 Cuihtlauac Alvarado + ® 1999-2004 Jean-Francois Monin + +This software is copyrighted under the GPL version 2. You are free to +distribute this software under the terms of said license. On Debian +systems, the complete text of the GNU General Public License can be +found in /usr/share/common-licenses/GPL-2 file. --- otags-3.09.3.orig/debian/otags.cron.daily +++ otags-3.09.3/debian/otags.cron.daily @@ -0,0 +1,4 @@ +#!/bin/sh + +test -x /usr/sbin/update-otags || exit 0 +/usr/sbin/update-otags 2>/dev/null --- otags-3.09.3.orig/debian/patches/20_camlp5.dpatch +++ otags-3.09.3/debian/patches/20_camlp5.dpatch @@ -0,0 +1,169 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 20_camlp5.dpatch by Mike Furr +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Use camlp5 instead of camlp4. + +@DPATCH@ +diff -urNad otags-3.09.3~/Makefile otags-3.09.3/Makefile +--- otags-3.09.3~/Makefile 2007-09-11 16:10:49.177667219 -0400 ++++ otags-3.09.3/Makefile 2007-09-11 16:15:48.758821205 -0400 +@@ -70,23 +70,23 @@ + # since 3.09.3 we don't need any source tree + camlp4o_pr_emacs: \ + tags.cmxa pr_emacs_tags.cmxa +- ${CAMLOPT} -linkall -o $@ -I ${CAMLP4DIR} odyl.cmxa camlp4.cmxa \ ++ ${CAMLOPT} -linkall -o $@ -I ${CAMLP4DIR} odyl.cmxa camlp5.cmxa \ + pa_o_fast.cmx $+ \ + odyl.cmx + + camlp4o_pr_vi: \ + tags.cmxa pr_vi_tags.cmxa +- ${CAMLOPT} -linkall -o $@ -I ${CAMLP4DIR} odyl.cmxa camlp4.cmxa \ ++ ${CAMLOPT} -linkall -o $@ -I ${CAMLP4DIR} odyl.cmxa camlp5.cmxa \ + pa_o_fast.cmx $+ \ + odyl.cmx + + camlp4o_pr_emacs_ext: tags.cmxa pr_emacs_tags.cmxa +- ${CAMLOPT} -linkall -o $@ -I ${CAMLP4DIR} odyl.cmxa camlp4.cmxa \ ++ ${CAMLOPT} -linkall -o $@ -I ${CAMLP4DIR} odyl.cmxa camlp5.cmxa \ + pa_o.cmx pa_op.cmx $+ \ + odyl.cmx + + camlp4o_pr_vi_ext: tags.cmxa pr_vi_tags.cmxa +- ${CAMLOPT} -linkall -o $@ -I ${CAMLP4DIR} odyl.cmxa camlp4.cmxa \ ++ ${CAMLOPT} -linkall -o $@ -I ${CAMLP4DIR} odyl.cmxa camlp5.cmxa \ + pa_o.cmx pa_op.cmx $+ \ + odyl.cmx + +diff -urNad otags-3.09.3~/Makefile.here.tpl otags-3.09.3/Makefile.here.tpl +--- otags-3.09.3~/Makefile.here.tpl 2007-03-15 18:40:43.000000000 -0400 ++++ otags-3.09.3/Makefile.here.tpl 2007-09-11 16:15:15.322674462 -0400 +@@ -1,3 +1,5 @@ ++ ++ + # This is a -*-Makefile-*- + # $Id: Makefile.here.tpl,v 1.12 2007-03-15 22:40:43 tews Exp $ + ROOT=/usr/local +@@ -15,7 +17,7 @@ + CAMLC=tplocamlc + CAMLOPT=tplocamlopt + CAMLAR=tplocamlc -a +-CAMLP4=camlp4o ++CAMLP4=camlp5o + CAMLP4DIR=${shell ${CAMLP4} -where} + CAMLLEX=ocamllex + CAMLDEP=ocamldep +diff -urNad otags-3.09.3~/configure otags-3.09.3/configure +--- otags-3.09.3~/configure 2007-09-11 16:10:31.000000000 -0400 ++++ otags-3.09.3/configure 2007-09-11 16:17:52.666188170 -0400 +@@ -11,7 +11,7 @@ + root=/usr/local + bindir=$root/bin + bindir_spec=no +-libdir=$root/lib/ocaml/camlp4 ++libdir=$root/lib/ocaml/camlp5 + #libdir=`camlp4 -where` + libdir_spec=no + #splaydir=$root/lib/ocaml +@@ -72,7 +72,7 @@ + + # check ocamlc version + if [ $versioncheck = 1 ] ; then +- if [ "$ocv" \< "3.09" -o "$ocv" \> "3.09.99" ] ; then ++ if [ "$ocv" \< "3.09" -o "$ocv" \> "3.11.99" ] ; then + echo ocaml version $ocv found. Need 3.09.x. + exit 1 + fi +diff -urNad otags-3.09.3~/editor.ml otags-3.09.3/editor.ml +--- otags-3.09.3~/editor.ml 2007-03-15 18:40:43.000000000 -0400 ++++ otags-3.09.3/editor.ml 2007-09-11 16:19:03.987033364 -0400 +@@ -2,7 +2,7 @@ + (* Cuihtlauac Alvarado, France Telecon, Recherche & Developement *) + (* Jean-François Monin, Université Joseph Fourier - VERIMAG *) + +-(* ocamlc options: !-I `camlp4 -where`!*) ++(* ocamlc options: !-I `camlp5 -where`!*) + + (* $Id: editor.ml,v 1.3 2007-03-15 22:40:43 tews Exp $ *) + +diff -urNad otags-3.09.3~/mk_conf otags-3.09.3/mk_conf +--- otags-3.09.3~/mk_conf 2007-03-15 18:40:43.000000000 -0400 ++++ otags-3.09.3/mk_conf 2007-09-11 16:20:48.864040187 -0400 +@@ -23,7 +23,7 @@ + echo "let editor = ref Emacs" + echo "let output = ref (Some \"TAGS\")" + echo "let camlp4 = ref (None : string option)" +-echo "let camlp4_default = \"camlp4o\"" ++echo "let camlp4_default = \"camlp5o\"" + echo "let quotations = ref false" + echo "let mli_tags = ref true" + +diff -urNad otags-3.09.3~/pr.ml otags-3.09.3/pr.ml +--- otags-3.09.3~/pr.ml 2007-03-15 18:40:43.000000000 -0400 ++++ otags-3.09.3/pr.ml 2007-09-11 16:32:04.927885471 -0400 +@@ -4,8 +4,8 @@ + + (* $Id: pr.ml,v 1.16 2007-03-15 22:40:43 tews Exp $ *) + +-(* ocamlc options: !-pp "camlp4o q_MLast.cmo" -I `camlp4 -where`!*) +-(* ocamldep options: !-pp "camlp4o q_MLast.cmo"!*) ++(* ocamlc options: !-pp "camlp5o q_MLast.cmo" -I `camlp5 -where`!*) ++(* ocamldep options: !-pp "camlp5o q_MLast.cmo"!*) + + module type Tags_param = sig + val add : string -> int * int -> unit +@@ -20,7 +20,8 @@ + *) + + (* TODO: remove this crap *) +- let kludge (a, b) = a.Lexing.pos_cnum, b.Lexing.pos_cnum ++ (*let kludge (a, b) = a.Lexing.pos_cnum, b.Lexing.pos_cnum*) ++ let kludge loc = (Stdpp.first_pos loc), (Stdpp.last_pos loc) + + let rec pe_patt ast = + let loc = kludge (MLast.loc_of_patt ast) in +@@ -125,7 +126,13 @@ + | <:str_item< module type $i$ = $mt$ >> + -> T.add i loc; pe_module_type_expr mt + | <:str_item< type $list:ssltl$ >> -> +- List.iter (fun ((loc,s),_,c,_) -> T.add s (kludge loc); pe_ctyp c) ssltl ++ (*List.iter (fun ((loc,s),_,c,_) -> T.add s (kludge loc); pe_ctyp c) ssltl*) ++ List.iter (fun td -> ++ let loc,s = td.MLast.tdNam in ++ T.add s (kludge loc); ++ pe_ctyp td.MLast.tdDef ++ ) ssltl ++ + | <:str_item< value $opt:rf$ $list:pel$ >> -> List.iter (fun (p, _) -> pe_patt p) pel + | <:str_item< class $list:cd$ >> -> + List.iter (etag_class_info) cd +@@ -179,7 +186,13 @@ + -> T.add i loc; pe_module_type_expr mt + | <:sig_item< open $sl$ >> -> () + | <:sig_item< type $list:ssltl$ >> -> +- List.iter (fun ((loc,s),_,c,_) -> T.add s (kludge loc); pe_ctyp c) ssltl ++ (*List.iter (fun ((loc,s),_,c,_) -> T.add s (kludge loc); pe_ctyp c) ssltl*) ++ List.iter ++ (fun td -> ++ let loc,s = td.MLast.tdNam in ++ T.add s (kludge loc); ++ pe_ctyp td.MLast.tdDef ++ ) ssltl + | <:sig_item< value $s$ : $t$ >> -> T.add s loc + | <:sig_item< class $list:cd$ >> -> List.iter (etag_class_type_info) cd + | <:sig_item< class type $list:cd$ >> -> List.iter etag_class_type_info cd +diff -urNad otags-3.09.3~/splay.ml otags-3.09.3/splay.ml +--- otags-3.09.3~/splay.ml 2007-03-15 18:40:43.000000000 -0400 ++++ otags-3.09.3/splay.ml 2007-09-11 16:20:26.589277675 -0400 +@@ -4,8 +4,8 @@ + + (* $Id: splay.ml,v 1.3 2007-03-15 22:40:43 tews Exp $ *) + +-(* ocamlc options: !-pp camlp4o!*) +-(* ocamldep options: !-pp camlp4o!*) ++(* ocamlc options: !-pp camlp5o!*) ++(* ocamldep options: !-pp camlp5o!*) + + (* dcell mutable, parcours fermeture éclair *) + --- otags-3.09.3.orig/debian/patches/10_Makefile.dpatch +++ otags-3.09.3/debian/patches/10_Makefile.dpatch @@ -0,0 +1,25 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_Makefile.dpatch by Mike Furr +## +## DP: Change install directory. + +@DPATCH@ +diff -urNad otags-3.09.0~/Makefile otags-3.09.0/Makefile +--- otags-3.09.0~/Makefile 2005-11-04 10:08:28.000000000 -0500 ++++ otags-3.09.0/Makefile 2005-11-08 22:15:01.864862679 -0500 +@@ -124,11 +124,11 @@ + rm -f *.tar* + + install: $(LIBS) $(OBJ) +- mkdir -p $(BINDIR) $(INSTALLLIBDIR) +- install -m 644 $(LIBS) $(INSTALLLIBDIR) +- install -m 755 $(OBJ) $(BINDIR) ++ mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(INSTALLLIBDIR) ++ install -m 644 $(LIBS) $(DESTDIR)$(INSTALLLIBDIR) ++ install -m 755 $(OBJ) $(DESTDIR)$(BINDIR) + if [ $(NATIVE) = "true" ] ; then \ +- install -m 755 $(NCAMLP4) $(BINDIR); \ ++ install -m 755 $(NCAMLP4) $(DESTDIR)$(BINDIR); \ + fi + + uninstall: --- otags-3.09.3.orig/debian/patches/00list +++ otags-3.09.3/debian/patches/00list @@ -0,0 +1,3 @@ + +10_Makefile +20_camlp5 \ No newline at end of file