[SCM] davmail packaging branch, master, updated. upstream/4.1.0-2042-14-ge008472
Alexandre Rossi
alexandre.rossi at gmail.com
Mon Oct 1 12:44:24 UTC 2012
The following commit has been merged in the master branch:
commit e008472f9ed0de5aa9e570222bb222cfa0b19c1e
Author: Alexandre Rossi <alexandre.rossi at gmail.com>
Date: Mon Oct 1 14:34:46 2012 +0200
refresh other patches
diff --git a/debian/patches/jackrabbit2 b/debian/patches/jackrabbit2
index 08ec65b..a81f132 100644
--- a/debian/patches/jackrabbit2
+++ b/debian/patches/jackrabbit2
@@ -2,10 +2,10 @@ Description: Port to jackrabbit 2 API
Forwarded: no
Author: Alexandre Rossi <alexandre.rossi at gmail.com>
-Index: davmail-src-3.9.9-1976/src/java/davmail/exchange/dav/DavExchangeSession.java
+Index: davmail.git/src/java/davmail/exchange/dav/DavExchangeSession.java
===================================================================
---- davmail-src-3.9.9-1976.orig/src/java/davmail/exchange/dav/DavExchangeSession.java 2012-07-07 00:55:54.000000000 +0200
-+++ davmail-src-3.9.9-1976/src/java/davmail/exchange/dav/DavExchangeSession.java 2012-07-18 11:31:08.331318904 +0200
+--- davmail.git.orig/src/java/davmail/exchange/dav/DavExchangeSession.java 2012-10-01 13:58:34.932661592 +0200
++++ davmail.git/src/java/davmail/exchange/dav/DavExchangeSession.java 2012-10-01 13:59:02.955171932 +0200
@@ -41,6 +41,7 @@
import org.apache.jackrabbit.webdav.property.DavProperty;
import org.apache.jackrabbit.webdav.property.DavPropertyNameSet;
@@ -14,7 +14,7 @@ Index: davmail-src-3.9.9-1976/src/java/davmail/exchange/dav/DavExchangeSession.j
import org.w3c.dom.Node;
import javax.mail.MessagingException;
-@@ -1685,7 +1686,7 @@
+@@ -1691,7 +1692,7 @@
// trigger activeSync push event, only if davmail.forceActiveSyncUpdate setting is true
if ((status == HttpStatus.SC_OK || status == HttpStatus.SC_CREATED) &&
(Settings.getBooleanProperty("davmail.forceActiveSyncUpdate"))) {
@@ -23,7 +23,7 @@ Index: davmail-src-3.9.9-1976/src/java/davmail/exchange/dav/DavExchangeSession.j
// Set contentclass to make ActiveSync happy
propertyList.add(Field.createDavProperty("contentclass", contentClass));
// ... but also set PR_INTERNET_CONTENT to preserve custom properties
-@@ -1884,7 +1885,7 @@
+@@ -1894,7 +1895,7 @@
} else if (statusCode != HttpStatus.SC_CREATED) {
throw DavGatewayHttpClientFacade.buildHttpException(method);
} else if (folderPath.equalsIgnoreCase("/users/" + getEmail() + "/calendar")) {
@@ -32,7 +32,7 @@ Index: davmail-src-3.9.9-1976/src/java/davmail/exchange/dav/DavExchangeSession.j
getWellKnownFolders();
}
} finally {
-@@ -2317,7 +2318,7 @@
+@@ -2336,7 +2337,7 @@
public void processItem(String folderPath, String itemName) throws IOException {
String eventPath = URIUtil.encodePath(getFolderPath(folderPath) + '/' + convertItemNameToEML(itemName));
// do not delete calendar messages, mark read and processed
@@ -41,7 +41,7 @@ Index: davmail-src-3.9.9-1976/src/java/davmail/exchange/dav/DavExchangeSession.j
list.add(Field.createDavProperty("processed", "true"));
list.add(Field.createDavProperty("read", "1"));
PropPatchMethod patchMethod = new PropPatchMethod(eventPath, list);
-@@ -2359,7 +2360,7 @@
+@@ -2378,7 +2379,7 @@
}
// failover for Exchange 2007, use PROPPATCH with forced timezone
if (fakeEventUrl == null) {
@@ -50,7 +50,7 @@ Index: davmail-src-3.9.9-1976/src/java/davmail/exchange/dav/DavExchangeSession.j
propertyList.add(Field.createDavProperty("contentclass", "urn:content-classes:appointment"));
propertyList.add(Field.createDavProperty("outlookmessageclass", "IPM.Appointment"));
propertyList.add(Field.createDavProperty("instancetype", "0"));
-@@ -2460,8 +2461,8 @@
+@@ -2479,8 +2480,8 @@
return new Contact(getFolderPath(folderPath), itemName, properties, etag, noneMatch).createOrUpdate();
}
@@ -61,7 +61,7 @@ Index: davmail-src-3.9.9-1976/src/java/davmail/exchange/dav/DavExchangeSession.j
if (properties != null) {
for (Map.Entry<String, String> entry : properties.entrySet()) {
if ("read".equals(entry.getKey())) {
-@@ -2506,7 +2507,7 @@
+@@ -2527,7 +2528,7 @@
public void createMessage(String folderPath, String messageName, HashMap<String, String> properties, MimeMessage mimeMessage) throws IOException {
String messageUrl = URIUtil.encodePathQuery(getFolderPath(folderPath) + '/' + messageName);
PropPatchMethod patchMethod;
@@ -70,7 +70,7 @@ Index: davmail-src-3.9.9-1976/src/java/davmail/exchange/dav/DavExchangeSession.j
if (properties != null && properties.containsKey("draft")) {
// note: draft is readonly after create, create the message first with requested messageFlags
-@@ -2549,7 +2550,7 @@
+@@ -2570,7 +2571,7 @@
if (code == HttpStatus.SC_NOT_ACCEPTABLE) {
LOGGER.warn("Draft message creation failed, failover to property update. Note: attachments are lost");
@@ -79,7 +79,7 @@ Index: davmail-src-3.9.9-1976/src/java/davmail/exchange/dav/DavExchangeSession.j
propertyList.add(Field.createDavProperty("to", mimeMessage.getHeader("to", ",")));
propertyList.add(Field.createDavProperty("cc", mimeMessage.getHeader("cc", ",")));
propertyList.add(Field.createDavProperty("message-id", mimeMessage.getHeader("message-id", ",")));
-@@ -2613,7 +2614,7 @@
+@@ -2634,7 +2635,7 @@
try {
// need to update bcc after put
if (mimeMessage.getHeader("Bcc") != null) {
@@ -88,7 +88,7 @@ Index: davmail-src-3.9.9-1976/src/java/davmail/exchange/dav/DavExchangeSession.j
davProperties.add(Field.createDavProperty("bcc", mimeMessage.getHeader("Bcc", ",")));
patchMethod = new PropPatchMethod(messageUrl, davProperties);
try {
-@@ -2705,7 +2706,7 @@
+@@ -2726,7 +2727,7 @@
createMessage(DRAFTS, itemName, properties, mimeMessage);
MoveMethod method = new MoveMethod(URIUtil.encodePath(getFolderPath(DRAFTS + '/' + itemName)),
URIUtil.encodePath(getFolderPath(SENDMSG)), false);
@@ -97,10 +97,10 @@ Index: davmail-src-3.9.9-1976/src/java/davmail/exchange/dav/DavExchangeSession.j
if (!Settings.getBooleanProperty("davmail.smtpSaveInSent", true)) {
method.setRequestHeader("Saveinsent", "f");
}
-Index: davmail-src-3.9.9-1976/src/java/davmail/exchange/dav/Field.java
+Index: davmail.git/src/java/davmail/exchange/dav/Field.java
===================================================================
---- davmail-src-3.9.9-1976.orig/src/java/davmail/exchange/dav/Field.java 2012-06-12 00:01:41.000000000 +0200
-+++ davmail-src-3.9.9-1976/src/java/davmail/exchange/dav/Field.java 2012-07-18 11:25:07.520653273 +0200
+--- davmail.git.orig/src/java/davmail/exchange/dav/Field.java 2012-10-01 13:58:34.932661592 +0200
++++ davmail.git/src/java/davmail/exchange/dav/Field.java 2012-10-01 13:59:02.967171294 +0200
@@ -19,7 +19,7 @@
package davmail.exchange.dav;
@@ -110,7 +110,7 @@ Index: davmail-src-3.9.9-1976/src/java/davmail/exchange/dav/Field.java
import org.apache.jackrabbit.webdav.property.DavPropertyName;
import org.apache.jackrabbit.webdav.property.DefaultDavProperty;
import org.apache.jackrabbit.webdav.xml.DomUtil;
-@@ -183,7 +183,7 @@
+@@ -184,7 +184,7 @@
createField(URN_SCHEMAS_CALENDAR, "exdate"); // DistinguishedPropertySetType.PublicStrings/urn:schemas:calendar:exdate/PtypMultipleTime
createField(SCHEMAS_MAPI, "reminderset"); // PidLidReminderSet
@@ -119,7 +119,7 @@ Index: davmail-src-3.9.9-1976/src/java/davmail/exchange/dav/Field.java
// TODO
createField(SCHEMAS_MAPI, "allattendeesstring"); // PidLidAllAttendeesString
-@@ -197,7 +197,7 @@
+@@ -198,7 +198,7 @@
createField(URN_SCHEMAS_CALENDAR, "busystatus"); // DistinguishedPropertySetType.PublicStrings/urn:schemas:calendar:busystatus/String
createField(URN_SCHEMAS_CALENDAR, "exrule"); // DistinguishedPropertySetType.PublicStrings/urn:schemas:calendar:exrule/PtypMultipleString
createField(URN_SCHEMAS_CALENDAR, "recurrenceidrange"); // DistinguishedPropertySetType.PublicStrings/urn:schemas:calendar:recurrenceidrange/String
@@ -128,7 +128,7 @@ Index: davmail-src-3.9.9-1976/src/java/davmail/exchange/dav/Field.java
createField(URN_SCHEMAS_CALENDAR, "reminderoffset"); // DistinguishedPropertySetType.PublicStrings/urn:schemas:calendar:reminderoffset/Integer
createField(URN_SCHEMAS_CALENDAR, "timezone"); // DistinguishedPropertySetType.PublicStrings/urn:schemas:calendar:timezone/String
-@@ -286,7 +286,7 @@
+@@ -287,7 +287,7 @@
createField("description", URN_SCHEMAS_HTTPMAIL, "textdescription"); // PR_BODY 0x1000 String
createField("im", SCHEMAS_MAPI, "InstMsg"); // InstantMessagingAddress DistinguishedPropertySetType.Address/0x00008062/String
createField(URN_SCHEMAS_CONTACTS, "othermobile"); // PR_CAR_TELEPHONE_NUMBER 0x3A1E String
@@ -137,7 +137,7 @@ Index: davmail-src-3.9.9-1976/src/java/davmail/exchange/dav/Field.java
createField(URN_SCHEMAS_CONTACTS, "otherTelephone"); // PR_OTHER_TELEPHONE_NUMBER 0x3A21 String
createField(URN_SCHEMAS_CONTACTS, "homefax"); // PR_HOME_FAX_NUMBER 0x3A25 String
-@@ -527,9 +527,9 @@
+@@ -528,9 +528,9 @@
*
* @param alias DavMail field alias
* @param value field value
diff --git a/debian/patches/no-osx-tray b/debian/patches/no-osx-tray
index 0ae35a3..1f4d2b5 100644
--- a/debian/patches/no-osx-tray
+++ b/debian/patches/no-osx-tray
@@ -2,10 +2,10 @@ Description: Remove OSX specific code.
Forwarded: not-needed
Author: Alexandre Rossi <alexandre.rossi at gmail.com>
-Index: davmail-src-4.0.0-2016/src/java/davmail/ui/tray/DavGatewayTray.java
+Index: davmail.git/src/java/davmail/ui/tray/DavGatewayTray.java
===================================================================
---- davmail-src-4.0.0-2016.orig/src/java/davmail/ui/tray/DavGatewayTray.java 2012-09-14 14:22:17.814184063 +0200
-+++ davmail-src-4.0.0-2016/src/java/davmail/ui/tray/DavGatewayTray.java 2012-09-14 14:22:23.390184274 +0200
+--- davmail.git.orig/src/java/davmail/ui/tray/DavGatewayTray.java 2012-10-01 13:58:35.060654788 +0200
++++ davmail.git/src/java/davmail/ui/tray/DavGatewayTray.java 2012-10-01 13:58:50.939810662 +0200
@@ -240,11 +240,7 @@
if (davGatewayTray == null) {
try {
@@ -33,11 +33,11 @@ Index: davmail-src-4.0.0-2016/src/java/davmail/ui/tray/DavGatewayTray.java
davGatewayTray.init();
}
}
-Index: davmail-src-4.0.0-2016/build.xml
+Index: davmail.git/build.xml
===================================================================
---- davmail-src-4.0.0-2016.orig/build.xml 2012-09-14 14:22:12.906183875 +0200
-+++ davmail-src-4.0.0-2016/build.xml 2012-09-14 14:24:53.494189982 +0200
-@@ -58,7 +58,8 @@
+--- davmail.git.orig/build.xml 2012-10-01 13:58:42.156277589 +0200
++++ davmail.git/build.xml 2012-10-01 13:58:50.959809598 +0200
+@@ -61,7 +61,8 @@
<target name="compile" depends="init">
<mkdir dir="target/classes"/>
<javac srcdir="src/java" destdir="target/classes" source="1.5" target="1.5" debug="on" encoding="UTF-8"
diff --git a/debian/patches/no-windows-service b/debian/patches/no-windows-service
index 58cf84a..0060ffc 100644
--- a/debian/patches/no-windows-service
+++ b/debian/patches/no-windows-service
@@ -2,11 +2,11 @@ Description: Avoid winrun4j build dependency
Forwarded: not-needed
Author: Alexandre Rossi <alexandre.rossi at gmail.com>
-Index: davmail-src-3.9.9-1976/build.xml
+Index: davmail.git/build.xml
===================================================================
---- davmail-src-3.9.9-1976.orig/build.xml 2012-09-05 10:26:05.632581656 +0200
-+++ davmail-src-3.9.9-1976/build.xml 2012-09-05 10:26:47.276583673 +0200
-@@ -58,6 +58,7 @@
+--- davmail.git.orig/build.xml 2012-10-01 13:58:35.152649898 +0200
++++ davmail.git/build.xml 2012-10-01 13:58:42.156277589 +0200
+@@ -61,6 +61,7 @@
<target name="compile" depends="init">
<mkdir dir="target/classes"/>
<javac srcdir="src/java" destdir="target/classes" source="1.5" target="1.5" debug="on" encoding="UTF-8"
--
davmail packaging
More information about the pkg-java-commits
mailing list