Author: treinen
Date: Sun May 20 19:10:13 2007
New Revision: 3767
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3767
Log:
remove ocamlmakefile from ocaml-tools package build
ocamlmakefile: fill in bug number of ITP, cosmetic changes
Added:
trunk/packages/ocamlmakefile/upstream/
trunk/packages/ocamlmakefile/upstream/ocamlmakefile_6.24.8.orig.tar.gz
(with props)
Removed:
trunk/packages/ocamlmakefile/trunk/debian/docs
Modified:
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/dirs
trunk/packages/ocaml-tools/trunk/debian/rules
trunk/packages/ocamlmakefile/trunk/debian/changelog
trunk/packages/ocamlmakefile/trunk/debian/control
trunk/packages/ocamlmakefile/trunk/debian/rules
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=3767&op=diff
==============================================================================
--- trunk/packages/ocaml-tools/trunk/debian/changelog (original)
+++ trunk/packages/ocaml-tools/trunk/debian/changelog Sun May 20 19:10:13 2007
@@ -3,9 +3,10 @@
[ Samuel Mimram ]
* Correct German debconf translation which was invalid, closes: #418980.
[ Ralf Treinen ]
- *Split off cmigrep into a package of its own.
-
- -- Ralf Treinen <[EMAIL PROTECTED]> Thu, 17 May 2007 19:22:19 +0200
+ * Split off cmigrep into a package of its own.
+ * Split off ocamlmakefile into a package of its own
+
+ -- Ralf Treinen <[EMAIL PROTECTED]> Sun, 20 May 2007 21:01:18 +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=3767&op=diff
==============================================================================
--- trunk/packages/ocaml-tools/trunk/debian/control (original)
+++ trunk/packages/ocaml-tools/trunk/debian/control Sun May 20 19:10:13 2007
@@ -16,7 +16,6 @@
Suggests: autoconf, graphviz, vim, otags
Description: various tools for ocaml programmers
This package collects various tools for ocaml programmers:
- - ocamlmakefile: a makefile template
- a configure.in and Makefile.in template
- ocamldot: generate program dependency graphs for ocaml programs
- omlet: a better ocaml indentation mode for vim
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=3767&op=diff
==============================================================================
--- trunk/packages/ocaml-tools/trunk/debian/copyright (original)
+++ trunk/packages/ocaml-tools/trunk/debian/copyright Sun May 20 19:10:13 2007
@@ -1,19 +1,5 @@
This package was debianized by Ralf Treinen <[EMAIL PROTECTED]> on
Sat, 24 Mar 2001 18:49:15 +0100.
-
-
-OCamlMake
----------
-Downloaded from http://www.ocaml.info/home/ocaml_sources.html#toc16
-
-Upstream Author: Markus Mottl <[EMAIL PROTECTED]>
-
-Copyright:
-
-This program is distributed under the GNU Lesser General Public
-License version 2. On a Debian system the GNU LGPL can be found in
-the file /usr/share/common-licenses/LGPL-2.
-
configure.in and Makefile.in
----------------------------
Modified: trunk/packages/ocaml-tools/trunk/debian/dirs
URL:
http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-tools/trunk/debian/dirs?rev=3767&op=diff
==============================================================================
--- trunk/packages/ocaml-tools/trunk/debian/dirs (original)
+++ trunk/packages/ocaml-tools/trunk/debian/dirs Sun May 20 19:10:13 2007
@@ -1,5 +1,4 @@
usr/share/doc/ocaml-tools
-usr/share/doc/ocaml-tools/examples.ocamlmake
usr/bin
usr/share/ocaml-tools
usr/share/ocaml-tools/omlet
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=3767&op=diff
==============================================================================
--- trunk/packages/ocaml-tools/trunk/debian/rules (original)
+++ trunk/packages/ocaml-tools/trunk/debian/rules Sun May 20 19:10:13 2007
@@ -6,13 +6,10 @@
OCAMLABI := $(shell ocamlc -version)
# top level dir for documentation
-export DOCDIR=debian/ocaml-tools/usr/share/doc/ocaml-tools
+DOCDIR = debian/ocaml-tools/usr/share/doc/ocaml-tools
# share dir where files are to be installed
-export SHDIR=debian/ocaml-tools/usr/share/ocaml-tools
-
-# ocamlmake source dir
-export OMAKESRC := $(shell echo ocaml-make-*)
+SHDIR = debian/ocaml-tools/usr/share/ocaml-tools
# omlet source dir
OMLETSRC = $(shell echo omlet-*)
@@ -43,20 +40,6 @@
cp ocamldot/ocamldot debian/ocaml-tools/usr/bin
cp ocamldot/README $(DOCDIR)/README.ocamldot
cp ocamldot/ocamldot.1 debian/ocaml-tools/usr/share/man/man1
-
- # ocaml-make
- cp $(OMAKESRC)/Changes $(DOCDIR)/changelog.ocamlmake
- cp $(OMAKESRC)/README $(DOCDIR)/README.ocamlmake
- for f in calc camlp4 idl gtk threads; do\
- cp -r $(OMAKESRC)/$$f $(DOCDIR)/examples.ocamlmake;\
- sed "s|../OCamlMakefile|/usr/share/ocaml-tools/OCamlMakefile|"\
- < $(OMAKESRC)/$$f/Makefile\
- > $(DOCDIR)/examples.ocamlmake/$$f/Makefile;\
- done
- cp debian/README.idl $(DOCDIR)/examples.ocamlmake/calc/README
- cp debian/README.idl $(DOCDIR)/examples.ocamlmake/idl/README
- sed "s|/usr/local/lib|/usr/lib|" < $(OMAKESRC)/OCamlMakefile\
- > $(SHDIR)/OCamlMakefile
# autoconf
cp autoconf/configure.in $(SHDIR)
Modified: trunk/packages/ocamlmakefile/trunk/debian/changelog
URL:
http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlmakefile/trunk/debian/changelog?rev=3767&op=diff
==============================================================================
--- trunk/packages/ocamlmakefile/trunk/debian/changelog (original)
+++ trunk/packages/ocamlmakefile/trunk/debian/changelog Sun May 20 19:10:13 2007
@@ -1,6 +1,6 @@
ocamlmakefile (6.24.8-1) unstable; urgency=low
- * Initial release (Closes: Bug#NNNNNN). This package is a split off from
+ * Initial release (Closes: Bug#425293). This package is a split off from
the ocaml-tools package.
-- Ralf Treinen <[EMAIL PROTECTED]> Fri, 18 May 2007 22:22:08 +0200
Modified: trunk/packages/ocamlmakefile/trunk/debian/control
URL:
http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlmakefile/trunk/debian/control?rev=3767&op=diff
==============================================================================
--- trunk/packages/ocamlmakefile/trunk/debian/control (original)
+++ trunk/packages/ocamlmakefile/trunk/debian/control Sun May 20 19:10:13 2007
@@ -7,8 +7,8 @@
Stefano Zacchiroli <[EMAIL PROTECTED]>, Sven Luther <[EMAIL PROTECTED]>,
Build-Depends: debhelper (>= 4.0)
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/
+XS-Vcs-Svn:
svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocamlmakefile
+XS-Vcs-Browser:
http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlmakefile/trunk/
Package: ocamlmakefile
Architecture: all
@@ -17,8 +17,7 @@
Replaces: ocaml-tools
Description: a general makefile for the Objective Caml programming language
Ocamlmakefile is a general makefile which allows a programmer to
- create quickly custmize makefiles for a project written in Objective
- Caml. Typically, a customized makefile consists of the definition of
+ create quickly custmized makefiles for a project written in Objective
+ Caml. Typically, a customized makefile consists of the definition of
a few variables, and an inclusion of the general makefile provided by
this package.
-
Modified: trunk/packages/ocamlmakefile/trunk/debian/rules
URL:
http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlmakefile/trunk/debian/rules?rev=3767&op=diff
==============================================================================
--- trunk/packages/ocamlmakefile/trunk/debian/rules (original)
+++ trunk/packages/ocamlmakefile/trunk/debian/rules Sun May 20 19:10:13 2007
@@ -6,7 +6,7 @@
# top level dir for documentation
export DOCDIR=debian/ocamlmakefile/usr/share/doc/ocamlmakefile
-# share dir where files are to be installed
+# shared dir where files are to be installed
export SHDIR=debian/ocamlmakefile/usr/share/ocamlmakefile
build: buildstamp
@@ -40,9 +40,8 @@
binary-indep: build install
dh_testdir
dh_testroot
- dh_installdocs
- dh_installchangelogs
- dh_link
+ dh_installdocs README
+ dh_installchangelogs Changes
dh_compress
dh_fixperms
dh_installdeb
Added: trunk/packages/ocamlmakefile/upstream/ocamlmakefile_6.24.8.orig.tar.gz
URL:
http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlmakefile/upstream/ocamlmakefile_6.24.8.orig.tar.gz?rev=3767&op=file
==============================================================================
Binary file - no diff available.
Propchange:
trunk/packages/ocamlmakefile/upstream/ocamlmakefile_6.24.8.orig.tar.gz
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
_______________________________________________
Pkg-ocaml-maint-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
