[jetty8] 03/03: Refreshed the patches

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Thu Oct 8 19:59:24 UTC 2015


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

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

commit d99749d2a9e9dd0b71ea5c3715ebcc9f6347ce09
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Oct 8 21:52:38 2015 +0200

    Refreshed the patches
---
 debian/changelog                                 | 7 +++++++
 debian/patches/aggregate-doc.patch               | 2 +-
 debian/patches/disable-modules.patch             | 4 ++--
 debian/patches/maven-bundle-plugin-version.patch | 2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f67a0f8..73ab456 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+jetty8 (8.1.18-1) unstable; urgency=medium
+
+  * New upstream release
+    - Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 08 Oct 2015 21:49:05 +0200
+
 jetty8 (8.1.17-2) unstable; urgency=medium
 
   * Added the missing build dependency on libjetty-java (Closes: #796441)
diff --git a/debian/patches/aggregate-doc.patch b/debian/patches/aggregate-doc.patch
index 2677890..3877cf4 100644
--- a/debian/patches/aggregate-doc.patch
+++ b/debian/patches/aggregate-doc.patch
@@ -3,7 +3,7 @@ Date: Thu, 12 Apr 2012 22:46:39 +0200
 Subject: aggregate-doc
 --- a/pom.xml
 +++ b/pom.xml
-@@ -328,6 +328,8 @@
+@@ -329,6 +329,8 @@
            <groupId>org.apache.maven.plugins</groupId>
            <artifactId>maven-javadoc-plugin</artifactId>
            <configuration>
diff --git a/debian/patches/disable-modules.patch b/debian/patches/disable-modules.patch
index c447c4f..c60a6a0 100644
--- a/debian/patches/disable-modules.patch
+++ b/debian/patches/disable-modules.patch
@@ -3,7 +3,7 @@ Date: Thu, 1 Mar 2012 21:33:06 +0100
 Subject: disable-modules
 --- a/pom.xml
 +++ b/pom.xml
-@@ -425,19 +425,19 @@
+@@ -426,19 +426,19 @@
      <module>jetty-start</module>
      <module>jetty-nested</module>
      <module>jetty-overlay-deployer</module>
@@ -29,7 +29,7 @@ Subject: disable-modules
    </modules>
    <dependencyManagement>
      <dependencies>
-@@ -579,7 +579,7 @@
+@@ -580,7 +580,7 @@
          <jdk>[1.7,)</jdk>
        </activation>
        <modules>
diff --git a/debian/patches/maven-bundle-plugin-version.patch b/debian/patches/maven-bundle-plugin-version.patch
index f0ef566..64b1e3c 100644
--- a/debian/patches/maven-bundle-plugin-version.patch
+++ b/debian/patches/maven-bundle-plugin-version.patch
@@ -3,7 +3,7 @@ Date: Thu, 1 Mar 2012 21:32:54 +0100
 Subject: maven-bundle-plugin-version
 --- a/pom.xml
 +++ b/pom.xml
-@@ -281,6 +281,7 @@
+@@ -282,6 +282,7 @@
          <plugin>
            <groupId>org.apache.felix</groupId>
            <artifactId>maven-bundle-plugin</artifactId>

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



More information about the pkg-java-commits mailing list