On Mon, May 02, 2005 at 11:26:03AM +0200, Philipp Meier wrote: > Am Samstag, den 30.04.2005, 12:28 +0200 schrieb Matej Vela: > > Will you be making an upload for jetty soon? If not, would you mind if I > > did a non-maintainer upload for #306761? (Another release-critical bug > > (#306739) depends on it.) > > I would appreciate a NMU because I'm rather busy at the moment.
Diffs attached. Thanks! Matej
diff -ruN jetty-5.0.0.dist/debian/changelog jetty-5.0.0/debian/changelog --- jetty-5.0.0.dist/debian/changelog 2005-05-02 11:57:59.000000000 +0200 +++ jetty-5.0.0/debian/changelog 2005-05-02 12:12:13.000000000 +0200 @@ -1,3 +1,10 @@ +jetty (5.0.0-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Transition to liblog4j1.2-java. Closes: #306761. + + -- Matej Vela <[EMAIL PROTECTED]> Mon, 2 May 2005 12:12:12 +0200 + jetty (5.0.0-2) unstable; urgency=low * Shipping working default configuration in /etc/jetty/jetty.xml. diff -ruN jetty-5.0.0.dist/debian/control jetty-5.0.0/debian/control --- jetty-5.0.0.dist/debian/control 2005-05-02 11:57:59.000000000 +0200 +++ jetty-5.0.0/debian/control 2005-05-02 12:11:33.000000000 +0200 @@ -2,7 +2,7 @@ Section: contrib/web Priority: optional Maintainer: Philipp Meier <[EMAIL PROTECTED]> -Build-Depends-Indep: j2sdk1.4 | j2sdk1.3, debhelper (>> 4.0.0), ant, junit, libmx4j-java, liblog4j-java, libservlet2.3-java, libtomcat4-java, libcommons-logging-java, cdbs ( >>0.4.5.3) +Build-Depends-Indep: j2sdk1.4 | j2sdk1.3, debhelper (>> 4.0.0), ant, junit, libmx4j-java, liblog4j1.2-java, libservlet2.3-java, libtomcat4-java, libcommons-logging-java, cdbs ( >>0.4.5.3) Standards-Version: 3.6.0 Package: jetty @@ -17,7 +17,7 @@ Package: jetty-extra Architecture: all -Depends: jetty, liblog4j-java +Depends: jetty, liblog4j1.2-java Description: Extensions to jetty Provides some extensions of jetty: * JettyPlus: contains a number of useful facilities integrated with Jetty, diff -ruN jetty-5.0.0.dist/debian/rules jetty-5.0.0/debian/rules --- jetty-5.0.0.dist/debian/rules 2005-05-02 11:57:59.000000000 +0200 +++ jetty-5.0.0/debian/rules 2005-05-02 12:11:33.000000000 +0200 @@ -13,7 +13,7 @@ /usr/lib/j2se/1.3 ANT_HOME := /usr/share/ant -DEB_JARS := mx4j.jar log4j-core.jar /usr/share/ant/lib/ant-launcher.jar log4j.jar +DEB_JARS := mx4j.jar log4j-1.2.jar /usr/share/ant/lib/ant-launcher.jar DEB_ANT_INSTALL_TARGET := extra javadoc