[Pkg-cli-libs-commits] [SCM] mono-addins branch, master, updated. debian/0.6.2-2

Jo Shields directhex at apebox.org
Mon Jan 23 01:14:43 UTC 2012


The following commit has been merged in the master branch:
commit a79717825061c0db48512060a3aea4040076e8b7
Author: Jo Shields <directhex at apebox.org>
Date:   Mon Jan 23 01:07:47 2012 +0000

    Add a workaround for Autpmake 1.11.2's insistance that you can't
    store SCRIPTS in pkglibdir

diff --git a/debian/patches/automake_1.11.2_pkglibdir_workaround.patch b/debian/patches/automake_1.11.2_pkglibdir_workaround.patch
new file mode 100644
index 0000000..49c1ae0
--- /dev/null
+++ b/debian/patches/automake_1.11.2_pkglibdir_workaround.patch
@@ -0,0 +1,15 @@
+Index: mono-addins/mautil/Makefile.am
+===================================================================
+--- mono-addins.orig/mautil/Makefile.am	2012-01-23 01:07:13.000000000 +0000
++++ mono-addins/mautil/Makefile.am	2012-01-23 01:07:33.000000000 +0000
+@@ -36,8 +36,8 @@
+ 
+ include $(top_srcdir)/Makefile.include
+ 
+-pkglibdir = $(libdir)/mono/mono-addins
+-pkglib_SCRIPTS = $(ASSEMBLY) $(build_datafiles)
++programfilesdir = $(libdir)/mono/mono-addins
++programfiles_SCRIPTS = $(ASSEMBLY) $(build_datafiles)
+ 
+ man_MANS = mautil.1
+ EXTRA_DIST += $(man_MANS)
diff --git a/debian/patches/series b/debian/patches/series
index 08aa04d..569c153 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 0003-fix_mono-addins-gui.pc.patch.patch
 0004-fix_mono-addins-setup.pc.patch.patch
 0005-fix_mono-addins-msbuild.pc.patch.patch
+automake_1.11.2_pkglibdir_workaround.patch

-- 
mono-addins



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