[Pkg-ocaml-maint-commits] [SCM] ocaml-atd packaging branch, master, updated. debian/0.9.2-1

[Sylvain Le Gall]

The following commit has been merged in the master branch:
commit 6c6768fec935f3caae064c85d5b446c86ea093bb
Author: Sylvain Le Gall <gildor at debian.org>
Date:   Fri Dec 3 01:39:31 2010 +0100

    Compile on non-native arches

diff --git a/Makefile b/Makefile
index 8e36586..3a865d1 100644
--- a/Makefile
+++ b/Makefile
@@ -58,7 +58,7 @@ endif
 
 default: all opt
 
-all: META atd.cma
+all: META atd.cma atdcat.byte
 
 opt: META atd.cmxa atdcat
 
@@ -119,6 +119,11 @@ atdcat: dep $(CMI) $(CMX) atdcat.ml
 		-package "$(OCAMLPACKS)" -linkpkg \
 		$(CMX) atdcat.ml
 
+atdcat.byte: dep $(CMI) $(CMO) atdcat.ml
+	ocamlfind ocamlc $(OCAMLFLAGS) -o atdcat \
+		-package "$(OCAMLPACKS)" -linkpkg \
+		$(CMO) atdcat.ml
+
 .PHONY: doc
 doc: odoc/index.html atdcat
 	cd manual; $(MAKE)
diff --git a/debian/patches/debian-changes-0.9.2-1 b/debian/patches/debian-changes-0.9.2-1
index 5d10f7f..3a72bc6 100644
--- a/debian/patches/debian-changes-0.9.2-1
+++ b/debian/patches/debian-changes-0.9.2-1
@@ -26,7 +26,28 @@ Last-Update: <YYYY-MM-DD>
 
 --- ocaml-atd-0.9.2.orig/Makefile
 +++ ocaml-atd-0.9.2/Makefile
-@@ -144,6 +144,13 @@ clean:
+@@ -58,7 +58,7 @@ endif
+ 
+ default: all opt
+ 
+-all: META atd.cma
++all: META atd.cma atdcat.byte
+ 
+ opt: META atd.cmxa atdcat
+ 
+@@ -119,6 +119,11 @@ atdcat: dep $(CMI) $(CMX) atdcat.ml
+ 		-package "$(OCAMLPACKS)" -linkpkg \
+ 		$(CMX) atdcat.ml
+ 
++atdcat.byte: dep $(CMI) $(CMO) atdcat.ml
++	ocamlfind ocamlc $(OCAMLFLAGS) -o atdcat \
++		-package "$(OCAMLPACKS)" -linkpkg \
++		$(CMO) atdcat.ml
++
+ .PHONY: doc
+ doc: odoc/index.html atdcat
+ 	cd manual; $(MAKE)
+@@ -144,6 +149,13 @@ clean:
  	rm -f $(patsubst %.mly,%.ml, $(MLY))
  	rm -f $(patsubst %.mll,%.ml, $(MLL))
  	rm -f atdcat.cm[ioxa] atdcat.o atdcat.cma atdcat.cmxa
diff --git a/debian/rules b/debian/rules
index bbed073..6a9e54a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,6 +34,10 @@ override_dh_auto_install:
 override_dh_install:
 	dh_install --fail-missing
 
+.PHONY: override_dh_auto_test
+override_dh_auto_clean:
+	true
+
 .PHONY: override_dh_auto_clean
 override_dh_auto_clean:
 	$(MAKE) clean

-- 
ocaml-atd packaging