[SCM] davmail packaging branch, master, updated. debian/4.1.0-2042-1_pre+1-15-ga4fbf3b
Matthias Schmitz
matthias at sigxcpu.org
Sat Apr 13 01:18:17 UTC 2013
The following commit has been merged in the master branch:
commit e901398591424e6063635ac162d2bbc91fef2e61
Author: Matthias Schmitz <matthias at sigxcpu.org>
Date: Sat Apr 13 03:01:19 2013 +0200
Rename debian/patches/*
diff --git a/debian/patches/0001-no-windows-service.patch b/debian/patches/0001-no-windows-service.patch
new file mode 100644
index 0000000..3894072
--- /dev/null
+++ b/debian/patches/0001-no-windows-service.patch
@@ -0,0 +1,20 @@
+From: Alexandre Rossi <alexandre.rossi at gmail.com>
+Date: Mon, 01 Oct 2012 13:58:42 +0200
+Subject: Avoid winrun4j build dependency
+
+---
+ build.xml | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/build.xml b/build.xml
+index 5fec007..ff23d1e 100644
+--- a/build.xml
++++ b/build.xml
+@@ -69,6 +69,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"
++ excludes="davmail/service/DavService.java"
+ includeantruntime="false">
+ <classpath>
+ <path refid="classpath"/>
diff --git a/debian/patches/no-osx-tray b/debian/patches/0002-no-osx-tray.patch
similarity index 65%
copy from debian/patches/no-osx-tray
copy to debian/patches/0002-no-osx-tray.patch
index b454e40..c9d4108 100644
--- a/debian/patches/no-osx-tray
+++ b/debian/patches/0002-no-osx-tray.patch
@@ -1,12 +1,31 @@
-Description: Remove OSX specific code.
-Forwarded: not-needed
-Author: Alexandre Rossi <alexandre.rossi at gmail.com>
+From: Alexandre Rossi <alexandre.rossi at gmail.com>
+Date: Sat, 13 Apr 2013 02:50:33 +0200
+Subject: no-osx-tray
-Index: davmail.git/src/java/davmail/ui/tray/DavGatewayTray.java
-===================================================================
---- 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 @@
+---
+ build.xml | 3 ++-
+ src/java/davmail/ui/tray/DavGatewayTray.java | 13 ++-----------
+ 2 files changed, 4 insertions(+), 12 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index ff23d1e..89bd6dd 100644
+--- a/build.xml
++++ b/build.xml
+@@ -69,7 +69,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"
+- excludes="davmail/service/DavService.java"
++ excludes="davmail/service/DavService.java,
++ davmail/ui/tray/OSXAwtGatewayTray.java"
+ includeantruntime="false">
+ <classpath>
+ <path refid="classpath"/>
+diff --git a/src/java/davmail/ui/tray/DavGatewayTray.java b/src/java/davmail/ui/tray/DavGatewayTray.java
+index cff867b..13e7029 100644
+--- a/src/java/davmail/ui/tray/DavGatewayTray.java
++++ b/src/java/davmail/ui/tray/DavGatewayTray.java
+@@ -240,11 +240,7 @@ public final class DavGatewayTray {
if (davGatewayTray == null) {
try {
if (SystemTray.isSupported()) {
@@ -19,7 +38,7 @@ Index: davmail.git/src/java/davmail/ui/tray/DavGatewayTray.java
davGatewayTray.init();
}
} catch (NoClassDefFoundError e) {
-@@ -252,12 +248,7 @@
+@@ -252,12 +248,7 @@ public final class DavGatewayTray {
}
}
if (davGatewayTray == null) {
@@ -33,17 +52,3 @@ Index: davmail.git/src/java/davmail/ui/tray/DavGatewayTray.java
davGatewayTray.init();
}
}
-Index: davmail.git/build.xml
-===================================================================
---- 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"
-- excludes="davmail/service/DavService.java"
-+ excludes="davmail/service/DavService.java,
-+ davmail/ui/tray/OSXAwtGatewayTray.java"
- includeantruntime="false">
- <classpath>
- <path refid="classpath"/>
diff --git a/debian/patches/base64-enc-dec b/debian/patches/0003-base64-enc-dec.patch
similarity index 93%
rename from debian/patches/base64-enc-dec
rename to debian/patches/0003-base64-enc-dec.patch
index 5fbebbc..d2d52e7 100644
--- a/debian/patches/base64-enc-dec
+++ b/debian/patches/0003-base64-enc-dec.patch
@@ -1,4 +1,6 @@
-Description: Add BASE64MailboxDecoder and BASE64MailboxEncoder
+From: Alexandre Rossi <alexandre.rossi at gmail.com>
+Date: Sat, 13 Apr 2013 02:50:33 +0200
+Subject: base64-enc-dec
Those are missing in libgnumail-java and needed to build davmail. The
alternative would be to depend on javamail which is now DFSG-free
@@ -7,11 +9,18 @@ alternative would be to depend on javamail which is now DFSG-free
Origin: javamail source code, http://kenai.com/projects/javamail/downloads
Forwarded: not-needed
Author: Alexandre Rossi <alexandre.rossi at gmail.com>
+---
+ .../mail/imap/protocol/BASE64MailboxDecoder.java | 194 +++++++++++++++
+ .../mail/imap/protocol/BASE64MailboxEncoder.java | 260 ++++++++++++++++++++
+ 2 files changed, 454 insertions(+)
+ create mode 100644 src/java/com/sun/mail/imap/protocol/BASE64MailboxDecoder.java
+ create mode 100644 src/java/com/sun/mail/imap/protocol/BASE64MailboxEncoder.java
-Index: davmail-src-3.9.9-1976/src/java/com/sun/mail/imap/protocol/BASE64MailboxDecoder.java
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ davmail-src-3.9.9-1976/src/java/com/sun/mail/imap/protocol/BASE64MailboxDecoder.java 2012-08-24 15:31:07.946121347 +0200
+diff --git a/src/java/com/sun/mail/imap/protocol/BASE64MailboxDecoder.java b/src/java/com/sun/mail/imap/protocol/BASE64MailboxDecoder.java
+new file mode 100644
+index 0000000..0f91415
+--- /dev/null
++++ b/src/java/com/sun/mail/imap/protocol/BASE64MailboxDecoder.java
@@ -0,0 +1,194 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
@@ -207,10 +216,11 @@ Index: davmail-src-3.9.9-1976/src/java/com/sun/mail/imap/protocol/BASE64MailboxD
+ pem_convert_array[pem_array[i]] = (byte) i;
+ }
+}
-Index: davmail-src-3.9.9-1976/src/java/com/sun/mail/imap/protocol/BASE64MailboxEncoder.java
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ davmail-src-3.9.9-1976/src/java/com/sun/mail/imap/protocol/BASE64MailboxEncoder.java 2012-08-24 15:31:08.017876275 +0200
+diff --git a/src/java/com/sun/mail/imap/protocol/BASE64MailboxEncoder.java b/src/java/com/sun/mail/imap/protocol/BASE64MailboxEncoder.java
+new file mode 100644
+index 0000000..c2021cc
+--- /dev/null
++++ b/src/java/com/sun/mail/imap/protocol/BASE64MailboxEncoder.java
@@ -0,0 +1,260 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
diff --git a/debian/patches/0001-Set-classpath-add-target-davmail-lib.patch b/debian/patches/0004-Set-classpath-add-target-davmail-lib.patch
similarity index 91%
rename from debian/patches/0001-Set-classpath-add-target-davmail-lib.patch
rename to debian/patches/0004-Set-classpath-add-target-davmail-lib.patch
index c492aae..7e234f6 100644
--- a/debian/patches/0001-Set-classpath-add-target-davmail-lib.patch
+++ b/debian/patches/0004-Set-classpath-add-target-davmail-lib.patch
@@ -1,14 +1,13 @@
-From bdbe421520ef651516e72a9e2e053fc70357d513 Mon Sep 17 00:00:00 2001
From: Matthias Schmitz <matthias at sigxcpu.org>
Date: Sat, 13 Apr 2013 00:51:23 +0200
-Subject: [PATCH] Set classpath, add target davmail-lib
+Subject: Set classpath, add target davmail-lib
---
build.xml | 43 ++++++++++++++++---------------------------
1 file changed, 16 insertions(+), 27 deletions(-)
diff --git a/build.xml b/build.xml
-index 5fec007..3216781 100644
+index 89bd6dd..7952438 100644
--- a/build.xml
+++ b/build.xml
@@ -3,10 +3,17 @@
@@ -33,7 +32,7 @@ index 5fec007..3216781 100644
</path>
<target name="clean">
-@@ -245,34 +252,13 @@
+@@ -247,34 +254,13 @@
</target>
@@ -70,7 +69,7 @@ index 5fec007..3216781 100644
</pathconvert>
<jar basedir="target/classes" destfile="dist/davmail.jar">
<manifest>
-@@ -285,6 +271,9 @@
+@@ -287,6 +273,9 @@
</section>
</manifest>
</jar>
@@ -80,6 +79,3 @@ index 5fec007..3216781 100644
<copy todir="dist/lib">
<fileset dir="lib">
<include name="*.jar"/>
---
-1.7.10.4
-
diff --git a/debian/patches/0005-Remove-Encoding-line-from-desktop-file-to-make-linti.patch b/debian/patches/0005-Remove-Encoding-line-from-desktop-file-to-make-linti.patch
new file mode 100644
index 0000000..61d43f9
--- /dev/null
+++ b/debian/patches/0005-Remove-Encoding-line-from-desktop-file-to-make-linti.patch
@@ -0,0 +1,19 @@
+From: Matthias Schmitz <matthias at sigxcpu.org>
+Date: Sat, 13 Apr 2013 02:50:56 +0200
+Subject: Remove Encoding: line from desktop file to make lintian happy
+
+---
+ davmail.desktop | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/davmail.desktop b/davmail.desktop
+index 2bf824f..306132b 100644
+--- a/davmail.desktop
++++ b/davmail.desktop
+@@ -1,6 +1,5 @@
+ [Desktop Entry]
+ Version=1.0
+-Encoding=UTF-8
+ Name=DavMail
+ Type=Application
+ Terminal=false
diff --git a/debian/patches/htmlcleaner22 b/debian/patches/htmlcleaner22
deleted file mode 100644
index 9b16035..0000000
--- a/debian/patches/htmlcleaner22
+++ /dev/null
@@ -1,42 +0,0 @@
-Description: Port to HTMLCleaner 2.2 API
-Forwarded: no
-Author: Alexandre Rossi <alexandre.rossi at gmail.com>
-
-Index: davmail-src-4.0.0-2016/src/java/davmail/exchange/ExchangeSession.java
-===================================================================
---- 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;
- import org.apache.log4j.Logger;
--import org.htmlcleaner.CommentToken;
--import org.htmlcleaner.ContentToken;
-+import org.htmlcleaner.CommentNode;
-+import org.htmlcleaner.ContentNode;
- import org.htmlcleaner.HtmlCleaner;
- import org.htmlcleaner.TagNode;
-
-@@ -475,8 +475,8 @@
- for (Object script : scriptList) {
- List contents = ((TagNode) script).getChildren();
- for (Object content : contents) {
-- if (content instanceof CommentToken) {
-- String scriptValue = ((CommentToken) content).getCommentedContent();
-+ if (content instanceof CommentNode) {
-+ String scriptValue = ((CommentNode) content).getCommentedContent();
- String sUrl = StringUtil.getToken(scriptValue, "var a_sUrl = \"", "\"");
- String sLgn = StringUtil.getToken(scriptValue, "var a_sLgnQS = \"", "\"");
- if (sLgn == null) {
-@@ -489,9 +489,9 @@
- logonMethod = buildLogonMethod(httpClient, newInitMethod);
- }
-
-- } else if (content instanceof ContentToken) {
-+ } else if (content instanceof ContentNode) {
- // Microsoft Forefront Unified Access Gateway redirect
-- String scriptValue = ((ContentToken) content).getContent();
-+ String scriptValue = ((ContentNode) content).getContent().toString();
- String location = StringUtil.getToken(scriptValue, "window.location.replace(\"", "\"");
- if (location != null) {
- LOGGER.debug("Post logon redirect to: " + location);
diff --git a/debian/patches/jackrabbit2 b/debian/patches/jackrabbit2
deleted file mode 100644
index a81f132..0000000
--- a/debian/patches/jackrabbit2
+++ /dev/null
@@ -1,151 +0,0 @@
-Description: Port to jackrabbit 2 API
-Forwarded: no
-Author: Alexandre Rossi <alexandre.rossi at gmail.com>
-
-Index: davmail.git/src/java/davmail/exchange/dav/DavExchangeSession.java
-===================================================================
---- 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;
- import org.apache.jackrabbit.webdav.property.DavPropertySet;
-+import org.apache.jackrabbit.webdav.property.PropEntry;
- import org.w3c.dom.Node;
-
- import javax.mail.MessagingException;
-@@ -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"))) {
-- ArrayList<DavConstants> propertyList = new ArrayList<DavConstants>();
-+ ArrayList<PropEntry> propertyList = new ArrayList<PropEntry>();
- // Set contentclass to make ActiveSync happy
- propertyList.add(Field.createDavProperty("contentclass", contentClass));
- // ... but also set PR_INTERNET_CONTENT to preserve custom properties
-@@ -1894,7 +1895,7 @@
- } else if (statusCode != HttpStatus.SC_CREATED) {
- throw DavGatewayHttpClientFacade.buildHttpException(method);
- } else if (folderPath.equalsIgnoreCase("/users/" + getEmail() + "/calendar")) {
-- // calendar renamed, need to reload well known folders
-+ // calendar renamed, need to reload well known folders
- getWellKnownFolders();
- }
- } finally {
-@@ -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
-- ArrayList<DavConstants> list = new ArrayList<DavConstants>();
-+ ArrayList<PropEntry> list = new ArrayList<PropEntry>();
- list.add(Field.createDavProperty("processed", "true"));
- list.add(Field.createDavProperty("read", "1"));
- PropPatchMethod patchMethod = new PropPatchMethod(eventPath, list);
-@@ -2378,7 +2379,7 @@
- }
- // failover for Exchange 2007, use PROPPATCH with forced timezone
- if (fakeEventUrl == null) {
-- ArrayList<DavConstants> propertyList = new ArrayList<DavConstants>();
-+ ArrayList<PropEntry> propertyList = new ArrayList<PropEntry>();
- propertyList.add(Field.createDavProperty("contentclass", "urn:content-classes:appointment"));
- propertyList.add(Field.createDavProperty("outlookmessageclass", "IPM.Appointment"));
- propertyList.add(Field.createDavProperty("instancetype", "0"));
-@@ -2479,8 +2480,8 @@
- return new Contact(getFolderPath(folderPath), itemName, properties, etag, noneMatch).createOrUpdate();
- }
-
-- protected List<DavConstants> buildProperties(Map<String, String> properties) {
-- ArrayList<DavConstants> list = new ArrayList<DavConstants>();
-+ protected List<PropEntry> buildProperties(Map<String, String> properties) {
-+ ArrayList<PropEntry> list = new ArrayList<PropEntry>();
- if (properties != null) {
- for (Map.Entry<String, String> entry : properties.entrySet()) {
- if ("read".equals(entry.getKey())) {
-@@ -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;
-- List<DavConstants> davProperties = buildProperties(properties);
-+ List<PropEntry> davProperties = buildProperties(properties);
-
- if (properties != null && properties.containsKey("draft")) {
- // note: draft is readonly after create, create the message first with requested messageFlags
-@@ -2570,7 +2571,7 @@
- if (code == HttpStatus.SC_NOT_ACCEPTABLE) {
- LOGGER.warn("Draft message creation failed, failover to property update. Note: attachments are lost");
-
-- ArrayList<DavConstants> propertyList = new ArrayList<DavConstants>();
-+ ArrayList<PropEntry> propertyList = new ArrayList<PropEntry>();
- 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", ",")));
-@@ -2634,7 +2635,7 @@
- try {
- // need to update bcc after put
- if (mimeMessage.getHeader("Bcc") != null) {
-- davProperties = new ArrayList<DavConstants>();
-+ davProperties = new ArrayList<PropEntry>();
- davProperties.add(Field.createDavProperty("bcc", mimeMessage.getHeader("Bcc", ",")));
- patchMethod = new PropPatchMethod(messageUrl, davProperties);
- try {
-@@ -2726,7 +2727,7 @@
- createMessage(DRAFTS, itemName, properties, mimeMessage);
- MoveMethod method = new MoveMethod(URIUtil.encodePath(getFolderPath(DRAFTS + '/' + itemName)),
- URIUtil.encodePath(getFolderPath(SENDMSG)), false);
-- // set header if saveInSent is disabled
-+ // set header if saveInSent is disabled
- if (!Settings.getBooleanProperty("davmail.smtpSaveInSent", true)) {
- method.setRequestHeader("Saveinsent", "f");
- }
-Index: davmail.git/src/java/davmail/exchange/dav/Field.java
-===================================================================
---- 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;
-
- import davmail.util.StringUtil;
--import org.apache.jackrabbit.webdav.DavConstants;
-+import org.apache.jackrabbit.webdav.property.PropEntry;
- import org.apache.jackrabbit.webdav.property.DavPropertyName;
- import org.apache.jackrabbit.webdav.property.DefaultDavProperty;
- import org.apache.jackrabbit.webdav.xml.DomUtil;
-@@ -184,7 +184,7 @@
- createField(URN_SCHEMAS_CALENDAR, "exdate"); // DistinguishedPropertySetType.PublicStrings/urn:schemas:calendar:exdate/PtypMultipleTime
-
- createField(SCHEMAS_MAPI, "reminderset"); // PidLidReminderSet
-- createField(SCHEMAS_MAPI, "reminderdelta"); // PidLidReminderDelta
-+ createField(SCHEMAS_MAPI, "reminderdelta"); // PidLidReminderDelta
-
- // TODO
- createField(SCHEMAS_MAPI, "allattendeesstring"); // PidLidAllAttendeesString
-@@ -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
-- createField(URN_SCHEMAS_CALENDAR, "rdate"); // DistinguishedPropertySetType.PublicStrings/urn:schemas:calendar:rdate/PtypMultipleTime
-+ createField(URN_SCHEMAS_CALENDAR, "rdate"); // DistinguishedPropertySetType.PublicStrings/urn:schemas:calendar:rdate/PtypMultipleTime
- createField(URN_SCHEMAS_CALENDAR, "reminderoffset"); // DistinguishedPropertySetType.PublicStrings/urn:schemas:calendar:reminderoffset/Integer
- createField(URN_SCHEMAS_CALENDAR, "timezone"); // DistinguishedPropertySetType.PublicStrings/urn:schemas:calendar:timezone/String
-
-@@ -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
-- createField(URN_SCHEMAS_CONTACTS, "internationalisdnnumber"); // PR_ISDN_NUMBER 0x3A2D String
-+ createField(URN_SCHEMAS_CONTACTS, "internationalisdnnumber"); // PR_ISDN_NUMBER 0x3A2D String
-
- createField(URN_SCHEMAS_CONTACTS, "otherTelephone"); // PR_OTHER_TELEPHONE_NUMBER 0x3A21 String
- createField(URN_SCHEMAS_CONTACTS, "homefax"); // PR_HOME_FAX_NUMBER 0x3A25 String
-@@ -528,9 +528,9 @@
- *
- * @param alias DavMail field alias
- * @param value field value
-- * @return DavProperty with value or DavPropertyName for null values
-+ * @return PropEntry with value or DavPropertyName for null values
- */
-- public static DavConstants createDavProperty(String alias, String value) {
-+ public static PropEntry createDavProperty(String alias, String value) {
- Field field = Field.get(alias);
- if (value == null) {
- // return DavPropertyName to remove property
diff --git a/debian/patches/no-windows-service b/debian/patches/no-windows-service
deleted file mode 100644
index 0060ffc..0000000
--- a/debian/patches/no-windows-service
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Avoid winrun4j build dependency
-Forwarded: not-needed
-Author: Alexandre Rossi <alexandre.rossi at gmail.com>
-
-Index: davmail.git/build.xml
-===================================================================
---- 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"
-+ excludes="davmail/service/DavService.java"
- includeantruntime="false">
- <classpath>
- <path refid="classpath"/>
diff --git a/debian/patches/series b/debian/patches/series
index 4a7095e..0568d89 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
-no-windows-service
-no-osx-tray
-base64-enc-dec
-0001-Set-classpath-add-target-davmail-lib.patch
+0001-no-windows-service.patch
+0002-no-osx-tray.patch
+0003-base64-enc-dec.patch
+0004-Set-classpath-add-target-davmail-lib.patch
+0005-Remove-Encoding-line-from-desktop-file-to-make-linti.patch
--
davmail packaging
More information about the pkg-java-commits
mailing list