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

[Mike Furr]

Author: mfurr
Date: 2005-12-30 19:04:39 +0000 (Fri, 30 Dec 2005)
New Revision: 2344

Added:
   trunk/packages/omake/trunk/omake_0.9.6.7-1.orig.tar.gz
Removed:
   trunk/packages/omake/trunk/debian/patches/00list
   trunk/packages/omake/trunk/debian/patches/10_Bytecode.dpatch
   trunk/packages/omake/trunk/omake_0.9.6.6-2.orig.tar.gz
Modified:
   trunk/packages/omake/trunk/debian/changelog
   trunk/packages/omake/trunk/debian/control
   trunk/packages/omake/trunk/debian/rules
Log:
new upstream release.


Modified: trunk/packages/omake/trunk/debian/changelog
===================================================================
--- trunk/packages/omake/trunk/debian/changelog	2005-12-28 16:45:37 UTC (rev 2343)
+++ trunk/packages/omake/trunk/debian/changelog	2005-12-30 19:04:39 UTC (rev 2344)
@@ -1,3 +1,11 @@
+omake (0.9.6.7-1-1) unstable; urgency=low
+
+  * New upstream release
+  * Removed bytecode compile patch as this is now handled upstream
+  * No more hard-coding the ABI in control
+
+ -- Mike Furr <mfurr at debian.org>  Fri, 30 Dec 2005 13:41:54 -0500
+
 omake (0.9.6.6-2-1) unstable; urgency=low
 
   * New upstream release 

Modified: trunk/packages/omake/trunk/debian/control
===================================================================
--- trunk/packages/omake/trunk/debian/control	2005-12-28 16:45:37 UTC (rev 2343)
+++ trunk/packages/omake/trunk/debian/control	2005-12-30 19:04:39 UTC (rev 2344)
@@ -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.09.0, libfam-dev, 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

Deleted: trunk/packages/omake/trunk/debian/patches/00list
===================================================================
--- trunk/packages/omake/trunk/debian/patches/00list	2005-12-28 16:45:37 UTC (rev 2343)
+++ trunk/packages/omake/trunk/debian/patches/00list	2005-12-30 19:04:39 UTC (rev 2344)
@@ -1 +0,0 @@
-10_Bytecode

Deleted: trunk/packages/omake/trunk/debian/patches/10_Bytecode.dpatch
===================================================================
--- trunk/packages/omake/trunk/debian/patches/10_Bytecode.dpatch	2005-12-28 16:45:37 UTC (rev 2343)
+++ trunk/packages/omake/trunk/debian/patches/10_Bytecode.dpatch	2005-12-30 19:04:39 UTC (rev 2344)
@@ -1,28 +0,0 @@
-#! /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
- #

Modified: trunk/packages/omake/trunk/debian/rules
===================================================================
--- trunk/packages/omake/trunk/debian/rules	2005-12-28 16:45:37 UTC (rev 2343)
+++ trunk/packages/omake/trunk/debian/rules	2005-12-30 19:04:39 UTC (rev 2344)
@@ -12,7 +12,13 @@
 
 PACKAGE=omake
 include /usr/share/dpatch/dpatch.make
+OCAMLABI = $(shell ocamlc -version)
 
+# note, this is only invoked manually during OCaml 
+# version transitions, not during each build
+debian/control:
+	sed -e 's%#OcamlABI#%$(OCAMLABI)%' $@.in >$@
+
 build: build-stamp
 build-stamp: patch
 	dh_testdir

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

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


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