[libfreemarker-java] 03/03: Refreshed the patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Sun Jul 12 21:23:17 UTC 2015
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository libfreemarker-java.
commit c4b81b7ce328e85a02131bf17f6e4f228ad63fac
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Sun Jul 12 23:10:21 2015 +0200
Refreshed the patches
---
debian/changelog | 1 +
debian/patches/ivy-configuration.patch | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 23589a7..ac7fdb0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
libfreemarker-java (2.3.23-1) UNRELEASED; urgency=medium
* New upstream release
+ - Refreshed the patches
- Updated debian/pom.xml
-- Emmanuel Bourg <ebourg at apache.org> Sun, 12 Jul 2015 23:02:13 +0200
diff --git a/debian/patches/ivy-configuration.patch b/debian/patches/ivy-configuration.patch
index cbf27c9..cbc318a 100644
--- a/debian/patches/ivy-configuration.patch
+++ b/debian/patches/ivy-configuration.patch
@@ -116,7 +116,7 @@ Forwarded: not-needed
-
- <!-- docs -->
-
-- <dependency org="org.freemarker" name="docgen" rev="1.0-branch-head" conf="manual->default" changing="true" />
+- <dependency org="org.freemarker" name="docgen" rev="2.0-branch-head" conf="manual->default" changing="true" />
+ <dependency org="org.eclipse.jetty" name="jetty8-server" rev="&jetty.version;" conf="test->default" />
+ <dependency org="org.eclipse.jetty" name="jetty8-webapp" rev="&jetty.version;" conf="test->default" />
+ <dependency org="org.eclipse.jetty" name="jetty8-jsp" rev="&jetty.version;" conf="test->default" />
@@ -133,7 +133,7 @@ Forwarded: not-needed
+</ivy-module>
--- a/build.xml
+++ b/build.xml
-@@ -997,29 +997,11 @@
+@@ -1008,29 +1008,11 @@
>
<echo>Getting dependencies...</echo>
<echo>-------------------------------------------------------</echo>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libfreemarker-java.git
More information about the pkg-java-commits
mailing list