Author: onkarshinde-guest Date: 2010-03-17 07:29:24 +0000 (Wed, 17 Mar 2010) New Revision: 11888
Added: trunk/velocity/debian/patches/fix_example_scripts.patch Modified: trunk/velocity/debian/changelog trunk/velocity/debian/control trunk/velocity/debian/patches/build.patch trunk/velocity/debian/patches/series trunk/velocity/debian/rules Log: misc fixes Modified: trunk/velocity/debian/changelog =================================================================== --- trunk/velocity/debian/changelog 2010-03-16 21:21:27 UTC (rev 11887) +++ trunk/velocity/debian/changelog 2010-03-17 07:29:24 UTC (rev 11888) @@ -1,3 +1,18 @@ +velocity (1.6.2-4) unstable; urgency=low + + [ Onkar Shinde ] + * Replace build-dep openjdk-6-jdk with default-jdk. Adjust JAVA_HOME in rules + file accordingly. + * Replace openjdk-6-doc with default-jdk-doc. (Closes: #567293) + * Replace build/runtime dep liblogkit-java with libexcalibur-logkit-java. + Adjust DEB_JARS in rules file accordingly. + * debian/patches/build.patch - Update to add 'Class-Path' attribute in + manifest file with appropriate list of jar files. + * debian/patches/fix_example_scripts.patch - New patch to fix shebang lines + in example scripts. Fixes lintian warnings. + + -- Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Sun, 07 Mar 2010 16:00:47 +0530 + velocity (1.6.2-3) unstable; urgency=low * Bump up Standards-Version to 3.8.3 Modified: trunk/velocity/debian/control =================================================================== --- trunk/velocity/debian/control 2010-03-16 21:21:27 UTC (rev 11887) +++ trunk/velocity/debian/control 2010-03-17 07:29:24 UTC (rev 11888) @@ -4,12 +4,12 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Arnaud Vandyck <av...@debian.org>, Wolfgang Baer <wb...@gmx.de>, Ludovic Claude <ludovic.cla...@laposte.net> -Build-Depends: debhelper (>= 6), cdbs, openjdk-6-jdk, quilt +Build-Depends: debhelper (>= 6), cdbs, default-jdk, quilt Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 5), ant, ant-optional, - junit, liblogkit-java, libservlet2.5-java, + junit, libexcalibur-logkit-java, libservlet2.5-java, liblog4j1.2-java, libjdom1-java, libcommons-lang-java, libcommons-collections3-java, libcommons-logging-java, - libwerken.xpath-java, liboro-java, openjdk-6-doc -Standards-Version: 3.8.3 + libwerken.xpath-java, liboro-java, default-jdk-doc +Standards-Version: 3.8.4 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/velocity Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/velocity Homepage: http://velocity.apache.org/ @@ -18,7 +18,7 @@ Architecture: all Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless, libcommons-lang-java, libcommons-collections3-java, liboro-java -Recommends: libcommons-logging-java, liblogkit-java, liblog4j1.2-java, +Recommends: libcommons-logging-java, libexcalibur-logkit-java, liblog4j1.2-java, libservlet2.5-java, libjdom1-java, libwerken.xpath-java, libxerces2-java Suggests: velocity-doc, ant Description: Java-based template engine for web application Modified: trunk/velocity/debian/patches/build.patch =================================================================== --- trunk/velocity/debian/patches/build.patch 2010-03-16 21:21:27 UTC (rev 11887) +++ trunk/velocity/debian/patches/build.patch 2010-03-17 07:29:24 UTC (rev 11888) @@ -1,5 +1,7 @@ ---- a/build/build.xml -+++ b/build/build.xml +Index: velocity-1.6.2/build/build.xml +=================================================================== +--- velocity-1.6.2.orig/build/build.xml 2009-01-22 03:36:59.000000000 +0530 ++++ velocity-1.6.2/build/build.xml 2010-03-17 11:06:23.000000000 +0530 @@ -139,12 +139,18 @@ <!-- sets up the build environment (classpath and libs) --> <!-- =================================================================== --> @@ -22,7 +24,15 @@ </fileset> </path> -@@ -918,7 +924,7 @@ +@@ -463,6 +469,7 @@ + <attribute name="Implementation-Vendor-Id" value="org.apache"/> + <attribute name="Implementation-Vendor" value="Apache Software Foundation"/> + <attribute name="Implementation-Version" value="${version}"/> ++ <attribute name="Class-Path" value="excalibur-logkit.jar servlet-api-2.5.jar log4j-1.2.jar jdom1.jar commons-lang.jar commons-collections3.jar commons-logging.jar werken.xpath.jar oro.jar"/> + </manifest> + </jar> + <checksum file="${build.dir}/${jarname}.jar" algorithm="md5" property="checksum.jar.md5"/> +@@ -918,7 +925,7 @@ <!-- Make HTML version of Velocity documentation --> <!-- =================================================================== --> @@ -31,8 +41,10 @@ description="Generates the Velocity HTML documentation"> <taskdef name="anakia" ---- a/build/build.properties -+++ b/build/build.properties +Index: velocity-1.6.2/build/build.properties +=================================================================== +--- velocity-1.6.2.orig/build/build.properties 2009-01-19 00:49:20.000000000 +0530 ++++ velocity-1.6.2/build/build.properties 2010-03-17 10:56:19.000000000 +0530 @@ -35,7 +35,7 @@ velocity.build.dir= build Added: trunk/velocity/debian/patches/fix_example_scripts.patch =================================================================== --- trunk/velocity/debian/patches/fix_example_scripts.patch (rev 0) +++ trunk/velocity/debian/patches/fix_example_scripts.patch 2010-03-17 07:29:24 UTC (rev 11888) @@ -0,0 +1,50 @@ +Index: velocity-1.6.2/examples/app_example1/example.sh +=================================================================== +--- velocity-1.6.2.orig/examples/app_example1/example.sh 2010-03-17 12:11:15.000000000 +0530 ++++ velocity-1.6.2/examples/app_example1/example.sh 2010-03-17 12:11:50.000000000 +0530 +@@ -1,4 +1,4 @@ +-# !/bin/sh ++#!/bin/sh + + # Licensed to the Apache Software Foundation (ASF) under one + # or more contributor license agreements. See the NOTICE file +Index: velocity-1.6.2/examples/app_example2/example2.sh +=================================================================== +--- velocity-1.6.2.orig/examples/app_example2/example2.sh 2010-03-17 12:11:15.000000000 +0530 ++++ velocity-1.6.2/examples/app_example2/example2.sh 2010-03-17 12:11:59.000000000 +0530 +@@ -1,4 +1,4 @@ +-# !/bin/sh ++#!/bin/sh + + # Licensed to the Apache Software Foundation (ASF) under one + # or more contributor license agreements. See the NOTICE file +Index: velocity-1.6.2/examples/context_example/dbcontexttest.sh +=================================================================== +--- velocity-1.6.2.orig/examples/context_example/dbcontexttest.sh 2010-03-17 12:11:14.000000000 +0530 ++++ velocity-1.6.2/examples/context_example/dbcontexttest.sh 2010-03-17 12:11:31.000000000 +0530 +@@ -1,4 +1,4 @@ +-# !/bin/sh ++#!/bin/sh + + # Licensed to the Apache Software Foundation (ASF) under one + # or more contributor license agreements. See the NOTICE file +Index: velocity-1.6.2/examples/logger_example/logger_example.sh +=================================================================== +--- velocity-1.6.2.orig/examples/logger_example/logger_example.sh 2010-03-17 12:11:14.000000000 +0530 ++++ velocity-1.6.2/examples/logger_example/logger_example.sh 2010-03-17 12:11:42.000000000 +0530 +@@ -1,4 +1,4 @@ +-# !/bin/sh ++#!/bin/sh + + # Licensed to the Apache Software Foundation (ASF) under one + # or more contributor license agreements. See the NOTICE file +Index: velocity-1.6.2/examples/xmlapp_example/xmlapp_example.sh +=================================================================== +--- velocity-1.6.2.orig/examples/xmlapp_example/xmlapp_example.sh 2010-03-17 12:11:15.000000000 +0530 ++++ velocity-1.6.2/examples/xmlapp_example/xmlapp_example.sh 2010-03-17 12:12:09.000000000 +0530 +@@ -1,4 +1,4 @@ +-# !/bin/sh ++#!/bin/sh + + # Licensed to the Apache Software Foundation (ASF) under one + # or more contributor license agreements. See the NOTICE file Modified: trunk/velocity/debian/patches/series =================================================================== --- trunk/velocity/debian/patches/series 2010-03-16 21:21:27 UTC (rev 11887) +++ trunk/velocity/debian/patches/series 2010-03-17 07:29:24 UTC (rev 11888) @@ -1 +1,2 @@ build.patch +fix_example_scripts.patch Modified: trunk/velocity/debian/rules =================================================================== --- trunk/velocity/debian/rules 2010-03-16 21:21:27 UTC (rev 11887) +++ trunk/velocity/debian/rules 2010-03-17 07:29:24 UTC (rev 11888) @@ -7,8 +7,8 @@ PACKAGE := $(DEB_SOURCE_PACKAGE) VERSION := $(DEB_UPSTREAM_VERSION) -JAVA_HOME := /usr/lib/jvm/java-6-openjdk -DEB_JARS := ant-nodeps junit logkit servlet-api-2.5 log4j-1.2 commons-lang commons-collections3 commons-logging werken.xpath bcel oro jdom1 antlr +JAVA_HOME := /usr/lib/jvm/default-java +DEB_JARS := ant-nodeps junit excalibur-logkit servlet-api-2.5 log4j-1.2 commons-lang commons-collections3 commons-logging werken.xpath bcel oro jdom1 antlr DEB_ANT_BUILD_TARGET := package javadoc DEB_ANT_BUILDFILE := /usr/share/maven-ant-helper/maven-build.xml DEB_ANT_ARGS := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE) -Dbin.package=$(PACKAGE) -Dversion=$(VERSION) _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
