[pkg-java] r13354 - branches/spring-build/squeeze-backports/debian

[Miguel Landaeta]

Author: nomadium-guest
Date: 2011-02-24 16:56:38 +0000 (Thu, 24 Feb 2011)
New Revision: 13354

Modified:
   branches/spring-build/squeeze-backports/debian/changelog
   branches/spring-build/squeeze-backports/debian/control
   branches/spring-build/squeeze-backports/debian/copyright
   branches/spring-build/squeeze-backports/debian/rules
Log:
* Merge with trunk.


Modified: branches/spring-build/squeeze-backports/debian/changelog
===================================================================
--- branches/spring-build/squeeze-backports/debian/changelog	2011-02-24 05:05:02 UTC (rev 13353)
+++ branches/spring-build/squeeze-backports/debian/changelog	2011-02-24 16:56:38 UTC (rev 13354)
@@ -1,10 +1,17 @@
-spring-build (2.5.2~git3be7d52-1~bpo60+1) UNRELEASED; urgency=low
+spring-build (2.7.0-1) unstable; urgency=low
 
-  * Rebuild for squeeze-backports.
-  * Add myself to Uploaders.
+  [ Miguel Landaeta ]
+  * New upstream release.
+  * Remove dangling symlink in clean target.
 
- -- Miguel Landaeta <miguel at miguel.cc>  Fri, 19 Nov 2010 19:39:13 -0430
+  [ 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)

Modified: branches/spring-build/squeeze-backports/debian/control
===================================================================
--- branches/spring-build/squeeze-backports/debian/control	2011-02-24 05:05:02 UTC (rev 13353)
+++ branches/spring-build/squeeze-backports/debian/control	2011-02-24 16:56:38 UTC (rev 13354)
@@ -6,7 +6,6 @@
  libcommons-httpclient-java, libjets3t-java, libequinox-osgi-java,
  libspring-build-java
 Maintainer: Damien Raude-Morvan <drazzib at debian.org>
-Uploaders: Miguel Landaeta <miguel at miguel.cc>
 Standards-Version: 3.9.1
 Homepage: http://www.springsource.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/spring-build/

Modified: branches/spring-build/squeeze-backports/debian/copyright
===================================================================
--- branches/spring-build/squeeze-backports/debian/copyright	2011-02-24 05:05:02 UTC (rev 13353)
+++ branches/spring-build/squeeze-backports/debian/copyright	2011-02-24 16:56:38 UTC (rev 13354)
@@ -1,34 +1,35 @@
-Format-Specification: http://dep.debian.net/deps/dep5/
-Name: Spring Build
-Maintainer: SpringSource
+Format: http://dep.debian.net/deps/dep5/
+Upstream-Name: Spring Build
+Upstream-Contact: SpringSource
 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, SpringSource
 License: Apache-2.0
 
+
 Files: debian/*
 Copyright: 2010, Damien Raude-Morvan <drazzib at drazzib.com>
 License: Apache-2.0
 
 
 License: Apache-2.0
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ .
+ http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ .
  On Debian systems the full text of the Apache License can be found
  in the `/usr/share/common-licenses/Apache-2.0' file.
+

Modified: branches/spring-build/squeeze-backports/debian/rules
===================================================================
--- branches/spring-build/squeeze-backports/debian/rules	2011-02-24 05:05:02 UTC (rev 13353)
+++ branches/spring-build/squeeze-backports/debian/rules	2011-02-24 16:56:38 UTC (rev 13354)
@@ -31,6 +31,7 @@
 	done
 	-rm spring-build
 	mh_clean
+	-unlink project-build/project-build
 
 get-orig-source:
 	sh debian/orig-tar.sh $(DEB_UPSTREAM_VERSION)