The following commit has been merged in the master branch: commit 72661e37fcded7d197c7a74ba637fd731923f645 Author: Hendrik Tews <hend...@askra.de> Date: Tue Jan 31 10:59:52 2012 +0100
* update packaging for new upstream version * dep5 compatible copyright diff --git a/.gitignore b/.gitignore index 845ca06..1be94dc 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ .pc +*~ diff --git a/debian/README.Debian b/debian/README.Debian index 24b0546..80be79b 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -1,20 +1,28 @@ -otags for Debian ----------------- + Otags for Debian +============================================================================== -QUICKSTART: -First run otags on the files you wish to add to the TAGS file('tags' -for -vi mode). Then +Quickstart +========== -emacs: Run M-x visit-tags-table and select the TAGS file. Then do -'M-.' <symbol> to jump to symbol. +Run otags on your files. For Emacs do -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. + otags -r . -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. +and for vi[m] do - -- Mike Furr <mf...@debian.org>, Sat Jan 7 17:43:28 2006 + otags -r -vi . + + +In the editor, move to a symbol and type M-. (for emacs) or ^] for vi[m]. +Emacs will ask for a tags table, vi[m] uses "tags" in the current +directory. In both editors you can cycle through tag locations, see +the relevant documentation. + + +System-wide tags table +====================== + +/var/lib/otags contains tag tables of /usr/lib/ocaml, updated once per +day. See the man page update-otags(8) about how to use them. + + -- Hendrik Tews <hend...@askra.de>, Fri, 27 Jan 2012 11:04:15 +0100 diff --git a/debian/clean b/debian/clean deleted file mode 100644 index fafcdff..0000000 --- a/debian/clean +++ /dev/null @@ -1,3 +0,0 @@ -Makefile.here -conf.ml -otags.byte diff --git a/debian/control b/debian/control index 6200fba..5114582 100644 --- a/debian/control +++ b/debian/control @@ -5,32 +5,30 @@ Maintainer: Debian OCaml Maintainers <debian-ocaml-ma...@lists.debian.org> Uploaders: Mike Furr <mf...@debian.org>, Mehdi Dogguy <me...@debian.org>, - Stéphane Glondu <glo...@debian.org> + Stéphane Glondu <glo...@debian.org>, + Hendrik Tews <hend...@askra.de> Build-Depends: - ocaml-nox (>= 3.11.1-3~), - debhelper (>= 7.2.11~), + ocaml-best-compilers, + debhelper (>= 7.0.50~), dh-ocaml (>= 0.9~), - camlp5 (>= 6.02.0) -Standards-Version: 3.9.1 -Homepage: http://www.cs.ru.nl/~tews/otags/ + camlp4-extra (>= 3.12.1), + camlp4-extra (<< 3.13) +Standards-Version: 3.9.2 +Homepage: http://askra.de/software/otags/ Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/otags.git Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/otags.git Package: otags Architecture: any Depends: - camlp5, + camlp4-extra (>= 3.12.1), + camlp4-extra (<< 3.13), ${ocaml:Depends}, ${shlibs:Depends}, ${misc: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... +Description: tags file generator for OCaml + Otags generates "tags" files for emacs and vi/vim to give these + editors the ability to directly jump to function and value + definitions. Otags is based on Camlp4. It can load all Camlp4 syntax + extentions and can therefore parse all sources that Camlp4 can parse + (including standard and revised syntax). diff --git a/debian/copyright b/debian/copyright index ba7dfc8..fd19107 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,15 +1,24 @@ -This package was debianized by Mike Furr <mf...@debian.org> on -Thu, 24 Jun 2004 16:33:50 -0400. +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: otags +Upstream-Contact: Hendrik Tews <prooft...@askra.de> +Source: http://askra.de/software/otags -It was downloaded from http://perso.rd.francetelecom.fr/alvarado/soft/ - -Upstream Authors: Cuihtlauac Alvarado <cuihtlauac.alvar...@francetelecom.com> - Jean-Francois Monin <jeanfrancois.mo...@francetelecom.com> - -Copyright: ® 1999-2004 Cuihtlauac Alvarado <cuihtlauac.alvar...@francetelecom.com> - ® 1999-2004 Jean-Francois Monin <jeanfrancois.mo...@francetelecom.com> - -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. +Files: * +Copyright: 2010-2012 Hendrik Tews +License: GPL-3+ + 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/dirs b/debian/dirs new file mode 100644 index 0000000..e171f13 --- /dev/null +++ b/debian/dirs @@ -0,0 +1 @@ +var/lib/otags diff --git a/debian/dirs.in b/debian/dirs.in deleted file mode 100644 index 141707f..0000000 --- a/debian/dirs.in +++ /dev/null @@ -1,4 +0,0 @@ -usr/bin -@OCamlStdlibDir@/otags -var/lib/otags/emacs -var/lib/otags/vi diff --git a/debian/docs b/debian/docs index e845566..6d07998 100644 --- a/debian/docs +++ b/debian/docs @@ -1 +1,2 @@ README +doc/changes.html diff --git a/debian/otags.1 b/debian/otags.1 deleted file mode 100644 index b12e16d..0000000 --- a/debian/otags.1 +++ /dev/null @@ -1,71 +0,0 @@ -.TH otags 1 "Date: June 2004" "otags" -.SH NAME - -otags \- generage TAGS files for emacs/vi - -.SH SYNOPIS - -otags [\-v] [\-o <str>] [\-sc] [\-sa <str>] [\-sr <str>] [\-r] [\-f] [\-vi] -[\-emacs] [\-camlp4 <str>] [\-pa <str>] [\-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 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... - -.SH OPTIONS -.IP -v -display debug messages -.IP "-o <str>" -output tags file (default: TAGS) (use \- for standard output) -.IP -sc -suffix list: clear (default: [.mli; .ml]) -.IP "-sa <str>" -suffix list: add target -.IP "-sr <str>" -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 <str>" -camlp4 command (default: camlp4) -.IP "-pa <str>" -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 <cuihtlauac.alvar...@francetelecom.com> -and - Jean-Francois Monin <jeanfrancois.mo...@francetelecom.com> -.P -This man page was written by Mike Furr <mf...@debian.org>. - -.SH "SEE ALSO" -.BR ocaml (1), -.BR emacs (1), -.BR vi (1) - diff --git a/debian/otags.cron.daily b/debian/otags.cron.daily index 8027c64..a00463e 100644 --- a/debian/otags.cron.daily +++ b/debian/otags.cron.daily @@ -1,4 +1,6 @@ #!/bin/sh +# update system-wide tags tables + test -x /usr/sbin/update-otags || exit 0 /usr/sbin/update-otags 2>/dev/null diff --git a/debian/otags.doc-base b/debian/otags.doc-base new file mode 100644 index 0000000..7169e4a --- /dev/null +++ b/debian/otags.doc-base @@ -0,0 +1,9 @@ +Document: otags-changes +Title: List of Changes for Otags +Author: Hendrik Tews +Abstract: list of changes +Section: Programming + +Format: HTML +Index: /usr/share/doc/otags/changes.html +Files: /usr/share/doc/otags/changes.html diff --git a/debian/otags.install b/debian/otags.install index 4cadffc..01f3b6a 100644 --- a/debian/otags.install +++ b/debian/otags.install @@ -1 +1,2 @@ -debian/update-otags usr/sbin/ +contrib/update-otags usr/sbin +contrib/update-otags.8 usr/share/man/man8 diff --git a/debian/otags.manpages b/debian/otags.manpages deleted file mode 100644 index c71db04..0000000 --- a/debian/otags.manpages +++ /dev/null @@ -1,2 +0,0 @@ -debian/otags.1 -debian/update-otags.8 diff --git a/debian/patches/0001-Change-install-directory.patch b/debian/patches/0001-Change-install-directory.patch deleted file mode 100644 index a79fdae..0000000 --- a/debian/patches/0001-Change-install-directory.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: Mike Furr <mf...@debian.org> -Date: Wed, 9 Nov 2005 03:24:34 +0000 -Subject: [PATCH] Change install directory - ---- - Makefile | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Makefile b/Makefile -index ad459b9..14c8937 100644 ---- a/Makefile -+++ b/Makefile -@@ -122,11 +122,11 @@ clean:: - 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: --- diff --git a/debian/patches/0002-Use-camlp5-instead-of-camlp4.patch b/debian/patches/0002-Use-camlp5-instead-of-camlp4.patch deleted file mode 100644 index 91e0d10..0000000 --- a/debian/patches/0002-Use-camlp5-instead-of-camlp4.patch +++ /dev/null @@ -1,155 +0,0 @@ -From: Mike Furr <mf...@debian.org> -Date: Tue, 11 Sep 2007 20:53:28 +0000 -Subject: [PATCH] Use camlp5 instead of camlp4 - ---- - Makefile | 8 ++++---- - configure | 2 +- - editor.ml | 2 +- - mk_conf | 2 +- - pr.ml | 23 ++++++++++++++++++----- - splay.ml | 4 ++-- - 6 files changed, 27 insertions(+), 14 deletions(-) - -diff --git a/Makefile b/Makefile -index 14c8937..bbc84a1 100644 ---- a/Makefile -+++ b/Makefile -@@ -70,23 +70,23 @@ otags.byte: conf.cmo otags.cmo - # 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 --git a/configure b/configure -index a356688..1c4fadf 100755 ---- a/configure -+++ b/configure -@@ -11,7 +11,7 @@ cmdline="$0 $*" - 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 -diff --git a/editor.ml b/editor.ml -index ca91618..7df49c2 100644 ---- a/editor.ml -+++ b/editor.ml -@@ -2,7 +2,7 @@ - (* Cuihtlauac Alvarado, France Telecon, Recherche & Developement *) - (* Jean-Fran�ois Monin, Universit� Joseph Fourier - VERIMAG *) - --(* ocamlc options: !-I `camlp4o -where`!*) -+(* ocamlc options: !-I `camlp5o -where`!*) - - (* $Id: editor.ml,v 1.4 2007-04-06 20:58:17 tews Exp $ *) - -diff --git a/mk_conf b/mk_conf -index 062701f..380c09a 100755 ---- a/mk_conf -+++ b/mk_conf -@@ -23,7 +23,7 @@ echo "let recursive = ref false" - 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 --git a/pr.ml b/pr.ml -index 9f3b678..b57173b 100644 ---- a/pr.ml -+++ b/pr.ml -@@ -4,8 +4,8 @@ - - (* $Id: pr.ml,v 1.17 2007-04-06 20:58:17 tews Exp $ *) - --(* ocamlc options: !-pp "camlp4o q_MLast.cmo" -I `camlp4o -where`!*) --(* ocamldep options: !-pp "camlp4o q_MLast.cmo"!*) -+(* ocamlc options: !-pp "camlp5o q_MLast.cmo" -I `camlp5o -where`!*) -+(* ocamldep options: !-pp "camlp5o q_MLast.cmo"!*) - - module type Tags_param = sig - val add : string -> int * int -> unit -@@ -20,7 +20,8 @@ module Tags = functor (T : Tags_param) -> struct - *) - - (* 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 @@ let rec pe_str_item ast = - | <: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 @@ and pe_sig_item ast = - -> 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 --git a/splay.ml b/splay.ml -index 9253fd9..df3210d 100644 ---- a/splay.ml -+++ b/splay.ml -@@ -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 *) - --- diff --git a/debian/patches/0003-Do-not-set-an-upper-bound-on-supported-OCaml-version.patch b/debian/patches/0003-Do-not-set-an-upper-bound-on-supported-OCaml-version.patch deleted file mode 100644 index e3650bc..0000000 --- a/debian/patches/0003-Do-not-set-an-upper-bound-on-supported-OCaml-version.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Stephane Glondu <st...@glondu.net> -Date: Tue, 18 May 2010 17:32:31 +0200 -Subject: [PATCH] Do not set an upper bound on supported OCaml versions - ---- - configure | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/configure b/configure -index 1c4fadf..4cd2a11 100755 ---- a/configure -+++ b/configure -@@ -77,7 +77,7 @@ fi - - # check ocamlc version - if [ $versioncheck = 1 ] ; then -- if [ "$ocv" \< "3.09" -o "$ocv" \> "3.09.99" ] ; then -+ if [ "$ocv" \< "3.09" ] ; then - echo ocaml version $ocv found. Need 3.09.x. - exit 1 - fi --- diff --git a/debian/patches/0004-Compatibility-with-Camlp5-6.02.1.patch b/debian/patches/0004-Compatibility-with-Camlp5-6.02.1.patch deleted file mode 100644 index 737a841..0000000 --- a/debian/patches/0004-Compatibility-with-Camlp5-6.02.1.patch +++ /dev/null @@ -1,63 +0,0 @@ -From: Stephane Glondu <st...@glondu.net> -Date: Tue, 16 Nov 2010 23:04:20 +0100 -Subject: [PATCH] Compatibility with Camlp5 6.02.1 - -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=618757 ---- - pr.ml | 14 +++++++++----- - 1 files changed, 9 insertions(+), 5 deletions(-) - -diff --git a/pr.ml b/pr.ml -index b57173b..fb9e486 100644 ---- a/pr.ml -+++ b/pr.ml -@@ -32,6 +32,10 @@ module Tags = functor (T : Tags_param) -> struct - | <:patt< ( $p$ : $t$ ) >> -> pe_patt p - | <:patt< $_$ >> -> () - -+ let option_iter f = function -+ | Some x -> f x -+ | None -> () -+ - let rec pe_ctyp ast = - (* let loc = kludge (MLast.loc_of_ctyp ast) in *) - match ast with -@@ -40,7 +44,7 @@ module Tags = functor (T : Tags_param) -> struct - | <:ctyp< { $list:sbtl$ } >> -> - List.iter (fun (loc,s,_,c) -> T.add s (kludge loc); pe_ctyp c) sbtl - | <:ctyp< [ $list:stll$ ] >> -> -- List.iter (fun (loc,s,l) -> T.add s (kludge loc); List.iter pe_ctyp l) stll -+ List.iter (fun (loc,s,l,c) -> T.add s (kludge loc); List.iter pe_ctyp l; option_iter pe_ctyp c) stll - | _ -> () - - -@@ -63,7 +67,7 @@ let rec pe_class_expr ast = - | <:class_expr< $ce$ $expr$ >> -> pe_class_expr ce - | <:class_expr< fun $p$ -> $cfb$ >> -> pe_class_expr cfb - | <:class_expr< ($ce$ : $ct$) >> -> pe_class_expr ce -- | <:class_expr< $list:id$ [ $list:tl$ ] >> -> () -+ | <:class_expr< $id$ [ $tl$ ] >> -> () - (* next one is possible but not neccessary *) - (* | <:class_expr< $list:id$ >> -> () *) - -@@ -99,7 +103,7 @@ let rec pe_class_sig_item ast = - let rec pe_class_type ast = - (* let loc = kludge (MLast.loc_of_class_type ast) in *) - match ast with -- | <:class_type< $list:id$ [ $list:tl$ ] >> -> () -+ | <:class_type< $id$ [ $tl$ ] >> -> () - (* possible but not necessary - * | <:class_type< $list:id$ >> -> () - *) -@@ -209,8 +213,8 @@ let rec interf = function - | [] -> () - | (a, _) :: l -> pe_sig_item a; interf l - --let _ = Pcaml.print_implem := implem --let _ = Pcaml.print_interf := interf -+let _ = Pcaml.print_implem := fun (x, _) -> implem x -+let _ = Pcaml.print_interf := fun (x, _) -> interf x - - (* switch off lexing of quotations *) - let _ = Plexer.no_quotations := true --- diff --git a/debian/patches/series b/debian/patches/series index e6cc530..1bb8bf6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1 @@ -0001-Change-install-directory.patch -0002-Use-camlp5-instead-of-camlp4.patch -0003-Do-not-set-an-upper-bound-on-supported-OCaml-version.patch -0004-Compatibility-with-Camlp5-6.02.1.patch +# empty diff --git a/debian/postinst b/debian/postinst old mode 100644 new mode 100755 index 4782022..17bfa93 --- a/debian/postinst +++ b/debian/postinst @@ -1,13 +1,22 @@ #!/bin/sh +# postinst script for otags +# +# see: dh_installdeb(1) set -e case "$1" in configure) - echo -n "Updating otags cache...(this may take a minute) " + echo -n "Updating system-wide tags tables...(this may take a minute) " update-otags 2> /dev/null echo "done." ;; esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + #DEBHELPER# + +exit 0 diff --git a/debian/prerm b/debian/prerm old mode 100644 new mode 100755 index f8413a7..c82a87d --- a/debian/prerm +++ b/debian/prerm @@ -1,4 +1,7 @@ #!/bin/sh +# prerm script for otags +# +# see: dh_installdeb(1) set -e @@ -6,13 +9,23 @@ case "$1" in remove) rm -f /var/lib/otags/vi/TAGS rm -f /var/lib/otags/emacs/TAGS + rm -f /var/lib/otags/TAGS + rm -f /var/lib/otags/tags ;; upgrade) rm -f /var/lib/otags/vi/TAGS rm -f /var/lib/otags/emacs/TAGS + rm -f /var/lib/otags/TAGS + rm -f /var/lib/otags/tags ;; esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + #DEBHELPER# + +exit 0 diff --git a/debian/rules b/debian/rules index e7816ca..059628d 100755 --- a/debian/rules +++ b/debian/rules @@ -1,39 +1,21 @@ #!/usr/bin/make -f # -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. # Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -include /usr/share/ocaml/ocamlvars.mk -FILES_TO_BACKUP = Makefile.depend +export DH_VERBOSE=1 %: - dh --with ocaml $@ + dh --with ocaml $@ .PHONY: override_dh_auto_configure override_dh_auto_configure: - for u in $(FILES_TO_BACKUP); do \ - cp $$u debian/$$u.backup; \ - done - ./configure --prefix /usr --libdir $(OCAML_STDLIB_DIR)/otags/ --bytecode - -.PHONY: override_dh_auto_build -override_dh_auto_build: - $(MAKE) depend - $(MAKE) - -.PHONY: override_dh_auto_clean -override_dh_auto_clean: - [ ! -f Makefile.here ] || $(MAKE) clean - for u in $(FILES_TO_BACKUP); do \ - if [ -f debian/$$u.backup ]; then \ - mv debian/$$u.backup $$u; \ - fi; \ - done - -.PHONY: override_dh_auto_install -override_dh_auto_install: - $(MAKE) install DESTDIR=$(CURDIR)/debian/otags + ./configure --prefix /usr .PHONY: override_dh_auto_test override_dh_auto_test: + @echo " dh_auto_test disabled" diff --git a/debian/update-otags b/debian/update-otags deleted file mode 100644 index d6de327..0000000 --- a/debian/update-otags +++ /dev/null @@ -1,8 +0,0 @@ -#!/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 diff --git a/debian/update-otags.8 b/debian/update-otags.8 deleted file mode 100644 index 81c39de..0000000 --- a/debian/update-otags.8 +++ /dev/null @@ -1,49 +0,0 @@ -'\" t -.\" Title: update-otags -.\" Author: Mehdi Dogguy <dog...@pps.jussieu.fr> -.\" Generator: DocBook XSL Stylesheets v1.75.1 <http://docbook.sf.net/> -.\" 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 diff --git a/debian/watch b/debian/watch index a7976ac..cf9b592 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,8 @@ +# try uscan(1) + +# Compulsory line, this is a version 3 file version=3 -http://www.cs.ru.nl/~tews/otags/otags-(.*)\.tar\.gz + +# Uncomment to examine a Webpage +# <Webpage URL> <string match> +http://askra.de/software/otags/ otags-reloaded-([0-9.]*)\.tar\.gz -- otags 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