[Pkg-ocaml-maint-commits] r4608 - in /trunk/packages/ocaml-curses/trunk/debian: changelog control patches/ patches/00list patches/byte.dpatch rules

[smimram at users.alioth.debian.org]

Author: smimram
Date: Wed Oct 10 10:56:34 2007
New Revision: 4608

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4608
Log:
Really fix the FTBFS on non-native archs.

Added:
    trunk/packages/ocaml-curses/trunk/debian/patches/
    trunk/packages/ocaml-curses/trunk/debian/patches/00list
    trunk/packages/ocaml-curses/trunk/debian/patches/byte.dpatch   (with props)
Modified:
    trunk/packages/ocaml-curses/trunk/debian/changelog
    trunk/packages/ocaml-curses/trunk/debian/control
    trunk/packages/ocaml-curses/trunk/debian/rules

Modified: trunk/packages/ocaml-curses/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-curses/trunk/debian/changelog?rev=4608&op=diff
==============================================================================
--- trunk/packages/ocaml-curses/trunk/debian/changelog (original)
+++ trunk/packages/ocaml-curses/trunk/debian/changelog Wed Oct 10 10:56:34 2007
@@ -1,3 +1,10 @@
+ocaml-curses (1.0.2-2) unstable; urgency=low
+
+  * Using dpatch to handle patches.
+  * Added byte.dpatch to really fix the FTBFS on non-native archs.
+
+ -- Samuel Mimram <smimram at debian.org>  Wed, 10 Oct 2007 10:53:14 +0000
+
 ocaml-curses (1.0.2-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/packages/ocaml-curses/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-curses/trunk/debian/control?rev=4608&op=diff
==============================================================================
--- trunk/packages/ocaml-curses/trunk/debian/control (original)
+++ trunk/packages/ocaml-curses/trunk/debian/control Wed Oct 10 10:56:34 2007
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: Samuel Mimram <smimram at debian.org>
-Build-Depends: debhelper (>> 4.0.0), dpkg-dev (>= 1.13.19), libncurses5-dev, ocaml-nox (>= 3.10), ocaml-findlib
+Build-Depends: debhelper (>> 4.0.0), dpkg-dev (>= 1.13.19), libncurses5-dev, ocaml-nox (>= 3.10), ocaml-findlib, dpatch
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocaml-curses
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-curses/trunk/

Added: trunk/packages/ocaml-curses/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-curses/trunk/debian/patches/00list?rev=4608&op=file
==============================================================================
--- trunk/packages/ocaml-curses/trunk/debian/patches/00list (added)
+++ trunk/packages/ocaml-curses/trunk/debian/patches/00list Wed Oct 10 10:56:34 2007
@@ -1,0 +1,1 @@
+byte

Added: trunk/packages/ocaml-curses/trunk/debian/patches/byte.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-curses/trunk/debian/patches/byte.dpatch?rev=4608&op=file
==============================================================================
--- trunk/packages/ocaml-curses/trunk/debian/patches/byte.dpatch (added)
+++ trunk/packages/ocaml-curses/trunk/debian/patches/byte.dpatch Wed Oct 10 10:56:34 2007
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## byte.dpatch by Samuel Mimram <smimram at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Build on non-native archs.
+
+ at DPATCH@
+diff -urNad ocaml-curses-1.0.2~/Makefile ocaml-curses-1.0.2/Makefile
+--- ocaml-curses-1.0.2~/Makefile	2007-10-10 10:54:03.000000000 +0000
++++ ocaml-curses-1.0.2/Makefile	2007-10-10 10:54:11.000000000 +0000
+@@ -11,7 +11,7 @@
+ LIBINSTALL_FILES = $(wildcard *.mli *.cmi *.cma *.cmxa *.a *.so)
+ OCAMLDOCFLAGS = -stars
+ 
+-all: byte opt
++all: byte
+ 
+ opt: ncl META
+ 

Propchange: trunk/packages/ocaml-curses/trunk/debian/patches/byte.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: trunk/packages/ocaml-curses/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-curses/trunk/debian/rules?rev=4608&op=diff
==============================================================================
--- trunk/packages/ocaml-curses/trunk/debian/rules (original)
+++ trunk/packages/ocaml-curses/trunk/debian/rules Wed Oct 10 10:56:34 2007
@@ -4,6 +4,8 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
+
+include /usr/share/dpatch/dpatch.make
 
 OCAMLABI := $(shell ocamlc -version)
 OFILES := $(patsubst %.in,%,$(wildcard debian/*.in))
@@ -15,7 +17,7 @@
 ocamlinit:
 	for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
 
-build: ocamlinit build-stamp
+build: patch ocamlinit build-stamp
 build-stamp:
 	dh_testdir
 
@@ -27,7 +29,7 @@
 
 	touch build-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
@@ -66,4 +68,4 @@
 binary-indep:
 
 binary: binary-arch
-.PHONY: build clean binary-indep binary-arch binary install ocamlinit
+.PHONY: build clean binary-indep binary-arch binary install ocamlinit patch unpatch