[Pkg-cli-apps-commits] [SCM] monodevelop branch, master, updated. debian/2.8.6.3+dfsg-2-9-gc063407

Jo Shields directhex at apebox.org
Tue May 15 17:38:35 UTC 2012


The following commit has been merged in the master branch:
commit c06340734220d8a60c34448a3bc2ca4d40a090e6
Author: Jo Shields <directhex at apebox.org>
Date:   Tue May 15 18:24:46 2012 +0100

    Upstream's Makefile.am tries to call into ../external, which obviously is
    wrong in a tarball build.

diff --git a/debian/patches/series b/debian/patches/series
index 2328359..e76e4cd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,6 +5,7 @@
 #use_keyfile_not_keycontainer.patch
 #port_to_nunit_2.5.patch
 #make_4.0_default_framework.patch
+stop_trying_to_leave_root_folder.patch
 dont_build_codemetrics.patch
 link_system_nunit.patch
 use_libsvn1.patch
diff --git a/debian/patches/stop_trying_to_leave_root_folder.patch b/debian/patches/stop_trying_to_leave_root_folder.patch
new file mode 100644
index 0000000..f0ff9a0
--- /dev/null
+++ b/debian/patches/stop_trying_to_leave_root_folder.patch
@@ -0,0 +1,10 @@
+Index: monodevelop/Makefile.am
+===================================================================
+--- monodevelop.orig/Makefile.am	2012-05-15 17:16:56.406504984 +0100
++++ monodevelop/Makefile.am	2012-05-15 18:24:11.825701399 +0100
+@@ -1,4 +1,4 @@
+-SUBDIRS = ../external contrib src po man theme-icons build tests
++SUBDIRS = contrib src po man theme-icons build tests
+ 
+ #capture aclocal flags for autoreconf
+ ACLOCAL_AMFLAGS=$(ACLOCAL_FLAGS)

-- 
monodevelop



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