[Pkg-ocaml-maint-commits] r2322 - in trunk/packages/ocamlodbc/trunk/debian: . patches

[Samuel Mimram]

Author: smimram
Date: 2005-12-25 15:05:40 +0000 (Sun, 25 Dec 2005)
New Revision: 2322

Removed:
   trunk/packages/ocamlodbc/trunk/debian/control.in
Modified:
   trunk/packages/ocamlodbc/trunk/debian/changelog
   trunk/packages/ocamlodbc/trunk/debian/patches/makefiles.dpatch
   trunk/packages/ocamlodbc/trunk/debian/rules
Log:
Solve the FTBFS.

Modified: trunk/packages/ocamlodbc/trunk/debian/changelog
===================================================================
--- trunk/packages/ocamlodbc/trunk/debian/changelog	2005-12-22 19:37:41 UTC (rev 2321)
+++ trunk/packages/ocamlodbc/trunk/debian/changelog	2005-12-25 15:05:40 UTC (rev 2322)
@@ -1,3 +1,10 @@
+ocamlodbc (2.10-3) unstable; urgency=low
+
+  * Updated makefiles.dpatch to build libocamlodbc.a and using back ocamlfind
+    to do the installation, closes: #340103.
+
+ -- Samuel Mimram <smimram at debian.org>  Sun, 25 Dec 2005 16:03:06 +0100
+
 ocamlodbc (2.10-2) unstable; urgency=low
 
   * Reverting to the former installation method, closes: #340103.

Deleted: trunk/packages/ocamlodbc/trunk/debian/control.in
===================================================================
--- trunk/packages/ocamlodbc/trunk/debian/control.in	2005-12-22 19:37:41 UTC (rev 2321)
+++ trunk/packages/ocamlodbc/trunk/debian/control.in	2005-12-25 15:05:40 UTC (rev 2322)
@@ -1,28 +0,0 @@
-Source: ocamlodbc
-Section: devel
-Priority: optional
-Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
-Uploaders: Samuel Mimram <smimram at debian.org>
-Build-Depends: debhelper (>= 4.0.0), unixodbc-dev, unixodbc-bin, ocaml-nox (>= @OCamlABI@), ocaml-findlib (>= 1.0.3-1), liblablgtk2-ocaml-dev, dpatch, chrpath
-Standards-Version: 3.6.2
-
-Package: libocamlodbc-ocaml-dev
-Section: libdevel
-Architecture: any
-Depends: ocaml-nox-${F:OCamlABI}, unixodbc-dev
-Description: UnixODBC database bindings for OCaml, Development Files
- This package provides UnixODBC database bindings for the OCaml language,
- letting you access any of many different databases from within OCaml.
- .
- This package provides the development and documentation file.
-
-Package: libocamlodbc-ocaml-bin
-Section: misc
-Architecture: any
-Depends: ${shlibs:Depends}
-Description: UnixODBC database bindings for OCaml, Biniki
- This package provides UnixODBC database bindings for the OCaml language,
- letting you access any of many different databases from within OCaml.
- .
- This package provides the graphical multi-database application
- Biniki.

Modified: trunk/packages/ocamlodbc/trunk/debian/patches/makefiles.dpatch
===================================================================
--- trunk/packages/ocamlodbc/trunk/debian/patches/makefiles.dpatch	2005-12-22 19:37:41 UTC (rev 2321)
+++ trunk/packages/ocamlodbc/trunk/debian/patches/makefiles.dpatch	2005-12-25 15:05:40 UTC (rev 2322)
@@ -7,7 +7,7 @@
 @DPATCH@
 diff -urNad ocamlodbc-2.10~/Biniki/Makefile ocamlodbc-2.10/Biniki/Makefile
 --- ocamlodbc-2.10~/Biniki/Makefile	2003-08-27 16:23:34.000000000 +0200
-+++ ocamlodbc-2.10/Biniki/Makefile	2005-11-20 17:38:04.000000000 +0100
++++ ocamlodbc-2.10/Biniki/Makefile	2005-12-25 16:00:34.000000000 +0100
 @@ -13,11 +13,16 @@
  # Overriden flags
  
@@ -29,7 +29,16 @@
  mysql:
 diff -urNad ocamlodbc-2.10~/Makefile ocamlodbc-2.10/Makefile
 --- ocamlodbc-2.10~/Makefile	2005-05-13 13:57:36.000000000 +0200
-+++ ocamlodbc-2.10/Makefile	2005-11-20 17:39:50.000000000 +0100
++++ ocamlodbc-2.10/Makefile	2005-12-25 16:01:14.000000000 +0100
+@@ -88,7 +88,7 @@
+ 	$(AR) $@ $(OBJFILES)
+ 	$(RANLIB) $@
+ 
+-$(LIB): $(OBJOCAML) $(LIBOBJ)
++$(LIB): $(OBJOCAML) $(LIBOBJ) $(LIB_C)
+ 	$(OCAMLC) -a -linkall -custom -o $@ -cclib -locamlodbc $(LINKFLAGS) $(OBJOCAML) $(LIBOBJ)
+ $(LIB_OPT): $(OBJOCAML_OPT) $(LIBOBJ_OPT) $(LIB_C)
+ 	$(OCAMLOPT) -a -linkall -o $(LIB_OPT) -cclib -locamlodbc $(LINKFLAGS) $(OBJOCAML_OPT) $(LIBOBJ_OPT)
 @@ -158,10 +158,10 @@
  	@echo '  To install $(RESULT) dirctly type : "make direct_install"'
  
@@ -46,7 +55,7 @@
  	for i in mysql postgres db2 unixodbc openingres oraclecfo ; do \
 diff -urNad ocamlodbc-2.10~/master.Makefile.in ocamlodbc-2.10/master.Makefile.in
 --- ocamlodbc-2.10~/master.Makefile.in	2005-05-13 11:42:22.000000000 +0200
-+++ ocamlodbc-2.10/master.Makefile.in	2005-11-20 17:40:25.000000000 +0100
++++ ocamlodbc-2.10/master.Makefile.in	2005-12-25 16:00:34.000000000 +0100
 @@ -42,8 +42,13 @@
  MKDIR=mkdir -p
  CP=cp -f

Modified: trunk/packages/ocamlodbc/trunk/debian/rules
===================================================================
--- trunk/packages/ocamlodbc/trunk/debian/rules	2005-12-22 19:37:41 UTC (rev 2321)
+++ trunk/packages/ocamlodbc/trunk/debian/rules	2005-12-25 15:05:40 UTC (rev 2322)
@@ -10,7 +10,7 @@
 include /usr/share/dpatch/dpatch.make
 
 OCAMLABI := $(shell ocamlc -version)
-OFILES := $(patsubst %.in,%,$(shell ls debian/*.in))
+OFILES := $(patsubst %.in,%,$(wildcard debian/*.in))
 
 DESTDIR = $(CURDIR)/debian/tmp/$(shell ocamlc -where)
 
@@ -56,6 +56,7 @@
 	rm -f build-stamp
 
 	-$(MAKE) clean_all
+	-$(MAKE) distclean
 	-cd Biniki && $(MAKE) clean_all
 	-rm -f Biniki/biniki_messages.ml config.{log,status} master.Makefile
 	-rm -rf unixodbc html
@@ -69,9 +70,10 @@
 	dh_installdirs
 
 	mkdir -p $(DESTDIR)
-	$(MAKE) direct_install prefix=$(CURDIR)/debian/tmp/usr DESTDIR=$(CURDIR)/debian/tmp
-#	$(MAKE) findlib_install prefix=$(CURDIR)/debian/tmp/usr OCAMLFIND_DESTDIR=$(DESTDIR) OCAMLFIND_LDCONF=ignore
-	mv $(DESTDIR)/ocamlodbc/unixodbc/* $(DESTDIR)/ocamlodbc; rmdir $(DESTDIR)/ocamlodbc/unixodbc
+#	$(MAKE) direct_install prefix=$(CURDIR)/debian/tmp/usr DESTDIR=$(CURDIR)/debian/tmp
+#	mv $(DESTDIR)/ocamlodbc/unixodbc/* $(DESTDIR)/ocamlodbc; rmdir $(DESTDIR)/ocamlodbc/unixodbc
+	$(MAKE) findlib_install prefix=$(CURDIR)/debian/tmp/usr OCAMLFIND_DESTDIR=$(DESTDIR) OCAMLFIND_LDCONF=ignore
+	mv $(DESTDIR)/ocamlodbc_unixodbc $(DESTDIR)/ocamlodbc
 	sed -e 's/ocamlodbc_unixodbc/ocamlodbc/g' $(DESTDIR)/ocamlodbc/META > $(DESTDIR)/ocamlodbc/META
 	mkdir -p debian/tmp/usr/bin
 	if [ -f Biniki/biniki.opt ]; then \
@@ -108,4 +110,4 @@
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: build clean binary-indep binary-arch binary install ocamlinit