[jenkins-winstone] 08/14: Don't put libjetty8-java in the dependencies of the binary package

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository jenkins-winstone.

commit 9c0d025bb3cab63b73b053f4d8f6b87558f4e4a5
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Sep 5 16:04:27 2014 +0200

    Don't put libjetty8-java in the dependencies of the binary package
---
 debian/changelog                               |  2 +-
 debian/patches/compile-time-dependencies.patch | 36 ++++++++++++++++++++++++++
 debian/patches/series                          |  1 +
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 2ca4754..0255dad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ jenkins-winstone (2.3-1) UNRELEASED; urgency=medium
 
   * Team upload.
   * New upstream release
-    - Added a dependency on libjetty8-java and libjetty8-extra-java
+    - Added a build dependency on libjetty8-java and libjetty8-extra-java
     - Removed specification-resources.patch since the JEE spec files now come
       with Jetty. Removed the related notes in README.source and d/copyright.
     - Refreshed java8-compatibility.patch
diff --git a/debian/patches/compile-time-dependencies.patch b/debian/patches/compile-time-dependencies.patch
new file mode 100644
index 0000000..fa580ad
--- /dev/null
+++ b/debian/patches/compile-time-dependencies.patch
@@ -0,0 +1,36 @@
+Description: Mark Jetty as a provided dependency to prevent maven-debian-helper
+ from adding libjetty8-java in the package dependencies (Jetty is actually embedded
+ in the Winstone jar)
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/pom.xml
++++ b/pom.xml
+@@ -213,24 +213,28 @@
+       <groupId>org.eclipse.jetty</groupId>
+       <artifactId>jetty-servlet</artifactId>
+       <version>8.1.13.v20130916</version>
++      <scope>provided</scope>
+     </dependency>
+ 
+     <dependency>
+       <groupId>org.eclipse.jetty</groupId>
+       <artifactId>jetty-webapp</artifactId>
+       <version>8.1.13.v20130916</version>
++      <scope>provided</scope>
+     </dependency>
+ 
+     <dependency>
+       <groupId>org.eclipse.jetty</groupId>
+       <artifactId>jetty-ajp</artifactId>
+       <version>8.1.13.v20130916</version>
++      <scope>provided</scope>
+     </dependency>
+ 
+     <dependency>
+       <groupId>org.eclipse.jetty.spdy</groupId>
+       <artifactId>spdy-jetty-http</artifactId>
+       <version>8.1.13.v20130916</version>
++      <scope>provided</scope>
+     </dependency>
+ 
+     <dependency>
diff --git a/debian/patches/series b/debian/patches/series
index 04ddc90..c5f84f9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+compile-time-dependencies.patch
 java8-compatibility.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jenkins-winstone.git