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

[smimram at users.alioth.debian.org]

Author: smimram
Date: Sat Apr 28 22:15:58 2007
New Revision: 3728

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3728
Log:
Added install.dpatch to correctly install on non-native archs.

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

Modified: trunk/packages/ocaml-ao/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-ao/trunk/debian/changelog?rev=3728&op=diff
==============================================================================
--- trunk/packages/ocaml-ao/trunk/debian/changelog (original)
+++ trunk/packages/ocaml-ao/trunk/debian/changelog Sat Apr 28 22:15:58 2007
@@ -1,3 +1,10 @@
+ocaml-ao (0.1.7.1-3) unstable; urgency=low
+
+  * Using dpatch to handle patches.
+  * Added install.dpatch to correctly install on non-native archs.
+
+ -- Samuel Mimram <smimram at debian.org>  Sun, 29 Apr 2007 00:10:30 +0200
+
 ocaml-ao (0.1.7.1-2) unstable; urgency=low
 
   * Correct the copyright file: library is under LGPL and not GPL.

Modified: trunk/packages/ocaml-ao/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-ao/trunk/debian/control?rev=3728&op=diff
==============================================================================
--- trunk/packages/ocaml-ao/trunk/debian/control (original)
+++ trunk/packages/ocaml-ao/trunk/debian/control Sat Apr 28 22:15:58 2007
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: Samuel Mimram <smimram at debian.org>
-Build-Depends: debhelper (>> 4.0.0), libao-dev, ocaml-nox (>= 3.08.3), ocaml-findlib, pkg-config, dpkg-dev (>= 1.13.19)
+Build-Depends: debhelper (>> 4.0.0), libao-dev, ocaml-nox (>= 3.08.3), ocaml-findlib, pkg-config, dpkg-dev (>= 1.13.19), dpatch
 Standards-Version: 3.7.2
 
 Package: libao-ocaml

Added: trunk/packages/ocaml-ao/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-ao/trunk/debian/patches/00list?rev=3728&op=file
==============================================================================
--- trunk/packages/ocaml-ao/trunk/debian/patches/00list (added)
+++ trunk/packages/ocaml-ao/trunk/debian/patches/00list Sat Apr 28 22:15:58 2007
@@ -1,0 +1,1 @@
+install

Added: trunk/packages/ocaml-ao/trunk/debian/patches/install.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-ao/trunk/debian/patches/install.dpatch?rev=3728&op=file
==============================================================================
--- trunk/packages/ocaml-ao/trunk/debian/patches/install.dpatch (added)
+++ trunk/packages/ocaml-ao/trunk/debian/patches/install.dpatch Sat Apr 28 22:15:58 2007
@@ -1,0 +1,18 @@
+#! /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: Correctly install files on non-native archs.
+
+ at DPATCH@
+diff -urNad ocaml-ao-0.1.7.1~/src/Makefile.in ocaml-ao-0.1.7.1/src/Makefile.in
+--- ocaml-ao-0.1.7.1~/src/Makefile.in	2007-03-02 14:56:19.000000000 +0100
++++ ocaml-ao-0.1.7.1/src/Makefile.in	2007-04-29 00:08:35.000000000 +0200
+@@ -11,6 +11,7 @@
+ OCAMLLIBPATH = @CAMLLIBPATH@
+ CC = @CC@
+ CPPFLAGS = @CPPFLAGS@
++LIBINSTALL_FILES = $(wildcard *.mli *.cmi *.cma *.cmxa *.a *.so)
+ BEST = @BEST@
+ 
+ all: $(BEST)

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

Modified: trunk/packages/ocaml-ao/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-ao/trunk/debian/rules?rev=3728&op=diff
==============================================================================
--- trunk/packages/ocaml-ao/trunk/debian/rules (original)
+++ trunk/packages/ocaml-ao/trunk/debian/rules Sat Apr 28 22:15:58 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))
@@ -32,7 +35,7 @@
 	dh_testdir
 	./configure $(confflags) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)"
 
-build: ocamlinit build-stamp
+build: patch ocamlinit build-stamp
 build-stamp: config.status
 	dh_testdir
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
@@ -41,7 +44,7 @@
 	$(MAKE)
 	touch build-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
@@ -79,4 +82,4 @@
 	dh_builddeb
 
 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