[pkg-java] r13529 - in tags/spring-build: . 2.7.0-2/debian 2.7.0-2/debian/patches
Damien Raude-Morvan
drazzib at alioth.debian.org
Wed Apr 13 22:17:15 UTC 2011
Author: drazzib
Date: 2011-04-13 22:17:14 +0000 (Wed, 13 Apr 2011)
New Revision: 13529
Added:
tags/spring-build/2.7.0-2/
tags/spring-build/2.7.0-2/debian/changelog
tags/spring-build/2.7.0-2/debian/patches/new_jets3t_0_8.diff
tags/spring-build/2.7.0-2/debian/patches/series
tags/spring-build/2.7.0-2/debian/rules
Removed:
tags/spring-build/2.7.0-2/debian/changelog
tags/spring-build/2.7.0-2/debian/patches/series
tags/spring-build/2.7.0-2/debian/rules
Log:
[svn-buildpackage] Tagging spring-build 2.7.0-2
Deleted: tags/spring-build/2.7.0-2/debian/changelog
===================================================================
--- trunk/spring-build/debian/changelog 2011-03-16 20:33:24 UTC (rev 13434)
+++ tags/spring-build/2.7.0-2/debian/changelog 2011-04-13 22:17:14 UTC (rev 13529)
@@ -1,19 +0,0 @@
-spring-build (2.7.0-1) unstable; urgency=low
-
- [ Miguel Landaeta ]
- * New upstream release.
- * Remove dangling symlink in clean target.
-
- [ Damien Raude-Morvan ]
- * d/copyright: Fix copyright assignment to SpringSource.
- Thanks to Torsten Werner.
- * d/copyright: Update to latest DEP-5 format.
- * Upload to unstable.
-
- -- Damien Raude-Morvan <drazzib at debian.org> Sun, 13 Feb 2011 19:35:21 +0100
-
-spring-build (2.5.2~git3be7d52-1) experimental; urgency=low
-
- * Initial release. (Closes: #586523)
-
- -- Damien Raude-Morvan <drazzib at debian.org> Tue, 24 Aug 2010 22:10:27 +0200
Copied: tags/spring-build/2.7.0-2/debian/changelog (from rev 13527, trunk/spring-build/debian/changelog)
===================================================================
--- tags/spring-build/2.7.0-2/debian/changelog (rev 0)
+++ tags/spring-build/2.7.0-2/debian/changelog 2011-04-13 22:17:14 UTC (rev 13529)
@@ -0,0 +1,27 @@
+spring-build (2.7.0-2) unstable; urgency=low
+
+ * d/patches/new_jets3t_0_8.diff: Fix build with lastest jets3t 0.8
+ (Closes: #621937).
+ * d/rules: Enhance symlink handling for "spring-build" directory.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Wed, 13 Apr 2011 23:57:40 +0200
+
+spring-build (2.7.0-1) unstable; urgency=low
+
+ [ Miguel Landaeta ]
+ * New upstream release.
+ * Remove dangling symlink in clean target.
+
+ [ Damien Raude-Morvan ]
+ * d/copyright: Fix copyright assignment to SpringSource.
+ Thanks to Torsten Werner.
+ * d/copyright: Update to latest DEP-5 format.
+ * Upload to unstable.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Sun, 13 Feb 2011 19:35:21 +0100
+
+spring-build (2.5.2~git3be7d52-1) experimental; urgency=low
+
+ * Initial release. (Closes: #586523)
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Tue, 24 Aug 2010 22:10:27 +0200
Copied: tags/spring-build/2.7.0-2/debian/patches/new_jets3t_0_8.diff (from rev 13527, trunk/spring-build/debian/patches/new_jets3t_0_8.diff)
===================================================================
--- tags/spring-build/2.7.0-2/debian/patches/new_jets3t_0_8.diff (rev 0)
+++ tags/spring-build/2.7.0-2/debian/patches/new_jets3t_0_8.diff 2011-04-13 22:17:14 UTC (rev 13529)
@@ -0,0 +1,47 @@
+--- a/org.springframework.build.aws.ant/src/main/java/org/springframework/build/aws/ant/AbstractS3DownloadOperation.java
++++ b/org.springframework.build.aws.ant/src/main/java/org/springframework/build/aws/ant/AbstractS3DownloadOperation.java
+@@ -24,6 +24,7 @@
+
+ import org.apache.tools.ant.Project;
+ import org.jets3t.service.S3Service;
++import org.jets3t.service.ServiceException;
+ import org.jets3t.service.S3ServiceException;
+ import org.jets3t.service.model.S3Bucket;
+ import org.jets3t.service.model.S3Object;
+@@ -55,6 +56,9 @@
+ long endTime = System.currentTimeMillis();
+ logEnd(source, startTime, endTime);
+ }
++ catch (ServiceException e) {
++ throw new S3ServiceException(e);
++ }
+ finally {
+ if (in != null) {
+ try {
+@@ -87,4 +91,4 @@
+ + TransferUtils.getFormattedSpeed(source.getContentLength(), transferTime), Project.MSG_INFO);
+ }
+
+-}
+\ No newline at end of file
++}
+--- a/org.springframework.build.aws.ivy/src/main/java/org/springframework/aws/ivy/S3Resource.java
++++ b/org.springframework.build.aws.ivy/src/main/java/org/springframework/aws/ivy/S3Resource.java
+@@ -21,6 +21,7 @@
+
+ import org.apache.ivy.plugins.repository.Resource;
+ import org.jets3t.service.S3Service;
++import org.jets3t.service.ServiceException;
+ import org.jets3t.service.S3ServiceException;
+ import org.jets3t.service.model.S3Bucket;
+ import org.jets3t.service.model.S3Object;
+@@ -83,6 +84,9 @@
+ catch (S3ServiceException e) {
+ throw new S3RepositoryException(e);
+ }
++ catch (ServiceException e) {
++ throw new S3RepositoryException(e);
++ }
+ }
+
+ private void initializeS3(String uri) {
Deleted: tags/spring-build/2.7.0-2/debian/patches/series
===================================================================
--- trunk/spring-build/debian/patches/series 2011-03-16 20:33:24 UTC (rev 13434)
+++ tags/spring-build/2.7.0-2/debian/patches/series 2011-04-13 22:17:14 UTC (rev 13529)
@@ -1,3 +0,0 @@
-ivy_local_only.diff
-ivy_artifact.diff
-ivy_aspectj.diff
Copied: tags/spring-build/2.7.0-2/debian/patches/series (from rev 13527, trunk/spring-build/debian/patches/series)
===================================================================
--- tags/spring-build/2.7.0-2/debian/patches/series (rev 0)
+++ tags/spring-build/2.7.0-2/debian/patches/series 2011-04-13 22:17:14 UTC (rev 13529)
@@ -0,0 +1,4 @@
+ivy_local_only.diff
+ivy_artifact.diff
+ivy_aspectj.diff
+new_jets3t_0_8.diff
Deleted: tags/spring-build/2.7.0-2/debian/rules
===================================================================
--- trunk/spring-build/debian/rules 2011-03-16 20:33:24 UTC (rev 13434)
+++ tags/spring-build/2.7.0-2/debian/rules 2011-04-13 22:17:14 UTC (rev 13529)
@@ -1,38 +0,0 @@
-#!/usr/bin/make -f
-
-include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-
-JAVA_HOME := /usr/lib/jvm/default-java
-DEB_JARS := ivy commons-net commons-httpclient jets3t org.eclipse.osgi
-DEB_ANT_BUILDFILE := debian/build.xml
-
-MODULES = ant aws.ant aws.ivy osgi
-PRJ_ROOT = org.springframework.build
-ARTIFACT_ROOT = target/artifacts/org.springframework.build
-
-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
-
-binary-post-install/libspring-build-java::
- for MYMOD in $(MODULES); do \
- POM=`echo debian/poms/$$MYMOD.xml`; \
- JAR=`echo $(PRJ_ROOT).$$MYMOD/$(ARTIFACT_ROOT).$$MYMOD.jar`; \
- mh_installpom -plibspring-build-java $$POM ; \
- mh_installjar -plibspring-build-java -l $$POM $$JAR ; \
- done
-
-clean::
- -for MYMOD in $(MODULES); do \
- rm org.springframework.build.$$MYMOD/spring-build; \
- done
- -rm spring-build
- mh_clean
- -unlink project-build/project-build
-
-get-orig-source:
- sh debian/orig-tar.sh $(DEB_UPSTREAM_VERSION)
-
Copied: tags/spring-build/2.7.0-2/debian/rules (from rev 13528, trunk/spring-build/debian/rules)
===================================================================
--- tags/spring-build/2.7.0-2/debian/rules (rev 0)
+++ tags/spring-build/2.7.0-2/debian/rules 2011-04-13 22:17:14 UTC (rev 13529)
@@ -0,0 +1,50 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
+
+JAVA_HOME := /usr/lib/jvm/default-java
+DEB_JARS := ivy commons-net commons-httpclient jets3t org.eclipse.osgi
+DEB_ANT_BUILDFILE := debian/build.xml
+
+MODULES = ant aws.ant aws.ivy osgi
+PRJ_ROOT = org.springframework.build
+ARTIFACT_ROOT = target/artifacts/org.springframework.build
+
+setuplinks:
+ if [ ! -d spring-build ]; then \
+ ln -s project-build spring-build; \
+ fi;
+ -for MYMOD in $(MODULES); do \
+ FILE=org.springframework.build.$$MYMOD/spring-build; \
+ if [ ! -d $$FILE ]; then \
+ (cd org.springframework.build.$$MYMOD/; ln -s ../project-build spring-build) \
+ fi; \
+ done
+
+removelinks:
+ for MYMOD in $(MODULES); do \
+ FILE=org.springframework.build.$$MYMOD/spring-build; \
+ if [ -d $$FILE ]; then \
+ rm $$FILE; \
+ fi; \
+ done
+ -unlink spring-build
+
+cleanbuilddir:: setuplinks
+makebuilddir:: setuplinks
+
+binary-post-install/libspring-build-java::
+ for MYMOD in $(MODULES); do \
+ POM=`echo debian/poms/$$MYMOD.xml`; \
+ JAR=`echo $(PRJ_ROOT).$$MYMOD/$(ARTIFACT_ROOT).$$MYMOD.jar`; \
+ mh_installpom -plibspring-build-java $$POM ; \
+ mh_installjar -plibspring-build-java -l $$POM $$JAR ; \
+ done
+
+clean:: removelinks
+ mh_clean
+
+get-orig-source:
+ sh debian/orig-tar.sh $(DEB_UPSTREAM_VERSION)
+
More information about the pkg-java-commits
mailing list