[Pkg-ocaml-maint-commits] r2111 - in trunk/packages/omake/trunk: . debian debian/patches

[Mike Furr]

Author: mfurr
Date: 2005-11-23 19:01:26 +0000 (Wed, 23 Nov 2005)
New Revision: 2111

Added:
   trunk/packages/omake/trunk/debian/patches/10_Bytecode.dpatch
   trunk/packages/omake/trunk/omake_0.9.6.6-2.orig.tar.gz
Removed:
   trunk/packages/omake/trunk/omake_0.9.6.5-2.orig.tar.gz
Modified:
   trunk/packages/omake/trunk/debian/changelog
   trunk/packages/omake/trunk/debian/control
   trunk/packages/omake/trunk/debian/patches/00list
   trunk/packages/omake/trunk/debian/rules
Log:
3.09 rebuild


Modified: trunk/packages/omake/trunk/debian/changelog
===================================================================
--- trunk/packages/omake/trunk/debian/changelog	2005-11-23 09:45:49 UTC (rev 2110)
+++ trunk/packages/omake/trunk/debian/changelog	2005-11-23 19:01:26 UTC (rev 2111)
@@ -1,3 +1,12 @@
+omake (0.9.6.6-2-1) unstable; urgency=low
+
+  * New upstream release 
+  * Build with OCaml 3.09.0 (Closes: 338567)
+  * Dropped version on fam-dev depends since it reverted its name change
+  * Fixed build to work on non-opt architectures. (Closes: 332284)
+
+ -- Mike Furr <mfurr at debian.org>  Wed, 23 Nov 2005 12:53:03 -0500
+
 omake (0.9.6.5-2-1) unstable; urgency=low
 
   * New upstream release. 

Modified: trunk/packages/omake/trunk/debian/control
===================================================================
--- trunk/packages/omake/trunk/debian/control	2005-11-23 09:45:49 UTC (rev 2110)
+++ trunk/packages/omake/trunk/debian/control	2005-11-23 19:01:26 UTC (rev 2111)
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: Mike Furr <mfurr at debian.org>
-Build-Depends: debhelper (>= 4.0.0), autotools-dev, ocaml-nox-3.08.3, libfam-dev (>= 2.7.0-7.2), libreadline5-dev, libncurses5-dev, dpatch
+Build-Depends: debhelper (>= 4.0.0), autotools-dev, ocaml-nox-3.09.0, libfam-dev, libreadline5-dev, libncurses5-dev, dpatch
 Standards-Version: 3.6.2
 
 Package: omake

Modified: trunk/packages/omake/trunk/debian/patches/00list
===================================================================
--- trunk/packages/omake/trunk/debian/patches/00list	2005-11-23 09:45:49 UTC (rev 2110)
+++ trunk/packages/omake/trunk/debian/patches/00list	2005-11-23 19:01:26 UTC (rev 2111)
@@ -0,0 +1 @@
+10_Bytecode

Added: trunk/packages/omake/trunk/debian/patches/10_Bytecode.dpatch
===================================================================
--- trunk/packages/omake/trunk/debian/patches/10_Bytecode.dpatch	2005-11-23 09:45:49 UTC (rev 2110)
+++ trunk/packages/omake/trunk/debian/patches/10_Bytecode.dpatch	2005-11-23 19:01:26 UTC (rev 2111)
@@ -0,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_Bytecode.dpatch by Mike Furr <mfurr at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad omake-0.9.6.6~/OMakeroot omake-0.9.6.6/OMakeroot
+--- omake-0.9.6.6~/OMakeroot	2005-08-19 18:42:11.000000000 -0400
++++ omake-0.9.6.6/OMakeroot	2005-11-23 13:47:06.998229498 -0500
+@@ -16,6 +16,17 @@
+ #
+ include lib/configure/Configure
+ 
++if $(exists-in-path ocamlopt)
++	println(got opt compiler)
++	NATIVE_ENABLED=true
++	BYTE_ENABLED=false
++	export
++else
++	println(got byte compiler)
++	NATIVE_ENABLED=false
++	BYTE_ENABLED=true
++	export
++
+ #
+ # Include the OMakefile
+ #


Property changes on: trunk/packages/omake/trunk/debian/patches/10_Bytecode.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/packages/omake/trunk/debian/rules
===================================================================
--- trunk/packages/omake/trunk/debian/rules	2005-11-23 09:45:49 UTC (rev 2110)
+++ trunk/packages/omake/trunk/debian/rules	2005-11-23 19:01:26 UTC (rev 2111)
@@ -14,7 +14,7 @@
 include /usr/share/dpatch/dpatch.make
 
 build: build-stamp
-build-stamp: 
+build-stamp: patch
 	dh_testdir
 
 	$(MAKE) PREFIX=/usr MANDIR=/usr/share/man boot
@@ -29,6 +29,8 @@
 	rm -f build-stamp 
 
 	-./omake-boot clean
+	find . -name '*.omc' | xargs rm -f
+	rm -f .omakedb .config
 
 	dh_clean 
 

Deleted: trunk/packages/omake/trunk/omake_0.9.6.5-2.orig.tar.gz
===================================================================
(Binary files differ)

Added: trunk/packages/omake/trunk/omake_0.9.6.6-2.orig.tar.gz
===================================================================
(Binary files differ)


Property changes on: trunk/packages/omake/trunk/omake_0.9.6.6-2.orig.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream