[Pkg-ocaml-maint-commits] r4396 - in /trunk/packages/lablgtk/trunk/debian: changelog liblablgtk2-ocaml-dev.install.in rules

[gildor at users.alioth.debian.org]

Author: gildor
Date: Fri Sep  7 12:52:05 2007
New Revision: 4396

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4396
Log:
* Install *.cmx[a]|*.o only on native arches

Modified:
    trunk/packages/lablgtk/trunk/debian/changelog
    trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml-dev.install.in
    trunk/packages/lablgtk/trunk/debian/rules

Modified: trunk/packages/lablgtk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/lablgtk/trunk/debian/changelog?rev=4396&op=diff
==============================================================================
--- trunk/packages/lablgtk/trunk/debian/changelog (original)
+++ trunk/packages/lablgtk/trunk/debian/changelog Fri Sep  7 12:52:05 2007
@@ -1,3 +1,11 @@
+lablgtk2 (2.6.0-13) unstable; urgency=low
+
+  * Revert previous change (the problem was not there) and remove *.cmx
+    *.cmxa and *.o from dh_install files. Use a move in the debian/rules to
+     transfer things if and only if on non native arches.
+
+ -- Sylvain Le Gall <gildor at debian.org>  Fri, 07 Sep 2007 00:07:37 +0200
+
 lablgtk2 (2.6.0-12) unstable; urgency=low
 
   * On non native arches, there is no *.cmx, don't fail at dh_install

Modified: trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml-dev.install.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml-dev.install.in?rev=4396&op=diff
==============================================================================
--- trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml-dev.install.in (original)
+++ trunk/packages/lablgtk/trunk/debian/liblablgtk2-ocaml-dev.install.in Fri Sep  7 12:52:05 2007
@@ -4,10 +4,7 @@
 usr/lib/ocaml/@OCamlABI@/lablgtk2/*.cmi
 usr/lib/ocaml/@OCamlABI@/lablgtk2/*.cma
 usr/lib/ocaml/@OCamlABI@/lablgtk2/*.cmo
-usr/lib/ocaml/@OCamlABI@/lablgtk2/*.cmx
-usr/lib/ocaml/@OCamlABI@/lablgtk2/*.cmxa
 usr/lib/ocaml/@OCamlABI@/lablgtk2/*.a
 usr/lib/ocaml/@OCamlABI@/lablgtk2/*.h
-usr/lib/ocaml/@OCamlABI@/lablgtk2/*.o
 usr/lib/ocaml/@OCamlABI@/lablgtk2/varcc
 usr/lib/ocaml/@OCamlABI@/lablgtk2/propcc

Modified: trunk/packages/lablgtk/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/lablgtk/trunk/debian/rules?rev=4396&op=diff
==============================================================================
--- trunk/packages/lablgtk/trunk/debian/rules (original)
+++ trunk/packages/lablgtk/trunk/debian/rules Fri Sep  7 12:52:05 2007
@@ -91,7 +91,12 @@
 	dh_installexamples -s --exclude='.cvsignore' --exclude='rsvg' --exclude='panel' --exclude='canvas' --exclude='GL'
 	dh_installmenu -s
 	dh_movefiles -s
-	dh_install -s --sourcedir=$(DESTDIR)
+	dh_install -s --sourcedir=$(DESTDIR) --list-missing -X ".cmx" -X ".cmxa" -X "*.o"
+	if [ -x /usr/bin/ocamlopt ]; then \
+	  mv $(DESTDIR)/$(OCAML_LIBDIR)/lablgtk2/*.cmx  '$(CURDIR)/debian/liblablgtk2-ocaml-dev/$(OCAML_LIBDIR)/lablgtk2/'; \
+	  mv $(DESTDIR)/$(OCAML_LIBDIR)/lablgtk2/*.cmxa '$(CURDIR)/debian/liblablgtk2-ocaml-dev/$(OCAML_LIBDIR)/lablgtk2/'; \
+	  mv $(DESTDIR)/$(OCAML_LIBDIR)/lablgtk2/*.o    '$(CURDIR)/debian/liblablgtk2-ocaml-dev/$(OCAML_LIBDIR)/lablgtk2/'; \
+	fi
 	# Doc generation (TODO: use CDBS)
 	OCAMLDOC_PKG="liblablgtk2-ocaml-dev liblablgtk2-gl-ocaml-dev liblablgtk2-gnome-ocaml-dev"; \
 	OCAMLDOC_INCLUDE=`for i in $$OCAMLDOC_PKG; do find debian/$$i/$(OCAML_LIBDIR)/ -type d -exec echo -I \{} \; ; done`; \