[SCM] jetty8 packaging branch, master, updated. debian/8.1.3-2-1-ga2f472c

Miguel Landaeta miguel at miguel.cc
Fri May 25 16:07:23 UTC 2012


The following commit has been merged in the master branch:
commit a2f472cc7261a46b750426ae4b04da4c8c7a648b
Author: Miguel Landaeta <miguel at miguel.cc>
Date:   Fri May 25 19:43:44 2012 -0430

    Allow co-installation of libjetty-java-doc with libjetty8-java-doc

diff --git a/debian/changelog b/debian/changelog
index e142435..5936e94 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+jetty8 (8.1.3-3) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Allow co-installation of libjetty-java-doc with libjetty8-java-doc.
+    (Closes: #674204).
+
+ -- Miguel Landaeta <miguel at miguel.cc>  Fri, 25 May 2012 19:18:36 -0430
+
 jetty8 (8.1.3-2) unstable; urgency=low
 
   * Fix server startup when jsvc is not installed.
diff --git a/debian/libjetty8-java-doc.doc-base b/debian/libjetty8-java-doc.doc-base
index d0af4f4..c9d8784 100644
--- a/debian/libjetty8-java-doc.doc-base
+++ b/debian/libjetty8-java-doc.doc-base
@@ -1,4 +1,4 @@
-Document: libjetty-java
+Document: libjetty8-java
 Title: API Javadoc for jetty
 Author: Mortbay Consulting
 Abstract: This is the API Javadoc provided by Jetty.

-- 
jetty8 packaging



More information about the pkg-java-commits mailing list