[Pkg-ocaml-maint-commits] [SCM] ocaml-res packaging branch, master, updated. debian/3.1.1-2-9-g2dc907a

[Stephane Glondu]

The following commit has been merged in the master branch:
commit c06f321a10cbab34e7b2d2657f6c4976ddb06b30
Author: Stephane Glondu <steph at glondu.net>
Date:   Wed Jul 1 15:15:51 2009 +0200

    Use quilt to handle patches

diff --git a/Makefile b/Makefile
index 5df91b1..e1a6ae3 100644
--- a/Makefile
+++ b/Makefile
@@ -4,10 +4,6 @@ EXAMPLES = $(filter-out examples/CVS, $(wildcard examples/*))
 all:
 	@cd lib && $(MAKE) byte-code-library native-code-library
 
-.PHONY: byte
-byte:
-	@cd lib && $(MAKE) byte-code-library
-
 .PHONY:	examples
 examples:
 	@for dir in $(EXAMPLES); do (cd $$dir && $(MAKE)); done
@@ -21,10 +17,6 @@ doc:
 install:
 	@cd lib && $(MAKE) $@
 
-.PHONY:	libinstall-byte-code
-libinstall-byte-code:
-	@cd lib && $(MAKE) $@
-
 .PHONY:	uninstall
 uninstall:
 	@cd lib && $(MAKE) $@
diff --git a/OCamlMakefile b/OCamlMakefile
index 5fc303e..e9e0753 100644
--- a/OCamlMakefile
+++ b/OCamlMakefile
@@ -1182,7 +1182,7 @@ libinstall:	all
 	$(QUIET)printf "\nInstallation successful.\n"
 
 .PHONY: libinstall-byte-code
-libinstall-byte-code:
+libinstall-byte-code:	all
 	$(QUIET)printf "\nInstalling byte-code library with ocamlfind\n"
 	$(OCAMLFIND) install $(OCAMLFIND_INSTFLAGS) $(RESULT) META \
 	  $(filter-out $(RESULT).$(EXT_LIB) $(RESULT).cmxa, $(LIBINSTALL_FILES))
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..b04f2fb
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,16 @@
+ocaml-res Debian source package
+===============================
+
+Patching upstream sources
+-------------------------
+
+This source package uses quilt to apply and remove its patches. Please
+refer to `/usr/share/doc/quilt/README.source' for information about
+how to use quilt for source packages.
+
+The quilt series is generated from the Git repository, using
+dom-{apply,save}-patches, from the dh-ocaml (>= 0.4.2) package. Please
+refer to the appendix about Git in the Debian OCaml Packaging Policy
+(from the same package).
+
+ -- Stephane Glondu <steph at glondu.net>, Wed, 01 Jul 2009 15:14:06 +0200
diff --git a/debian/control b/debian/control
index e293634..913548a 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,7 @@ Uploaders:
 DM-Upload-Allowed: yes
 Build-Depends: cdbs,
  debhelper (>= 7),
+ quilt,
  dh-ocaml,
  ocaml-nox,
  ocaml-findlib
diff --git a/debian/patches/0001-Fix-build-on-non-native-archs.patch b/debian/patches/0001-Fix-build-on-non-native-archs.patch
new file mode 100644
index 0000000..ea3afd9
--- /dev/null
+++ b/debian/patches/0001-Fix-build-on-non-native-archs.patch
@@ -0,0 +1,49 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Wed, 1 Jul 2009 15:10:40 +0200
+Subject: [PATCH] Fix build on non-native archs
+
+---
+ Makefile      |    8 ++++++++
+ OCamlMakefile |    2 +-
+ 2 files changed, 9 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index e1a6ae3..5df91b1 100644
+--- a/Makefile
++++ b/Makefile
+@@ -4,6 +4,10 @@ EXAMPLES = $(filter-out examples/CVS, $(wildcard examples/*))
+ all:
+ 	@cd lib && $(MAKE) byte-code-library native-code-library
+ 
++.PHONY: byte
++byte:
++	@cd lib && $(MAKE) byte-code-library
++
+ .PHONY:	examples
+ examples:
+ 	@for dir in $(EXAMPLES); do (cd $$dir && $(MAKE)); done
+@@ -17,6 +21,10 @@ doc:
+ install:
+ 	@cd lib && $(MAKE) $@
+ 
++.PHONY:	libinstall-byte-code
++libinstall-byte-code:
++	@cd lib && $(MAKE) $@
++
+ .PHONY:	uninstall
+ uninstall:
+ 	@cd lib && $(MAKE) $@
+diff --git a/OCamlMakefile b/OCamlMakefile
+index e9e0753..5fc303e 100644
+--- a/OCamlMakefile
++++ b/OCamlMakefile
+@@ -1182,7 +1182,7 @@ libinstall:	all
+ 	$(QUIET)printf "\nInstallation successful.\n"
+ 
+ .PHONY: libinstall-byte-code
+-libinstall-byte-code:	all
++libinstall-byte-code:
+ 	$(QUIET)printf "\nInstalling byte-code library with ocamlfind\n"
+ 	$(OCAMLFIND) install $(OCAMLFIND_INSTFLAGS) $(RESULT) META \
+ 	  $(filter-out $(RESULT).$(EXT_LIB) $(RESULT).cmxa, $(LIBINSTALL_FILES))
+-- 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b94aac2
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Fix-build-on-non-native-archs.patch
diff --git a/debian/rules b/debian/rules
index c0ee33f..eb6a2f4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/makefile.mk
 include /usr/share/cdbs/1/rules/ocaml.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 LIB_NAME = res
 PKG_NAME = lib$(LIB_NAME)-ocaml-dev
@@ -18,4 +19,3 @@ endif
 
 build/$(PKG_NAME)::
 	mkdir -p $(DESTDIR)
-

-- 
ocaml-res packaging