[Pkg-ocaml-maint-commits] r2412 - trunk/packages/otags/debian

Mike Furr mfurr at costa.debian.org
Sat Jan 7 23:12:51 UTC 2006 

Author: mfurr
Date: 2006-01-07 23:12:50 +0000 (Sat, 07 Jan 2006)
New Revision: 2412

Added:
   trunk/packages/otags/debian/control.in
   trunk/packages/otags/debian/dirs.in
   trunk/packages/otags/debian/otags.cron.daily
   trunk/packages/otags/debian/otags.install
   trunk/packages/otags/debian/postinst
   trunk/packages/otags/debian/prerm
   trunk/packages/otags/debian/update-otags
Removed:
   trunk/packages/otags/debian/control
   trunk/packages/otags/debian/dirs
   trunk/packages/otags/debian/otags.substvars
Modified:
   trunk/packages/otags/debian/README.Debian
   trunk/packages/otags/debian/changelog
   trunk/packages/otags/debian/rules
Log:
rebuild + de-hard-code-abi-ification


Modified: trunk/packages/otags/debian/README.Debian
===================================================================
--- trunk/packages/otags/debian/README.Debian	2006-01-07 17:40:14 UTC (rev 2411)
+++ trunk/packages/otags/debian/README.Debian	2006-01-07 23:12:50 UTC (rev 2412)
@@ -13,4 +13,8 @@
 explanation is outside the scope of the this README.  Consult your
 favorite vi resource for more information.
 
- -- Mike Furr <mfurr at debian.org>, Mon Jul  5 15:57:38 2004
+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 <mfurr at debian.org>, Sat Jan  7 17:43:28 2006

Modified: trunk/packages/otags/debian/changelog
===================================================================
--- trunk/packages/otags/debian/changelog	2006-01-07 17:40:14 UTC (rev 2411)
+++ trunk/packages/otags/debian/changelog	2006-01-07 23:12:50 UTC (rev 2412)
@@ -1,3 +1,13 @@
+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 <mfurr at debian.org>  Sat,  7 Jan 2006 17:44:36 -0500
+
 otags (3.09.0-1) unstable; urgency=low
 
   * New upstream release

Deleted: trunk/packages/otags/debian/control
===================================================================
--- trunk/packages/otags/debian/control	2006-01-07 17:40:14 UTC (rev 2411)
+++ trunk/packages/otags/debian/control	2006-01-07 23:12:50 UTC (rev 2412)
@@ -1,21 +0,0 @@
-Source: otags
-Section: devel
-Priority: optional
-Maintainer: Mike Furr <mfurr at debian.org>
-Build-Depends: ocaml-nox-3.09.0, debhelper (>= 4.0.0), dpatch
-Standards-Version: 3.6.1.0
-
-Package: otags
-Architecture: any
-Depends: ocaml-nox-3.09.0,${shlibs:Depends}
-Description: tool for building TAGS files from O'Caml 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 O'Caml source files in either the standard or
- revised syntax, and creates a TAGS file with the locations
- offunctions, type declarations, record fields, sum type constructors,
- etc...

Added: trunk/packages/otags/debian/control.in
===================================================================
--- trunk/packages/otags/debian/control.in	2006-01-07 17:40:14 UTC (rev 2411)
+++ trunk/packages/otags/debian/control.in	2006-01-07 23:12:50 UTC (rev 2412)
@@ -0,0 +1,21 @@
+Source: otags
+Section: devel
+Priority: optional
+Maintainer: Mike Furr <mfurr at debian.org>
+Build-Depends: ocaml-nox (>= #OCamlABI#), debhelper (>= 4.0.0), dpatch
+Standards-Version: 3.6.1.0
+
+Package: otags
+Architecture: any
+Depends: ocaml-base-nox-${F:OCamlABI},${shlibs:Depends}
+Description: tool for building TAGS files from O'Caml 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 O'Caml source files in either the standard or
+ revised syntax, and creates a TAGS file with the locations
+ offunctions, type declarations, record fields, sum type constructors,
+ etc...

Deleted: trunk/packages/otags/debian/dirs
===================================================================
--- trunk/packages/otags/debian/dirs	2006-01-07 17:40:14 UTC (rev 2411)
+++ trunk/packages/otags/debian/dirs	2006-01-07 23:12:50 UTC (rev 2412)
@@ -1,2 +0,0 @@
-usr/bin
-usr/lib/ocaml/3.09.0/otags

Added: trunk/packages/otags/debian/dirs.in
===================================================================
--- trunk/packages/otags/debian/dirs.in	2006-01-07 17:40:14 UTC (rev 2411)
+++ trunk/packages/otags/debian/dirs.in	2006-01-07 23:12:50 UTC (rev 2412)
@@ -0,0 +1,4 @@
+usr/bin
+usr/lib/ocaml/#OCamlABI#/otags
+var/lib/otags/emacs
+var/lib/otags/vi

Added: trunk/packages/otags/debian/otags.cron.daily
===================================================================
--- trunk/packages/otags/debian/otags.cron.daily	2006-01-07 17:40:14 UTC (rev 2411)
+++ trunk/packages/otags/debian/otags.cron.daily	2006-01-07 23:12:50 UTC (rev 2412)
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+test -x /usr/sbin/update-otags || exit 0
+/usr/sbin/update-otags

Added: trunk/packages/otags/debian/otags.install
===================================================================
--- trunk/packages/otags/debian/otags.install	2006-01-07 17:40:14 UTC (rev 2411)
+++ trunk/packages/otags/debian/otags.install	2006-01-07 23:12:50 UTC (rev 2412)
@@ -0,0 +1 @@
+debian/update-otags	usr/sbin/

Deleted: trunk/packages/otags/debian/otags.substvars
===================================================================
--- trunk/packages/otags/debian/otags.substvars	2006-01-07 17:40:14 UTC (rev 2411)
+++ trunk/packages/otags/debian/otags.substvars	2006-01-07 23:12:50 UTC (rev 2412)
@@ -1 +0,0 @@
-shlibs:Depends=libc6 (>= 2.3.2.ds1-4)

Added: trunk/packages/otags/debian/postinst
===================================================================
--- trunk/packages/otags/debian/postinst	2006-01-07 17:40:14 UTC (rev 2411)
+++ trunk/packages/otags/debian/postinst	2006-01-07 23:12:50 UTC (rev 2412)
@@ -0,0 +1,9 @@
+#!/bin/sh -e
+
+case "$1" in
+  configure)
+    /usr/sbin/update-otags 2> /dev/null
+  ;;
+esac
+
+#DEBHELPER#

Added: trunk/packages/otags/debian/prerm
===================================================================
--- trunk/packages/otags/debian/prerm	2006-01-07 17:40:14 UTC (rev 2411)
+++ trunk/packages/otags/debian/prerm	2006-01-07 23:12:50 UTC (rev 2412)
@@ -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#

Modified: trunk/packages/otags/debian/rules
===================================================================
--- trunk/packages/otags/debian/rules	2006-01-07 17:40:14 UTC (rev 2411)
+++ trunk/packages/otags/debian/rules	2006-01-07 23:12:50 UTC (rev 2412)
@@ -8,10 +8,17 @@
 
 PACKAGE=otags
 include /usr/share/dpatch/dpatch.make
+OCAMLABI = $(shell ocamlc -version)
 
+.PHONY: transition
+
+transition: debian/dirs.in debian/control.in 
+	for t in $^; do \
+	    sed -e 's%#OCamlABI#%$(OCAMLABI)%' $$t >$${t%.in}; \
+	done
 configure-stamp: patch-stamp configure
 	dh_testdir
-	./configure --prefix /usr --libdir /usr/lib/ocaml/3.09.0/otags/
+	./configure --prefix /usr --libdir /usr/lib/ocaml/$(OCAMLABI)/otags/
 	touch configure-stamp
 
 build: build-stamp
@@ -55,13 +62,15 @@
 	dh_installdocs
 	dh_installexamples
 	dh_installman debian/otags.1
+	dh_install
+	dh_installcron
 	dh_link
 	dh_strip
 	dh_compress
 	dh_fixperms
 	dh_installdeb
 	dh_shlibdeps
-	dh_gencontrol
+	dh_gencontrol -- -VF:OCamlABI="$(OCAMLABI)"
 	dh_md5sums
 	dh_builddeb
 

Added: trunk/packages/otags/debian/update-otags
===================================================================
--- trunk/packages/otags/debian/update-otags	2006-01-07 17:40:14 UTC (rev 2411)
+++ trunk/packages/otags/debian/update-otags	2006-01-07 23:12:50 UTC (rev 2412)
@@ -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
+$OTAGS -r -emacs -o /var/lib/otags/emacs/TAGS $OCAMLDIR

More information about the Pkg-ocaml-maint-commits mailing list