[Pkg-cli-apps-commits] [SCM] monodevelop branch, master, updated. debian/2.8.5+dfsg-3

Jo Shields directhex at apebox.org
Fri Jan 20 17:32:47 UTC 2012


The following commit has been merged in the master branch:
commit 980e6b4d756cb1aae3c27de8656d656db7ab5d05
Author: Jo Shields <directhex at apebox.org>
Date:   Fri Jan 20 17:28:11 2012 +0000

    Update Autotools exporter template not to try and use pkglib_SCRIPTS for assemblies, as Automake 1.11.2 does not permit this.

diff --git a/debian/patches/generate_automake_1.11.2_compatible_makefiles.patch b/debian/patches/generate_automake_1.11.2_compatible_makefiles.patch
new file mode 100644
index 0000000..317f414
--- /dev/null
+++ b/debian/patches/generate_automake_1.11.2_compatible_makefiles.patch
@@ -0,0 +1,14 @@
+Index: monodevelop/src/addins/MonoDevelop.Autotools/templates/Makefile.include
+===================================================================
+--- monodevelop.orig/src/addins/MonoDevelop.Autotools/templates/Makefile.include	2012-01-20 17:26:47.000000000 +0000
++++ monodevelop/src/addins/MonoDevelop.Autotools/templates/Makefile.include	2012-01-20 17:27:20.000000000 +0000
+@@ -62,7 +62,8 @@
+ CLEANFILES += $(ASSEMBLY) $(ASSEMBLY).mdb $(BINARIES) $(build_resx_resources) $(build_satellite_assembly_list)
+ DISTCLEANFILES = $(GENERATED_FILES) $(pc_files) $(BUILD_DIR)/*
+ 
+-pkglib_SCRIPTS = $(ASSEMBLY)
++programfilesdir = $(pkglibdir)
++programfiles_DATA = $(ASSEMBLY)
+ bin_SCRIPTS = $(BINARIES)
+ 
+ %%DEPLOY_DIRS%%
diff --git a/debian/patches/series b/debian/patches/series
index e73c65f..da32b45 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,3 +16,4 @@ use_csc.patch
 #remove_support_for_soft_debugger.patch
 remove_support_for_moonlight.patch
 no_appmenu
+generate_automake_1.11.2_compatible_makefiles.patch

-- 
monodevelop



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