Author: twerner Date: 2011-09-15 08:18:54 +0000 (Thu, 15 Sep 2011) New Revision: 14905
Added: trunk/velocity/debian/source/ trunk/velocity/debian/source/format Modified: trunk/velocity/debian/changelog trunk/velocity/debian/control trunk/velocity/debian/copyright trunk/velocity/debian/orig-tar.sh trunk/velocity/debian/rules trunk/velocity/debian/watch Log: * Remove bundled ivy*.jar from orig tarball. * Switch to source format 3.0. * Mangle alpha and beta versions in debian/watch. * Document copyright and license of xmleb.jar. Modified: trunk/velocity/debian/changelog =================================================================== --- trunk/velocity/debian/changelog 2011-09-14 21:06:50 UTC (rev 14904) +++ trunk/velocity/debian/changelog 2011-09-15 08:18:54 UTC (rev 14905) @@ -6,8 +6,12 @@ * Remove Arnaud and Wolfgang from Uploaders list. * Switch to debhelper level 7. * Update Standards-Version: 3.9.2. + * Remove bundled ivy*.jar from orig tarball. + * Switch to source format 3.0. + * Mangle alpha and beta versions in debian/watch. + * Document copyright and license of xmleb.jar. - -- Torsten Werner <[email protected]> Mon, 12 Sep 2011 23:42:47 +0200 + -- Torsten Werner <[email protected]> Thu, 15 Sep 2011 10:12:42 +0200 velocity (1.6.2-4) unstable; urgency=low Modified: trunk/velocity/debian/control =================================================================== --- trunk/velocity/debian/control 2011-09-14 21:06:50 UTC (rev 14904) +++ trunk/velocity/debian/control 2011-09-15 08:18:54 UTC (rev 14905) @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Ludovic Claude <[email protected]> -Build-Depends: debhelper (>= 7), cdbs, default-jdk, quilt +Build-Depends: debhelper (>= 7), cdbs, default-jdk Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 5), ant, ant-optional, junit, libexcalibur-logkit-java, libservlet2.5-java, liblog4j1.2-java, libjdom1-java, libcommons-lang-java, libcommons-collections3-java, libcommons-logging-java, Modified: trunk/velocity/debian/copyright =================================================================== --- trunk/velocity/debian/copyright 2011-09-14 21:06:50 UTC (rev 14904) +++ trunk/velocity/debian/copyright 2011-09-15 08:18:54 UTC (rev 14905) @@ -32,3 +32,50 @@ The full text of the license can be found in '/usr/share/common-licenses/Apache-2.0'. + + +The file xmleb.jar is + + Copyright (c) 2001 The Apache Software Foundation. All rights + reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + + 3. The end-user documentation included with the redistribution, if + any, must include the following acknowlegement: + "This product includes software developed by the + Apache Software Foundation (http://www.apache.org/)." + Alternately, this acknowlegement may appear in the software itself, + if and wherever such third-party acknowlegements normally appear. + + 4. The names "The Jakarta Project", "Velocity", and "Apache Software + Foundation" must not be used to endorse or promote products derived + from this software without prior written permission. For written + permission, please contact [email protected]. + + 5. Products derived from this software may not be called "Apache" + nor may "Apache" appear in their names without prior written + permission of the Apache Group. + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR + ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. Modified: trunk/velocity/debian/orig-tar.sh =================================================================== --- trunk/velocity/debian/orig-tar.sh 2011-09-14 21:06:50 UTC (rev 14904) +++ trunk/velocity/debian/orig-tar.sh 2011-09-15 08:18:54 UTC (rev 14905) @@ -6,7 +6,7 @@ TAG=$2 svn export http://svn.apache.org/repos/asf/velocity/engine/tags/$TAG $DIR -tar -c -z -f $TAR $DIR +tar -c -z -f $TAR --exclude 'ivy*.jar' $DIR rm -rf $DIR ../$TAG # move to directory 'tarballs' Modified: trunk/velocity/debian/rules =================================================================== --- trunk/velocity/debian/rules 2011-09-14 21:06:50 UTC (rev 14904) +++ trunk/velocity/debian/rules 2011-09-15 08:18:54 UTC (rev 14905) @@ -3,7 +3,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/ant.mk -include /usr/share/cdbs/1/rules/patchsys-quilt.mk PACKAGE := $(DEB_SOURCE_PACKAGE) VERSION := $(DEB_UPSTREAM_VERSION) @@ -34,5 +33,5 @@ install -m 644 src/java/org/apache/velocity/runtime/defaults/velocity.properties debian/velocity/etc/velocity get-orig-source: - -uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename + uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename Added: trunk/velocity/debian/source/format =================================================================== --- trunk/velocity/debian/source/format (rev 0) +++ trunk/velocity/debian/source/format 2011-09-15 08:18:54 UTC (rev 14905) @@ -0,0 +1 @@ +3.0 (quilt) Modified: trunk/velocity/debian/watch =================================================================== --- trunk/velocity/debian/watch 2011-09-14 21:06:50 UTC (rev 14904) +++ trunk/velocity/debian/watch 2011-09-15 08:18:54 UTC (rev 14905) @@ -1,4 +1,6 @@ version=3 -http://svn.apache.org/repos/asf/velocity/engine/tags/ \ + +opts=uversionmangle=s/-(alpha|beta)/~$1/ \ + http://svn.apache.org/repos/asf/velocity/engine/tags/ \ ([1-9].*)/ debian debian/orig-tar.sh _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
