[SCM] davmail packaging branch, master, updated. 02c2b101f323ee4dc652f941a0d9441a59cfa0da

[Alexandre Rossi]

The following commit has been merged in the master branch:
commit 45e9801ae65b01ff3e99323ab0f2915552172051
Author: Alexandre Rossi <alexandre.rossi at gmail.com>
Date:   Mon Oct 1 10:57:23 2012 +0200

    refresh htmlcleaner 2.2 patch

diff --git a/debian/patches/htmlcleaner22 b/debian/patches/htmlcleaner22
index b7b6c30..9b16035 100644
--- a/debian/patches/htmlcleaner22
+++ b/debian/patches/htmlcleaner22
@@ -2,10 +2,10 @@ Description: Port to HTMLCleaner 2.2 API
 Forwarded: no
 Author: Alexandre Rossi <alexandre.rossi at gmail.com>
 
-Index: davmail-src-3.9.9-1976/src/java/davmail/exchange/ExchangeSession.java
+Index: davmail-src-4.0.0-2016/src/java/davmail/exchange/ExchangeSession.java
 ===================================================================
---- davmail-src-3.9.9-1976.orig/src/java/davmail/exchange/ExchangeSession.java	2012-07-07 00:55:55.000000000 +0200
-+++ davmail-src-3.9.9-1976/src/java/davmail/exchange/ExchangeSession.java	2012-07-18 11:39:24.887318823 +0200
+--- davmail-src-4.0.0-2016.orig/src/java/davmail/exchange/ExchangeSession.java	2012-08-26 23:02:14.000000000 +0200
++++ davmail-src-4.0.0-2016/src/java/davmail/exchange/ExchangeSession.java	2012-09-14 13:59:39.666132414 +0200
 @@ -33,8 +33,8 @@
  import org.apache.commons.httpclient.params.HttpClientParams;
  import org.apache.commons.httpclient.util.URIUtil;
@@ -17,7 +17,7 @@ Index: davmail-src-3.9.9-1976/src/java/davmail/exchange/ExchangeSession.java
  import org.htmlcleaner.HtmlCleaner;
  import org.htmlcleaner.TagNode;
  
-@@ -440,8 +440,8 @@
+@@ -475,8 +475,8 @@
                      for (Object script : scriptList) {
                          List contents = ((TagNode) script).getChildren();
                          for (Object content : contents) {
@@ -28,7 +28,7 @@ Index: davmail-src-3.9.9-1976/src/java/davmail/exchange/ExchangeSession.java
                                  String sUrl = StringUtil.getToken(scriptValue, "var a_sUrl = \"", "\"");
                                  String sLgn = StringUtil.getToken(scriptValue, "var a_sLgnQS = \"", "\"");
                                  if (sLgn == null) {
-@@ -454,9 +454,9 @@
+@@ -489,9 +489,9 @@
                                      logonMethod = buildLogonMethod(httpClient, newInitMethod);
                                  }
  

-- 
davmail packaging