[Pkg-cli-apps-commits] r4421 - in /packages/ikvm/trunk/debian: IKVM.OpenJDK.ClassLibrary.dll.config IKVM.Runtime.JNI.dll.config IKVM.Runtime.dll.config changelog patches/03-use_mono.snk_for_ikvm-key.patch rules

meebey at users.alioth.debian.org meebey at users.alioth.debian.org
Sun Jan 11 02:05:55 UTC 2009 

Author: meebey
Date: Sun Jan 11 02:05:54 2009
New Revision: 4421

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=4421
Log:
  * debian/rules
    debian/IKVM.Runtime.dll.config
    debian/IKVM.Runtime.JNI.dll.config
    debian/IKVM.OpenJDK.ClassLibrary.dll.config:  
   + Added missing dll-maps for libikvm-native.so invocation.


Added:
    packages/ikvm/trunk/debian/IKVM.OpenJDK.ClassLibrary.dll.config
    packages/ikvm/trunk/debian/IKVM.Runtime.JNI.dll.config
    packages/ikvm/trunk/debian/IKVM.Runtime.dll.config
Modified:
    packages/ikvm/trunk/debian/changelog
    packages/ikvm/trunk/debian/patches/03-use_mono.snk_for_ikvm-key.patch
    packages/ikvm/trunk/debian/rules

Added: packages/ikvm/trunk/debian/IKVM.OpenJDK.ClassLibrary.dll.config
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/ikvm/trunk/debian/IKVM.OpenJDK.ClassLibrary.dll.config?rev=4421&op=file
==============================================================================
--- packages/ikvm/trunk/debian/IKVM.OpenJDK.ClassLibrary.dll.config (added)
+++ packages/ikvm/trunk/debian/IKVM.OpenJDK.ClassLibrary.dll.config Sun Jan 11 02:05:54 2009
@@ -1,0 +1,3 @@
+<configuration>
+	<dllmap dll="ikvm-native" target="/usr/lib/ikvm/libikvm-native.so"/>
+</configuration>

Added: packages/ikvm/trunk/debian/IKVM.Runtime.JNI.dll.config
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/ikvm/trunk/debian/IKVM.Runtime.JNI.dll.config?rev=4421&op=file
==============================================================================
--- packages/ikvm/trunk/debian/IKVM.Runtime.JNI.dll.config (added)
+++ packages/ikvm/trunk/debian/IKVM.Runtime.JNI.dll.config Sun Jan 11 02:05:54 2009
@@ -1,0 +1,3 @@
+<configuration>
+	<dllmap dll="ikvm-native" target="/usr/lib/ikvm/libikvm-native.so"/>
+</configuration>

Added: packages/ikvm/trunk/debian/IKVM.Runtime.dll.config
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/ikvm/trunk/debian/IKVM.Runtime.dll.config?rev=4421&op=file
==============================================================================
--- packages/ikvm/trunk/debian/IKVM.Runtime.dll.config (added)
+++ packages/ikvm/trunk/debian/IKVM.Runtime.dll.config Sun Jan 11 02:05:54 2009
@@ -1,0 +1,3 @@
+<configuration>
+	<dllmap dll="ikvm-native" target="/usr/lib/ikvm/libikvm-native.so"/>
+</configuration>

Modified: packages/ikvm/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/ikvm/trunk/debian/changelog?rev=4421&op=diff
==============================================================================
--- packages/ikvm/trunk/debian/changelog (original)
+++ packages/ikvm/trunk/debian/changelog Sun Jan 11 02:05:54 2009
@@ -1,4 +1,4 @@
-ikvm (0.38.0.2+dfsg-1) UNRELEASED; urgency=low
+ikvm (0.38.0.2+dfsg-1) experimental; urgency=low
 
   [ Jo Shields ]
   * Package adopted by Debian CLI Libraries Team. (Closes: #466336)
@@ -10,6 +10,9 @@
   * 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. (Closes: #484125)
+  * Use correct path in ikvm.pc file. (Closes: #504529)
+  * Ensure that Configuration.java uses the ikvm-key configured for the build,
+    not a hard-coded value. (Closes: #337414)
 
   [ David Paleino ]
   * debian/compat bumped to 7
@@ -27,6 +30,11 @@
    + Added dh_clistrip and dh_clifixperms calls.
    + Removed unneeded chmod calls (as dh_clifixperms takes now care).
    + Replaced hardcoded mono calls with DEB_CLI_RUNTIME variable.
+  * debian/rules
+    debian/IKVM.Runtime.dll.config
+    debian/IKVM.Runtime.JNI.dll.config
+    debian/IKVM.OpenJDK.ClassLibrary.dll.config:
+   + Added missing dll-maps for libikvm-native.so invocation.
 
  -- Jo Shields <directhex at apebox.org>  Tue,  6 Jan 2009 16:24:02 +0000
 

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=4421&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 Sun Jan 11 02:05:54 2009
@@ -3,10 +3,8 @@
 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-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
+--- 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
 @@ -33,5 +33,6 @@
  
  #if SIGNCODE
@@ -15,10 +13,8 @@
 +	[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-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
+--- 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
 @@ -29,7 +29,8 @@
  
  #if SIGNCODE
@@ -29,3 +25,29 @@
  #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
+@@ -2,8 +2,8 @@
+ <project name="ikvm" default="all">
+     <target name="signed">
+          <property name="signed" value="SIGNCODE" />
+-         <property name="signoption" value="-key:ikvm-key" />
+-         <property name="ilasm_signoption" value="/key:@ikvm-key" />
++         <property name="signoption" value="-keyfile:../../debian/mono.snk" />
++         <property name="ilasm_signoption" value="/key:../../debian/mono.snk" />
+          <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
+@@ -6,8 +6,8 @@
+     </target>
+     <target name="signed">
+         <property name="signed" value="SIGNCODE" />
+-        <property name="signoption" value="-key:ikvm-key" />
+-        <property name="ilasm_signoption" value="/key:@ikvm-key" />
++        <property name="signoption" value="-keyfile:../../../debian/mono.snk" />
++        <property name="ilasm_signoption" value="/key:../../../debian/mono.snk" />
+         <call target="IKVM.Runtime" />
+     </target>
+ 

Modified: packages/ikvm/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/ikvm/trunk/debian/rules?rev=4421&op=diff
==============================================================================
--- packages/ikvm/trunk/debian/rules (original)
+++ packages/ikvm/trunk/debian/rules Sun Jan 11 02:05:54 2009
@@ -7,7 +7,6 @@
 include /usr/share/quilt/quilt.make
 
 export MONO_SHARED_DIR=$(CURDIR)/debian
-export XDG_CONFIG_HOME=$(CURDIR)/debian
 
 DEB_CLI_ABI_VERSION = 0.38
 DEB_CLI_API_VERSION = 0.38.0.2
@@ -27,7 +26,7 @@
 configure: configure-stamp
 configure-stamp: $(QUILT_STAMPFN)
 	dh_testdir
-	mkdir -p $(MONO_SHARED_DIR)/.wapi $(XDG_CONFIG_HOME)/.mono
+	mkdir -p $(MONO_SHARED_DIR)/.wapi
 	@echo "`date` Running nant -v clean"
 	nant -v -f:ikvm-$(UPVERSION)/ikvm.build clean
 
@@ -104,7 +103,7 @@
 		ikvm-*/openjdk/Configuration.java \
 		debian/mono.snk
 	rename -f 's/\.dist$$//' ikvm-*/classpath/*
-	-rm -rf $(MONO_SHARED_DIR)/.wapi $(XDG_CONFIG_HOME)/.mono
+	-rm -rf $(MONO_SHARED_DIR)/.wapi
 
 	dh_clean 
 
@@ -113,7 +112,7 @@
 install-arch-stamp:
 	dh_testdir
 	dh_testroot
-	dh_clean -k 
+	dh_clean -k
 	dh_installdirs
 
 	mkdir -p $(CURDIR)/debian/libikvm-native/usr/lib/ikvm
@@ -124,13 +123,17 @@
 install-indep-stamp:
 	dh_testdir
 	dh_testroot
-	dh_clean -k 
+	dh_clean -k
 	dh_installdirs
 
 	mkdir -p $(CURDIR)/debian/ikvm/usr/lib/cli/ikvm-$(DEB_CLI_ABI_VERSION)
 	cd ikvm-$(UPVERSION)/bin; \
 	for DLL in *.dll; do \
 	  cp $$DLL $(CURDIR)/debian/ikvm/usr/lib/cli/ikvm-$(DEB_CLI_ABI_VERSION); \
+	done
+
+	for DLLMAP in $(CURDIR)/debian/*.dll.config; do \
+		cp $$DLLMAP $(CURDIR)/debian/ikvm/usr/lib/cli/ikvm-$(DEB_CLI_ABI_VERSION); \
 	done
 
 	cd ikvm-$(UPVERSION)/bin; \
@@ -163,7 +166,7 @@
 	dh_fixperms -i
 	dh_clifixperms -i
 	dh_installdeb -i
-	dh_makeclilibs -i -m$(DEB_CLI_API_VERSION)
+	dh_makeclilibs -i -m $(DEB_CLI_API_VERSION)
 	dh_clideps -i
 	dh_gencontrol -i
 	dh_md5sums -i

More information about the Pkg-cli-apps-commits mailing list