Merge branch '3.6.x'

1 files changed, 0 insertions, 27 deletions

diff --git a/debian/patches/0211_nxcomp_set_default_options.full+lite.patch b/debian/patches/0211_nxcomp_set_default_options.full+lite.patch
deleted file mode 100644
index 0472db21d..000000000
--- a/debian/patches/0211_nxcomp_set_default_options.full+lite.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Set default pack and link options to avoid damage of session.
-Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de>
-
---- a/nxcomp/Loop.cpp
-+++ b/nxcomp/Loop.cpp
-@@ -8328,8 +8328,8 @@ int ParseEnvironmentOptions(const char *
- 
-         cerr << "Error" << ": Can't identify 'link' option in string '"
-              << value << "'.\n";
--
--        return -1;
-+        if (ParseLinkOption("adsl") < 0)
-+           return -1;
-       }
-     }
-     else if (strcasecmp(name, "limit") == 0)
-@@ -8783,8 +8783,8 @@ int ParseEnvironmentOptions(const char *
- 
-         cerr << "Error" << ": Can't identify pack method for string '"
-              << value << "'.\n";
--
--        return -1;
-+        if (ParsePackOption("nopack")<0)
-+           return -1;
-       }
-     }
-     else if (strcasecmp(name, "core") == 0)