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

Dave Beckett dajobe@costa.debian.org
Tue, 12 Jul 2005 21:02:02 +0000


Author: dajobe
Date: 2005-07-12 21:02:00 +0000 (Tue, 12 Jul 2005)
New Revision: 1908

Added:
   non-group/ikvm/trunk/debian/ikvm.1
   non-group/ikvm/trunk/debian/ikvm.pc.in
   non-group/ikvm/trunk/debian/ikvmc.1
   non-group/ikvm/trunk/debian/ikvmstub.1
   non-group/ikvm/trunk/debian/run.sh.in
Removed:
   non-group/ikvm/trunk/debian/README.Debian
   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/01-JniInterface-delfix.patch
Modified:
   non-group/ikvm/trunk/debian/changelog
   non-group/ikvm/trunk/debian/control
   non-group/ikvm/trunk/debian/copyright
   non-group/ikvm/trunk/debian/rules
Log:
ikvm-0.16.0.0-1

Deleted: non-group/ikvm/trunk/debian/README.Debian
===================================================================
--- non-group/ikvm/trunk/debian/README.Debian	2005-07-12 18:52:20 UTC (rev 1907)
+++ non-group/ikvm/trunk/debian/README.Debian	2005-07-12 21:02:00 UTC (rev 1908)
@@ -1,12 +0,0 @@
-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

Modified: non-group/ikvm/trunk/debian/changelog
===================================================================
--- non-group/ikvm/trunk/debian/changelog	2005-07-12 18:52:20 UTC (rev 1907)
+++ non-group/ikvm/trunk/debian/changelog	2005-07-12 21:02:00 UTC (rev 1908)
@@ -1,3 +1,22 @@
+ikvm (0.16.0.0-1) unstable; urgency=low
+
+  * New upstream release
+  * Build using GNU Classpath 0.16.0.0 sources
+  * Require mono 1.1.8.2
+  * Remove 01-JniInterface-delfix.patch applied upstream
+  * Build strong-named DLLs
+  * Install DLLs into the GAC
+  * Do not install ICSharpCode.SharpZipLib.dll as it is shipped with 
+    the main mono distribution
+
+ -- Dave Beckett <dajobe@debian.org>  Tue, 12 Jul 2005 21:52:57 +0100
+
+ikvm (0.14.0.1-8) unstable; urgency=low
+
+  * Added new manual pages for ikvm, ikvmc and ikvmstub
+
+ -- Dave Beckett <dajobe@debian.org>  Sun, 19 Jun 2005 23:29:17 +0100
+
 ikvm (0.14.0.1-7) unstable; urgency=low
 
   * Restore older piped uudecode method to use less disk space

Modified: non-group/ikvm/trunk/debian/control
===================================================================
--- non-group/ikvm/trunk/debian/control	2005-07-12 18:52:20 UTC (rev 1907)
+++ non-group/ikvm/trunk/debian/control	2005-07-12 21:02:00 UTC (rev 1908)
@@ -2,12 +2,12 @@
 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
+Build-Depends: debhelper (>= 4.0.0), jikes, nant (>= 0.84+0.85-rc3-3), mono-mcs (>= 1.1.8.2), libmono-dev (>= 1.1.8.2), cli-common (>= 0.1.3), mono-gac, sharutils, bzip2, dpatch
+Standards-Version: 3.6.2
 
 Package: ikvm
 Architecture: all
-Depends: ${cli:Depends}, java-common, libikvm-native (= ${ikvm:upversion})
+Depends: ${cli:Depends}, java-common, libikvm-native (= ${ikvm:debversion})
 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:

Modified: non-group/ikvm/trunk/debian/copyright
===================================================================
--- non-group/ikvm/trunk/debian/copyright	2005-07-12 18:52:20 UTC (rev 1907)
+++ non-group/ikvm/trunk/debian/copyright	2005-07-12 21:02:00 UTC (rev 1908)
@@ -1,24 +1,17 @@
 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
+ikvm releases were downloaded from
+   http://ikvm.net/
+   http://sourceforge.net/project/showfiles.php?group_id=69637
+   http://www.frijters.net/ikvm-0.16.0.0.zip
 
+See also http://weblog.ikvm.net/ IKVM.NET weblog.
+
 Copyright:
 
-IMPORTANT NOTICE
+  Copyright (C) 2002, 2003, 2004, 2005 Jeroen Frijters
 
-  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.
@@ -40,10 +33,19 @@
 
 -----------------------------------------------------------------------------
 
-Classpath is licensed under the terms of the GNU General Public License ( with a special exception described below).
+  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)
 
-(You can find a copy of the GPL at /usr/share/common-licenses/GPL on Debian systems)
+-----------------------------------------------------------------------------
 
+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

Added: non-group/ikvm/trunk/debian/ikvm.1
===================================================================
--- non-group/ikvm/trunk/debian/ikvm.1	2005-07-12 18:52:20 UTC (rev 1907)
+++ non-group/ikvm/trunk/debian/ikvm.1	2005-07-12 21:02:00 UTC (rev 1908)
@@ -0,0 +1,125 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\"
+.\"
+.TH ikvm 1 "2005-06-19"
+.SH "NAME"
+ikvm \- java virtual machine executable using the CLI runtime
+.SH "SYNOPOSIS"
+.B ikvm
+[
+.IB "options"
+]
+.I "class"
+[
+.I "args ..."
+]
+.LP
+.B ikvm
+[
+.I "options"
+]
+.B \-jar
+.I "jarfile"
+[
+.I "args ..."
+]
+.SH "DESCRIPTION"
+IKVM is an implentation of the Java for the Common Language
+Infrastructure (CLI) runtime.  It includes a byte code JIT
+compiler/verifier to translate Java byte code to CIL and GNU
+Classpath to provide the Java class libraries.  
+.B ikvm
+program performs this translation and execution at run time,
+the ikvmc(1) program provides a static compilation to CIL.
+.LP
+This program is intended to act as a drop-in replacement
+for the
+.B java
+program that executes java bytecode (with or without a JIT)
+and as such, takes a subset of that tool's options and arguments
+as given here.
+.LP
+.B ikvm
+operates in two modes, either on a fully-qualified
+Java \fIclassname\fP or on a jar file with the
+.B \-jar
+.I "jarfile"
+option given.  Any remaining arguments \fIargs ...\fP
+are passed to the main class.
+.SH "CLASS SEARCHING"
+Classes are searched for in the current directory if no \-cp / \-classpath
+option, no \-jar option and no CLASSPATH environment variable is set.
+.LP
+If only CLASSPATH is set and no ptions are given only that is used to find
+classes, the current directory is not used unless CLSSPATH contains .
+.LP
+If \-cp / \-classpath is given, CLASSPATH is ignored.
+.LP
+If \-jar is given, the jar file is put at the start of the classpath
+taken from either the \-cp / \-classpath option or from CLASSPATH.
+.LP
+See also the description for the
+.B \-Xbootclasspath
+option below.
+.SH "OPTIONS"
+.TP
+.B \-cp \fIpath\fP
+.TP
+.B \-classpath \fIpath\fP
+Set the JVM classpath to search for application classes and resources.
+The \fIpath\fP is a sequence of directories and zip/jar files
+separated by : (; on Windows).  If this option is given more
+than once, only the last one applies.
+.TP
+.B \-D\fIname\fP=\fIvalue\fP
+Set a system property \fIname\fP to \fIvalue\fP.
+.TP
+.B \-ea[:\fIpackagename\fP ... | :\fIclassname\fP]
+.TP
+.B \-enableassertions[:\fIpackagename\fP ... | :\fIclassname\fP]
+Enable assertions.
+.TP
+.B \-da[:\fIpackagename\fP ... |:\fIclassname\fP]
+.TP
+.B \-disableassertions[:\fIpackagename\fP ... | :\fIclassname\fP]
+Disable assertions.
+.TP
+.B \-version
+Display IKVM and runtime version
+.TP
+.B \-Xbootclasspath:\fIpath\fP
+Set the boot JVM classpath for bootstrap classes and resources.
+The \fIpath\fP is a sequence of directories and zip/jar files
+separated by : (; on Windows).  If this option is given more
+than once, only the last one applies.
+.TP
+.B \-Xbreak
+Trigger a user defined breakpoint at startup
+.TP
+.B \-Xmethodtrace:\fIstring\fP
+Builds method trace into the specified output methods
+.TP
+.B \-Xsave
+Save the generated assembly for debugging.
+.TP
+.B \-Xtime
+Time the execution.
+.TP
+.B \-Xtrace:\fIname\fP
+Displays all tracepoints with the given \fIname\fP.
+.TP
+.B \-Xwait
+Keep the process hanging around after exit.
+.TP
+.B \-? -help
+Display a summary of the usage.
+.SH "SEE ALSO"
+.BR ikvmc (1),
+.BR ikvmstub (1).
+.LP
+IKVM Project web site
+.UR http://ikvm.net/
+http://ikvm.net/
+.UE
+.LP
+Man page by Dave Beckett, made available under the same terms as IKVM.

Added: non-group/ikvm/trunk/debian/ikvm.pc.in
===================================================================
--- non-group/ikvm/trunk/debian/ikvm.pc.in	2005-07-12 18:52:20 UTC (rev 1907)
+++ non-group/ikvm/trunk/debian/ikvm.pc.in	2005-07-12 21:02:00 UTC (rev 1908)
@@ -0,0 +1,9 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+
+
+Name: IKVM.NET
+Description: An implementation of Java for Mono and the Microsoft .NET Framework.
+Version: @VERSION@
+Libs: -r:${libdir}/ikvm/IKVM.Runtime.dll -r:${libdir}/ikvm/IKVM.GNU.Classpath.dll

Deleted: non-group/ikvm/trunk/debian/ikvm.sh
===================================================================
--- non-group/ikvm/trunk/debian/ikvm.sh	2005-07-12 18:52:20 UTC (rev 1907)
+++ non-group/ikvm/trunk/debian/ikvm.sh	2005-07-12 21:02:00 UTC (rev 1908)
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/cli /usr/lib/ikvm/ikvm.exe "$@"

Added: non-group/ikvm/trunk/debian/ikvmc.1
===================================================================
--- non-group/ikvm/trunk/debian/ikvmc.1	2005-07-12 18:52:20 UTC (rev 1907)
+++ non-group/ikvm/trunk/debian/ikvmc.1	2005-07-12 21:02:00 UTC (rev 1908)
@@ -0,0 +1,154 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\"
+.\"
+.TH ikvm 1 "2005-06-19"
+.SH "NAME"
+ikvmc \- compile java classes and jars into CIL assemblies
+.SH "SYNOPOSIS"
+.B ikvmc
+[
+.IB "-options"
+]
+.I "class"
+|
+.I "jar ..."
+.SH "DESCRIPTION"
+IKVM is an implentation of the Java for the Common Language
+Infrastructure (CLI) runtime.  It includes a byte code JIT
+compiler/verifier to translate Java byte code to CIL and GNU
+Classpath to provide the Java class libraries.  
+.B ikvmc
+allows statically compiling of Java bytecodes in Java classes and
+jars into CIL assemblies.
+The ikvm(1) program provides dynamic compilation to CIL
+and execution.
+.LP
+The Java
+.I class
+or
+.I jar
+parameters may be file globs such as
+.B "*.class"
+and used to process multiple sources in one step.  Duplicates
+specified in processing will be ignored, with a warning given.
+.SH "OPTIONS"
+.TP
+.B \-D\fIname\fP=\fIvalue\fP
+Set system property \fIname\fP to \fIvalue\fP at runtime.
+.TP
+.B \-apartment:mta
+Apply MTAThreadAttribute to the main class.
+.TP
+.B \-apartment:none
+Don't apply STAThreadAttribute to the main class.
+.TP
+.B \-apartment:sta
+(default) Apply STAThreadAttribute to the main class.
+.TP
+.B \-assembly:\fIassembly-name\fP
+Specify the generated assembly name to \fIassembly-name\fP
+If this option is omitted, the assembly name is usually the
+output filename.
+.TP
+.B \-da[:\fIpackagename\fP ... | :\fIclassname\fP]
+Set the system property to disable assertions.
+.TP
+.B \-debug
+Generate debugging info in the output file.  Only useful if
+the source class files contained debug information, such as
+compiled with the javac -g option.
+.TP
+.B \-disableassertions[:\fIpackagename\fP ... | :\fIclassname\fP]
+Set the system property to disable assertions.
+.TP
+.B \-ea[:\fIpackagename\fP ... | :\fIclassname\fP]
+Set the system property to enable assertions.
+.TP
+.B \-enableassertions[:\fIpackagename\fP ... | :\fIclassname\fP]
+Set the system property to enable assertions.
+.TP
+.B \-exclude:\fIfilename\fP
+Use the list of classes in \fIfilename\fP to exclude from compiling.
+.TP
+.B \-key:\fIkeycontainer\fP
+Use the key in the container \fIkeycontainer\fP to sign the assembly.
+.TP
+.B \-keyfile:\fIkeyfilename\fP
+Use the key in file \fIkeyfilename\fP to sign the assembly.
+.TP
+.B \-main:\fImainclass\fP
+Specify the main method class \fImainclass\fP contains the main
+method.  If omitted and the target is an executable, a search is done
+for a qualifying main method and ikvmc reports if it is found.
+.TP
+.B \-noglobbing
+Do not glob the class or jar arguments.
+.TP
+.B \-nojni
+Do not generate a JNI stub for native methods.
+.TP
+.B \-nostacktraceinfo
+Do not create metadata to emit rich stack traces.
+.TP
+.B \-opt:fields
+Remove unused private fields.
+.TP
+.B \-out:\fIoutputfile\fP
+Set the output filename to \fIoutputfile\fP.  The extension used
+here must match the
+.B \-target
+used.  For a library, it must end in .dll and for an exe or
+winexe, it must end in .exe.
+If this option is omitted, an output name will be chosen based
+on the target type and the name of the input files.  If
+the input files were given with globs, this option must be used.
+.TP
+.B \-recurse:\fIfilespec\fP
+Process all files and directories matching \fIfilespec\fP which
+can use globbing.
+.TP
+.B \-r:\fIlibrary-filespec\fP
+.TP
+.B \-reference:\fIlibrary-filespec\fP
+Reference an assembly \fIlibrary-filespec\fP used from Java.
+This option can be used multiple times and globbing is allowed.
+.TP
+.B \-resource:\fIname\fP=\fIpath\fP
+Include a Java resource named \fIname\fP in file \fIpath\fP.
+.TP
+.B \-srcpath:\fIpath\fP
+Set the location of source code for debugging to \fIpath\fP.
+The name of a package is appended to the path to find the file.
+.TP
+.B \-target:exe
+.TP
+.B \-target:library
+.TP
+.B \-target:winexe
+.TP
+.B \-target:module
+Set the generated target type to either a
+console executable (exe) generating a result.exe,
+library (library) generating a result.dll,
+windows executable for GUI applications (winexe) generating a result.exe
+or module for use by the linker (module) generating a
+result.netmodule.  winexe is only used on Windows.
+.TP
+.B \-Xmethodtrace:\fImethod-name\fP
+Build tracing into the specified output method \fImethod-name\fP.
+.TP
+.B \-Xtrace:\fIname\fP
+Displays all tracepoints with the given name \fIname\fP.
+.TP
+.B \-version:\fIM.m.b.r\fP
+Set the assembly version to \fIM.m.b.r\f.
+.SH "SEE ALSO"
+.BR ikvm (1),
+.BR ikvmstub (1).
+.LP
+IKVM Project web site
+.UR http://ikvm.net/
+http://ikvm.net/
+.UE
+.LP
+Man page by Dave Beckett, made available under the same terms as IKVM.

Deleted: non-group/ikvm/trunk/debian/ikvmc.sh
===================================================================
--- non-group/ikvm/trunk/debian/ikvmc.sh	2005-07-12 18:52:20 UTC (rev 1907)
+++ non-group/ikvm/trunk/debian/ikvmc.sh	2005-07-12 21:02:00 UTC (rev 1908)
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/cli /usr/lib/ikvm/ikvmc.exe "$@"

Added: non-group/ikvm/trunk/debian/ikvmstub.1
===================================================================
--- non-group/ikvm/trunk/debian/ikvmstub.1	2005-07-12 18:52:20 UTC (rev 1907)
+++ non-group/ikvm/trunk/debian/ikvmstub.1	2005-07-12 21:02:00 UTC (rev 1908)
@@ -0,0 +1,40 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\"
+.\"
+.TH ikvm 1 "2005-06-19"
+.SH "NAME"
+ikvmstub \- generate java stub class files from a CIL assembly
+.SH "SYNOPOSIS"
+.B ikvmstub
+.I assembly 
+|
+.I path
+.SH "DESCRIPTION"
+IKVM is an implentation of the Java for the Common Language
+Infrastructure (CLI) runtime.  It includes a byte code JIT
+compiler/verifier to translate Java byte code to CIL and GNU
+Classpath to provide the Java class libraries.  
+.B ikvmsub
+generates a jar file containing stub class files from a CIL assembly
+enabling Java code to be compiled against the assembly.  When these
+stub classes are used with ikvm(1), the references to the stubs are
+replaced with references to the real CIL references.
+.LP
+Assemblies are first searched for in the default load context,
+usually the Global Assembly Cache (GAC).  If the assembly is not
+found there, it is searched in the 
+.I path
+or the current directory if no path is given.
+.SH "OPTIONS"
+None.
+.SH "SEE ALSO"
+.BR ikvm (1),
+.BR ikvmc (1).
+.LP
+IKVM Project web site
+.UR http://ikvm.net/
+http://ikvm.net/
+.UE
+.LP
+Man page by Dave Beckett, made available under the same terms as IKVM.
+

Deleted: non-group/ikvm/trunk/debian/ikvmstub.sh
===================================================================
--- non-group/ikvm/trunk/debian/ikvmstub.sh	2005-07-12 18:52:20 UTC (rev 1907)
+++ non-group/ikvm/trunk/debian/ikvmstub.sh	2005-07-12 21:02:00 UTC (rev 1908)
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/cli /usr/lib/ikvm/ikvmstub.exe "$@"

Deleted: non-group/ikvm/trunk/debian/patches/01-JniInterface-delfix.patch
===================================================================
--- non-group/ikvm/trunk/debian/patches/01-JniInterface-delfix.patch	2005-07-12 18:52:20 UTC (rev 1907)
+++ non-group/ikvm/trunk/debian/patches/01-JniInterface-delfix.patch	2005-07-12 21:02:00 UTC (rev 1908)
@@ -1,21 +0,0 @@
-#!/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]);

Modified: non-group/ikvm/trunk/debian/rules
===================================================================
--- non-group/ikvm/trunk/debian/rules	2005-07-12 18:52:20 UTC (rev 1907)
+++ non-group/ikvm/trunk/debian/rules	2005-07-12 21:02:00 UTC (rev 1908)
@@ -6,7 +6,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-CLASSPATH_VERSION=0.15
+CLASSPATH_VERSION=0.16
 
 export MONO_SHARED_DIR=$(CURDIR)/debian
 DEBVERSION = $(shell dpkg-parsechangelog | grep ^Vers | cut -d\  -f2)
@@ -58,7 +58,7 @@
 build-stamp: configure-stamp 
 	dh_testdir
 
-	nant -v
+	nant -v signed
 
 	touch build-stamp
 
@@ -96,16 +96,26 @@
 	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; \
+# Install the signed DLLs into the GAC
+	cd bin; \
+	for DLL in *.dll; do \
+          if test $$DLL != ICSharpCode.SharpZipLib.dll; then \
+	    gacutil -root $(CURDIR)/debian/ikvm/usr/lib -i $$DLL; \
+	  fi; \
 	done
 
+	cd bin; \
+	dest=$(CURDIR)/debian/ikvm/usr/bin; \
+	for FILE in *.exe; do \
+	  base=`basename $$FILE .exe`; \
+	  install -m644 $$FILE $(CURDIR)/debian/ikvm/usr/lib/ikvm/$$FILE; \
+	  sed -e "s,@EXE@,/usr/lib/ikvm/$$FILE," $(CURDIR)/debian/run.sh.in > $$dest/$$base; \
+	  chmod 711 $$dest/$$base; \
+	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
+	mv bin/libikvm-native.so $(CURDIR)/debian/libikvm-native/usr/lib/ikvm
 
-	find $(CURDIR)/debian/ikvm/usr/lib/ikvm -type f -exec chmod a-x {} \;
-
 	sed -e "s/@VERSION@/$(UPVERSION)/" debian/ikvm.pc.in > $(CURDIR)/debian/ikvm/usr/lib/pkgconfig/ikvm.pc
 	touch install-stamp
 
@@ -127,7 +137,7 @@
 	dh_fixperms
 	dh_installdeb
 	dh_shlibdeps
-	dh_gencontrol -a -- -Vikvm:upversion=$(DEBVERSION)
+	dh_gencontrol -a -- -Vikvm:debversion=$(DEBVERSION)
 	dh_md5sums
 	dh_builddeb
 

Added: non-group/ikvm/trunk/debian/run.sh.in
===================================================================
--- non-group/ikvm/trunk/debian/run.sh.in	2005-07-12 18:52:20 UTC (rev 1907)
+++ non-group/ikvm/trunk/debian/run.sh.in	2005-07-12 21:02:00 UTC (rev 1908)
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /usr/bin/cli @EXE@ "$@"