[Pkg-ocaml-maint-commits] r3764 - in /trunk/packages: cmigrep/trunk/debian/ ocaml-tools/trunk/debian/
treinen at users.alioth.debian.org
treinen at users.alioth.debian.org
Thu May 17 17:26:47 UTC 2007
Author: treinen
Date: Thu May 17 17:26:47 2007
New Revision: 3764
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3764
Log:
fix bug with emacs files in cmigrep
remove cmigrep from ocaml-tools
Modified:
trunk/packages/cmigrep/trunk/debian/cmigrep.1
trunk/packages/cmigrep/trunk/debian/control
trunk/packages/cmigrep/trunk/debian/emacsen-install
trunk/packages/cmigrep/trunk/debian/emacsen-remove
trunk/packages/ocaml-tools/trunk/debian/changelog
trunk/packages/ocaml-tools/trunk/debian/control
trunk/packages/ocaml-tools/trunk/debian/copyright
trunk/packages/ocaml-tools/trunk/debian/rules
Modified: trunk/packages/cmigrep/trunk/debian/cmigrep.1
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cmigrep/trunk/debian/cmigrep.1?rev=3764&op=diff
==============================================================================
--- trunk/packages/cmigrep/trunk/debian/cmigrep.1 (original)
+++ trunk/packages/cmigrep/trunk/debian/cmigrep.1 Thu May 17 17:26:47 2007
@@ -1,10 +1,10 @@
.TH CMIGREP 1
.SH NAME
-cmigrep \- gather information from ocaml compiled interface files
+cmigrep \- search in ocaml compiled interface files
.SH SYNOPSIS
.B cmigrep
.I
-.RI <option> <module>
+.RI <options> <module-expression>
.SH DESCRIPTION
This manual page documents briefly the
.BR cmigrep
@@ -65,7 +65,7 @@
.SH SEE ALSO
Examples can be found on
-.I /usr/share/doc/ocaml-tools/README.cmigrep\fR.
+.I /usr/share/doc/cmigrep/README\fR.
.SH AUTHOR
\fBcmigrep\fR is written by Eric Stokes
Modified: trunk/packages/cmigrep/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cmigrep/trunk/debian/control?rev=3764&op=diff
==============================================================================
--- trunk/packages/cmigrep/trunk/debian/control (original)
+++ trunk/packages/cmigrep/trunk/debian/control Thu May 17 17:26:47 2007
@@ -17,9 +17,10 @@
Depends: ocaml-base-nox-${F:OCamlABI}
Conflicts: ocaml-tools (<= 2007.02.04-2)
Replaces: ocaml-tools
-Description: gather information from ocaml compiled interface files
- This program allows you to search in compiled interface files (file
- extension .cmi) generated by the Objective Caml compiler.
+Description: search in ocaml compiled interface files
+ This program allows you to search for items (like for instance types,
+ constructors, or exceptions) in compiled interface files generated by
+ the Objective Caml compiler.
Modified: trunk/packages/cmigrep/trunk/debian/emacsen-install
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cmigrep/trunk/debian/emacsen-install?rev=3764&op=diff
==============================================================================
--- trunk/packages/cmigrep/trunk/debian/emacsen-install (original)
+++ trunk/packages/cmigrep/trunk/debian/emacsen-install Thu May 17 17:26:47 2007
@@ -13,8 +13,8 @@
echo install/${PACKAGE}: Handling install for emacsen flavor ${FLAVOR}
FLAGS="${SITEFLAG} -q -batch -l path.el -f batch-byte-compile"
-ELDIR=/usr/share/emacs/site-lisp/${PACKAGE}
-ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE}
+ELDIR=/usr/share/emacs/site-lisp
+ELCDIR=/usr/share/${FLAVOR}/site-lisp
# Install-info-altdir does not actually exist.
# Maybe somebody will write it.
Modified: trunk/packages/cmigrep/trunk/debian/emacsen-remove
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/cmigrep/trunk/debian/emacsen-remove?rev=3764&op=diff
==============================================================================
--- trunk/packages/cmigrep/trunk/debian/emacsen-remove (original)
+++ trunk/packages/cmigrep/trunk/debian/emacsen-remove Thu May 17 17:26:47 2007
@@ -6,5 +6,5 @@
if [ ${FLAVOR} != emacs ]; then
echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR}
- rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE}
+ rm -rf /usr/share/${FLAVOR}/site-lisp/cmigrep.elc
fi
Modified: trunk/packages/ocaml-tools/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-tools/trunk/debian/changelog?rev=3764&op=diff
==============================================================================
--- trunk/packages/ocaml-tools/trunk/debian/changelog (original)
+++ trunk/packages/ocaml-tools/trunk/debian/changelog Thu May 17 17:26:47 2007
@@ -1,9 +1,11 @@
ocaml-tools (2007.02.04-3) UNRELEASED; urgency=low
- * NOT RELEASED YET
+ [ Samuel Mimram ]
* Correct German debconf translation which was invalid, closes: #418980.
-
- -- Samuel Mimram <smimram at debian.org> Fri, 13 Apr 2007 09:19:22 +0200
+ [ Ralf Treinen ]
+ *Split off cmigrep into a package of its own.
+
+ -- Ralf Treinen <treinen at debian.org> Thu, 17 May 2007 19:22:19 +0200
ocaml-tools (2007.02.04-2) unstable; urgency=low
Modified: trunk/packages/ocaml-tools/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-tools/trunk/debian/control?rev=3764&op=diff
==============================================================================
--- trunk/packages/ocaml-tools/trunk/debian/control (original)
+++ trunk/packages/ocaml-tools/trunk/debian/control Thu May 17 17:26:47 2007
@@ -4,7 +4,7 @@
Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
Uploaders: Ralf Treinen <treinen at debian.org>, Sven Luther <luther at debian.org>, Remi Vanicat <vanicat at debian.org>, Stefano Zacchiroli <zack at debian.org>, Samuel Mimram <smimram at debian.org>
Build-Depends: debhelper (>= 4.0), dpatch
-Build-Depends-Indep: ocaml-nox (>= 3.09.1), libpcre-ocaml-dev, ocaml-findlib, ocaml-compiler-libs
+Build-Depends-Indep: ocaml-nox (>= 3.09.1)
Standards-Version: 3.7.2
XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocaml-tools
XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-tools/trunk/
@@ -20,5 +20,4 @@
- a configure.in and Makefile.in template
- ocamldot: generate program dependency graphs for ocaml programs
- omlet: a better ocaml indentation mode for vim
- - cmigrep: gather information from ocaml compiled interface files
Modified: trunk/packages/ocaml-tools/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-tools/trunk/debian/copyright?rev=3764&op=diff
==============================================================================
--- trunk/packages/ocaml-tools/trunk/debian/copyright (original)
+++ trunk/packages/ocaml-tools/trunk/debian/copyright Thu May 17 17:26:47 2007
@@ -54,22 +54,5 @@
(at your option) any later version.
On Debian systems you can find a copy of this license in
-/usr/share/common-licenses/GPL.
+/usr/share/common-licenses/GPL.X
-cmigrep
--------
-Downloaded from http://homepage.mac.com/letaris/
-
-Upstream Author: Eric Stokes <letaris at mac.com>
-
-Copyright (C) 2004 Eric Stokes
-
-Licence:
-
-This library 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 2.1 of the License, or
-(at your option) any later version.
-
-On Debian systems you can find a copy of this license in
-/usr/share/common-licenses/GPL.
Modified: trunk/packages/ocaml-tools/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-tools/trunk/debian/rules?rev=3764&op=diff
==============================================================================
--- trunk/packages/ocaml-tools/trunk/debian/rules (original)
+++ trunk/packages/ocaml-tools/trunk/debian/rules Thu May 17 17:26:47 2007
@@ -13,23 +13,17 @@
# ocamlmake source dir
export OMAKESRC := $(shell echo ocaml-make-*)
-export CMIGREPSRC := $(shell echo cmigrep-*)
# omlet source dir
OMLETSRC = $(shell echo omlet-*)
include /usr/share/dpatch/dpatch.make
-build: ocamldot/ocamldot $(CMIGREPSRC)/cmigrep
+build: ocamldot/ocamldot
ocamldot/ocamldot: patch
dh_testdir
(cd ocamldot; make)
-
-$(CMIGREPSRC)/cmigrep: patch
- dh_testdir
- (cd $(CMIGREPSRC);\
- make byte GODI_LIB=/usr/lib/ocaml/$(OCAMLABI)/compiler-libs)
clean: unpatch
dh_testdir
@@ -74,10 +68,6 @@
cp $(OMLETSRC)/README $(DOCDIR)/README.omlet
cp $(OMLETSRC)/ChangeLog $(DOCDIR)/changelog.omlet
- # cmigrep
- cp $(CMIGREPSRC)/cmigrep debian/ocaml-tools/usr/bin
- cp $(CMIGREPSRC)/README $(DOCDIR)/README.cmigrep
-
cp debian/lintian-overrides \
debian/ocaml-tools/usr/share/lintian/overrides/ocaml-tools
@@ -87,7 +77,6 @@
dh_testdir
dh_testroot
dh_installdocs
- dh_installman debian/cmigrep.1
dh_installchangelogs
dh_installdebconf
dh_link
More information about the Pkg-ocaml-maint-commits
mailing list