Merge branch '3.0' into 3.1

2014-07-04 15:27:01 +02:00 · 2014-07-04 15:27:01 +02:00 · 66fbd4bbc9
commit 66fbd4bbc9
parent fd250b75e8 95c2fe7bf5
1 changed files with 14 additions and 0 deletions
--- a/samba/samba-install_yapp_driver.patch
+++ b/samba/samba-install_yapp_driver.patch
@ -0,0 +1,14 @@
+--- wscript_build.orig	2014-07-04 11:51:11.280336055 +0200
+++ wscript_build	2014-07-04 11:52:11.564922410 +0200
+@@ -28,10 +28,6 @@
+                   Parse/Pidl/Samba3/ServerNDR.pm
+                   Parse/Pidl/Compat.pm
+                   Parse/Pidl/NDR.pm
+                  Parse/Yapp/Driver.pm
+                   ''',
+                   flat=False)
+-
+-if not bld.CONFIG_SET('USING_SYSTEM_PARSE_YAPP_DRIVER'):
+-    bld.INSTALL_FILES(bld.env.PERL_LIB_INSTALL_DIR,
+-                      'Parse/Yapp/Driver.pm',
+-                      flat=False)