[Pkg-mono-svn-commits] rev 1853 - in non-group: . ikvm ikvm/trunk ikvm/trunk/debian ikvm/trunk/debian/patches

Dave Beckett dajobe@costa.debian.org
Sat, 18 Jun 2005 10:43:45 +0000


Author: dajobe
Date: 2005-06-18 10:43:45 +0000 (Sat, 18 Jun 2005)
New Revision: 1853

Added:
   non-group/ikvm/
   non-group/ikvm/branches/
   non-group/ikvm/tags/
   non-group/ikvm/trunk/
   non-group/ikvm/trunk/debian/
   non-group/ikvm/trunk/debian/README.Debian
   non-group/ikvm/trunk/debian/changelog
   non-group/ikvm/trunk/debian/compat
   non-group/ikvm/trunk/debian/control
   non-group/ikvm/trunk/debian/copyright
   non-group/ikvm/trunk/debian/dirs
   non-group/ikvm/trunk/debian/docs
   non-group/ikvm/trunk/debian/ikvm.sh
   non-group/ikvm/trunk/debian/ikvmc.sh
   non-group/ikvm/trunk/debian/ikvmstub.sh
   non-group/ikvm/trunk/debian/patches/
   non-group/ikvm/trunk/debian/patches/01-JniInterface-delfix.patch
   non-group/ikvm/trunk/debian/rules
   non-group/ikvm/trunk/debian/watch
Log:
Imported ikvm 0.14.0.1-5

Added: non-group/ikvm/trunk/debian/README.Debian
===================================================================
--- non-group/ikvm/trunk/debian/README.Debian	2005-06-17 23:48:55 UTC (rev 1852)
+++ non-group/ikvm/trunk/debian/README.Debian	2005-06-18 10:43:45 UTC (rev 1853)
@@ -0,0 +1,12 @@
+ikvm for Debian
+---------------
+
+Upstream has not yet provided any documentation with the distribution.
+
+Please find documentation online at http://ikvm.net/
+
+Thanks,
+
+John
+
+ -- John Goerzen <jgoerzen@complete.org>, Thu, 26 Aug 2004 10:18:19 -0500

Added: non-group/ikvm/trunk/debian/changelog
===================================================================
--- non-group/ikvm/trunk/debian/changelog	2005-06-17 23:48:55 UTC (rev 1852)
+++ non-group/ikvm/trunk/debian/changelog	2005-06-18 10:43:45 UTC (rev 1853)
@@ -0,0 +1,60 @@
+ikvm (0.14.0.1-5) unstable; urgency=low
+
+  * Removed obsolete Build-Depend: on mono-utils
+  * Simplify uudecode of included classpath tarball in attempt to get
+    it working inside a buildd environment
+
+ -- Dave Beckett <dajobe@debian.org>  Sat, 18 Jun 2005 11:11:27 +0100
+
+ikvm (0.14.0.1-4) unstable; urgency=low
+
+  * Upload to unstable now that nant and mono 1.1.x are in unstable
+  * Added debian/watch file
+
+ -- Dave Beckett <dajobe@debian.org>  Thu, 16 Jun 2005 12:36:42 +0100
+
+ikvm (0.14.0.1-3) experimental; urgency=low
+
+  * Make ikvm depend on exact same version of libikvm-native
+  * Make binary-arch and binary-indep build binaries properly (Closes: 311182)
+
+ -- Dave Beckett <dajobe@debian.org>  Sun, 29 May 2005 23:06:58 +0100
+
+ikvm (0.14.0.1-2) experimental; urgency=low
+
+  * Switch to Build-Depends rather than Build-Depends-Indep (Closes: #310300)
+  * Use dpatch to apply patch 01-JniInterface-delfix.patch
+  * Added libmono-dev and dpatch to Build-Depends
+  * Confirmed package builds under pbuilder
+
+ -- Dave Beckett <dajobe@debian.org>  Mon, 23 May 2005 09:24:43 +0100
+
+ikvm (0.14.0.1-1) experimental; urgency=low
+
+  * New upstream release (Closes: #299058)
+  * Updated to include GNU classpath 0.15 sources
+  * Uses new mono 1.1.x experimental debs (Closes: #307100)
+  * Updated to new Mono packaging conventions
+  * Added libikvm-native package for native part of IKVM core
+
+ -- Dave Beckett <dajobe@debian.org>  Sat, 21 May 2005 18:50:45 +0100
+
+ikvm (0.12.0.0-1) unstable; urgency=low
+
+  * New upstream release
+  * Updated to include GNU classpath 0.14 sources
+
+ -- Dave Beckett <dajobe@debian.org>  Mon, 16 May 2005 23:27:08 +0100
+
+ikvm (0.8.0.0-2) unstable; urgency=low
+
+  * New Maintainer (closes: 305459)
+
+ -- Dave Beckett <dajobe@debian.org>  Thu, 21 Apr 2005 22:43:11 +0100
+
+ikvm (0.8.0.0-1) unstable; urgency=low
+
+  * Initial Release.  Closes: #268233.
+
+ -- John Goerzen <jgoerzen@complete.org>  Thu, 26 Aug 2004 10:18:19 -0500
+

Added: non-group/ikvm/trunk/debian/compat
===================================================================
--- non-group/ikvm/trunk/debian/compat	2005-06-17 23:48:55 UTC (rev 1852)
+++ non-group/ikvm/trunk/debian/compat	2005-06-18 10:43:45 UTC (rev 1853)
@@ -0,0 +1 @@
+4

Added: non-group/ikvm/trunk/debian/control
===================================================================
--- non-group/ikvm/trunk/debian/control	2005-06-17 23:48:55 UTC (rev 1852)
+++ non-group/ikvm/trunk/debian/control	2005-06-18 10:43:45 UTC (rev 1853)
@@ -0,0 +1,34 @@
+Source: ikvm
+Section: devel
+Priority: optional
+Maintainer: Dave Beckett <dajobe@debian.org>
+Build-Depends: debhelper (>= 4.0.0), jikes, nant (>= 0.84+0.85-rc3-3), mono-mcs (>= 1.1.6), libmono-dev (>= 1.1.6), cli-common (>= 0.1.3), sharutils, bzip2, dpatch
+Standards-Version: 3.6.1
+
+Package: ikvm
+Architecture: all
+Depends: ${cli:Depends}, java-common, libikvm-native (= ${ikvm:upversion})
+Description: Java virtual machine/compiler implemented in .NET (Mono)
+ IKVM.NET is a Java Virtual Machine (JVM) for the .NET and Mono
+ runtimes. There are two main ways of using IKVM.NET:
+ .
+ Dynamically: In this mode, Java classes and jars are used directly to
+ execute Java applications on the .NET runtime. Java bytecode is
+ translated on the fly into CIL and no further steps are necessary. The
+ full Java class loader model is supported in this mode.
+ .
+ Statically: In order to allow Java code to be used by .NET
+ applications, it must be compiled down to a DLL and used directly. The
+ bytecode is translated to CIL and stored in this form. The assemblies
+ can be referenced directly by the .NET applications and the "Java"
+ objects can be used as if they were .NET objects. While the static mode
+ does not support the full Java class loader mechanism, it is possible
+ for statically-compiled code to create a class loader and load classes
+ dynamically.
+
+Package: libikvm-native
+Architecture: any
+Description: Native library for IKVM Java virtual machine for .NET (Mono)
+  Provides the native compiled support library for IKVM.NET which
+  is a Java Virtual Machine (JVM) for the .NET and Mono runtimes.
+

Added: non-group/ikvm/trunk/debian/copyright
===================================================================
--- non-group/ikvm/trunk/debian/copyright	2005-06-17 23:48:55 UTC (rev 1852)
+++ non-group/ikvm/trunk/debian/copyright	2005-06-18 10:43:45 UTC (rev 1853)
@@ -0,0 +1,70 @@
+This package was debianized by John Goerzen <jgoerzen@complete.org> on
+Thu, 26 Aug 2004 10:18:19 -0500.
+
+It was downloaded from ikvm.net
+
+Copyright:
+
+IMPORTANT NOTICE
+
+  Some files in this distribution are part of GNU Classpath and have a
+  different license. This applies in particular to:
+    - IKVM.GNU.Classpath.dll
+    - some of the *.java files (see each file header for license)
+
+  See http://www.gnu.org/software/classpath/ for information on the
+  GNU Classpath license.
+
+-----------------------------------------------------------------------------
+
+  Copyright (C) 2002, 2003, 2004 Jeroen Frijters
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  Jeroen Frijters
+  jeroen@frijters.net
+
+-----------------------------------------------------------------------------
+
+Classpath is licensed under the terms of the GNU General Public License ( with a special exception described below).
+
+(You can find a copy of the GPL at /usr/share/common-licenses/GPL on Debian systems)
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+ 
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version.
+
+External libraries included with GNU Classpath may be distributed under
+different licensing terms.  Refer to the documentation for each package
+located in the external directory.
+
+Parts of the native library fdlibm in native/fdlibm are copyright of 
+Sun Microsystems, Inc. or AT&T.
+

Added: non-group/ikvm/trunk/debian/dirs
===================================================================
--- non-group/ikvm/trunk/debian/dirs	2005-06-17 23:48:55 UTC (rev 1852)
+++ non-group/ikvm/trunk/debian/dirs	2005-06-18 10:43:45 UTC (rev 1853)
@@ -0,0 +1,3 @@
+usr/bin
+usr/lib/ikvm
+

Added: non-group/ikvm/trunk/debian/docs
===================================================================
--- non-group/ikvm/trunk/debian/docs	2005-06-17 23:48:55 UTC (rev 1852)
+++ non-group/ikvm/trunk/debian/docs	2005-06-18 10:43:45 UTC (rev 1853)
@@ -0,0 +1 @@
+THANKYOU

Added: non-group/ikvm/trunk/debian/ikvm.sh
===================================================================
--- non-group/ikvm/trunk/debian/ikvm.sh	2005-06-17 23:48:55 UTC (rev 1852)
+++ non-group/ikvm/trunk/debian/ikvm.sh	2005-06-18 10:43:45 UTC (rev 1853)
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /usr/bin/cli /usr/lib/ikvm/ikvm.exe "$@"

Added: non-group/ikvm/trunk/debian/ikvmc.sh
===================================================================
--- non-group/ikvm/trunk/debian/ikvmc.sh	2005-06-17 23:48:55 UTC (rev 1852)
+++ non-group/ikvm/trunk/debian/ikvmc.sh	2005-06-18 10:43:45 UTC (rev 1853)
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /usr/bin/cli /usr/lib/ikvm/ikvmc.exe "$@"

Added: non-group/ikvm/trunk/debian/ikvmstub.sh
===================================================================
--- non-group/ikvm/trunk/debian/ikvmstub.sh	2005-06-17 23:48:55 UTC (rev 1852)
+++ non-group/ikvm/trunk/debian/ikvmstub.sh	2005-06-18 10:43:45 UTC (rev 1853)
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /usr/bin/cli /usr/lib/ikvm/ikvmstub.exe "$@"

Added: non-group/ikvm/trunk/debian/patches/01-JniInterface-delfix.patch
===================================================================
--- non-group/ikvm/trunk/debian/patches/01-JniInterface-delfix.patch	2005-06-17 23:48:55 UTC (rev 1852)
+++ non-group/ikvm/trunk/debian/patches/01-JniInterface-delfix.patch	2005-06-18 10:43:45 UTC (rev 1853)
@@ -0,0 +1,21 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 01_some_patch.dpatch by Dave Beckett <dajobe@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Revert the mcs fix that no longer applies at mono 1.1.6
+
+--- ikvm-0.14.0.1/runtime/JniInterface.cs.orig	2005-05-16 23:45:45.000000000 +0100
++++ ikvm-0.14.0.1/runtime/JniInterface.cs	2005-05-16 23:46:03.000000000 +0100
+@@ -903,12 +903,7 @@
+ 		{
+ 			JNI.jvmCreated = true;
+ 			pJavaVM = (JavaVM*)(void*)JniMem.Alloc(IntPtr.Size * (1 + vtableDelegates.Length));
+-#if __MonoCS__ 
+-		// MONOBUG mcs requires this bogus fixed construct (and Microsoft doesn't allow it)
+-		fixed(void** p = &pJavaVM->firstVtableEntry) { pJavaVM->vtable = p; }
+-#else
+ 			pJavaVM->vtable = &pJavaVM->firstVtableEntry;
+-#endif
+ 			for(int i = 0; i < vtableDelegates.Length; i++)
+ 			{
+ 				pJavaVM->vtable[i] = JniHelper.ikvm_MarshalDelegate(vtableDelegates[i]);


Property changes on: non-group/ikvm/trunk/debian/patches/01-JniInterface-delfix.patch
___________________________________________________________________
Name: svn:executable
   + *

Added: non-group/ikvm/trunk/debian/rules
===================================================================
--- non-group/ikvm/trunk/debian/rules	2005-06-17 23:48:55 UTC (rev 1852)
+++ non-group/ikvm/trunk/debian/rules	2005-06-18 10:43:45 UTC (rev 1853)
@@ -0,0 +1,142 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+CLASSPATH_VERSION=0.15
+
+export MONO_SHARED_DIR=$(CURDIR)/debian
+DEBVERSION = $(shell dpkg-parsechangelog | grep ^Vers | cut -d\  -f2)
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	INSTALL_PROGRAM += -s
+endif
+
+patch: patch-stamp
+patch-stamp:
+	dpatch apply-all && touch patch-stamp
+
+unpatch:
+	dpatch deapply-all
+	rm -rf patch-stamp debian/patched
+
+configure: configure-stamp
+configure-stamp: patch-stamp
+	dh_testdir
+	mkdir -p $(MONO_SHARED_DIR)/.wapi
+	nant -v clean
+	uudecode debian/classpath-$(CLASSPATH_VERSION).tar.bz2.uue && tar -xjf classpath-$(CLASSPATH_VERSION).tar.bz2 && mv classpath-$(CLASSPATH_VERSION) classtmp && rm classpath-$(CLASSPATH_VERSION).tar.bz2
+
+	if [ ! -f classpath/allsources.lst.dist ]; then \
+	  mv classpath/allsources.lst classpath/allsources.lst.dist; \
+	fi
+	sed -e "s,^../../classpath-$(CLASSPATH_VERSION),../classtmp," < classpath/allsources.lst.dist > classpath/allsources.lst
+
+	if [ ! -f classpath/classpath.build.dist ]; then \
+	  mv classpath/classpath.build classpath/classpath.build.dist; \
+	fi
+	sed -e "s,/../../classpath-$(CLASSPATH_VERSION),/../classtmp," < classpath/classpath.build.dist > classpath/classpath.build
+
+	touch configure-stamp
+
+
+build: build-stamp
+build-stamp: configure-stamp 
+	dh_testdir
+
+	nant -v
+
+	touch build-stamp
+
+clean: clean1 unpatch
+clean1:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp configure-stamp install-stamp
+
+	-rm -rf classtmp
+	-mkdir -p $(MONO_SHARED_DIR)/.wapi
+	-nant -v clean
+	-rm -f native/libikvm-native.so
+	find . -name "*.class" -exec rm {} \;
+	-rm -f classpath/*.dll
+
+	if [ -f classpath/allsources.lst.dist ]; then \
+	  rm -f classpath/allclasses.lst; \
+	  mv classpath/allsources.lst.dist classpath/allsources.lst; \
+	fi
+
+	if [ -f classpath/classpath.build.dist ]; then \
+	  rm -f classpath/classpath.build; \
+	  mv classpath/classpath.build.dist classpath/classpath.build; \
+	fi
+
+	rm -f classpath-$(CLASSPATH_VERSION).tar.bz2
+
+	-rm -rf $(MONO_SHARED_DIR)/.wapi
+
+	dh_clean 
+
+install: install-stamp build
+install-stamp:
+	dh_testdir
+	dh_testroot
+	dh_clean -k 
+	dh_installdirs
+
+	cp -r bin/* $(CURDIR)/debian/ikvm/usr/lib/ikvm
+	for FILE in ikvm ikvmc ikvmstub; do \
+	  install -m711 debian/$$FILE.sh $(CURDIR)/debian/ikvm/usr/bin/$$FILE; \
+	done
+
+	mkdir -p $(CURDIR)/debian/libikvm-native/usr/lib/ikvm
+	mv $(CURDIR)/debian/ikvm/usr/lib/ikvm/libikvm-native.so $(CURDIR)/debian/libikvm-native/usr/lib/ikvm
+
+	find $(CURDIR)/debian/ikvm/usr/lib/ikvm -type f -exec chmod a-x {} \;
+
+	touch install-stamp
+
+
+# Single target to build all the packages, all at once
+binary-common:
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs 
+	dh_installdocs
+	dh_installexamples
+	-find $(CURDIR)/debian/ikvm -name .arch-ids -exec rm -rvf {} \;
+	dh_makeclilibs
+	dh_clideps
+	dh_installman
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol -a -- -Vikvm:upversion=$(DEBVERSION)
+	dh_md5sums
+	dh_builddeb
+
+
+# Build architecture independent packages using the common target.
+binary-indep: build install
+	 $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+
+# Build architecture dependent packages using the common target.
+binary-arch: build install
+	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install patch unpatch \
+	configure clean1


Property changes on: non-group/ikvm/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
   + *

Added: non-group/ikvm/trunk/debian/watch
===================================================================
--- non-group/ikvm/trunk/debian/watch	2005-06-17 23:48:55 UTC (rev 1852)
+++ non-group/ikvm/trunk/debian/watch	2005-06-18 10:43:45 UTC (rev 1853)
@@ -0,0 +1,3 @@
+version=2
+
+ftp://ftp.sf.net/i/ik/ikvm/ikvm-([\.\d]+)\.zip debian uupdate