[pkg-java] r12938 - in trunk/spring-build/debian: . patches
Damien Raude-Morvan
drazzib at alioth.debian.org
Tue Aug 24 22:22:58 UTC 2010
Author: drazzib
Date: 2010-08-24 22:22:56 +0000 (Tue, 24 Aug 2010)
New Revision: 12938
Modified:
trunk/spring-build/debian/changelog
trunk/spring-build/debian/control
trunk/spring-build/debian/copyright
trunk/spring-build/debian/orig-tar.exclude
trunk/spring-build/debian/orig-tar.sh
trunk/spring-build/debian/patches/ivy_artifact.diff
trunk/spring-build/debian/patches/ivy_aspectj.diff
trunk/spring-build/debian/patches/ivy_local_only.diff
trunk/spring-build/debian/rules
Log:
New tarball from GIT && Upload to experimental
Modified: trunk/spring-build/debian/changelog
===================================================================
--- trunk/spring-build/debian/changelog 2010-08-23 20:53:24 UTC (rev 12937)
+++ trunk/spring-build/debian/changelog 2010-08-24 22:22:56 UTC (rev 12938)
@@ -1,7 +1,5 @@
-spring-build (2.5.1~svn715-1) UNRELEASED; urgency=low
+spring-build (2.5.2~git3be7d52-1) experimental; urgency=low
- WAIT-FOR: http://jira.springframework.org/browse/SPR-7352
-
* Initial release. (Closes: #586523)
- -- Damien Raude-Morvan <drazzib at debian.org> Wed, 14 Jul 2010 14:00:32 +0200
+ -- Damien Raude-Morvan <drazzib at debian.org> Tue, 24 Aug 2010 22:10:27 +0200
Modified: trunk/spring-build/debian/control
===================================================================
--- trunk/spring-build/debian/control 2010-08-23 20:53:24 UTC (rev 12937)
+++ trunk/spring-build/debian/control 2010-08-24 22:22:56 UTC (rev 12938)
@@ -6,7 +6,7 @@
libcommons-httpclient-java, libjets3t-java, libequinox-osgi-java,
libspring-build-java
Maintainer: Damien Raude-Morvan <drazzib at debian.org>
-Standards-Version: 3.9.0
+Standards-Version: 3.9.1
Homepage: http://www.springsource.org/
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/spring-build/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/spring-build/
Modified: trunk/spring-build/debian/copyright
===================================================================
--- trunk/spring-build/debian/copyright 2010-08-23 20:53:24 UTC (rev 12937)
+++ trunk/spring-build/debian/copyright 2010-08-24 22:22:56 UTC (rev 12938)
@@ -1,18 +1,17 @@
Format-Specification: http://dep.debian.net/deps/dep5/
Name: Spring Build
Maintainer: SpringSource
-Source: https://src.springframework.org/svn/spring-build/
+Source: git://git.springsource.org/spring-build/spring-build.git
+ git://git.springsource.org/spring-build/misc-ant.git
+ git://git.springsource.org/spring-build/aws-ant.git
+ git://git.springsource.org/spring-build/aws-ivy.git
+ git://git.springsource.org/spring-build/osgi-ant.git
Files: *
Copyright: 2008-2010, the original author or authors
License: Apache-2.0
-Files: org.springframework.build.osgi/src/main/java/org/springframework/build/osgi/validator/ValidationFailedException.java,
- org.springframework.build.osgi/src/main/java/org/springframework/build/osgi/validator/BundleResolutionValidator.java
-Copyright: Copyright (C) 2008 SpringSource Inc.
-License: GPL-3+
-
Files: debian/*
Copyright: 2010, Damien Raude-Morvan <drazzib at drazzib.com>
License: Apache-2.0
@@ -33,23 +32,3 @@
On Debian systems the full text of the Apache License can be found
in the `/usr/share/common-licenses/Apache-2.0' file.
-
-
-License: GPL-3+
- The SpringSource dm Server is free software: you can redistribute it and/or
- modify it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or (at your
- option) any later version.
-
- The SpringSource dm Server is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- more details.
-
- You should have received a copy of the GNU General Public License along with
- the SpringSource dm Server. If not, see <http://www.gnu.org/licenses/>.
-
- On Debian systems, the full text of the GNU General Public
- License version 3 can be found in the file
- `/usr/share/common-licenses/GPL-3'.
-
Modified: trunk/spring-build/debian/orig-tar.exclude
===================================================================
--- trunk/spring-build/debian/orig-tar.exclude 2010-08-23 20:53:24 UTC (rev 12937)
+++ trunk/spring-build/debian/orig-tar.exclude 2010-08-24 22:22:56 UTC (rev 12938)
@@ -1 +1,3 @@
project-build/lib/*.jar
+.gitmodules
+spring-build
Modified: trunk/spring-build/debian/orig-tar.sh
===================================================================
--- trunk/spring-build/debian/orig-tar.sh 2010-08-23 20:53:24 UTC (rev 12937)
+++ trunk/spring-build/debian/orig-tar.sh 2010-08-24 22:22:56 UTC (rev 12938)
@@ -3,17 +3,27 @@
# $1 version
TAR=../spring-build_$1.orig.tar.gz
DIR=spring-build-$1.orig
-VERSION=`echo $1 | sed -e 's/[+~].*//g' | sed -e 's/\./_/g'`
-REVISION=`echo $1 | sed -e 's/.*svn//'`
-TAG=release-$VERSION
-SVN_ROOT=https://src.springframework.org/svn/spring-build/trunk/
-SVN_OPTS=--ignore-externals
+VERSION=`echo $1 | sed -e 's/[+~].*//g'`
+TAG=$VERSION
-# clean up the upstream tarball
-svn export $SVN_OPTS -r $REVISION $SVN_ROOT $DIR
-GZIP=--best tar -c -z -f $TAR -X debian/orig-tar.exclude $DIR
-rm -rf $DIR
+GIT_ROOT=git://git.springsource.org/spring-build
+GIT_MODULES="misc-ant aws-ant aws-ivy osgi-ant"
+mkdir orig_tmp
+(cd orig_tmp && \
+mkdir $DIR && \
+git clone ${GIT_ROOT}/spring-build.git && \
+(cd spring-build; git archive --prefix=project-build/ --format=tar $TAG | tar -C ../$DIR -xf -) && \
+for git_module in $GIT_MODULES; do \
+ git clone ${GIT_ROOT}/${git_module}.git && \
+ (cd ${git_module}; git archive --format=tar HEAD | tar -C ../$DIR -xf -); \
+done
+)
+
+GZIP=--best tar -C orig_tmp -c -z -f $TAR -X debian/orig-tar.exclude $DIR
+
+rm -rf orig_tmp
+
# move to directory 'tarballs'
if [ -r .svn/deb-layout ]; then
. .svn/deb-layout
Modified: trunk/spring-build/debian/patches/ivy_artifact.diff
===================================================================
--- trunk/spring-build/debian/patches/ivy_artifact.diff 2010-08-23 20:53:24 UTC (rev 12937)
+++ trunk/spring-build/debian/patches/ivy_artifact.diff 2010-08-24 22:22:56 UTC (rev 12938)
@@ -20,7 +20,7 @@
</ivy-module>
--- a/project-build/standard/artifact.xml
+++ b/project-build/standard/artifact.xml
-@@ -7,13 +7,25 @@
+@@ -22,13 +22,25 @@
<!-- Other targets -->
<target name="compile.init" depends="ivy.init">
@@ -46,7 +46,7 @@
<taskdef resource="org/springframework/build/ant/antlib.xml" uri="antlib:org.springframework.build">
<classpath>
<path refid="spring.ant.classpath"/>
-@@ -22,4 +34,4 @@
+@@ -37,4 +49,4 @@
</taskdef>
</target>
@@ -55,7 +55,7 @@
+</project>
--- a/project-build/weaving-external/artifact.xml
+++ b/project-build/weaving-external/artifact.xml
-@@ -42,9 +42,14 @@
+@@ -58,9 +58,14 @@
organisation="org.springframework.build" module="org.springframework.build.ant"
revision="${org.springframework.build.ant.version}" conf="runtime" type="jar" inline="true"
log="download-only"/>
@@ -70,7 +70,7 @@
<taskdef resource="org/springframework/build/ant/antlib.xml" uri="antlib:org.springframework.build">
<classpath>
<path refid="spring.ant.classpath"/>
-@@ -64,4 +69,4 @@
+@@ -80,4 +85,4 @@
</bundlor:bundlor>
</target>
@@ -79,7 +79,7 @@
+</project>
--- a/project-build/war/artifact.xml
+++ b/project-build/war/artifact.xml
-@@ -44,9 +44,14 @@
+@@ -60,9 +60,14 @@
organisation="org.springframework.build" module="org.springframework.build.ant"
revision="${org.springframework.build.ant.version}" conf="runtime" type="jar" inline="true"
log="download-only"/>
@@ -94,7 +94,7 @@
<taskdef resource="org/springframework/build/ant/antlib.xml" uri="antlib:org.springframework.build">
<classpath>
<path refid="spring.ant.classpath"/>
-@@ -66,4 +71,4 @@
+@@ -82,4 +87,4 @@
</bundlor:bundlor>
</target>
@@ -121,7 +121,7 @@
<dependencies>
+<!--
- <dependency org="org.jets3t" name="com.springsource.org.jets3t" rev="0.6.0" conf="compile->default;runtime->runtime"/>
+ <dependency org="org.jets3t" name="com.springsource.org.jets3t" rev="0.7.0" conf="compile->compile;runtime->runtime"/>
<dependency org="org.apache.ant" name="com.springsource.org.apache.ivy" rev="2.0.0.beta2" conf="compile->compile"/>
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.httpclient" rev="3.1.0" conf="runtime->runtime"/>
+-->
Modified: trunk/spring-build/debian/patches/ivy_aspectj.diff
===================================================================
--- trunk/spring-build/debian/patches/ivy_aspectj.diff 2010-08-23 20:53:24 UTC (rev 12937)
+++ trunk/spring-build/debian/patches/ivy_aspectj.diff 2010-08-24 22:22:56 UTC (rev 12938)
@@ -4,7 +4,7 @@
Last-Update: 2010-06-19
--- a/project-build/aspect/artifact.xml
+++ b/project-build/aspect/artifact.xml
-@@ -9,10 +9,16 @@
+@@ -24,10 +24,16 @@
<!-- Other targets -->
<target name="compile.init" depends="ivy.init">
@@ -25,7 +25,7 @@
+</project>
--- a/project-build/weaving-external/artifact.xml
+++ b/project-build/weaving-external/artifact.xml
-@@ -17,7 +17,8 @@
+@@ -32,7 +32,8 @@
<delete quiet="true" file="${source-jar.output.file}"/>
<mkdir dir="${source-jar.output.dir}"/>
@@ -35,7 +35,7 @@
outJar="${jar.output.file}" source="${source.version}" checkRuntimeVersion="false" X="${aspectj.x}"/>
<antcall target="bundlor"/>
<copy tofile="${source-jar.output.file}">
-@@ -33,9 +34,14 @@
+@@ -49,9 +50,14 @@
<!-- Other targets -->
<target name="compile.init" depends="ivy.init">
@@ -52,7 +52,7 @@
<ivy:cachepath resolveId="spring.ant.classpath" pathid="spring.ant.classpath"
--- a/project-build/weaving/artifact.xml
+++ b/project-build/weaving/artifact.xml
-@@ -10,9 +10,15 @@
+@@ -25,9 +25,15 @@
<!-- Other targets -->
<target name="compile.init" depends="ivy.init">
@@ -68,7 +68,7 @@
<taskdef resource="org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties" classpathref="ajc.classpath"/>
<ivy:cachepath resolveId="spring.ant.classpath" pathid="spring.ant.classpath"
-@@ -41,4 +47,4 @@
+@@ -56,4 +62,4 @@
</bundlor:bundlor>
</target>
@@ -77,7 +77,7 @@
+</project>
--- a/project-build/aspect/common.xml
+++ b/project-build/aspect/common.xml
-@@ -10,7 +10,8 @@
+@@ -25,7 +25,8 @@
<attribute name="output.dir"/>
<attribute name="resources.dir"/>
<sequential>
@@ -87,7 +87,7 @@
debug="${compile.debug}" debugLevel="${compile.debug.level}" checkRuntimeVersion="false"
aspectPathRef="aspects.classpath" X="${aspectj.x}"/>
<copy todir="@{output.dir}">
-@@ -27,4 +28,4 @@
+@@ -42,4 +43,4 @@
</sequential>
</macrodef>
@@ -96,7 +96,7 @@
+</project>
--- a/project-build/aspect/quality.xml
+++ b/project-build/aspect/quality.xml
-@@ -16,7 +16,8 @@
+@@ -31,7 +31,8 @@
</path>
<test-compile classpath.id="test.compile.classpath" input.dir="${test.java.dir}" output.dir="${test.output.dir}"
resources.dir="${test.resources.dir}"/>
@@ -106,7 +106,7 @@
destDir="${test.output.dir}" source="${source.version}" checkRuntimeVersion="false" X="${aspectj.x}"/>
<path id="test.run.classpath">
-@@ -51,9 +52,10 @@
+@@ -66,9 +67,10 @@
</path>
<test-compile classpath.id="test.compile.classpath" input.dir="${test.clover.dir}" output.dir="${test.output.dir}"
resources.dir="${test.resources.dir}"/>
Modified: trunk/spring-build/debian/patches/ivy_local_only.diff
===================================================================
--- trunk/spring-build/debian/patches/ivy_local_only.diff 2010-08-23 20:53:24 UTC (rev 12937)
+++ trunk/spring-build/debian/patches/ivy_local_only.diff 2010-08-24 22:22:56 UTC (rev 12938)
@@ -4,8 +4,8 @@
Last-Update: 2010-06-19
--- a/project-build/common/ivysettings.xml
+++ b/project-build/common/ivysettings.xml
-@@ -1,8 +1,6 @@
- <?xml version="1.0" encoding="UTF-8"?>
+@@ -16,8 +16,6 @@
+ -->
<ivysettings>
- <typedef name="s3" classname="org.springframework.aws.ivy.S3Resolver"/>
@@ -13,7 +13,7 @@
<settings defaultResolver="external-lookup" defaultLatestStrategy="latest-lexico"/>
<caches resolutionCacheDir="${ivy.cache.dir}/resolution" repositoryCacheDir="${ivy.cache.dir}/repository"
-@@ -36,32 +34,31 @@
+@@ -51,32 +49,31 @@
<!-- Lookup repositories -->
<chain name="external-lookup" returnFirst="true">
Modified: trunk/spring-build/debian/rules
===================================================================
--- trunk/spring-build/debian/rules 2010-08-23 20:53:24 UTC (rev 12937)
+++ trunk/spring-build/debian/rules 2010-08-24 22:22:56 UTC (rev 12938)
@@ -11,7 +11,8 @@
PRJ_ROOT = org.springframework.build
ARTIFACT_ROOT = target/artifacts/org.springframework.build
-makebuilddir::
+pre-build::
+ -ln -s project-build spring-build
-for MYMOD in $(MODULES); do \
(cd org.springframework.build.$$MYMOD; ln -s ../project-build spring-build); \
done
@@ -28,7 +29,7 @@
-for MYMOD in $(MODULES); do \
rm org.springframework.build.$$MYMOD/spring-build; \
done
- -rm project-build/project-build
+ -rm spring-build
mh_clean
get-orig-source:
More information about the pkg-java-commits
mailing list