[Pkg-cli-apps-commits] r4959 - in /packages/ikvm/trunk/debian: ./ patches/
directhex-guest at users.alioth.debian.org
directhex-guest at users.alioth.debian.org
Sat Jun 6 11:09:11 UTC 2009
Author: directhex-guest
Date: Sat Jun 6 11:09:11 2009
New Revision: 4959
URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=4959
Log:
NOT READY YET, UPSTREAM BUNDLING PROBLEMS
* New upstream release
* debian/control:
+ Fix Vcs-* fields
* debian/rules:
+ Ensure CLI policy folder is actually used for get-orig-source
+ Add new refemit build to list of nant files to build
* debian/patches/01-use_system_SharpZipLib.patch,
debian/patches/03-use_mono.snk_for_ikvm-key.patch,
debian/patches/04-decouple_arch_build_from_indep.patch:
+ Update for new release
* debian/patches/02-use_ikvm-key_for_openJDKConfiguration.patch,
debian/patches/00-use_ikvm-key_for_JniInterface.patch:
+ Removed, fixed upstream
Removed:
packages/ikvm/trunk/debian/patches/00-use_ikvm-key_for_JniInterface.patch
packages/ikvm/trunk/debian/patches/02-use_ikvm-key_for_openJDKConfiguration.patch
Modified:
packages/ikvm/trunk/debian/changelog
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/patches/series
packages/ikvm/trunk/debian/rules
Modified: packages/ikvm/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/ikvm/trunk/debian/changelog?rev=4959&op=diff
==============================================================================
--- packages/ikvm/trunk/debian/changelog (original)
+++ packages/ikvm/trunk/debian/changelog Sat Jun 6 11:09:11 2009
@@ -1,9 +1,22 @@
-ikvm (0.38.0.2+dfsg-3) UNRELEASED; urgency=low
-
+ikvm (0.40.0.1+dfsg-1) UNRELEASED; urgency=low
+
+ NOT READY YET, UPSTREAM BUNDLING PROBLEMS
+
+ * New upstream release
* debian/control:
+ Fix Vcs-* fields
-
- -- Jo Shields <directhex at apebox.org> Tue, 03 Mar 2009 11:27:39 +0000
+ * debian/rules:
+ + Ensure CLI policy folder is actually used for get-orig-source
+ + Add new refemit build to list of nant files to build
+ * debian/patches/01-use_system_SharpZipLib.patch,
+ debian/patches/03-use_mono.snk_for_ikvm-key.patch,
+ debian/patches/04-decouple_arch_build_from_indep.patch:
+ + Update for new release
+ * debian/patches/02-use_ikvm-key_for_openJDKConfiguration.patch,
+ debian/patches/00-use_ikvm-key_for_JniInterface.patch:
+ + Removed, fixed upstream
+
+ -- Jo Shields <directhex at apebox.org> Sat, 06 Jun 2009 11:13:15 +0100
ikvm (0.38.0.2+dfsg-2) unstable; urgency=low
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=4959&op=diff
==============================================================================
--- packages/ikvm/trunk/debian/patches/01-use_system_SharpZipLib.patch (original)
+++ packages/ikvm/trunk/debian/patches/01-use_system_SharpZipLib.patch Sat Jun 6 11:09:11 2009
@@ -1,16 +1,16 @@
Author: Jo Shields
Description: This patch ensures that we use Mono's bundled copy of SharpZipLib,
Description: not the binary copy bundled with upstream
-Index: ikvm-0.38.0.2+dfsg/ikvm-0.38.0.2/ikvmc/ikvmc.build
+Index: ikvm-0.40.0.1+dfsg/ikvm-0.40.0.1/ikvmc/ikvmc.build
===================================================================
---- 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 @@
+--- ikvm-0.40.0.1+dfsg.orig/ikvm-0.40.0.1/ikvmc/ikvmc.build 2009-03-04 06:47:20.000000000 +0000
++++ ikvm-0.40.0.1+dfsg/ikvm-0.40.0.1/ikvmc/ikvmc.build 2009-06-06 11:44:49.000000000 +0100
+@@ -37,7 +37,7 @@
<include name="../runtime/vm.cs" />
</sources>
<references>
- <include name="../bin/ICSharpCode.SharpZipLib.dll" asis="true" />
+ <include name="ICSharpCode.SharpZipLib.dll" asis="true" />
+ <include name="../bin/IKVM.Reflection.Emit.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=4959&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 Sat Jun 6 11:09:11 2009
@@ -3,8 +3,10 @@
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
---- ikvm-0.38.0.2+dfsg.orig/ikvm-0.38.0.2/CommonAssemblyInfo.cs
-+++ ikvm-0.38.0.2+dfsg/ikvm-0.38.0.2/CommonAssemblyInfo.cs
+Index: ikvm-0.40.0.1+dfsg/ikvm-0.40.0.1/CommonAssemblyInfo.cs
+===================================================================
+--- ikvm-0.40.0.1+dfsg.orig/ikvm-0.40.0.1/CommonAssemblyInfo.cs 2009-04-20 10:48:46.000000000 +0100
++++ ikvm-0.40.0.1+dfsg/ikvm-0.40.0.1/CommonAssemblyInfo.cs 2009-06-06 11:38:42.000000000 +0100
@@ -33,5 +33,6 @@
#if SIGNCODE
@@ -13,8 +15,10 @@
+ [assembly: AssemblyDelaySign(false)]
+ [assembly: AssemblyKeyFile("../../debian/mono.snk")]
#endif
---- ikvm-0.38.0.2+dfsg.orig/ikvm-0.38.0.2/tools/pubkey.cs
-+++ ikvm-0.38.0.2+dfsg/ikvm-0.38.0.2/tools/pubkey.cs
+Index: ikvm-0.40.0.1+dfsg/ikvm-0.40.0.1/tools/pubkey.cs
+===================================================================
+--- ikvm-0.40.0.1+dfsg.orig/ikvm-0.40.0.1/tools/pubkey.cs 2008-09-18 07:34:30.000000000 +0100
++++ ikvm-0.40.0.1+dfsg/ikvm-0.40.0.1/tools/pubkey.cs 2009-06-06 11:39:20.000000000 +0100
@@ -29,7 +29,8 @@
#if SIGNCODE
@@ -25,8 +29,10 @@
#endif
class PublicKey
---- ikvm-0.38.0.2+dfsg.orig/ikvm-0.38.0.2/ikvm.build
-+++ ikvm-0.38.0.2+dfsg/ikvm-0.38.0.2/ikvm.build
+Index: ikvm-0.40.0.1+dfsg/ikvm-0.40.0.1/ikvm.build
+===================================================================
+--- ikvm-0.40.0.1+dfsg.orig/ikvm-0.40.0.1/ikvm.build 2009-03-26 15:32:28.000000000 +0000
++++ ikvm-0.40.0.1+dfsg/ikvm-0.40.0.1/ikvm.build 2009-06-06 11:40:16.000000000 +0100
@@ -2,8 +2,8 @@
<project name="ikvm" default="all">
<target name="signed">
@@ -38,8 +44,10 @@
<call target="all" />
</target>
<target name="all">
---- ikvm-0.38.0.2+dfsg.orig/ikvm-0.38.0.2/runtime/runtime.build
-+++ ikvm-0.38.0.2+dfsg/ikvm-0.38.0.2/runtime/runtime.build
+Index: ikvm-0.40.0.1+dfsg/ikvm-0.40.0.1/runtime/runtime.build
+===================================================================
+--- ikvm-0.40.0.1+dfsg.orig/ikvm-0.40.0.1/runtime/runtime.build 2009-03-04 06:47:20.000000000 +0000
++++ ikvm-0.40.0.1+dfsg/ikvm-0.40.0.1/runtime/runtime.build 2009-06-06 11:40:37.000000000 +0100
@@ -6,8 +6,8 @@
</target>
<target name="signed">
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=4959&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 Sat Jun 6 11:09:11 2009
@@ -2,21 +2,21 @@
Description: This patch removes the "native" (i.e. Arch) components of the IKVM
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
+Index: ikvm-0.40.0.1+dfsg/ikvm-0.40.0.1/ikvm.build
===================================================================
---- 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
+--- ikvm-0.40.0.1+dfsg.orig/ikvm-0.40.0.1/ikvm.build 2009-06-06 11:42:51.000000000 +0100
++++ ikvm-0.40.0.1+dfsg/ikvm-0.40.0.1/ikvm.build 2009-06-06 11:43:27.000000000 +0100
@@ -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="refemit/refemit.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" />
+@@ -42,7 +41,6 @@
+ <include name="bin/IKVM.OpenJDK.Util.dll" />
+ <include name="bin/IKVM.OpenJDK.XML.dll" />
<include name="bin/ikvm-native.dll" />
- <include name="bin/libikvm-native.so" />
<include name="bin/ikvm.exe" />
Modified: packages/ikvm/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/ikvm/trunk/debian/patches/series?rev=4959&op=diff
==============================================================================
--- packages/ikvm/trunk/debian/patches/series (original)
+++ packages/ikvm/trunk/debian/patches/series Sat Jun 6 11:09:11 2009
@@ -1,5 +1,3 @@
-02-use_ikvm-key_for_openJDKConfiguration.patch
03-use_mono.snk_for_ikvm-key.patch
04-decouple_arch_build_from_indep.patch
01-use_system_SharpZipLib.patch
-00-use_ikvm-key_for_JniInterface.patch
Modified: packages/ikvm/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/ikvm/trunk/debian/rules?rev=4959&op=diff
==============================================================================
--- packages/ikvm/trunk/debian/rules (original)
+++ packages/ikvm/trunk/debian/rules Sat Jun 6 11:09:11 2009
@@ -217,7 +217,7 @@
ikvm-$(UPVERSION)+dfsg/ikvm-*/runtime/JniInterface.cs \
ikvm-$(UPVERSION)+dfsg/ikvm-*/openjdk/Configuration.java \
ikvm-$(UPVERSION)+dfsg/ikvm-*/openjdk/vfs.zip
- tar cfvz ikvm_$(UPVERSION)+dfsg.orig.tar.gz ikvm-$(UPVERSION)+dfsg
+ tar cfvz ../tarballs/ikvm_$(UPVERSION)+dfsg.orig.tar.gz ikvm-$(UPVERSION)+dfsg
rm -fr ikvm-$(UPVERSION)+dfsg
.PHONY: build clean binary-indep binary-arch binary install patch unpatch \
More information about the Pkg-cli-apps-commits
mailing list