[Pkg-mono-svn-commits] [SCM] mono-tools branch, master, updated. debian/2.10-2

[Jo Shields]

The following commit has been merged in the master branch:
commit 7ad165c40281933612f6477bfadec1c7bf14cc9f
Author: Jo Shields <directhex at apebox.org>
Date:   Fri Jan 20 16:48:32 2012 +0000

    Automake 1.11.2 enforces C-libs-only in pkglib, so use a custom-defined programfilesdir for installing the main assembly.

diff --git a/debian/patches/automake_devs_need_a_new_job b/debian/patches/automake_devs_need_a_new_job
new file mode 100644
index 0000000..2d5b696
--- /dev/null
+++ b/debian/patches/automake_devs_need_a_new_job
@@ -0,0 +1,84 @@
+Index: mono-tools.git/Mono.Profiler/Mono.Profiler.Widgets/Makefile.am
+===================================================================
+--- mono-tools.git.orig/Mono.Profiler/Mono.Profiler.Widgets/Makefile.am	2012-01-20 16:45:55.000000000 +0000
++++ mono-tools.git/Mono.Profiler/Mono.Profiler.Widgets/Makefile.am	2012-01-20 16:46:07.000000000 +0000
+@@ -9,7 +9,8 @@
+ ASSEMBLY_MDB = 
+ endif
+ 
+-pkglib_DATA = $(ASSEMBLY) $(ASSEMBLY_MDB)
++programfilesdir = $(pkglibdir)
++programfiles_DATA = $(ASSEMBLY) $(ASSEMBLY_MDB)
+ 
+ CLEANFILES = $(ASSEMBLY) $(ASSEMBLY_MDB)
+ 
+Index: mono-tools.git/Mono.Profiler/heap-snapshot-explorer/Makefile.am
+===================================================================
+--- mono-tools.git.orig/Mono.Profiler/heap-snapshot-explorer/Makefile.am	2012-01-20 16:43:27.000000000 +0000
++++ mono-tools.git/Mono.Profiler/heap-snapshot-explorer/Makefile.am	2012-01-20 16:45:45.000000000 +0000
+@@ -9,7 +9,8 @@
+ ASSEMBLY_MDB = 
+ endif
+ 
+-pkglib_DATA = $(ASSEMBLY) $(ASSEMBLY_MDB)
++programfilesdir = $(pkglibdir)
++programfiles_DATA = $(ASSEMBLY) $(ASSEMBLY_MDB)
+ 
+ CLEANFILES = $(ASSEMBLY) $(ASSEMBLY_MDB)
+ 
+Index: mono-tools.git/Mono.Profiler/heap-snapshot-viewer/Makefile.am
+===================================================================
+--- mono-tools.git.orig/Mono.Profiler/heap-snapshot-viewer/Makefile.am	2012-01-20 16:46:34.000000000 +0000
++++ mono-tools.git/Mono.Profiler/heap-snapshot-viewer/Makefile.am	2012-01-20 16:46:41.000000000 +0000
+@@ -8,7 +8,8 @@
+ ASSEMBLY_MDB = 
+ endif
+ 
+-pkglib_DATA = $(ASSEMBLY) $(ASSEMBLY_MDB)
++programfilesdir = $(pkglibdir)
++programfiles_DATA = $(ASSEMBLY) $(ASSEMBLY_MDB)
+ bin_SCRIPTS = mprof-heap-viewer
+ man_MANS=man/man1/mprof-heap-viewer.1
+ 
+Index: mono-tools.git/Mono.Profiler/mprof-gui/Makefile.am
+===================================================================
+--- mono-tools.git.orig/Mono.Profiler/mprof-gui/Makefile.am	2012-01-20 16:46:14.000000000 +0000
++++ mono-tools.git/Mono.Profiler/mprof-gui/Makefile.am	2012-01-20 16:46:23.000000000 +0000
+@@ -8,7 +8,8 @@
+ ASSEMBLY_MDB = 
+ endif
+ 
+-pkglib_DATA = $(ASSEMBLY) $(ASSEMBLY_MDB)
++programfilesdir = $(pkglibdir)
++programfiles_DATA = $(ASSEMBLY) $(ASSEMBLY_MDB)
+ bin_SCRIPTS = emveepee
+ 
+ CLEANFILES = $(ASSEMBLY) $(ASSEMBLY_MDB)
+Index: mono-tools.git/Mono.Profiler/profiler-decoder-library/Makefile.am
+===================================================================
+--- mono-tools.git.orig/Mono.Profiler/profiler-decoder-library/Makefile.am	2012-01-20 16:47:07.000000000 +0000
++++ mono-tools.git/Mono.Profiler/profiler-decoder-library/Makefile.am	2012-01-20 16:47:15.000000000 +0000
+@@ -9,7 +9,8 @@
+ ASSEMBLY_MDB = 
+ endif
+ 
+-pkglib_DATA = $(ASSEMBLY) $(ASSEMBLY_MDB)
++programfilesdir = $(pkglibdir)
++programfiles_DATA = $(ASSEMBLY) $(ASSEMBLY_MDB)
+ 
+ CLEANFILES = $(ASSEMBLY) $(ASSEMBLY_MDB)
+ 
+Index: mono-tools.git/Mono.Profiler/profiler-file-decoder/Makefile.am
+===================================================================
+--- mono-tools.git.orig/Mono.Profiler/profiler-file-decoder/Makefile.am	2012-01-20 16:46:50.000000000 +0000
++++ mono-tools.git/Mono.Profiler/profiler-file-decoder/Makefile.am	2012-01-20 16:47:00.000000000 +0000
+@@ -9,7 +9,8 @@
+ ASSEMBLY_MDB = 
+ endif
+ 
+-pkglib_DATA = $(ASSEMBLY) $(ASSEMBLY_MDB)
++programfilesdir = $(pkglibdir)
++programfiles_DATA = $(ASSEMBLY) $(ASSEMBLY_MDB)
+ bin_SCRIPTS = mprof-decoder
+ man_MANS = man/man1/mprof-decoder.1 
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 7842e30..0e78e8b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 add_missing_Global.asax.patch
 00-fix_build_system.patch
+automake_devs_need_a_new_job

-- 
mono-tools