r161 - in /packages/mtasc/trunk/debian: ./ patches/

pabs at users.alioth.debian.org pabs at users.alioth.debian.org
Tue Sep 4 07:50:12 UTC 2007


Author: pabs
Date: Tue Sep  4 07:50:12 2007
New Revision: 161

URL: http://svn.debian.org/wsvn/pkg-flash/?sc=1&rev=161
Log:
add versions I forgot to commit

Added:
    packages/mtasc/trunk/debian/README.Debian
    packages/mtasc/trunk/debian/docs
    packages/mtasc/trunk/debian/patches/
    packages/mtasc/trunk/debian/patches/01_exe_in_usage.patch
    packages/mtasc/trunk/debian/patches/02_makefile_kludges.patch
    packages/mtasc/trunk/debian/patches/03_flashlite_compat.patch
    packages/mtasc/trunk/debian/patches/04_include_dirs.patch
    packages/mtasc/trunk/debian/patches/series
Removed:
    packages/mtasc/trunk/debian/HelloWorld.as
    packages/mtasc/trunk/debian/install
    packages/mtasc/trunk/debian/mtasc.1
Modified:
    packages/mtasc/trunk/debian/changelog
    packages/mtasc/trunk/debian/compat
    packages/mtasc/trunk/debian/control
    packages/mtasc/trunk/debian/copyright
    packages/mtasc/trunk/debian/dirs
    packages/mtasc/trunk/debian/examples
    packages/mtasc/trunk/debian/maketarball
    packages/mtasc/trunk/debian/manpages
    packages/mtasc/trunk/debian/rules
    packages/mtasc/trunk/debian/watch

Added: packages/mtasc/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-flash/packages/mtasc/trunk/debian/README.Debian?rev=161&op=file
==============================================================================
--- packages/mtasc/trunk/debian/README.Debian (added)
+++ packages/mtasc/trunk/debian/README.Debian Tue Sep  4 07:50:12 2007
@@ -1,0 +1,7 @@
+mtasc for Debian
+--
+
+Sysadmins can override the installed headers by placing files in
+/usr/local/share/mtasc/ and the std and std8 subdirectories.
+
+ -- Paul Wise <pabs at debian.org>  Sat, 26 May 2007 19:29:43 +1000

Modified: packages/mtasc/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-flash/packages/mtasc/trunk/debian/changelog?rev=161&op=diff
==============================================================================
--- packages/mtasc/trunk/debian/changelog (original)
+++ packages/mtasc/trunk/debian/changelog Tue Sep  4 07:50:12 2007
@@ -1,3 +1,39 @@
+mtasc (1.13-3) experimental; urgency=low
+
+  * Update for ocaml 3.10.0 transition
+  * Use camlp4o.opt where available
+  * Don't ignore errors from make clean
+
+ -- Paul Wise <pabs at debian.org>  Thu, 30 Aug 2007 15:14:12 +1000
+
+mtasc (1.13-2) unstable; urgency=low
+
+  * Fix detection of executable path, prevents FTBFS (Closes: #425908)
+  * Fix classpath locations for standard includes
+  * Create and use extra classpath dirs in /usr/local
+  * Also test build HelloWorld.as with Flash version 8
+  * More completely fix upstream Makefile
+
+ -- Paul Wise <pabs at debian.org>  Sat, 26 May 2007 20:30:44 +1000
+
+mtasc (1.13-1) unstable; urgency=low
+
+  * New upstream release (Closes: #425530)
+    - drop changes to install.ml - use new Makefile instead
+    - drop HelloWorld.as, mtasc.1 - included upstream
+    - remove new copy of zlib when generating the tarball
+  * Generate a ChangeLog when creating the tarball and install it
+  * The Windows compiled version is updated more, watch it
+  * Change my email address now that I'm a Debian Developer
+  * Bump Standards-Version (no changes)
+  * Bump debhelper compatibility level
+  * Split all changes into quilt patches
+  * Place packaging in the public domain
+  * Install CHANGES.txt as a NEWS file and also install Future.txt
+  * Test-build HelloWorld.as
+
+ -- Paul Wise <pabs at debian.org>  Wed, 23 May 2007 19:17:16 +1000
+
 mtasc (1.12-3) unstable; urgency=low
 
   * Use an argument to dh_gencontrol instead of modifying mtasc.substvars

Modified: packages/mtasc/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-flash/packages/mtasc/trunk/debian/compat?rev=161&op=diff
==============================================================================
--- packages/mtasc/trunk/debian/compat (original)
+++ packages/mtasc/trunk/debian/compat Tue Sep  4 07:50:12 2007
@@ -1,1 +1,1 @@
-4
+5

Modified: packages/mtasc/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-flash/packages/mtasc/trunk/debian/control?rev=161&op=diff
==============================================================================
--- packages/mtasc/trunk/debian/control (original)
+++ packages/mtasc/trunk/debian/control Tue Sep  4 07:50:12 2007
@@ -1,9 +1,9 @@
 Source: mtasc
 Section: devel
 Priority: optional
-Maintainer: Paul Wise <pabs3 at bonedaddy.net>
-Build-Depends: debhelper (>= 4.0.0), ocaml, ocaml-best-compilers, ocaml-findlib, libextlib-ocaml-dev (>= 1.5), zlib1g-dev
-Standards-Version: 3.6.2
+Maintainer: Paul Wise <pabs at debian.org>
+Build-Depends: debhelper (>= 5.0.0), quilt (>= 0.40), ocaml (>= 3.10.0), ocaml-best-compilers, camlp4, ocaml-findlib (>= 1.1.2pl1), libextlib-ocaml-dev (>= 1.5), zlib1g-dev
+Standards-Version: 3.7.2
 
 Package: mtasc
 Architecture: any

Modified: packages/mtasc/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-flash/packages/mtasc/trunk/debian/copyright?rev=161&op=diff
==============================================================================
--- packages/mtasc/trunk/debian/copyright (original)
+++ packages/mtasc/trunk/debian/copyright Tue Sep  4 07:50:12 2007
@@ -1,29 +1,33 @@
-This package was debianized by Paul Wise <pabs3 at bonedaddy.net> on
+This package was debianized by Paul Wise <pabs at debian.org> on
 Thu, 23 Feb 2006 20:32:28 +0800.
 
 It was downloaded from :pserver:anonymous at cvs.motion-twin.com:/cvsroot
 
 Copyright:
 
-Copyright 2004, 2005 Nicolas Cannasse
+  Copyright 2004-2006 Nicolas Cannasse
 
 License:
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
 
-The GPL license does NOT imply that you source code will
-have to be GPL or Open Source. You can use MTASC in order to
-compiler any source code without restrictions. Only if you
-want use the compiler as part of your application you'll have
-to apply the GPL rules.
+  The GPL license does NOT imply that you source code will
+  have to be GPL or Open Source. You can use MTASC in order to
+  compiler any source code without restrictions. Only if you
+  want use the compiler as part of your application you'll have
+  to apply the GPL rules.
 
-On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in /usr/share/common-licenses/GPL.
+  On Debian GNU/Linux systems, the complete text of the GNU General
+  Public License can be found in /usr/share/common-licenses/GPL.
+
+Debian packaging:
+
+  Placed in the Public Domain in 2007 by Paul Wise

Modified: packages/mtasc/trunk/debian/dirs
URL: http://svn.debian.org/wsvn/pkg-flash/packages/mtasc/trunk/debian/dirs?rev=161&op=diff
==============================================================================
--- packages/mtasc/trunk/debian/dirs (original)
+++ packages/mtasc/trunk/debian/dirs Tue Sep  4 07:50:12 2007
@@ -1,2 +1,2 @@
-usr/bin
-usr/share/mtasc
+usr/local/share/mtasc/std
+usr/local/share/mtasc/std8

Added: packages/mtasc/trunk/debian/docs
URL: http://svn.debian.org/wsvn/pkg-flash/packages/mtasc/trunk/debian/docs?rev=161&op=file
==============================================================================
--- packages/mtasc/trunk/debian/docs (added)
+++ packages/mtasc/trunk/debian/docs Tue Sep  4 07:50:12 2007
@@ -1,0 +1,2 @@
+NEWS
+ocaml/mtasc/doc/Future.txt

Modified: packages/mtasc/trunk/debian/examples
URL: http://svn.debian.org/wsvn/pkg-flash/packages/mtasc/trunk/debian/examples?rev=161&op=diff
==============================================================================
--- packages/mtasc/trunk/debian/examples (original)
+++ packages/mtasc/trunk/debian/examples Tue Sep  4 07:50:12 2007
@@ -1,1 +1,1 @@
-debian/HelloWorld.as
+ocaml/mtasc/doc/HelloWorld.as

Modified: packages/mtasc/trunk/debian/maketarball
URL: http://svn.debian.org/wsvn/pkg-flash/packages/mtasc/trunk/debian/maketarball?rev=161&op=diff
==============================================================================
--- packages/mtasc/trunk/debian/maketarball (original)
+++ packages/mtasc/trunk/debian/maketarball Tue Sep  4 07:50:12 2007
@@ -2,12 +2,21 @@
 set -e
 package=`dpkg-parsechangelog | sed -n 's/^Source: //p'`
 tag=v`echo "$2" | sed 's/\./-/g'`
-rm -f "$3" ../$package-$2-linux.tgz
+rm -f "$3" ../$package-$2.zip
 mkdir $package-$2
 cd $package-$2
+cvs -z3 -d:pserver:anonymous at cvs.motion-twin.com:/cvsroot checkout -r HEAD ocaml/extc
+cvs -z3 -d:pserver:anonymous at cvs.motion-twin.com:/cvsroot checkout -r HEAD ocaml/swflib
+cvs -z3 -d:pserver:anonymous at cvs.motion-twin.com:/cvsroot checkout -r $tag ocaml/mtasc
+cd ocaml
+cvs2cl
+mv ChangeLog ..
+cd ..
+rm -rf ocaml
 cvs -z3 -d:pserver:anonymous at cvs.motion-twin.com:/cvsroot export -r HEAD ocaml/extc
 cvs -z3 -d:pserver:anonymous at cvs.motion-twin.com:/cvsroot export -r HEAD ocaml/swflib
 cvs -z3 -d:pserver:anonymous at cvs.motion-twin.com:/cvsroot export -r $tag ocaml/mtasc
+rm -rf ocaml/extc/zlib/
 cd ..
 tar zcf $package-$2.tar.gz $package-$2/
 mv $package-$2.tar.gz ..

Modified: packages/mtasc/trunk/debian/manpages
URL: http://svn.debian.org/wsvn/pkg-flash/packages/mtasc/trunk/debian/manpages?rev=161&op=diff
==============================================================================
--- packages/mtasc/trunk/debian/manpages (original)
+++ packages/mtasc/trunk/debian/manpages Tue Sep  4 07:50:12 2007
@@ -1,1 +1,1 @@
-debian/mtasc.1
+ocaml/mtasc/doc/mtasc.1

Added: 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=161&op=file
==============================================================================
--- packages/mtasc/trunk/debian/patches/01_exe_in_usage.patch (added)
+++ packages/mtasc/trunk/debian/patches/01_exe_in_usage.patch Tue Sep  4 07:50:12 2007
@@ -1,0 +1,17 @@
+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
+@@ -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 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 base_path = normalize_path (try Extc.executable_path() with _ -> ".") in
+ 	let files = ref [] in
+ 	let time = Sys.time() in

Added: packages/mtasc/trunk/debian/patches/02_makefile_kludges.patch
URL: http://svn.debian.org/wsvn/pkg-flash/packages/mtasc/trunk/debian/patches/02_makefile_kludges.patch?rev=161&op=file
==============================================================================
--- packages/mtasc/trunk/debian/patches/02_makefile_kludges.patch (added)
+++ packages/mtasc/trunk/debian/patches/02_makefile_kludges.patch Tue Sep  4 07:50:12 2007
@@ -1,0 +1,50 @@
+02_makefile_kludges.patch
+Paul Wise <pabs at debian.org>
+Kludge the Makefile so it is useful for Debian
+--- ocaml/mtasc/doc/Makefile.orig
++++ ocaml/mtasc/doc/Makefile
+@@ -1,14 +1,24 @@
+ DESTDIR=
+ PREFIX=/usr/local
+-ZLIB=/usr/lib/libz.so
++ZLIB=-lz
++C=ocamlopt
++O=cmx
++A=cmxa
++CU=
++CP=camlp4o
++#C=ocamlc
++#O=cmo
++#A=cma
++#CU=-custom
++#CP=camlp4
+ 
+ build:
+-	( cd ocaml/extc ; ocamlc extc_stubs.c ;\
+-	ocamlfind ocamlopt -package extlib -a -o extc.cmxa -cclib ../extc/extc_stubs.o -cclib $(ZLIB) extc.mli extc.ml )
+-	cd ocaml/swflib ; ocamlfind ocamlopt -package extlib -a -o swflib.cmxa -I .. -I ../extc swf.ml swfZip.ml actionScript.ml swfParser.ml
+-	( cd ocaml/mtasc ; ocamllex lexer.mll ;	ocamlopt -c expr.ml lexer.ml ; ocamlopt -c -pp camlp4o parser.ml ;\
+-	ocamlfind ocamlopt -package extlib -c -I .. -I ../extc -I ../swflib typer.ml class.ml plugin.ml genSwf.ml main.ml ;\
+-	ocamlfind ocamlopt -package extlib -linkpkg -o mtasc -cclib $(ZLIB) extLib.cmxa ../extc/extc.cmxa ../swflib/swflib.cmxa expr.cmx lexer.cmx parser.cmx typer.cmx class.cmx plugin.cmx genSwf.cmx main.cmx )
++	( cd ocaml/extc ; $(C) extc_stubs.c ;\
++	ocamlfind $(C) -package extlib -a -o extc.$(A) -cclib ../extc/extc_stubs.o -cclib $(ZLIB) extc.mli extc.ml )
++	cd ocaml/swflib ; ocamlfind $(C) -package extlib -a -o swflib.$(A) -I .. -I ../extc as3.mli as3code.ml as3parse.ml swf.ml swfZip.ml actionScript.ml swfParser.ml
++	( cd ocaml/mtasc ; ocamllex lexer.mll ; ocamlfind $(C) -c expr.ml lexer.ml ; ocamlfind $(C) -c -pp $(CP) parser.ml ;\
++	ocamlfind $(C) -package extlib -c -I .. -I ../extc -I ../swflib typer.ml class.ml plugin.ml genSwf.ml main.ml ;\
++	ocamlfind $(C) -package extlib -linkpkg $(CU) -o mtasc -cclib $(ZLIB) ../extc/extc.$(A) ../swflib/swflib.$(A) expr.$(O) lexer.$(O) parser.$(O) typer.$(O) class.$(O) plugin.$(O) genSwf.$(O) main.$(O) )
+ 
+ clean:
+ 	rm -f ocaml/*/*.cma ocaml/*/*.cmi ocaml/*/*.cmo ocaml/*/*.cmx
+@@ -16,9 +26,9 @@
+ 	rm -f ocaml/mtasc/lexer.ml ocaml/mtasc/mtasc
+ 
+ install:
+-	mkdir -p $(DESTDIR)$(PREFIX)/bin/ $(DESTDIR)$(PREFIX)/share/
++	mkdir -p $(DESTDIR)$(PREFIX)/bin/ $(DESTDIR)$(PREFIX)/share/mtasc/
+ 	cp ocaml/mtasc/mtasc $(DESTDIR)$(PREFIX)/bin/
+-	cp -r ocaml/mtasc/std $(DESTDIR)$(PREFIX)/share/
+-	cp -r ocaml/mtasc/std8 $(DESTDIR)$(PREFIX)/share/
++	cp -r ocaml/mtasc/std $(DESTDIR)$(PREFIX)/share/mtasc/
++	cp -r ocaml/mtasc/std8 $(DESTDIR)$(PREFIX)/share/mtasc/
+ 
+ .PHONY: build install clean

Added: packages/mtasc/trunk/debian/patches/03_flashlite_compat.patch
URL: http://svn.debian.org/wsvn/pkg-flash/packages/mtasc/trunk/debian/patches/03_flashlite_compat.patch?rev=161&op=file
==============================================================================
--- packages/mtasc/trunk/debian/patches/03_flashlite_compat.patch (added)
+++ packages/mtasc/trunk/debian/patches/03_flashlite_compat.patch Tue Sep  4 07:50:12 2007
@@ -1,0 +1,19 @@
+03_flashlite_compat.patch
+Adam Pasztory <adampasz at gmail.com>
+http://www.osflash.org/pipermail/osflash_osflash.org/2007-February/012644.html
+Compatability with FlashLite 2.0 headers
+Index: ocaml/mtasc/std/System/capabilities.as
+===================================================================
+--- ocaml/mtasc/std/System/capabilities.as.orig	2007-05-23 17:46:29.000000000 +1000
++++ ocaml/mtasc/std/System/capabilities.as	2007-05-23 17:46:57.000000000 +1000
+@@ -40,8 +40,8 @@
+ 	static var hasMIDI:Boolean;
+ 	static var hasMMS:Boolean;
+ 	static var hasMouse:Boolean;
+-	static var hasMP3:Boolean;
+-	static var hasPrinting:Boolean;
++	//static var hasMP3:Boolean;
++	//static var hasPrinting:Boolean;
+ 	static var hasQWERTYKeyboard:Boolean;
+ 	static var hasSharedObjects:Boolean;
+ 	static var hasSMAF:Boolean;

Added: 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=161&op=file
==============================================================================
--- packages/mtasc/trunk/debian/patches/04_include_dirs.patch (added)
+++ packages/mtasc/trunk/debian/patches/04_include_dirs.patch Tue Sep  4 07:50:12 2007
@@ -1,0 +1,57 @@
+04_include_dirs.patch
+Paul Wise <pabs at debian.org>
+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
+@@ -117,7 +117,9 @@
+ 	let base_path = normalize_path (try Extc.executable_path() with _ -> ".") in
+ 	let files = ref [] in
+ 	let time = Sys.time() in
+-	Plugin.class_path := [base_path;"";"/"];
++	let prefix = "/usr/share/mtasc/" in
++	let local = "/usr/local/share/mtasc/" in
++	Plugin.class_path := [base_path;local;prefix;"";"/"];
+ 	let args_spec = [
+ 		("-pack",Arg.String (fun path -> files := read_package path @ !files),"<path> : compile all files in target package");
+ 		("-cp",Arg.String (fun path -> Plugin.class_path := parse_class_path base_path path @ !Plugin.class_path),"<paths> : add classpath");
+@@ -133,8 +135,8 @@
+ 		),": use precompiled mx package");
+ 	] @ !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;
++	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;
+ 	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
+@@ -137,14 +137,16 @@
+ 		failwith("executable_path");
+ 	return caml_copy_string(path);
+ #else
+-	const char *p = getenv("_");
+-	if( p != NULL )
+-		return caml_copy_string(p);
+ 	{
+ 		char path[200];
+ 		int length = readlink("/proc/self/exe", path, sizeof(path));
+-		if( length < 0 || length >= 200 )
+-			failwith("executable_path");
++		if( length < 0 || length >= 200 ){
++			const char *p = getenv("_");
++			if( p != NULL )
++				return caml_copy_string(p);
++			else
++				failwith("executable_path");
++		}
+ 	    path[length] = '\0';
+ 		return caml_copy_string(path);
+ 	}

Added: packages/mtasc/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-flash/packages/mtasc/trunk/debian/patches/series?rev=161&op=file
==============================================================================
--- packages/mtasc/trunk/debian/patches/series (added)
+++ packages/mtasc/trunk/debian/patches/series Tue Sep  4 07:50:12 2007
@@ -1,0 +1,4 @@
+01_exe_in_usage.patch -p0
+02_makefile_kludges.patch -p0
+03_flashlite_compat.patch -p0
+04_include_dirs.patch -p0

Modified: packages/mtasc/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-flash/packages/mtasc/trunk/debian/rules?rev=161&op=diff
==============================================================================
--- packages/mtasc/trunk/debian/rules (original)
+++ packages/mtasc/trunk/debian/rules Tue Sep  4 07:50:12 2007
@@ -2,46 +2,63 @@
 
 #export DH_VERBOSE=1
 
+include /usr/share/quilt/quilt.make
+
 ifeq ($(shell test -x /usr/bin/ocamlopt -o -x /usr/bin/ocamlopt.opt && echo true),true)
-  OCAMLTYPE = -n
+  OCAMLC = ocamlopt
+  OCAMLOBJECT = cmx
+  OCAMLARCHIVE = cmxa
+  OCAMLCUSTOM = 
   OCAMLSTRIP =
   OCAMLDEPS = ocaml:Depends=
 else
-  OCAMLTYPE = -b
+  OCAMLC = ocamlc
+  OCAMLOBJECT = cmo
+  OCAMLARCHIVE = cma
+  OCAMLCUSTOM = -custom
   OCAMLSTRIP = -Xmtasc
   OCAMLDEPS = ocaml:Depends=ocaml-base-nox-$(shell ocamlfind ocamlc -version)
 endif
 
-build: build-stamp
+ifeq ($(shell test -x /usr/bin/camlp4o.opt && echo true),true)
+  CAMLP4 = camlp4o.opt
+else ifeq ($(shell test -x /usr/bin/camlp4o && echo true),true)
+  CAMLP4 = camlp4o
+endif
+
+build: patch build-stamp
 build-stamp:
 	dh_testdir
-	ocaml ocaml/mtasc/doc/install.ml $(OCAMLTYPE)
+	cp ocaml/mtasc/doc/Makefile .
+	make C=$(OCAMLC) O=$(OCAMLOBJECT) A=$(OCAMLARCHIVE) CU=$(OCAMLCUSTOM) CP=$(CAMLP4)
+	./ocaml/mtasc/mtasc -v -swf helloworld.swf -main -header 640:480:20 ocaml/mtasc/doc/HelloWorld.as
+	./ocaml/mtasc/mtasc -version 8 -v -swf helloworld.swf -main -header 640:480:20 ocaml/mtasc/doc/HelloWorld.as
+	cp ocaml/mtasc/doc/CHANGES.txt NEWS
 	touch build-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp
-	rm -f ocaml/*/*.cma ocaml/*/*.cmi ocaml/*/*.cmo ocaml/*/*.cmx
-	rm -f ocaml/*/*.cmxa ocaml/*/*.o ocaml/*/*.a
-	rm -f ocaml/mtasc/lexer.ml ocaml/mtasc/mtasc
+	[ ! -f Makefile ] || $(MAKE) clean
+	rm -f build-stamp Makefile NEWS helloworld.swf
 	dh_clean 
 
 install: build
 	dh_testdir
 	dh_testroot
 	dh_clean -k 
-	dh_installdirs
-	dh_install
+	make install PREFIX=/usr DESTDIR=debian/mtasc
 
 binary-indep: build install
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs ocaml/mtasc/doc/CHANGES.txt
+	dh_installchangelogs ChangeLog
 	dh_installdocs
 	dh_installexamples
 	dh_installman
+	dh_installdirs
+	dh_usrlocal
 	dh_strip $(OCAMLSTRIP)
 	dh_compress
 	dh_fixperms

Modified: packages/mtasc/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-flash/packages/mtasc/trunk/debian/watch?rev=161&op=diff
==============================================================================
--- packages/mtasc/trunk/debian/watch (original)
+++ packages/mtasc/trunk/debian/watch Tue Sep  4 07:50:12 2007
@@ -1,2 +1,2 @@
 version=3
-http://mtasc.org/ zip/mtasc-([\d.]*)-linux\.tgz debian sh ./debian/maketarball
+http://mtasc.org/ zip/mtasc-([\d.]*)\.zip debian sh ./debian/maketarball




More information about the pkg-flash-devel mailing list