[jetty9] 85/99: Refreshed the patches

[Jakub Adam]

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

xhaakon-guest pushed a commit to branch master
in repository jetty9.

commit 19f52802bea28e7630e757d72fe0191c5f2c0657
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon May 11 12:05:18 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 8184349..b4e263d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+jetty8 (8.1.17-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+    - Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 11 May 2015 11:59:17 +0200
+
 jetty8 (8.1.16-4) unstable; urgency=medium
 
   * Fixed an error on purging jetty8 when authbind is not installed
diff --git a/debian/patches/aggregate-doc.patch b/debian/patches/aggregate-doc.patch
index a4f1591..2677890 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
-@@ -315,6 +315,8 @@
+@@ -328,6 +328,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 a39532f..c447c4f 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
-@@ -412,19 +412,19 @@
+@@ -425,19 +425,19 @@
      <module>jetty-start</module>
      <module>jetty-nested</module>
      <module>jetty-overlay-deployer</module>
@@ -29,7 +29,7 @@ Subject: disable-modules
    </modules>
    <dependencyManagement>
      <dependencies>
-@@ -566,7 +566,7 @@
+@@ -579,7 +579,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 a204777..f0ef566 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
-@@ -268,6 +268,7 @@
+@@ -281,6 +281,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/jetty9.git