[Pkg-mono-svn-commits] rev 3853 - in mono-tools/trunk/debian: . patches

[Mirco Bauer]

Author: meebey
Date: 2008-11-27 00:28:52 +0000 (Thu, 27 Nov 2008)
New Revision: 3853

Added:
   mono-tools/trunk/debian/patches/dont_bundle_cecil.patch
Modified:
   mono-tools/trunk/debian/changelog
   mono-tools/trunk/debian/patches/series
Log:
  * debian/patches/dont_bundle_cecil.patch:
    + Don't copy the Mono.Cecil library during the build into the binary
      package, as it's already in the GAC.



Modified: mono-tools/trunk/debian/changelog
===================================================================
--- mono-tools/trunk/debian/changelog	2008-11-26 23:28:02 UTC (rev 3852)
+++ mono-tools/trunk/debian/changelog	2008-11-27 00:28:52 UTC (rev 3853)
@@ -1,5 +1,6 @@
 mono-tools (2.0-1) experimental; urgency=low
 
+  [ David Paleino ]
   * New upstream release
   * Group Policy:
     + implemented get-orig-source in debian/rules
@@ -30,6 +31,11 @@
     + converted to quilt
     + 00-fix_build_system.patch added
 
+  [ Mirco Bauer ]
+  * debian/patches/dont_bundle_cecil.patch:
+    + Don't copy the Mono.Cecil library during the build into the binary
+      package, as it's already in the GAC.
+
  -- David Paleino <d.paleino at gmail.com>  Thu, 27 Nov 2008 00:12:02 +0100
 
 mono-tools (1.9-2) unstable; urgency=medium

Added: mono-tools/trunk/debian/patches/dont_bundle_cecil.patch
===================================================================
--- mono-tools/trunk/debian/patches/dont_bundle_cecil.patch	                        (rev 0)
+++ mono-tools/trunk/debian/patches/dont_bundle_cecil.patch	2008-11-27 00:28:52 UTC (rev 3853)
@@ -0,0 +1,29 @@
+--- mono-tools-2.0.orig/gui-compare/Makefile.am
++++ mono-tools-2.0/gui-compare/Makefile.am
+@@ -1,8 +1,8 @@
+ guicomparedir=$(prefix)/lib/gui-compare
+ bin_SCRIPTS = gui-compare
+-guicompare_DATA = gui-compare.exe Mono.Cecil.dll
++guicompare_DATA = gui-compare.exe
+ 
+-CLEANFILES = gui-compare.exe gui-compare.exe.mdb Mono.Cecil.dll  gui-compare
++CLEANFILES = gui-compare.exe gui-compare.exe.mdb gui-compare
+ 
+ 
+ gui_compare_sources = \
+@@ -53,12 +53,9 @@
+ 
+ EXTRA_DIST = $(gui_compare_sources) $(gui_compare_resources) gui-compare.mds gui-compare.mdp  gui-compare.in
+ 
+-packages = -pkg:gtk-sharp-2.0 -pkg:glib-sharp-2.0 -pkg:glade-sharp-2.0 -r:Mono.Cecil.dll
+-assemblies = -r:System -r:Mono.Posix -r:System.Xml
++packages = -pkg:gtk-sharp-2.0 -pkg:glib-sharp-2.0 -pkg:glade-sharp-2.0
++assemblies = -r:System -r:Mono.Posix -r:System.Xml -r:$(CECIL_ASM)
+ ress= $(foreach res,$(gui_compare_resources), $(addprefix -resource:,$(res)),$(notdir $(res)))
+ 
+-Mono.Cecil.dll: 
+-	cp $(CECIL_ASM) .
+-
+-gui-compare.exe: $(gui_compare_sources) $(gui_compare_resources) Mono.Cecil.dll
++gui-compare.exe: $(gui_compare_sources) $(gui_compare_resources)
+ 	$(GMCS) -noconfig -codepage:utf8 -warn:4 -optimize+ -debug -define:DEBUG -target:exe -out:gui-compare.exe $(gui_compare_sources) $(ress) $(packages) $(assemblies)

Modified: mono-tools/trunk/debian/patches/series
===================================================================
--- mono-tools/trunk/debian/patches/series	2008-11-26 23:28:02 UTC (rev 3852)
+++ mono-tools/trunk/debian/patches/series	2008-11-27 00:28:52 UTC (rev 3853)
@@ -6,3 +6,4 @@
 #05-cecil.patch
 #06-nunit_2.4_port.patch
 #07-webkit-sharp_port.patch
+dont_bundle_cecil.patch