[Pkg-ocaml-maint-commits] r2306 - trunk/packages/ocamlodbc/trunk/debian

[Samuel Mimram]

Author: smimram
Date: 2005-12-19 20:55:14 +0000 (Mon, 19 Dec 2005)
New Revision: 2306

Added:
   trunk/packages/ocamlodbc/trunk/debian/libocamlodbc-ocaml-bin.override
Modified:
   trunk/packages/ocamlodbc/trunk/debian/changelog
   trunk/packages/ocamlodbc/trunk/debian/rules
Log:
Reverting to former installation method.

Modified: trunk/packages/ocamlodbc/trunk/debian/changelog
===================================================================
--- trunk/packages/ocamlodbc/trunk/debian/changelog	2005-12-19 20:37:55 UTC (rev 2305)
+++ trunk/packages/ocamlodbc/trunk/debian/changelog	2005-12-19 20:55:14 UTC (rev 2306)
@@ -1,3 +1,9 @@
+ocamlodbc (2.10-2) unstable; urgency=low
+
+  * Reverting to the former installation method, closes: #340103.
+
+ -- Samuel Mimram <smimram at debian.org>  Mon, 19 Dec 2005 21:40:27 +0100
+
 ocamlodbc (2.10-1) unstable; urgency=low
 
   * New upstream release.

Added: trunk/packages/ocamlodbc/trunk/debian/libocamlodbc-ocaml-bin.override
===================================================================
--- trunk/packages/ocamlodbc/trunk/debian/libocamlodbc-ocaml-bin.override	2005-12-19 20:37:55 UTC (rev 2305)
+++ trunk/packages/ocamlodbc/trunk/debian/libocamlodbc-ocaml-bin.override	2005-12-19 20:55:14 UTC (rev 2306)
@@ -0,0 +1 @@
+unstripped-binary-or-object ./usr/bin/biniki

Modified: trunk/packages/ocamlodbc/trunk/debian/rules
===================================================================
--- trunk/packages/ocamlodbc/trunk/debian/rules	2005-12-19 20:37:55 UTC (rev 2305)
+++ trunk/packages/ocamlodbc/trunk/debian/rules	2005-12-19 20:55:14 UTC (rev 2306)
@@ -69,8 +69,9 @@
 	dh_installdirs
 
 	mkdir -p $(DESTDIR)
-	$(MAKE) findlib_install prefix=$(CURDIR)/debian/tmp/usr OCAMLFIND_DESTDIR=$(DESTDIR) OCAMLFIND_LDCONF=ignore
-	mv $(DESTDIR)/ocamlodbc_unixodbc $(DESTDIR)/ocamlodbc
+	$(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
 	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 \
@@ -80,6 +81,7 @@
 		cp Biniki/biniki debian/tmp/usr/bin; \
 	fi
 	chrpath -d debian/tmp/usr/bin/biniki
+	install -m 644 debian/libocamlodbc-ocaml-bin.override debian/libocamlodbc-ocaml-bin/usr/share/lintian/overrides/libocamlodbc-ocaml-bin
 
 # Build architecture-independent files here.
 binary-indep: build install