[Pkg-mono-svn-commits] rev 2599 - in cecil/trunk/debian: . patches

[Sebastian Dröge]

Author: slomo-guest
Date: 2006-07-08 19:14:37 +0000 (Sat, 08 Jul 2006)
New Revision: 2599

Added:
   cecil/trunk/debian/policy.0.4.Mono.Cecil.config
Modified:
   cecil/trunk/debian/changelog
   cecil/trunk/debian/libmono-cecil0.4-cil.installcligac
   cecil/trunk/debian/patches/01_strong-name.dpatch
   cecil/trunk/debian/rules
Log:
* updated cecil to a svn snapshot


Modified: cecil/trunk/debian/changelog
===================================================================
--- cecil/trunk/debian/changelog	2006-07-05 09:25:01 UTC (rev 2598)
+++ cecil/trunk/debian/changelog	2006-07-08 19:14:37 UTC (rev 2599)
@@ -1,3 +1,15 @@
+cecil (0.4.1+svn20060703-1) unstable; urgency=low
+
+  * New upstream release
+  * debian/patches/01_strong-name.dpatch:
+    + updated
+  * debian/policy.0.4.Mono.Cecil.config,
+    debian/libmono-cecil0.4-cil.installcligac,
+    debian/rules:
+    + Add policy files for mapping 0.4.1 to 0.4.2
+
+ -- Sebastian Dröge <slomo at ubuntu.com>  Tue,  4 Jul 2006 16:45:17 +0200
+
 cecil (0.4.1-1) unstable; urgency=low
 
   * New upstream version

Modified: cecil/trunk/debian/libmono-cecil0.4-cil.installcligac
===================================================================
--- cecil/trunk/debian/libmono-cecil0.4-cil.installcligac	2006-07-05 09:25:01 UTC (rev 2598)
+++ cecil/trunk/debian/libmono-cecil0.4-cil.installcligac	2006-07-08 19:14:37 UTC (rev 2599)
@@ -1 +1,2 @@
 /usr/lib/cli/mono-cecil-0.4/Mono.Cecil.dll
+/usr/lib/cli/mono-cecil-0.4/policy.0.4.Mono.Cecil.dll

Modified: cecil/trunk/debian/patches/01_strong-name.dpatch
===================================================================
--- cecil/trunk/debian/patches/01_strong-name.dpatch	2006-07-05 09:25:01 UTC (rev 2598)
+++ cecil/trunk/debian/patches/01_strong-name.dpatch	2006-07-08 19:14:37 UTC (rev 2599)
@@ -2,18 +2,18 @@
 
 @DPATCH@
 
---- cecil-0.3/Makefile.old	2006-03-19 20:40:03.475726384 +0100
-+++ cecil-0.3/Makefile	2006-03-19 20:40:22.098895232 +0100
+--- cecil/Makefile.old	2006-07-04 16:48:11.733169250 +0200
++++ cecil/Makefile	2006-07-04 16:48:48.387460000 +0200
 @@ -1,7 +1,7 @@
  include config.make
  
  MCS = mcs
--MCS_FLAGS =
-+MCS_FLAGS = -keyfile:debian/Cecil.snk
+-KEY_FILE = ../../mcs/class/mono.snk
++KEY_FILE = debian/Cecil.snk
+ MCS_FLAGS = -keyfile:$(KEY_FILE)
  
  all: 
- 	$(MCS) $(MCS_FLAGS) @Mono.Cecil.dll.sources /target:library /out:Mono.Cecil.dll
-@@ -17,4 +17,5 @@
+@@ -18,4 +18,5 @@
  install: all mono-cecil.pc
  	mkdir -p $(prefix)/lib/Mono.Cecil
  	cp Mono.Cecil.dll $(prefix)/lib/Mono.Cecil

Added: cecil/trunk/debian/policy.0.4.Mono.Cecil.config
===================================================================
--- cecil/trunk/debian/policy.0.4.Mono.Cecil.config	2006-07-05 09:25:01 UTC (rev 2598)
+++ cecil/trunk/debian/policy.0.4.Mono.Cecil.config	2006-07-08 19:14:37 UTC (rev 2599)
@@ -0,0 +1,11 @@
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Mono.Cecil" publicKeyToken="9b4bd814fdde2e2e" />
+        <bindingRedirect oldVersion="0.4.1" newVersion="0.4.2"/>
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
+

Modified: cecil/trunk/debian/rules
===================================================================
--- cecil/trunk/debian/rules	2006-07-05 09:25:01 UTC (rev 2598)
+++ cecil/trunk/debian/rules	2006-07-08 19:14:37 UTC (rev 2599)
@@ -22,12 +22,17 @@
 build-stamp:
 	uudecode -o debian/Cecil.snk debian/Cecil.snk.uue
 	$(MAKE)
+	cd debian && al -link:policy.0.4.Mono.Cecil.config \
+                    -out:policy.0.4.Mono.Cecil.dll \
+                    -keyfile:Cecil.snk
+
 	touch build-stamp
 
 clean: unpatch
 	dh_testdir
 	dh_testroot
 	-$(MAKE) clean
+	rm -f debian/policy.0.4.Mono.Cecil.dll
 	rm -rf $(MONO_SHARED_DIR)/.wapi
 	rm -f build-stamp configure-stamp debian/Cecil.snk
 	rm -f config.make
@@ -44,8 +49,9 @@
 	# fix the version in the pkgconfig file
 	sed -i 's;^Version:.*;Version:\ $(UPVERSION);g' debian/tmp/usr/lib/pkgconfig/mono-cecil.pc
 	# fix the assemblies dir
-	mkdir -p debian/tmp/usr/lib/cli
-	mv debian/tmp/usr/lib/Mono.Cecil debian/tmp/usr/lib/cli/mono-cecil-$(ABIVERSION)
+	mkdir -p debian/tmp/usr/lib/cli/mono-cecil-$(ABIVERSION)
+	cp -a debian/tmp/usr/lib/Mono.Cecil/* debian/tmp/usr/lib/cli/mono-cecil-$(ABIVERSION)
+	cp -a debian/policy.0.4.Mono.Cecil* debian/tmp/usr/lib/cli/mono-cecil-$(ABIVERSION)
 	sed -i 's;^assemblies_dir=.*;assemblies_dir=$${prefix}/lib/cli/mono-cecil-$(ABIVERSION);g' debian/tmp/usr/lib/pkgconfig/mono-cecil.pc
 	# fix permissions
 	find debian/tmp -type f -name "*.dll" -or -name "*.mdb" -or -name "*.cs" -or -name "*.config" | xargs chmod -x
@@ -56,9 +62,9 @@
 	dh_installchangelogs ChangeLog
 	dh_installdocs
 	dh_installdirs
-	dh_installcligac
 	dh_install
 	dh_installman
+	dh_installcligac
 	dh_compress
 	dh_fixperms
 	dh_makeclilibs -m $(UPVERSION)