Author: eugene-guest Date: 2014-04-11 11:52:59 +0000 (Fri, 11 Apr 2014) New Revision: 18019
Modified: trunk/jetty/debian/changelog trunk/jetty/debian/control trunk/jetty/debian/rules Log: fix for #686876 Modified: trunk/jetty/debian/changelog =================================================================== --- trunk/jetty/debian/changelog 2014-04-11 11:05:38 UTC (rev 18018) +++ trunk/jetty/debian/changelog 2014-04-11 11:52:59 UTC (rev 18019) @@ -1,3 +1,11 @@ +jetty (6.1.26-2) unstable; urgency=low + + * Team upload. + * Bumped to Standard-Versions 3.9.5 - no changes required. + * Switched to libtomcat7-java (Closes: #686876) + + -- Eugene Zhukov <[email protected]> Fri, 11 Apr 2014 11:35:28 +0000 + jetty (6.1.26-1) unstable; urgency=low * New upstream release. Modified: trunk/jetty/debian/control =================================================================== --- trunk/jetty/debian/control 2014-04-11 11:05:38 UTC (rev 18018) +++ trunk/jetty/debian/control 2014-04-11 11:52:59 UTC (rev 18019) @@ -8,9 +8,9 @@ Build-Depends: debhelper (>= 7), cdbs (>> 0.4.5.3), default-jdk, ant-optional, maven-repo-helper, libservlet2.5-java, libslf4j-java, libmx4j-java, libgnumail-java, libgnujaf-java, libcommons-daemon-java, junit, libgeronimo-jta-1.0.1b-spec-java, - libtomcat6-java, default-jdk-doc, libgnumail-java-doc, libservlet2.5-java-doc, + libtomcat7-java, default-jdk-doc, libgnumail-java-doc, libservlet2.5-java-doc, dpkg-dev (>= 1.16.1~) -Standards-Version: 3.8.4 +Standards-Version: 3.9.5 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jetty Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jetty Homepage: http://jetty.mortbay.com/ Modified: trunk/jetty/debian/rules =================================================================== --- trunk/jetty/debian/rules 2014-04-11 11:05:38 UTC (rev 18018) +++ trunk/jetty/debian/rules 2014-04-11 11:52:59 UTC (rev 18019) @@ -8,7 +8,7 @@ PACKAGE := $(DEB_SOURCE_PACKAGE) VERSION := $(DEB_UPSTREAM_VERSION) JAVA_HOME := /usr/lib/jvm/default-java -DEB_JARS := servlet-api-2.5 slf4j-api slf4j-simple mx4j mx4j-tools gnumail activation commons-daemon junit ant-junit geronimo-jta-1.0.1b-spec annotations-api +DEB_JARS := servlet-api-2.5 slf4j-api slf4j-simple mx4j mx4j-tools gnumail activation commons-daemon junit ant-junit geronimo-jta-1.0.1b-spec tomcat-annotations-api DEB_ANT_BUILD_TARGET := package DEB_ANT_BUILDFILE := debian/build.xml DEB_ANT_ARGS := -DVERSION=$(VERSION) -Dbuild.sysclasspath=last @@ -61,7 +61,7 @@ mh_clean get-orig-source: - uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename + uscan --download-current-version --force-download --rename # No documentation released yet. #binary-post-install/$(PACKAGE)-doc:: _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

