[pkg-java] r12728 - in trunk/libspring-java/debian: . patches

[Damien Raude-Morvan]

Author: drazzib
Date: 2010-07-05 19:22:42 +0000 (Mon, 05 Jul 2010)
New Revision: 12728

Modified:
   trunk/libspring-java/debian/build-classpath
   trunk/libspring-java/debian/changelog
   trunk/libspring-java/debian/control
   trunk/libspring-java/debian/patches/0008_jpa_20_api.diff
   trunk/libspring-java/debian/rules
Log:
Update Standards-Version and d/changelog

Modified: trunk/libspring-java/debian/build-classpath
===================================================================
--- trunk/libspring-java/debian/build-classpath	2010-07-05 14:19:43 UTC (rev 12727)
+++ trunk/libspring-java/debian/build-classpath	2010-07-05 19:22:42 UTC (rev 12728)
@@ -40,7 +40,6 @@
 /usr/share/java/glassfish-appserv-jstl.jar
 # Just for javax.servlet.jsp.jstl.*
 /usr/share/java/glassfish-javaee.jar
-/usr/share/java/glassfish-jpa.jar
 /usr/share/java/glassfish-jta.jar
 /usr/share/java/glassfish-mail.jar
 /usr/share/java/glassfish-toplink-essentials.jar

Modified: trunk/libspring-java/debian/changelog
===================================================================
--- trunk/libspring-java/debian/changelog	2010-07-05 14:19:43 UTC (rev 12727)
+++ trunk/libspring-java/debian/changelog	2010-07-05 19:22:42 UTC (rev 12728)
@@ -1,15 +1,17 @@
 libspring-java (3.0.3.RELEASE-1) UNRELEASED; urgency=low
 
-  * FTBFS (missing Castor) !
-
   * New major upstream release.
     - rename packages to match libspring-*-java convention
     - build using spring-build-script Ant+Ivy infrastructure
-    - completly rework B-D and Depends for all packages
+    - completely rework B-D and Depends for all packages
       based on Maven metadata
   * Drop Andreas from Uploaders
+  * Add Miguel Landaeta as Uploaders
+  * Bump Standards-Version to 3.9.0: no changes needed.
+  * Use mh_clean in clean target:
+    - Build-Depends on maven-repo-helper >= 1.1
 
- -- Damien Raude-Morvan <drazzib at debian.org>  Sun, 20 Jun 2010 20:45:54 +0200
+ -- Damien Raude-Morvan <drazzib at debian.org>  Mon, 05 Jul 2010 21:21:49 +0200
 
 libspring-2.5-java (2.5.6.SEC01-10) unstable; urgency=low
 

Modified: trunk/libspring-java/debian/control
===================================================================
--- trunk/libspring-java/debian/control	2010-07-05 14:19:43 UTC (rev 12727)
+++ trunk/libspring-java/debian/control	2010-07-05 19:22:42 UTC (rev 12728)
@@ -4,7 +4,7 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Damien Raude-Morvan <drazzib at debian.org>, Miguel Landaeta <miguel at miguel.cc>
 Build-Depends: debhelper (>= 7.0.50~), ant, openjdk-6-jdk
-Build-Depends-Indep: maven-repo-helper, ivy, spring-build-scripts,
+Build-Depends-Indep: maven-repo-helper (>= 1.1), ivy, spring-build-scripts,
  aspectj, bsh, glassfish-javaee, glassfish-mail, glassfish-toplink-essentials,
  groovy, junit4 (>= 4.5), libaopalliance-java, libasm3-java, libatinject-jsr330-api-java,
  libaxis-java, libbackport-util-concurrent-java, libc3p0-java, libcastor-core-java, libcastor-xml-java,
@@ -19,7 +19,7 @@
  libquartz-java, librome-java, libservlet2.5-java, libspring-build-java, libstruts1.2-java,
  libtiles-java, libtomcat6-java, libvelocity-tools-java, libxmlbeans-java, libxstream-java,
  testng, velocity
-Standards-Version: 3.8.4
+Standards-Version: 3.9.0
 Homepage: http://springframework.org/about
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libspring-java/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libspring-java/

Modified: trunk/libspring-java/debian/patches/0008_jpa_20_api.diff
===================================================================
--- trunk/libspring-java/debian/patches/0008_jpa_20_api.diff	2010-07-05 14:19:43 UTC (rev 12727)
+++ trunk/libspring-java/debian/patches/0008_jpa_20_api.diff	2010-07-05 19:22:42 UTC (rev 12728)
@@ -3,9 +3,9 @@
 Forwarded: no
 Last-Update: 2010-07-02
 
---- libspring-java-3.0.3.RELEASE.orig/projects/org.springframework.orm/src/main/java/org/springframework/orm/jpa/persistenceunit/MutablePersistenceUnitInfo.java
-+++ libspring-java-3.0.3.RELEASE/projects/org.springframework.orm/src/main/java/org/springframework/orm/jpa/persistenceunit/MutablePersistenceUnitInfo.java
-@@ -22,6 +22,8 @@ import java.util.List;
+--- a/projects/org.springframework.orm/src/main/java/org/springframework/orm/jpa/persistenceunit/MutablePersistenceUnitInfo.java
++++ b/projects/org.springframework.orm/src/main/java/org/springframework/orm/jpa/persistenceunit/MutablePersistenceUnitInfo.java
+@@ -22,6 +22,8 @@
  import java.util.Properties;
  import javax.persistence.spi.ClassTransformer;
  import javax.persistence.spi.PersistenceUnitTransactionType;
@@ -14,7 +14,7 @@
  import javax.sql.DataSource;
  
  import org.springframework.util.ClassUtils;
-@@ -220,4 +222,12 @@ public class MutablePersistenceUnitInfo
+@@ -220,4 +222,12 @@
  		return builder.toString();
  	}
  

Modified: trunk/libspring-java/debian/rules
===================================================================
--- trunk/libspring-java/debian/rules	2010-07-05 14:19:43 UTC (rev 12727)
+++ trunk/libspring-java/debian/rules	2010-07-05 19:22:42 UTC (rev 12728)
@@ -18,6 +18,7 @@
 
 override_dh_auto_clean:
 	$(ANT) clean
+	mh_clean
 
 override_dh_auto_configure:
 	rm -rf projects/spring-build
@@ -27,7 +28,6 @@
 	$(ANT) jar
 
 override_dh_auto_install:
-
 	mh_installpom -plibspring-core-java $(PRJ_ROOT).spring-parent/pom.xml
 	for MYMOD in $(MODULES); do \
 		BASENAME=`echo spring-$$MYMOD | sed "s/\\./\\-/"`; \