[Pkg-ocaml-maint-commits] [SCM] ocamlcreal packaging branch, master, updated. debian/0.7-5-6-g086c7d5

Mehdi Dogguy mehdi at debian.org
Tue Oct 6 19:05:57 UTC 2009 

The following commit has been merged in the master branch:
commit 086c7d503f609126f1d13fce0494f3bebf0d5db2
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Tue Oct 6 18:57:34 2009 +0200

    Use quilt

diff --git a/debian/changelog b/debian/changelog
index 2e73084..97cf516 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ ocamlcreal (0.7-6) UNRELEASED; urgency=low
   * Update my e-mail address
   * Refresh packaging:
     - Use debhelper (>= 7.0.50~)
+    - Use quilt (>= 0.46-7) instead of dpatch
     - Bump standards to 3.8.3
     - Use new features of dh-ocaml (>= 0.9~) (Closes: #549802)
 
diff --git a/debian/control b/debian/control
index e3dd7d8..b814091 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Uploaders:
 Build-Depends:
  ocaml-nox (>= 3.11.1-3~),
  debhelper (>= 7.0.50~),
- dpatch,
+ quilt (>= 0.46-7),
  libgmp-ocaml-dev (>= 20021123-15),
  dh-ocaml (>= 0.9~)
 Standards-Version: 3.8.3
diff --git a/debian/patches/10_Makefile.in.dpatch b/debian/patches/0001-Add-OCAMLBEST-targets-and-fix-build-and-install-proc.patch
old mode 100755
new mode 100644
similarity index 82%
rename from debian/patches/10_Makefile.in.dpatch
rename to debian/patches/0001-Add-OCAMLBEST-targets-and-fix-build-and-install-proc.patch
index 7bd9bab..244c975
--- a/debian/patches/10_Makefile.in.dpatch
+++ b/debian/patches/0001-Add-OCAMLBEST-targets-and-fix-build-and-install-proc.patch
@@ -1,13 +1,16 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_Makefile.in.dpatch by Mike Furr <mfurr at debian.org>
-##
-## DP: Add $(OCAMLBEST) targets and fix build and install process.
+From: Mike Furr <mfurr at debian.org>
+Date: Tue, 6 Oct 2009 19:15:45 +0200
+Subject: [PATCH] Add $(OCAMLBEST) targets and fix build and install process
 
- at DPATCH@
-diff -urNad creal-0.7~/Makefile.in creal-0.7/Makefile.in
---- creal-0.7~/Makefile.in	2005-12-07 18:30:29.000000000 -0500
-+++ creal-0.7/Makefile.in	2005-12-07 18:31:27.188466000 -0500
-@@ -16,7 +16,7 @@
+---
+ Makefile.in |   54 ++++++++++++++++++++++++++++--------------------------
+ 1 files changed, 28 insertions(+), 26 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index b6bcbe9..d217a3e 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -16,7 +16,7 @@ OCAMLOPT = @OCAMLOPT@
  OCAMLLEX = @OCAMLLEX@
  OCAMLYACC= @OCAMLYACC@
  
@@ -16,7 +19,7 @@ diff -urNad creal-0.7~/Makefile.in creal-0.7/Makefile.in
  BFLAGS = -g $(INCLUDES)
  OFLAGS = -unsafe $(INCLUDES)
  
-@@ -31,19 +31,23 @@
+@@ -31,19 +31,20 @@ CRCMX = $(CRCMO:.cmo=.cmx)
  CMA = creal.cma
  CMXA = creal.cmxa
  
@@ -27,29 +30,26 @@ diff -urNad creal-0.7~/Makefile.in creal-0.7/Makefile.in
  
 -all: @OCAMLBEST@ test. at OCAMLBEST@ test_cr. at OCAMLBEST@ ecalc. at OCAMLBEST@
 +OCAMLBEST = @OCAMLBEST@
++all: $(OCAMLBEST) test.$(OCAMLBEST) test_cr.$(OCAMLBEST) ecalc.$(OCAMLBEST)
  
 -byte: $(GMPCMA) $(CMA) $(CRCMO) cmpf.cmo
 -opt:  $(GMPCMA) $(CMA) $(GMPCMXA) $(CMXA) $(CRCMO) $(CRCMX) cmpf.cmx
-+all: $(OCAMLBEST) test.$(OCAMLBEST) test_cr.$(OCAMLBEST) ecalc.$(OCAMLBEST)
++byte: $(CMA) $(CRCMO) cmpf.cmo
++opt:  $(CMA) $(CMXA) $(CRCMO) $(CRCMX) cmpf.cmx
  
 -$(CMA): libcreal.a $(GMPCMA) $(CMO)
 -	ocamlmklib -linkall -o creal $(GMPCMA) $(CMO) -lgmp
-+byte: $(CMA) $(CRCMO) cmpf.cmo
-+opt:  $(CMA) $(CMXA) $(CRCMO) $(CRCMX) cmpf.cmx
++$(CMA): $(CMO)
++	$(OCAMLC) -a -o $(CMA) $(CMO)
  
 -$(CMXA):libcreal.a $(GMPCMX) $(CMX)
 -	ocamlmklib -linkall -o creal $(GMPCMX) $(CMX) -lgmp
-+$(CMA): $(CMO)
-+#	ocamlmklib -linkall -o creal $(GMPCMA) $(CMO) -lgmp
-+	$(OCAMLC) -a -o $(CMA) $(CMO)
-+
 +$(CMXA): $(CMX)
-+#	ocamlmklib -linkall -o creal $(GMPCMX) $(CMX) -lgmp
 +	$(OCAMLOPT) -a -o $(CMXA) $(CMX)
  
  libcreal.a: mlgmp/mlgmp_z.o mlgmp/mlgmp_q.o mlgmp/mlgmp_misc.o
  	ocamlmklib -oc creal $^ -lgmp
-@@ -68,19 +72,19 @@
+@@ -68,19 +69,19 @@ TESTCMO=test.cmo
  TESTCMX=$(TESTCMO:.cmo=.cmx)
  
  test.opt: $(CMXA) $(TESTCMX)
@@ -73,7 +73,7 @@ diff -urNad creal-0.7~/Makefile.in creal-0.7/Makefile.in
  
  md.opt: $(CMXA) md.ml
  	$(OCAMLOPT) $(OFLAGS) -o $@ $^ -cclib "-L."
-@@ -100,10 +104,10 @@
+@@ -100,10 +101,10 @@ CALCCMO=calc.cmo
  CALCCMX=$(CALCCMO:.cmo=.cmx)
  
  ecalc.opt: $(CMXA) $(CALCCMX)
@@ -86,7 +86,7 @@ diff -urNad creal-0.7~/Makefile.in creal-0.7/Makefile.in
  
  GENERATED=calc.ml
  
-@@ -117,8 +121,8 @@
+@@ -117,8 +118,8 @@ CREALPP=creal_pp.cmo install_creal_pp.cmo
  ocamlcreal: creal.cma $(GMPPP) $(CREALPP)
  	ocamlmktop -o $@ $^ -cclib "-L."
  
@@ -97,7 +97,7 @@ diff -urNad creal-0.7~/Makefile.in creal-0.7/Makefile.in
  
  bench: test.opt
  	echo -n `date +"%a %d/%m/%Y %H:%M"` >> bench.log
-@@ -130,28 +134,28 @@
+@@ -130,28 +131,28 @@ bench: test.opt
  GMPBYTEFILES = mlgmp/gmp.cma mlgmp/gmp.cmi mlgmp/gmp.mli mlgmp/libmlgmp.a
  GMPOPTFILES = mlgmp/gmp.cmxa mlgmp/gmp.a
  BYTEFILES = $(CMA) $(CMI) $(MLI)
@@ -133,12 +133,11 @@ diff -urNad creal-0.7~/Makefile.in creal-0.7/Makefile.in
  
  install-prog-opt:
  	mkdir -p $(BINDIR)
-@@ -262,11 +266,11 @@
- 	rm -f $(GENERATED)
+@@ -263,10 +264,11 @@ clean:
  	rm -f creal.tex creal.dvi creal.ps creal.ps.gz
  	rm -f test.byte test.opt ecalc.byte ecalc.opt
--	rm -f ocamlgmp ocamlcreal
-+	rm -f test_cr.byte test_cr.opt ocamlgmp ocamlcreal
+ 	rm -f ocamlgmp ocamlcreal
++	rm -f test_cr.byte test_cr.opt
  
  depend: $(GENERATED)
  	rm -f .depend
@@ -147,3 +146,4 @@ diff -urNad creal-0.7~/Makefile.in creal-0.7/Makefile.in
  
  include .depend
  
+-- 
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 25b1c06..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-10_Makefile.in
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..17cdfaa
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Add-OCAMLBEST-targets-and-fix-build-and-install-proc.patch
diff --git a/debian/rules b/debian/rules
index 64a06a2..3cc5d4b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,6 @@
 
 PACKAGE=libcreal-ocaml-dev
 
-include /usr/share/dpatch/dpatch.make
 include /usr/share/ocaml/ocamlvars.mk
 
 override_dh_auto_build:
@@ -20,7 +19,4 @@ override_dh_auto_install:
 	cp debian/META debian/$(PACKAGE)$(OCAML_STDLIB_DIR)/creal
 
 %:
-	dh --with ocaml $@
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+	dh --with quilt,ocaml $@

-- 
ocamlcreal packaging

More information about the Pkg-ocaml-maint-commits mailing list