On Wed, Dec 4, 2013 at 10:23 AM, Emmanuel Bourg <ebo...@apache.org> wrote:
> The pending changes can be uploaded. You can add your changes to the
> history and push a team upload instead of a NMU.
Done and uploaded.
Although it seems I cannot push because I do not have permissions,
probably because I am not part of pkg-java.
I am attaching the patches generated with git format-patch, if you
could merge them in, please, it would be great.
> in the package. Also, I don't think it's necessary to specify the
> version of maven-javadoc-plugin in debian/maven.rules.
You are right. I need that patch only when I build with
git-buildpackage invoking cowbuilder.
If I generate the source package and then build with cowbuilder it
works without that patch.
Cheers,
Ludovico
From cfed81644dcc263b5f6ae81d562fb1b4c60e600d Mon Sep 17 00:00:00 2001
From: Ludovico Cavedon <cave...@debian.org>
Date: Sun, 1 Dec 2013 22:45:19 -0800
Subject: [PATCH 1/2] Add jars in libjetty8-java for: jetty-jaspi, jetty-jsp,
jetty-nested, jetty-websocket (Closes: #724973).
---
debian/changelog | 5 +++++
debian/rules | 6 ++++--
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 10b7d80..c5fe122 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,15 @@
jetty8 (8.1.3-9) UNRELEASED; urgency=low
+ [ Emmanuel Bourg ]
* Team upload.
* Use the Tomcat 7 jars from /usr/share/tomcat7/lib
* Updated Standards-Version to 3.9.5 (no changes)
* debian/copyright: Updated the Format URI
+ [ Ludovico Cavedon ]
+ * Added jars in libjetty8-java for: jetty-jaspi, jetty-jsp, jetty-nested,
+ jetty-websocket (Closes: #724973).
+
-- Emmanuel Bourg <ebo...@apache.org> Thu, 07 Nov 2013 10:01:43 +0100
jetty8 (8.1.3-8) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 6407a12..0553ff9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,8 +11,10 @@ DEB_MAVEN_INSTALL_DOC_TARGET :=
DEB_MAVEN_DOC_TARGET := javadoc:aggregate
DEB_MAVEN_ARGS := -P-aggregates -P-osgi
-LIBJETTY_JARS := continuation deploy http io jmx overlay-deployer policy rewrite security \
- server servlet servlets start util webapp xml
+LIBJETTY_JARS := continuation deploy http io jaspi jmx jsp nested \
+ overlay-deployer policy rewrite security server servlet servlets start util \
+ webapp websocket xml
+
LIBJETTY_EXTRA_JARS := ajp annotations client jndi monitor plus
--
1.8.4.rc3
From bc246eed8d96f9a32c00551dae02ab04e27ed720 Mon Sep 17 00:00:00 2001
From: Ludovico Cavedon <cave...@debian.org>
Date: Thu, 5 Dec 2013 22:21:35 -0800
Subject: [PATCH 2/2] Prepare for upload to unstable.
---
debian/changelog | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c5fe122..9d3ba1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-jetty8 (8.1.3-9) UNRELEASED; urgency=low
+jetty8 (8.1.3-9) unstable; urgency=low
[ Emmanuel Bourg ]
* Team upload.
@@ -10,7 +10,7 @@ jetty8 (8.1.3-9) UNRELEASED; urgency=low
* Added jars in libjetty8-java for: jetty-jaspi, jetty-jsp, jetty-nested,
jetty-websocket (Closes: #724973).
- -- Emmanuel Bourg <ebo...@apache.org> Thu, 07 Nov 2013 10:01:43 +0100
+ -- Ludovico Cavedon <cave...@debian.org> Thu, 05 Dec 2013 22:20:15 -0800
jetty8 (8.1.3-8) unstable; urgency=low
--
1.8.4.rc3
__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>.
Please use
debian-j...@lists.debian.org for discussions and questions.
