[Pkg-ocaml-maint-commits] [SCM] freetennis packaging branch, master, updated. debian/0.4.8-5-8-gb4770a4

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit bc73931a96017d64c6bab7456da2bd024583e25d
Author: Mehdi Dogguy <dogguy at pps.jussieu.fr>
Date:   Tue Jun 23 11:25:31 2009 +0200

    Drop 02_Makefile.dpatch and use debian/Makefile instead

diff --git a/debian/Makefile b/debian/Makefile
new file mode 100644
index 0000000..26c1c97
--- /dev/null
+++ b/debian/Makefile
@@ -0,0 +1,21 @@
+# add -noassert for speedup
+
+CMXA = bigarray.cmxa sdl.cmxa lablgtk.cmxa lablgl.cmxa graphics.cmxa sdlmixer.cmxa sdlttf.cmxa unix.cmxa
+CMA  = $(CMXA:.cmxa=.cma)
+
+OFLAGS = -I +camlimages -I +lablGL -I +lablgtk2 -I +sdl -w Aelzy
+BFLAGS = $(OFLAGS) -custom
+
+OCAMLC=ocamlc
+OCAMLOPT=ocamlopt
+
+NAME=freetennis
+
+$(NAME).opt:
+	$(OCAMLOPT) $(OFLAGS) -o $(NAME) $(CMXA) $(NAME).ml
+
+$(NAME).byte:
+	$(OCAMLC) $(BFLAGS) -o $(NAME) $(CMA) $(NAME).ml
+
+clean:
+	rm -f *.cm[oixa] *.cmxa *.o *.a *~ $(NAME).opt $(NAME).byte
diff --git a/debian/changelog b/debian/changelog
index b2b866a..82ce046 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ freetennis (0.4.8-6) UNRELEASED; urgency=low
 
   * Using make -j doesn't cause the package to FTBFS, Closes: #483792. 
   * Switch packaging to git
+  * Drop 02_Makefile.dpatch and use debian/Makefile instead (Same content
+    but easier to modify).
 
  -- Mehdi Dogguy <dogguy at pps.jussieu.fr>  Tue, 23 Jun 2009 11:08:47 +0200
 
diff --git a/debian/patches/00list b/debian/patches/00list
index 51e8c2c..2480ff0 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,2 +1 @@
 01_sfx_path
-02_Makefile
diff --git a/debian/patches/02_Makefile.dpatch b/debian/patches/02_Makefile.dpatch
deleted file mode 100755
index 67ccd20..0000000
--- a/debian/patches/02_Makefile.dpatch
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_Makefile.dpatch by  <dogguy at pps.jussieu.fr>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad trunk~/Makefile trunk/Makefile
---- trunk~/Makefile	2005-11-21 22:20:33.000000000 +0100
-+++ trunk/Makefile	2008-04-26 17:57:58.000000000 +0200
-@@ -1,3 +1,21 @@
- # add -noassert for speedup
--all: freetennis.ml 
--	ocamlopt   -I +camlimages  -I +lablGL -I +lablgtk2    -I +sdl -o freetennis  bigarray.cmxa sdl.cmxa lablgtk.cmxa lablgl.cmxa  ci_core.cmxa  sdlmixer.cmxa sdlttf.cmxa unix.cmxa freetennis.ml
-+
-+CMXA = bigarray.cmxa sdl.cmxa lablgtk.cmxa lablgl.cmxa ci_core.cmxa sdlmixer.cmxa sdlttf.cmxa unix.cmxa
-+CMA  = $(CMXA:.cmxa=.cma)
-+
-+OFLAGS = -I +camlimages -I +lablGL -I +lablgtk2 -I +sdl -w Aelzy
-+BFLAGS = $(OFLAGS) -custom
-+
-+OCAMLC=ocamlc
-+OCAMLOPT=ocamlopt
-+
-+NAME=freetennis
-+
-+$(NAME).opt:
-+	$(OCAMLOPT) $(OFLAGS) -o $(NAME) $(CMXA) $(NAME).ml
-+
-+$(NAME).byte:
-+	$(OCAMLC) $(BFLAGS) -o $(NAME) $(CMA) $(NAME).ml
-+
-+clean:
-+	rm -f *.cm[oixa] *.cmxa *.o *.a *~ $(NAME).opt $(NAME).byte
diff --git a/debian/rules b/debian/rules
index 3d38533..8dd5cd2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,7 +25,7 @@ build: build-stamp
 
 build-stamp: patch configure-stamp 
 	dh_testdir
-	$(MAKE) freetennis.$(OCAMLBEST)
+	$(MAKE) -f debian/Makefile freetennis.$(OCAMLBEST)
 	touch $@
 
 clean: unpatch

-- 
freetennis packaging