[pkg-java] r13356 - branches/libspring-java/squeeze-backports/debian

[Miguel Landaeta]

Author: nomadium-guest
Date: 2011-02-24 18:58:49 +0000 (Thu, 24 Feb 2011)
New Revision: 13356

Modified:
   branches/libspring-java/squeeze-backports/debian/changelog
   branches/libspring-java/squeeze-backports/debian/copyright
   branches/libspring-java/squeeze-backports/debian/rules
Log:
* Merge with trunk.


Modified: branches/libspring-java/squeeze-backports/debian/changelog
===================================================================
--- branches/libspring-java/squeeze-backports/debian/changelog	2011-02-24 16:59:30 UTC (rev 13355)
+++ branches/libspring-java/squeeze-backports/debian/changelog	2011-02-24 18:58:49 UTC (rev 13356)
@@ -1,9 +1,14 @@
-libspring-java (3.0.5.RELEASE-1~bpo60+1) UNRELEASED; urgency=low
+libspring-java (3.0.5.RELEASE-2) unstable; urgency=low
 
-  * Rebuild for squeeze-backports.
+  [ Miguel Landaeta ]
+  * Fix clean target in order to allow two builds in a row.
 
- -- Miguel Landaeta <miguel at miguel.cc>  Fri, 19 Nov 2010 20:14:58 -0430
+  [ Damien Raude-Morvan ]
+  * Upload to unstable.
+  * d/copyright: Update to latest DEP-5 format.
 
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sun, 13 Feb 2011 19:34:54 +0100
+
 libspring-java (3.0.5.RELEASE-1) experimental; urgency=low
 
   [ Miguel Landaeta ]

Modified: branches/libspring-java/squeeze-backports/debian/copyright
===================================================================
--- branches/libspring-java/squeeze-backports/debian/copyright	2011-02-24 16:59:30 UTC (rev 13355)
+++ branches/libspring-java/squeeze-backports/debian/copyright	2011-02-24 18:58:49 UTC (rev 13356)
@@ -1,6 +1,6 @@
-Format-Specification: http://dep.debian.net/deps/dep5/
-Name: Spring Framework
-Maintainer: SpringSource Inc.
+Format: http://dep.debian.net/deps/dep5/
+Upstream-Name: Spring Framework
+Upstream-Contact: SpringSource Inc.
 Source: http://springframework.org/download
 
 Files: *
@@ -9,22 +9,25 @@
 Copyright: 2009 SpringSource Inc.
 License: Apache-2.0
 
+
 Files: debian/*
 Copyright: Copyright 2010, Damien Raude-Morvan <drazzib at debian.org>
 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/libspring-java/squeeze-backports/debian/rules
===================================================================
--- branches/libspring-java/squeeze-backports/debian/rules	2011-02-24 16:59:30 UTC (rev 13355)
+++ branches/libspring-java/squeeze-backports/debian/rules	2011-02-24 18:58:49 UTC (rev 13356)
@@ -18,6 +18,9 @@
 
 override_dh_auto_clean:
 	$(ANT) clean
+	$(ANT) clean-integration
+	-unlink projects/spring-build
+	rm -rf projects/ivy-cache
 	mh_clean
 
 override_dh_auto_configure: