[Pkg-ocaml-maint-commits] r3737 - in /trunk/packages/ocaml-sqlite3/trunk/debian: changelog patches/install-no-mktop.dpatch

[smimram at users.alioth.debian.org]

Author: smimram
Date: Sun May  6 12:13:03 2007
New Revision: 3737

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3737
Log:
Updated install-no-mktop.dpatch in order to correctly install on non-native archs.

Modified:
    trunk/packages/ocaml-sqlite3/trunk/debian/changelog
    trunk/packages/ocaml-sqlite3/trunk/debian/patches/install-no-mktop.dpatch

Modified: trunk/packages/ocaml-sqlite3/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-sqlite3/trunk/debian/changelog?rev=3737&op=diff
==============================================================================
--- trunk/packages/ocaml-sqlite3/trunk/debian/changelog (original)
+++ trunk/packages/ocaml-sqlite3/trunk/debian/changelog Sun May  6 12:13:03 2007
@@ -1,3 +1,10 @@
+ocaml-sqlite3 (0.16.0-2) unstable; urgency=low
+
+  * Updated install-no-mktop.dpatch in order to correctly install on
+    non-native archs, closes: #421052.
+
+ -- Samuel Mimram <smimram at debian.org>  Sun, 06 May 2007 14:07:31 +0200
+
 ocaml-sqlite3 (0.16.0-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/packages/ocaml-sqlite3/trunk/debian/patches/install-no-mktop.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-sqlite3/trunk/debian/patches/install-no-mktop.dpatch?rev=3737&op=diff
==============================================================================
--- trunk/packages/ocaml-sqlite3/trunk/debian/patches/install-no-mktop.dpatch (original)
+++ trunk/packages/ocaml-sqlite3/trunk/debian/patches/install-no-mktop.dpatch Sun May  6 12:13:03 2007
@@ -6,16 +6,21 @@
 
 @DPATCH@
 diff -urNad ocaml-sqlite3-0.16.0~/Makefile.in ocaml-sqlite3-0.16.0/Makefile.in
---- ocaml-sqlite3-0.16.0~/Makefile.in	2007-04-24 23:36:31.000000000 +0200
-+++ ocaml-sqlite3-0.16.0/Makefile.in	2007-04-24 23:37:36.000000000 +0200
-@@ -35,8 +35,8 @@
- # one in .
- install: sqlite3.cma sqlite3.cmxa sqlite3top
+--- ocaml-sqlite3-0.16.0~/Makefile.in	2007-05-05 11:34:30.000000000 +0200
++++ ocaml-sqlite3-0.16.0/Makefile.in	2007-05-05 11:35:32.000000000 +0200
+@@ -31,13 +31,9 @@
+ distclean: clean
+ 	rm -rf autom4te.* config.* META Makefile doc
+ 
+-# install rebuilds sqlite3top to point to the findlib-managed dll and not the
+-# one in .
+-install: sqlite3.cma sqlite3.cmxa sqlite3top
++install: sqlite3.cma
  	[ -f *.so ] && SO_FILES=*.so; \
 -	ocamlfind install sqlite3 META sqlite3.cmi sqlite3.mli sqlite3.cma *.cmxa *.a *.cmx $$SO_FILES
 -	ocamlfind ocamlmktop -o sqlite3top -package "sqlite3" sqlite3.cma
+-	$(INSTALL) sqlite3top $(bindir)/sqlite3top
 +	ocamlfind install sqlite3 META sqlite3.cmi sqlite3.mli sqlite3.cma $(wildcard *.cmxa *.a *.cmx) $$SO_FILES
-+	#ocamlfind ocamlmktop -o sqlite3top -package "sqlite3" sqlite3.cma
- 	$(INSTALL) sqlite3top $(bindir)/sqlite3top
  
  remove: uninstall
+ uninstall: