r317 - in /packages/mtasc/trunk/debian: changelog patches/01_exe_in_usage.patch patches/03_flashlite_compat.patch patches/04_include_dirs.patch patches/series

pabs at users.alioth.debian.org pabs at users.alioth.debian.org
Mon Mar 9 08:24:07 UTC 2009 

Author: pabs
Date: Mon Mar  9 08:24:07 2009
New Revision: 317

URL: http://svn.debian.org/wsvn/pkg-flash/?sc=1&rev=317
Log:
* New upstream release
  - drop 03_flashlite_compat.patch, included upstream

Removed:
    packages/mtasc/trunk/debian/patches/03_flashlite_compat.patch
Modified:
    packages/mtasc/trunk/debian/changelog
    packages/mtasc/trunk/debian/patches/01_exe_in_usage.patch
    packages/mtasc/trunk/debian/patches/04_include_dirs.patch
    packages/mtasc/trunk/debian/patches/series

Modified: packages/mtasc/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-flash/packages/mtasc/trunk/debian/changelog?rev=317&op=diff
==============================================================================
--- packages/mtasc/trunk/debian/changelog (original)
+++ packages/mtasc/trunk/debian/changelog Mon Mar  9 08:24:07 2009
@@ -1,3 +1,10 @@
+mtasc (1.14-1) UNRELEASED; urgency=low
+
+  * New upstream release
+    - drop 03_flashlite_compat.patch, included upstream
+
+ -- Paul Wise <pabs at debian.org>  Mon, 09 Mar 2009 16:56:39 +0900
+
 mtasc (1.13-4) unstable; urgency=low
 
   * Upload to unstable for ocaml 3.10.0 transition

Modified: packages/mtasc/trunk/debian/patches/01_exe_in_usage.patch
URL: http://svn.debian.org/wsvn/pkg-flash/packages/mtasc/trunk/debian/patches/01_exe_in_usage.patch?rev=317&op=diff
==============================================================================
--- packages/mtasc/trunk/debian/patches/01_exe_in_usage.patch (original)
+++ packages/mtasc/trunk/debian/patches/01_exe_in_usage.patch Mon Mar  9 08:24:07 2009
@@ -1,17 +1,15 @@
 01_exe_in_usage.patch
 Paul Wise <pabs at debian.org>
 Only show .exe in the usage on Win32
-Index: ocaml/mtasc/main.ml
-===================================================================
---- ocaml/mtasc/main.ml.orig	2007-05-23 19:01:25.000000000 +1000
-+++ ocaml/mtasc/main.ml	2007-05-23 19:01:43.000000000 +1000
+--- ocaml/mtasc/main.ml.orig
++++ ocaml/mtasc/main.ml
 @@ -112,7 +112,8 @@
  	if do_exit then exit 1
  ;;
  try	
--	let usage = "Motion-Twin ActionScript2 Compiler 1.13 - (c)2004-2007 Motion-Twin\n Usage : mtasc.exe [options] <files...>\n Options :" in
+-	let usage = "Motion-Twin ActionScript2 Compiler 1.14 - (c)2004-2008 Motion-Twin\n Usage : mtasc.exe [options] <files...>\n Options :" in
 +	let exe_ext = match Sys.os_type with "Win32" | "Cygwin" -> ".exe" | _ -> "" in
-+	let usage = "Motion-Twin ActionScript2 Compiler 1.13 - (c)2004-2007 Motion-Twin\n Usage : mtasc" ^ exe_ext ^ " [options] <files...>\n Options :" in
++	let usage = "Motion-Twin ActionScript2 Compiler 1.14 - (c)2004-2008 Motion-Twin\n Usage : mtasc" ^ exe_ext ^ " [options] <files...>\n Options :" in
  	let base_path = normalize_path (try Extc.executable_path() with _ -> ".") in
  	let files = ref [] in
  	let time = Sys.time() in

Modified: packages/mtasc/trunk/debian/patches/04_include_dirs.patch
URL: http://svn.debian.org/wsvn/pkg-flash/packages/mtasc/trunk/debian/patches/04_include_dirs.patch?rev=317&op=diff
==============================================================================
--- packages/mtasc/trunk/debian/patches/04_include_dirs.patch (original)
+++ packages/mtasc/trunk/debian/patches/04_include_dirs.patch Mon Mar  9 08:24:07 2009
@@ -3,10 +3,8 @@
 Add a couple of paths to the default classpath
 Keep the default path, needed during the test build
 Fix detection of the executable path
-Index: ocaml/mtasc/main.ml
-===================================================================
---- ocaml/mtasc/main.ml.orig	2007-05-26 20:13:29.000000000 +1000
-+++ ocaml/mtasc/main.ml	2007-05-26 20:13:29.000000000 +1000
+--- ocaml/mtasc/main.ml.orig
++++ ocaml/mtasc/main.ml
 @@ -117,7 +117,9 @@
  	let base_path = normalize_path (try Extc.executable_path() with _ -> ".") in
  	let files = ref [] in
@@ -23,16 +21,14 @@
  	] @ !Plugin.options in
  	Arg.parse args_spec (fun file -> files := file :: !files) usage;
 -	Plugin.class_path := (base_path ^ "std/") :: !Plugin.class_path;
--	if !GenSwf.version = Some 8 then Plugin.class_path := (base_path ^ "std8/") :: !Plugin.class_path;
+-	if (match !GenSwf.version with Some x -> x >= 8 | None -> false) then Plugin.class_path := (base_path ^ "std8/") :: !Plugin.class_path;
 +	Plugin.class_path := (base_path ^ "std/") :: (local ^ "std/") :: (prefix ^ "std/") :: !Plugin.class_path;
-+	if !GenSwf.version = Some 8 then Plugin.class_path := (base_path ^ "std8/") :: (local ^ "std8/") :: (prefix ^ "std8/") :: !Plugin.class_path;
++	if (match !GenSwf.version with Some x -> x >= 8 | None -> false) then Plugin.class_path := (base_path ^ "std8/") :: (local ^ "std8/") :: (prefix ^ "std8/") :: !Plugin.class_path;
  	Hashtbl.remove Lexer.keywords "add";
  	Parser.warning := (fun msg pos -> report ~do_exit:false (msg,pos) "Warning" (fun msg -> msg));
  	if !files = [] then begin
-Index: ocaml/extc/extc_stubs.c
-===================================================================
---- ocaml/extc/extc_stubs.c.orig	2007-05-26 20:13:28.000000000 +1000
-+++ ocaml/extc/extc_stubs.c	2007-05-26 20:13:29.000000000 +1000
+--- ocaml/extc/extc_stubs.c.orig
++++ ocaml/extc/extc_stubs.c
 @@ -137,14 +137,16 @@
  		failwith("executable_path");
  	return caml_copy_string(path);

Modified: packages/mtasc/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-flash/packages/mtasc/trunk/debian/patches/series?rev=317&op=diff
==============================================================================
--- packages/mtasc/trunk/debian/patches/series (original)
+++ packages/mtasc/trunk/debian/patches/series Mon Mar  9 08:24:07 2009
@@ -1,4 +1,3 @@
 01_exe_in_usage.patch -p0
 02_makefile_kludges.patch -p0
-03_flashlite_compat.patch -p0
 04_include_dirs.patch -p0

More information about the pkg-flash-devel mailing list