[Pkg-ocaml-maint-commits] r5412 - in /trunk/projects/approx/trunk: debian/changelog debian/compat debian/control debian/rules myocamlbuild.ml tests/config_test.ml tests/metadata_test.ml
ecc-guest at users.alioth.debian.org
ecc-guest at users.alioth.debian.org
Wed Apr 2 16:16:04 UTC 2008
Author: ecc-guest
Date: Wed Apr 2 16:16:04 2008
New Revision: 5412
URL: http://svn.debian.org/wsvn/?sc=1&rev=5412
Log:
prevent dh_strip from stripping custom bytecode executables
change to debhelper v6 mode
fix tests that broke after config module rename
Modified:
trunk/projects/approx/trunk/debian/changelog
trunk/projects/approx/trunk/debian/compat
trunk/projects/approx/trunk/debian/control
trunk/projects/approx/trunk/debian/rules
trunk/projects/approx/trunk/myocamlbuild.ml
trunk/projects/approx/trunk/tests/config_test.ml
trunk/projects/approx/trunk/tests/metadata_test.ml
Modified: trunk/projects/approx/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/projects/approx/trunk/debian/changelog?rev=5412&op=diff
==============================================================================
--- trunk/projects/approx/trunk/debian/changelog (original)
+++ trunk/projects/approx/trunk/debian/changelog Wed Apr 2 16:16:04 2008
@@ -1,11 +1,17 @@
+approx (3.1.0) unstable; urgency=low
+
+ * Prevent dh_strip from stripping custom bytecode executables
+ (closes: #473707)
+ * Change to debhelper v6 mode
+
+ -- Eric Cooper <ecc at cmu.edu> Wed, 02 Apr 2008 11:00:55 -0400
+
approx (3.1.0~rc2) experimental; urgency=low
* Pass -byte-plugin flag to ocamlbuild when building bytecode
(closes: #471665)
- * Add nostrip to DEB_BUILD_OPTIONS when building bytecode
- (closes: #473707)
-
- -- Eric Cooper <ecc at cmu.edu> Tue, 01 Apr 2008 18:24:42 -0400
+
+ -- Eric Cooper <ecc at cmu.edu> Tue, 01 Apr 2008 14:49:03 -0400
approx (3.1.0~rc1) experimental; urgency=low
Modified: trunk/projects/approx/trunk/debian/compat
URL: http://svn.debian.org/wsvn/trunk/projects/approx/trunk/debian/compat?rev=5412&op=diff
==============================================================================
--- trunk/projects/approx/trunk/debian/compat (original)
+++ trunk/projects/approx/trunk/debian/compat Wed Apr 2 16:16:04 2008
@@ -1,1 +1,1 @@
-5
+6
Modified: trunk/projects/approx/trunk/debian/control
URL: http://svn.debian.org/wsvn/trunk/projects/approx/trunk/debian/control?rev=5412&op=diff
==============================================================================
--- trunk/projects/approx/trunk/debian/control (original)
+++ trunk/projects/approx/trunk/debian/control Wed Apr 2 16:16:04 2008
@@ -4,7 +4,7 @@
Maintainer: Eric Cooper <ecc at cmu.edu>
Uploaders: Sylvain Le Gall <gildor at debian.org>, Ralf Treinen <treinen at debian.org>
DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 5.0), cdbs, ocaml-nox (>= 3.10), ocaml-best-compilers, libnethttpd-ocaml-dev (>= 2.2.8), libpcre-ocaml-dev (>= 5.11), libsha-ocaml-dev (>= 1.3), libsyslog-ocaml-dev (>= 1.3), libwrap0-dev
+Build-Depends: debhelper (>= 6.0), cdbs, ocaml-nox (>= 3.10), ocaml-best-compilers, libnethttpd-ocaml-dev (>= 2.2.8), libpcre-ocaml-dev (>= 5.11), libsha-ocaml-dev (>= 1.3), libsyslog-ocaml-dev (>= 1.3), libwrap0-dev
Standards-Version: 3.7.3
Homepage: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/projects/approx
Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/projects/approx/trunk
Modified: trunk/projects/approx/trunk/debian/rules
URL: http://svn.debian.org/wsvn/trunk/projects/approx/trunk/debian/rules?rev=5412&op=diff
==============================================================================
--- trunk/projects/approx/trunk/debian/rules (original)
+++ trunk/projects/approx/trunk/debian/rules Wed Apr 2 16:16:04 2008
@@ -5,10 +5,10 @@
include /usr/share/cdbs/1/class/ocaml.mk
ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
- DEB_MAKE_BUILD_TARGET = all TARGET=native
+ DEB_MAKE_BUILD_TARGET = TARGET=native
DEB_DH_GENCONTROL_ARGS += -VF:OCamlRun=""
else
- DEB_MAKE_BUILD_TARGET = all TARGET=byte
+ DEB_MAKE_BUILD_TARGET = TARGET=byte
DEB_DH_GENCONTROL_ARGS += -VF:OCamlRun="ocaml-base-nox-$(OCAML_ABI)"
- export DEB_BUILD_OPTIONS += nostrip
+ DEB_STRIP_EXCLUDE += usr/sbin
endif
Modified: trunk/projects/approx/trunk/myocamlbuild.ml
URL: http://svn.debian.org/wsvn/trunk/projects/approx/trunk/myocamlbuild.ml?rev=5412&op=diff
==============================================================================
--- trunk/projects/approx/trunk/myocamlbuild.ml (original)
+++ trunk/projects/approx/trunk/myocamlbuild.ml Wed Apr 2 16:16:04 2008
@@ -8,10 +8,10 @@
let libraries =
["pcre"; "sha"; "syslog";
- "netsys"; "netstring"; "+netcgi2 netcgi"; "nethttpd-for-netcgi2"]
+ "netsys"; "netstring"; "+netcgi2:netcgi"; "nethttpd-for-netcgi2"]
let split str =
- let i = String.index str ' ' in
+ let i = String.index str ':' in
String.sub str 0 i, String.sub str (i+1) (String.length str - (i+1))
let add_library lib =
Modified: trunk/projects/approx/trunk/tests/config_test.ml
URL: http://svn.debian.org/wsvn/trunk/projects/approx/trunk/tests/config_test.ml?rev=5412&op=diff
==============================================================================
--- trunk/projects/approx/trunk/tests/config_test.ml (original)
+++ trunk/projects/approx/trunk/tests/config_test.ml Wed Apr 2 16:16:04 2008
@@ -10,5 +10,5 @@
| _ -> eprintf "Usage: %s config-file\n" Sys.argv.(0); exit 1
let () =
- Config.read file;
- Config.iter (fun k v -> printf "%s: %s\n" k v)
+ Config_file.read file;
+ Config_file.iter (fun k v -> printf "%s: %s\n" k v)
Modified: trunk/projects/approx/trunk/tests/metadata_test.ml
URL: http://svn.debian.org/wsvn/trunk/projects/approx/trunk/tests/metadata_test.ml?rev=5412&op=diff
==============================================================================
--- trunk/projects/approx/trunk/tests/metadata_test.ml (original)
+++ trunk/projects/approx/trunk/tests/metadata_test.ml Wed Apr 2 16:16:04 2008
@@ -4,7 +4,7 @@
open Printf
open Util
-open Default_config
+open Config
let files = ref []
More information about the Pkg-ocaml-maint-commits
mailing list