[Pkg-ocaml-maint-commits] r3687 - in /trunk/packages/ocaml-dtools/trunk/debian: changelog control patches/ patches/00list patches/install.dpatch rules

[smimram at users.alioth.debian.org]

Author: smimram
Date: Thu Apr 12 22:04:45 2007
New Revision: 3687

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3687
Log:
Correcly install on non-native archs.

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

Modified: trunk/packages/ocaml-dtools/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-dtools/trunk/debian/changelog?rev=3687&op=diff
==============================================================================
--- trunk/packages/ocaml-dtools/trunk/debian/changelog (original)
+++ trunk/packages/ocaml-dtools/trunk/debian/changelog Thu Apr 12 22:04:45 2007
@@ -1,3 +1,11 @@
+ocaml-dtools (0.1.3-2) unstable; urgency=low
+
+  * Using dpatch to handle patches.
+  * Added install.dpatch to correctly install files on archs without a native
+    ocaml compiler, closes: #418728.
+
+ -- Samuel Mimram <smimram at debian.org>  Thu, 12 Apr 2007 23:57:45 +0200
+
 ocaml-dtools (0.1.3-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/packages/ocaml-dtools/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-dtools/trunk/debian/control?rev=3687&op=diff
==============================================================================
--- trunk/packages/ocaml-dtools/trunk/debian/control (original)
+++ trunk/packages/ocaml-dtools/trunk/debian/control Thu Apr 12 22:04:45 2007
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Samuel Mimram <smimram at debian.org>
 Uploaders: Romain Beauxis <toots at rastageeks.org>
-Build-Depends: debhelper (>= 4.2.0), ocaml-nox (>= 3.08.3), ocaml-findlib
+Build-Depends: debhelper (>= 4.2.0), ocaml-nox (>= 3.08.3), ocaml-findlib, dpatch
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocaml-dtools
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-dtools/trunk/

Added: trunk/packages/ocaml-dtools/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-dtools/trunk/debian/patches/00list?rev=3687&op=file
==============================================================================
--- trunk/packages/ocaml-dtools/trunk/debian/patches/00list (added)
+++ trunk/packages/ocaml-dtools/trunk/debian/patches/00list Thu Apr 12 22:04:45 2007
@@ -1,0 +1,1 @@
+install

Added: trunk/packages/ocaml-dtools/trunk/debian/patches/install.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-dtools/trunk/debian/patches/install.dpatch?rev=3687&op=file
==============================================================================
--- trunk/packages/ocaml-dtools/trunk/debian/patches/install.dpatch (added)
+++ trunk/packages/ocaml-dtools/trunk/debian/patches/install.dpatch Thu Apr 12 22:04:45 2007
@@ -1,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## install.dpatch by Samuel Mimram <smimram at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Use wildcards in the list of files to install in order to cope with
+## DP: archs without native compiler.
+
+ at DPATCH@
+diff -urNad ocaml-dtools-0.1.3~/src/Makefile.in ocaml-dtools-0.1.3/src/Makefile.in
+--- ocaml-dtools-0.1.3~/src/Makefile.in	2007-03-02 14:53:50.000000000 +0100
++++ ocaml-dtools-0.1.3/src/Makefile.in	2007-04-12 23:58:57.000000000 +0200
+@@ -21,7 +21,7 @@
+ THREADS = "yes"
+ SOURCES = dtools.mli dtools.ml
+ RESULT = dtools
+-LIBINSTALL_FILES = dtools.cma dtools.cmxa dtools.mli dtools.cmi dtools.a
++LIBINSTALL_FILES = $(wildcard *.cma *.cmxa *.mli *.cmi *.a)
+ OCAMLLDFLAGS =
+ LIBS = unix str
+ 

Propchange: trunk/packages/ocaml-dtools/trunk/debian/patches/install.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: trunk/packages/ocaml-dtools/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-dtools/trunk/debian/rules?rev=3687&op=diff
==============================================================================
--- trunk/packages/ocaml-dtools/trunk/debian/rules (original)
+++ trunk/packages/ocaml-dtools/trunk/debian/rules Thu Apr 12 22:04:45 2007
@@ -4,6 +4,9 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
+
+# We want to use dpatch
+include /usr/share/dpatch/dpatch.make
 
 OCAMLABI := $(shell ocamlc -version)
 OFILES := $(patsubst %.in,%,$(wildcard debian/*.in))
@@ -17,13 +20,13 @@
 	dh_testdir
 	./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
 
-build: ocamlinit build-stamp
+build: ocamlinit patch-stamp build-stamp
 build-stamp: config.status
 	dh_testdir
 	$(MAKE)
 	touch build-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
@@ -67,4 +70,4 @@
 	dh_builddeb
 
 binary: binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: build clean binary-indep binary-arch binary install patch unpatch