[Pkg-cli-apps-commits] r4404 - in /packages/ikvm/trunk/debian: ./ man/ patches/
directhex-guest at users.alioth.debian.org
directhex-guest at users.alioth.debian.org
Tue Jan 6 22:13:18 UTC 2009
Author: directhex-guest
Date: Tue Jan 6 22:13:18 2009
New Revision: 4404
URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=4404
Log:
NEARLY final IKVM package
* Lintian clean(!)
* Licensing problem remains on debian/*
* Anyone volunteering to do the app/lib split?
* Can someone be a sweetie & add README.source to docdir? Ta.
Added:
packages/ikvm/trunk/debian/README.source
packages/ikvm/trunk/debian/ikvm.manpages
Modified:
packages/ikvm/trunk/debian/changelog
packages/ikvm/trunk/debian/man/ikvmc.1
packages/ikvm/trunk/debian/patches/00-use_ikvm-key_for_JniInterface.patch
packages/ikvm/trunk/debian/patches/01-use_system_SharpZipLib.patch
packages/ikvm/trunk/debian/patches/03-use_mono.snk_for_ikvm-key.patch
packages/ikvm/trunk/debian/patches/04-decouple_arch_build_from_indep.patch
packages/ikvm/trunk/debian/rules
Added: packages/ikvm/trunk/debian/README.source
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/ikvm/trunk/debian/README.source?rev=4404&op=file
==============================================================================
--- packages/ikvm/trunk/debian/README.source (added)
+++ packages/ikvm/trunk/debian/README.source Tue Jan 6 22:13:18 2009
@@ -1,0 +1,32 @@
+IKVM is a complex application, built from three different components -
+GNU Classpath, OpenJDK, and IKVM itself. Unfortunately, it is not
+possible to use the Debian packages for OpenJDK and Classpath as a base
+(not only are there files unavailable in them, but IKVM requires *exact*
+slightly modified snapshot versions).
+
+As such, we decided within the Mono packaging teams that the simplest
+way to deal with the need, rather than a 40+ megabyte diff.gz, would be
+to construct a new orig.tar.gz from the three constituent components.
+
+The get-orig-source rule in debian/rules should download the latest IKVM
+release, then use the URLS contained inside it to download the matching
+Classpath and OpenJDK. All three parts are mixed together a little, to
+remove DFSG-related issues such as stray .class, .so, .dll, and .exe
+files.
+
+Unfortunately, IKVM requires IKVM to build (yay!). We've managed to pull
+the number of bootstrapping binaries down to three machine-generated
+files (.class stubs generated from Mono .dll files using ikvmstub). To
+ensure a completely "clean" build, this package is therfore compiled in
+two passes - the first pass is used to regenerate these bootstrap
+binaries with "known-good" versions based on the currently installed
+Mono framework, and the second pass uses these new files to compile a
+"final" version of IKVM.
+
+It's all unquestionably messy, but when even upstream is warning you
+that building from source should be considered nigh on impossible, we're
+proud that we've produced a Lintian-clean package.
+
+Enjoy.
+
+--Jo Shields <directhex at apebox.org>, 2008-01-06
Modified: packages/ikvm/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/ikvm/trunk/debian/changelog?rev=4404&op=diff
==============================================================================
--- packages/ikvm/trunk/debian/changelog (original)
+++ packages/ikvm/trunk/debian/changelog Tue Jan 6 22:13:18 2009
@@ -8,6 +8,7 @@
* Signed using Mono key - it causes an ABI breakage for now, but it's an
improvement on the randomly generated keys used previously, as it means
ABI breakage is no longer guaranteed between compiles
+ * TODO: sort licensing problem in debian/* with CosmicRay
[ David Paleino ]
* debian/compat bumped to 7
Added: packages/ikvm/trunk/debian/ikvm.manpages
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/ikvm/trunk/debian/ikvm.manpages?rev=4404&op=file
==============================================================================
--- packages/ikvm/trunk/debian/ikvm.manpages (added)
+++ packages/ikvm/trunk/debian/ikvm.manpages Tue Jan 6 22:13:18 2009
@@ -1,0 +1,1 @@
+debian/man/*.1
Modified: packages/ikvm/trunk/debian/man/ikvmc.1
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/ikvm/trunk/debian/man/ikvmc.1?rev=4404&op=diff
==============================================================================
--- packages/ikvm/trunk/debian/man/ikvmc.1 (original)
+++ packages/ikvm/trunk/debian/man/ikvmc.1 Tue Jan 6 22:13:18 2009
@@ -56,7 +56,7 @@
.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.
+compiled with the javac \-g option.
.TP
.B \-disableassertions[:\fIpackagename\fP ... | :\fIclassname\fP]
Set the system property to disable assertions.
@@ -141,7 +141,7 @@
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.
+Set the assembly version to \fIM.m.b.r\fP.
.SH "SEE ALSO"
.BR ikvm (1),
.BR ikvmstub (1).
Modified: packages/ikvm/trunk/debian/patches/00-use_ikvm-key_for_JniInterface.patch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/ikvm/trunk/debian/patches/00-use_ikvm-key_for_JniInterface.patch?rev=4404&op=diff
==============================================================================
--- packages/ikvm/trunk/debian/patches/00-use_ikvm-key_for_JniInterface.patch (original)
+++ packages/ikvm/trunk/debian/patches/00-use_ikvm-key_for_JniInterface.patch Tue Jan 6 22:13:18 2009
@@ -1,13 +1,13 @@
Author: Jo Shields
Description: This patch replaces JniInterface.cs with JniInterface.cs.in, an
- identical except for one thing - it uses a PUBLICKEY token
- instead of a hard-coded value. There is also a minor tweak to
- the build file to replace the token with an actual value during
- compilation.
+Description: identical except for one thing - it uses a PUBLICKEY token
+Description: instead of a hard-coded value. There is also a minor tweak to
+Description: the build file to replace the token with an actual value during
+Description: compilation.
Index: ikvm-0.38.0.2+dfsg/ikvm-0.38.0.2/runtime/JniInterface.cs.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ ikvm-0.38.0.2+dfsg/ikvm-0.38.0.2/runtime/JniInterface.cs.in 2009-01-06 14:42:51.000000000 +0000
++++ ikvm-0.38.0.2+dfsg/ikvm-0.38.0.2/runtime/JniInterface.cs.in 2009-01-06 20:07:00.000000000 +0000
@@ -0,0 +1,3487 @@
+/*
+ Copyright (C) 2002-2008 Jeroen Frijters
@@ -3498,19 +3498,19 @@
+}
Index: ikvm-0.38.0.2+dfsg/ikvm-0.38.0.2/runtime/runtime.build
===================================================================
---- ikvm-0.38.0.2+dfsg.orig/ikvm-0.38.0.2/runtime/runtime.build 2009-01-06 14:42:49.000000000 +0000
-+++ ikvm-0.38.0.2+dfsg/ikvm-0.38.0.2/runtime/runtime.build 2009-01-06 14:42:51.000000000 +0000
+--- ikvm-0.38.0.2+dfsg.orig/ikvm-0.38.0.2/runtime/runtime.build 2009-01-06 19:58:47.000000000 +0000
++++ ikvm-0.38.0.2+dfsg/ikvm-0.38.0.2/runtime/runtime.build 2009-01-06 20:07:37.000000000 +0000
@@ -41,6 +41,13 @@
- </replacetokens>
- </filterchain>
- </copy>
-+ <copy file="JniInterface.cs.in" tofile="JniInterface.cs" overwrite="true">
-+ <filterchain>
-+ <replacetokens>
-+ <token key="PUBLICKEY" value="${publickey}" />
-+ </replacetokens>
-+ </filterchain>
-+ </copy>
- <if test="${first-pass}">
- <property name="defs" value="${defs};FIRST_PASS" />
- </if>
+ </replacetokens>
+ </filterchain>
+ </copy>
++ <copy file="JniInterface.cs.in" tofile="JniInterface.cs" overwrite="true">
++ <filterchain>
++ <replacetokens>
++ <token key="PUBLICKEY" value="${publickey}" />
++ </replacetokens>
++ </filterchain>
++ </copy>
+ <if test="${first-pass}">
+ <property name="defs" value="${defs};FIRST_PASS" />
+ </if>
Modified: packages/ikvm/trunk/debian/patches/01-use_system_SharpZipLib.patch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/ikvm/trunk/debian/patches/01-use_system_SharpZipLib.patch?rev=4404&op=diff
==============================================================================
--- packages/ikvm/trunk/debian/patches/01-use_system_SharpZipLib.patch (original)
+++ packages/ikvm/trunk/debian/patches/01-use_system_SharpZipLib.patch Tue Jan 6 22:13:18 2009
@@ -1,16 +1,16 @@
Author: Jo Shields
Description: This patch ensures that we use Mono's bundled copy of SharpZipLib,
- not the binary copy bundled with upstream
+Description: not the binary copy bundled with upstream
Index: ikvm-0.38.0.2+dfsg/ikvm-0.38.0.2/ikvmc/ikvmc.build
===================================================================
---- ikvm-0.38.0.2+dfsg.orig/ikvm-0.38.0.2/ikvmc/ikvmc.build 2008-12-30 15:35:15.000000000 +0000
-+++ ikvm-0.38.0.2+dfsg/ikvm-0.38.0.2/ikvmc/ikvmc.build 2008-12-30 15:35:22.000000000 +0000
+--- ikvm-0.38.0.2+dfsg.orig/ikvm-0.38.0.2/ikvmc/ikvmc.build 2009-01-06 19:58:47.000000000 +0000
++++ ikvm-0.38.0.2+dfsg/ikvm-0.38.0.2/ikvmc/ikvmc.build 2009-01-06 20:06:25.000000000 +0000
@@ -35,7 +35,7 @@
- <include name="../runtime/vm.cs" />
- </sources>
- <references>
-- <include name="../bin/ICSharpCode.SharpZipLib.dll" asis="true" />
-+ <include name="ICSharpCode.SharpZipLib.dll" asis="true" />
- <!-- HACK mcs requires an explicit reference to System.Configuration -->
- <include name="${framework::get-assembly-directory(framework::get-target-framework())}/System.Configuration.dll" />
- </references>
+ <include name="../runtime/vm.cs" />
+ </sources>
+ <references>
+- <include name="../bin/ICSharpCode.SharpZipLib.dll" asis="true" />
++ <include name="ICSharpCode.SharpZipLib.dll" asis="true" />
+ <!-- HACK mcs requires an explicit reference to System.Configuration -->
+ <include name="${framework::get-assembly-directory(framework::get-target-framework())}/System.Configuration.dll" />
+ </references>
Modified: packages/ikvm/trunk/debian/patches/03-use_mono.snk_for_ikvm-key.patch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/ikvm/trunk/debian/patches/03-use_mono.snk_for_ikvm-key.patch?rev=4404&op=diff
==============================================================================
--- packages/ikvm/trunk/debian/patches/03-use_mono.snk_for_ikvm-key.patch (original)
+++ packages/ikvm/trunk/debian/patches/03-use_mono.snk_for_ikvm-key.patch Tue Jan 6 22:13:18 2009
@@ -1,31 +1,31 @@
Author: Jo Shields
Description: This patch ensures that rather than trying to use the Mono Crypto
- Service Provider to retrieve a signing key (CSP is not safe to
- run with fakeroot), we simply hard-code the path to a bundled key
- file
+Description: Service Provider to retrieve a signing key (CSP is not safe to
+Description: run with fakeroot), we simply hard-code the path to a bundled key
+Description: file
Index: ikvm-0.38.0.2+dfsg/ikvm-0.38.0.2/CommonAssemblyInfo.cs
===================================================================
---- ikvm-0.38.0.2+dfsg.orig/ikvm-0.38.0.2/CommonAssemblyInfo.cs 2009-01-01 21:36:52.000000000 +0000
-+++ ikvm-0.38.0.2+dfsg/ikvm-0.38.0.2/CommonAssemblyInfo.cs 2009-01-01 21:37:32.000000000 +0000
+--- ikvm-0.38.0.2+dfsg.orig/ikvm-0.38.0.2/CommonAssemblyInfo.cs 2009-01-06 19:58:47.000000000 +0000
++++ ikvm-0.38.0.2+dfsg/ikvm-0.38.0.2/CommonAssemblyInfo.cs 2009-01-06 20:03:35.000000000 +0000
@@ -33,5 +33,6 @@
-
- #if SIGNCODE
- #pragma warning disable 1699
-- [assembly: AssemblyKeyName("ikvm-key")]
-+ [assembly: AssemblyDelaySign(false)]
-+ [assembly: AssemblyKeyFile("../../debian/mono.snk")]
- #endif
+
+ #if SIGNCODE
+ #pragma warning disable 1699
+- [assembly: AssemblyKeyName("ikvm-key")]
++ [assembly: AssemblyDelaySign(false)]
++ [assembly: AssemblyKeyFile("../../debian/mono.snk")]
+ #endif
Index: ikvm-0.38.0.2+dfsg/ikvm-0.38.0.2/tools/pubkey.cs
===================================================================
---- ikvm-0.38.0.2+dfsg.orig/ikvm-0.38.0.2/tools/pubkey.cs 2009-01-01 21:37:39.000000000 +0000
-+++ ikvm-0.38.0.2+dfsg/ikvm-0.38.0.2/tools/pubkey.cs 2009-01-01 21:37:53.000000000 +0000
+--- ikvm-0.38.0.2+dfsg.orig/ikvm-0.38.0.2/tools/pubkey.cs 2009-01-06 19:58:47.000000000 +0000
++++ ikvm-0.38.0.2+dfsg/ikvm-0.38.0.2/tools/pubkey.cs 2009-01-06 20:03:04.000000000 +0000
@@ -29,7 +29,8 @@
-
- #if SIGNCODE
- #pragma warning disable 1699
-- [assembly: AssemblyKeyName("ikvm-key")]
-+ [assembly: AssemblyDelaySign(false)]
-+ [assembly: AssemblyKeyFile("../../debian/mono.snk")]
- #endif
-
- class PublicKey
+
+ #if SIGNCODE
+ #pragma warning disable 1699
+- [assembly: AssemblyKeyName("ikvm-key")]
++ [assembly: AssemblyDelaySign(false)]
++ [assembly: AssemblyKeyFile("../../debian/mono.snk")]
+ #endif
+
+ class PublicKey
Modified: packages/ikvm/trunk/debian/patches/04-decouple_arch_build_from_indep.patch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/ikvm/trunk/debian/patches/04-decouple_arch_build_from_indep.patch?rev=4404&op=diff
==============================================================================
--- packages/ikvm/trunk/debian/patches/04-decouple_arch_build_from_indep.patch (original)
+++ packages/ikvm/trunk/debian/patches/04-decouple_arch_build_from_indep.patch Tue Jan 6 22:13:18 2009
@@ -1,24 +1,24 @@
Author: Jo Shields
Description: This patch removes the "native" (i.e. Arch) components of the IKVM
- build from IKVM's main build file. This ensures that there is a
- completely clean split between Arch and Indep build sections
+Description: build from IKVM's main build file. This ensures that there is a
+Description: completely clean split between Arch and Indep build sections
Index: ikvm-0.38.0.2+dfsg/ikvm-0.38.0.2/ikvm.build
===================================================================
---- ikvm-0.38.0.2+dfsg.orig/ikvm-0.38.0.2/ikvm.build 2008-09-18 06:34:30.000000000 +0000
-+++ ikvm-0.38.0.2+dfsg/ikvm-0.38.0.2/ikvm.build 2008-12-30 23:31:40.000000000 +0000
+--- ikvm-0.38.0.2+dfsg.orig/ikvm-0.38.0.2/ikvm.build 2009-01-06 19:58:47.000000000 +0000
++++ ikvm-0.38.0.2+dfsg/ikvm-0.38.0.2/ikvm.build 2009-01-06 20:04:53.000000000 +0000
@@ -9,7 +9,6 @@
- <target name="all">
- <nant buildfile="tools/tools.build" />
- <nant buildfile="runtime/runtime.build" target="first-pass" />
-- <nant buildfile="native/native.build" />
- <nant buildfile="ikvmc/ikvmc.build" />
- <nant buildfile="openjdk/openjdk.build" />
- <nant buildfile="runtime/runtime.build" />
+ <target name="all">
+ <nant buildfile="tools/tools.build" />
+ <nant buildfile="runtime/runtime.build" target="first-pass" />
+- <nant buildfile="native/native.build" />
+ <nant buildfile="ikvmc/ikvmc.build" />
+ <nant buildfile="openjdk/openjdk.build" />
+ <nant buildfile="runtime/runtime.build" />
@@ -28,7 +27,6 @@
- <include name="bin/IKVM.Runtime.JNI.dll" />
- <include name="bin/IKVM.OpenJDK.ClassLibrary.dll" />
- <include name="bin/ikvm-native.dll" />
-- <include name="bin/libikvm-native.so" />
- <include name="bin/ikvm.exe" />
- <include name="bin/ikvmc.exe" />
- <include name="bin/ikvmstub.exe" />
+ <include name="bin/IKVM.Runtime.JNI.dll" />
+ <include name="bin/IKVM.OpenJDK.ClassLibrary.dll" />
+ <include name="bin/ikvm-native.dll" />
+- <include name="bin/libikvm-native.so" />
+ <include name="bin/ikvm.exe" />
+ <include name="bin/ikvmc.exe" />
+ <include name="bin/ikvmstub.exe" />
Modified: packages/ikvm/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/ikvm/trunk/debian/rules?rev=4404&op=diff
==============================================================================
--- packages/ikvm/trunk/debian/rules (original)
+++ packages/ikvm/trunk/debian/rules Tue Jan 6 22:13:18 2009
@@ -178,7 +178,7 @@
binary-arch: build-arch install-arch
dh_testdir
dh_testroot
- dh_installchangelogs -i
+ dh_installchangelogs -a
dh_link -a
dh_install
dh_installdocs -a
More information about the Pkg-cli-apps-commits
mailing list