[Pkg-ocaml-maint-commits] r2200 - in
trunk/packages/camlidl/trunk/debian: . patches
Sylvain LE GALL
gildor-guest at costa.debian.org
Thu Dec 1 23:55:27 UTC 2005
Author: gildor-guest
Date: 2005-12-01 23:55:27 +0000 (Thu, 01 Dec 2005)
New Revision: 2200
Added:
trunk/packages/camlidl/trunk/debian/control.in
Modified:
trunk/packages/camlidl/trunk/debian/changelog
trunk/packages/camlidl/trunk/debian/control
trunk/packages/camlidl/trunk/debian/copyright
trunk/packages/camlidl/trunk/debian/patches/37_make.dpatch
trunk/packages/camlidl/trunk/debian/rules
Log:
Prepare to release camlidl -- SLG
Modified: trunk/packages/camlidl/trunk/debian/changelog
===================================================================
--- trunk/packages/camlidl/trunk/debian/changelog 2005-12-01 21:53:31 UTC (rev 2199)
+++ trunk/packages/camlidl/trunk/debian/changelog 2005-12-01 23:55:27 UTC (rev 2200)
@@ -1,21 +1,14 @@
-camlidl (1.05-6) unstable; urgency=low
+camlidl (1.05-4) unstable; urgency=low
* Update for ocaml 3.09, and stop hardcoding the ocaml version number in the
- source package.
-
- -- Julien Cristau <julien.cristau at ens-lyon.org> Tue, 29 Nov 2005 15:41:57 +0100
-
-camlidl (1.05-5) unstable; urgency=low
-
+ source package (Julien Cristau).
* Remove direct reference to ocaml library dir
-
- -- Sylvain Le Gall <sylvain.le-gall at polytechnique.org> Wed, 9 Nov 2005 15:22:47 +0100
-
-camlidl (1.05-4) unstable; urgency=low
-
* Transition to svn-buildpackage
+ * Add debian/control target in debian/rules
+ * Rewrite patch 37_make to patch config/Makefile.unix rather than
+ config/Makefile and copy this file during the build process
- -- Sylvain Le Gall <sylvain.le-gall at polytechnique.org> Mon, 22 Aug 2005 23:36:31 +0200
+ -- Sylvain Le Gall <sylvain.le-gall at polytechnique.org> Fri, 2 Dec 2005 00:54:19 +0100
camlidl (1.05-3) unstable; urgency=low
Modified: trunk/packages/camlidl/trunk/debian/control
===================================================================
--- trunk/packages/camlidl/trunk/debian/control 2005-12-01 21:53:31 UTC (rev 2199)
+++ trunk/packages/camlidl/trunk/debian/control 2005-12-01 23:55:27 UTC (rev 2200)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
Uploaders: Sven Luther <luther at debian.org>, Ralf Treinen <treinen at debian.org>, Remi Vanicat <vanicat at debian.org>, Stefano Zacchiroli <zack at debian.org>, Sylvain Le Gall <sylvain.le-gall at polytechnique.org>
-Build-Depends: debhelper (>> 4.0.0), cpp, binutils, ocaml-nox, dpatch
+Build-Depends: debhelper (>> 4.0.0), cpp, binutils, ocaml-nox (>= 3.09.0), dpatch
Standards-Version: 3.6.2.0
Package: camlidl
Copied: trunk/packages/camlidl/trunk/debian/control.in (from rev 2199, trunk/packages/camlidl/trunk/debian/control)
===================================================================
--- trunk/packages/camlidl/trunk/debian/control 2005-12-01 21:53:31 UTC (rev 2199)
+++ trunk/packages/camlidl/trunk/debian/control.in 2005-12-01 23:55:27 UTC (rev 2200)
@@ -0,0 +1,24 @@
+Source: camlidl
+Section: devel
+Priority: optional
+Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
+Uploaders: Sven Luther <luther at debian.org>, Ralf Treinen <treinen at debian.org>, Remi Vanicat <vanicat at debian.org>, Stefano Zacchiroli <zack at debian.org>, Sylvain Le Gall <sylvain.le-gall at polytechnique.org>
+Build-Depends: debhelper (>> 4.0.0), cpp, binutils, ocaml-nox (>= #OCamlABI#), dpatch
+Standards-Version: 3.6.2.0
+
+Package: camlidl
+Section: devel
+Architecture: any
+Suggests: camlidl-doc
+Depends: ocaml-nox-${F:OCamlABI}, ${shlibs:Depends}, ${misc:Depends}
+Conflicts: camlidl-doc (<< 1.04)
+Description: Stub code generator for Objective Caml
+ CamlIDL generates stub code for interfacing Caml with C from an IDL
+ description of the C functions. Thus, CamlIDL automates the most
+ tedious task in interfacing C libraries with Caml programs.
+ .
+ It can also be used to interface Caml programs with other languages, as
+ long as those languages have a well-defined C interface.
+ .
+ This package contains the CamlIDL executable.
+
Modified: trunk/packages/camlidl/trunk/debian/copyright
===================================================================
--- trunk/packages/camlidl/trunk/debian/copyright 2005-12-01 21:53:31 UTC (rev 2199)
+++ trunk/packages/camlidl/trunk/debian/copyright 2005-12-01 23:55:27 UTC (rev 2200)
@@ -29,11 +29,10 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
- You should have received a copy of the GNU Library General Public
- License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA
-
+ You should have received a copy of the GNU Library General Public License
+ along with this library; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+
On Debian GNU/Linux systems, the complete text of the GNU Library General
Public License can be found in `/usr/share/common-licenses/LGPL'.
The GNU Library General Public Licenses in
Modified: trunk/packages/camlidl/trunk/debian/patches/37_make.dpatch
===================================================================
--- trunk/packages/camlidl/trunk/debian/patches/37_make.dpatch 2005-12-01 21:53:31 UTC (rev 2199)
+++ trunk/packages/camlidl/trunk/debian/patches/37_make.dpatch 2005-12-01 23:55:27 UTC (rev 2200)
@@ -24,8 +24,56 @@
exit 0
@DPATCH@
---- camlidl-1.04.orig/lib/Makefile
-+++ camlidl-1.04/lib/Makefile
+diff -urNad camlidl-1.05~/config/Makefile.unix camlidl-1.05/config/Makefile.unix
+--- camlidl-1.05~/config/Makefile.unix 2002-04-22 13:50:46.000000000 +0200
++++ camlidl-1.05/config/Makefile.unix 2005-12-02 00:46:33.000000000 +0100
+@@ -19,7 +19,7 @@
+
+ # How to invoke the C preprocessor
+ # Works on most Unix systems:
+-CPP=/lib/cpp
++CPP=cpp
+ # Alternatives:
+ # CPP=cpp
+ # CPP=/usr/ccs/lib/cpp
+@@ -30,23 +30,25 @@
+ # If ranlib is not needed:
+ #RANLIB=:
+
+-# Location of the Objective Caml library in your installation
+-OCAMLLIB=/usr/local/lib/ocaml
++# Location of the header files
++DEBIANOCAMLINCDIR=$(shell ocamlc -where)
++OCAMLINCDIR=$(DESTDIR)$(DEBIANOCAMLINCDIR)/caml
+
++# Location of the Objective Caml library in your installation
++OCAMLLIB=$(DESTDIR)$(shell ocamlc -where)
+ # Where to install the binaries
+-BINDIR=/usr/local/bin
++BINDIR=$(DESTDIR)/usr/bin
+
+ # The Objective Caml compilers (the defaults below should be OK)
+-OCAMLC=ocamlc -g
++# OCAMLC=ocamlc -g
++OCAMLC=ocamlc
+ OCAMLOPT=ocamlopt
+ OCAMLYACC=ocamlyacc -v
+ OCAMLLEX=ocamllex
+ OCAMLDEP=ocamldep
+
+ # Extra flags to pass to the C compiler
+-CFLAGS=-Wall -g
++CFLAGS=-I$(DEBIANOCAMLINCDIR)
+
+-# Suffixes for executables and libraries (do not change)
+-EXE=
+-LIBEXT=a
+-OBJEXT=o
++# Extension for lib files (do not change)
++LIB=.a
+diff -urNad camlidl-1.05~/lib/Makefile camlidl-1.05/lib/Makefile
+--- camlidl-1.05~/lib/Makefile 2005-12-02 00:44:03.000000000 +0100
++++ camlidl-1.05/lib/Makefile 2005-12-02 00:45:11.000000000 +0100
@@ -19,8 +19,11 @@
NATIVEOBJS=$(BYTEOBJS:.cmo=.cmx)
NATIVELIB=$(BYTELIB:.cma=.cmxa)
@@ -65,8 +113,9 @@
# Dependencies
depend:
---- camlidl-1.04.orig/Makefile
-+++ camlidl-1.04/Makefile
+diff -urNad camlidl-1.05~/Makefile camlidl-1.05/Makefile
+--- camlidl-1.05~/Makefile 2005-12-02 00:44:03.000000000 +0100
++++ camlidl-1.05/Makefile 2005-12-02 00:45:11.000000000 +0100
@@ -20,6 +20,9 @@
cd lib; $(MAKE) all
cd tools; $(MAKE) all
@@ -77,65 +126,9 @@
install:
cd compiler; $(MAKE) install
cd runtime; $(MAKE) install
---- camlidl-1.04.orig/config/Makefile
-+++ camlidl-1.04/config/Makefile
-@@ -0,0 +1,54 @@
-+#***********************************************************************
-+#* *
-+#* CamlIDL *
-+#* *
-+#* Xavier Leroy, projet Cristal, INRIA Rocquencourt *
-+#* *
-+#* Copyright 1999 Institut National de Recherche en Informatique et *
-+#* en Automatique. All rights reserved. This file is distributed *
-+#* under the terms of the GNU Library General Public License. *
-+#* *
-+#***********************************************************************
-+
-+#* $Id: Makefile.unix,v 1.3 2000/08/19 11:04:59 xleroy Exp $
-+
-+## Configuration section
-+
-+# Type of system -- do not change
-+OSTYPE=unix
-+
-+# How to invoke the C preprocessor
-+# Works on most Unix systems:
-+CPP=cpp
-+# Alternatives:
-+# CPP=cpp
-+# CPP=/usr/ccs/lib/cpp
-+# CPP=gcc -x c -E
-+
-+# How to invoke ranlib (only relevant for Unix)
-+RANLIB=ranlib
-+# If ranlib is not needed:
-+#RANLIB=:
-+
-+# Location of the header files
-+DEBIANOCAMLINCDIR=$(shell ocamlc -where)
-+OCAMLINCDIR=$(DESTDIR)$(DEBIANOCAMLINCDIR)/caml
-+
-+# Location of the Objective Caml library in your installation
-+OCAMLLIB=$(DESTDIR)$(shell ocamlc -where)
-+# Where to install the binaries
-+BINDIR=$(DESTDIR)/usr/bin
-+
-+# The Objective Caml compilers (the defaults below should be OK)
-+# OCAMLC=ocamlc -g
-+OCAMLC=ocamlc
-+OCAMLOPT=ocamlopt
-+OCAMLYACC=ocamlyacc -v
-+OCAMLLEX=ocamllex
-+OCAMLDEP=ocamldep
-+
-+# Extra flags to pass to the C compiler
-+CFLAGS=-I$(DEBIANOCAMLINCDIR)
-+
-+# Extension for lib files (do not change)
-+LIB=.a
---- camlidl-1.04.orig/runtime/Makefile.unix
-+++ camlidl-1.04/runtime/Makefile.unix
+diff -urNad camlidl-1.05~/runtime/Makefile.unix camlidl-1.05/runtime/Makefile.unix
+--- camlidl-1.05~/runtime/Makefile.unix 2005-12-02 00:44:03.000000000 +0100
++++ camlidl-1.05/runtime/Makefile.unix 2005-12-02 00:45:11.000000000 +0100
@@ -22,7 +22,7 @@
$(RANLIB) $@
Modified: trunk/packages/camlidl/trunk/debian/rules
===================================================================
--- trunk/packages/camlidl/trunk/debian/rules 2005-12-01 21:53:31 UTC (rev 2199)
+++ trunk/packages/camlidl/trunk/debian/rules 2005-12-01 23:55:27 UTC (rev 2200)
@@ -10,9 +10,13 @@
OCAMLIBDIR=$(shell ocamlc -where)
OCAMLABI=$(shell ocamlc -version)
+debian/control: debian/control.in
+ sed -e 's%#OCamlABI#%$(OCAMLABI)%' $@.in >$@
+
build: build-stamp
build-stamp: patch-stamp
dh_testdir
+ cp config/Makefile.unix config/Makefile
$(MAKE) all
# TODO: check for byte compilation
if [ -x /usr/bin/ocamlopt ] || [ -x /usr/bin/ocamlopt.opt ]; then \
@@ -27,6 +31,8 @@
dh_testroot
-$(MAKE) clean
-$(RM) *.cm[ioax] *.cmxa *.a *.o *~
+ -$(RM) lib/*.cm[ioax] lib/*.cmxa lib/*.a lib/*.o
+ -$(RM) config/Makefile
-$(RM) build-stamp
dh_clean
More information about the Pkg-ocaml-maint-commits
mailing list