[libfreemarker-java] 01/03: Build depend on libjetty9-java instead of libjetty8-java

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Wed Feb 3 22:58:38 UTC 2016


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 70bcbf45a17e39cd57a88cad4a2fbe63a01c8410
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Feb 3 23:54:12 2016 +0100

    Build depend on libjetty9-java instead of libjetty8-java
---
 debian/changelog                       | 7 +++++++
 debian/control                         | 2 +-
 debian/patches/ivy-configuration.patch | 8 ++++----
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 78d9add..711486d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libfreemarker-java (2.3.23-3) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Build depend on libjetty9-java instead of libjetty8-java
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 03 Feb 2016 23:41:15 +0100
+
 libfreemarker-java (2.3.23-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 4a16f18..0368f91 100644
--- a/debian/control
+++ b/debian/control
@@ -32,7 +32,7 @@ Build-Depends: ant,
                libjaxen-java-doc,
                libjdom1-java,
                libjdom1-java-doc,
-               libjetty8-java,
+               libjetty9-java,
                liblogback-java,
                librhino-java,
                librhino-java-doc,
diff --git a/debian/patches/ivy-configuration.patch b/debian/patches/ivy-configuration.patch
index cbc318a..6994bd5 100644
--- a/debian/patches/ivy-configuration.patch
+++ b/debian/patches/ivy-configuration.patch
@@ -117,10 +117,10 @@ Forwarded: not-needed
 -    <!-- docs -->
 -    
 -    <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" />
-+    <dependency org="org.eclipse.jetty" name="jetty8-util" rev="&jetty.version;" conf="test->default" />
++    <dependency org="org.eclipse.jetty" name="jetty9-server" rev="&jetty.version;" conf="test->default" />
++    <dependency org="org.eclipse.jetty" name="jetty9-webapp" rev="&jetty.version;" conf="test->default" />
++    <!--<dependency org="org.eclipse.jetty" name="jetty9-jsp" rev="&jetty.version;" conf="test->default" />-->
++    <dependency org="org.eclipse.jetty" name="jetty9-util" rev="&jetty.version;" conf="test->default" />
      
      <!-- parser -->
      

-- 
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