[Pkg-osm-commits] [SCM] osmosis branch, master, updated. debian/0.39+ds1-1-1-g951cbd2

[David Paleino]

The following commit has been merged in the master branch:
commit 951cbd208c87e35db810ebefa3b84a667fc8d48e
Author: David Paleino <dapal at debian.org>
Date:   Wed Sep 28 19:52:23 2011 +0200

    Complete switch from Spring Framework 2.5 to 3.0 (Closes: #638539)

diff --git a/debian/changelog b/debian/changelog
index e8c8a8b..58db5ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+osmosis (0.39+ds1-2) UNRELEASED; urgency=low
+
+  * Complete switch from Spring Framework 2.5 to 3.0 (Closes: #638539)
+
+ -- David Paleino <dapal at debian.org>  Wed, 28 Sep 2011 19:51:44 +0200
+
 osmosis (0.39+ds1-1) unstable; urgency=low
 
   [ David Paleino ]
diff --git a/debian/control b/debian/control
index 98437bd..7fbdb68 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,7 @@ Build-Depends:
  , libspring-beans-java
  , libspring-context-java
  , libspring-jdbc-java
- , libspring-tx-2.5-java
+ , libspring-transaction-java
  , libwoodstox-java
  , libstax2-api-java
  , libbatik-java
diff --git a/debian/patches/03-create_manifest.patch b/debian/patches/03-create_manifest.patch
index 267d857..4341d4d 100644
--- a/debian/patches/03-create_manifest.patch
+++ b/debian/patches/03-create_manifest.patch
@@ -41,7 +41,7 @@ Forwarded: not-needed
 --- /dev/null
 +++ osmosis/apidb/jar.properties
 @@ -0,0 +1 @@
-+jar.classpath=/usr/share/osmosis/osmosis-core.jar /usr/share/osmosis/osmosis-replication.jar /usr/share/osmosis/osmosis-xml.jar /usr/share/java/spring-jdbc.jar /usr/share/java/commons-dbcp.jar /usr/share/java/postgresql.jar /usr/share/java/mysql-connector-java.jar
++jar.classpath=/usr/share/osmosis/osmosis-core.jar /usr/share/osmosis/osmosis-replication.jar /usr/share/osmosis/osmosis-xml.jar /usr/share/java/spring3-jdbc.jar /usr/share/java/commons-dbcp.jar /usr/share/java/postgresql.jar /usr/share/java/mysql-connector-java.jar
 --- /dev/null
 +++ osmosis/areafilter/jar.properties
 @@ -0,0 +1 @@
@@ -69,11 +69,11 @@ Forwarded: not-needed
 --- /dev/null
 +++ osmosis/pgsimple/jar.properties
 @@ -0,0 +1 @@
-+jar.classpath=/usr/share/osmosis-core.jar /usr/share/osmosis-dataset.jar /usr/share/osmosis-xml.jar /usr/share/java/spring-jdbc.jar /usr/share/java/commons-dbcp.jar /usr/share/java/postgresql.jar /usr/share/java/postgis.jar
++jar.classpath=/usr/share/osmosis-core.jar /usr/share/osmosis-dataset.jar /usr/share/osmosis-xml.jar /usr/share/java/spring3-jdbc.jar /usr/share/java/commons-dbcp.jar /usr/share/java/postgresql.jar /usr/share/java/postgis.jar
 --- /dev/null
 +++ osmosis/pgsnapshot/jar.properties
 @@ -0,0 +1 @@
-+jar.classpath=/usr/share/osmosis/osmosis-core.jar /usr/share/osmosis/osmosis-hstore.jar /usr/share/osmosis/osmosis-dataset.jar /usr/share/osmosis/osmosis-xml.jar /usr/share/java/spring-jdbc.jar /usr/share/java/commons-dbcp.jar /usr/share/java/postgresql.jar /usr/share/java/postgis.jar
++jar.classpath=/usr/share/osmosis/osmosis-core.jar /usr/share/osmosis/osmosis-hstore.jar /usr/share/osmosis/osmosis-dataset.jar /usr/share/osmosis/osmosis-xml.jar /usr/share/java/spring3-jdbc.jar /usr/share/java/commons-dbcp.jar /usr/share/java/postgresql.jar /usr/share/java/postgis.jar
 --- /dev/null
 +++ osmosis/replication/jar.properties
 @@ -0,0 +1 @@
diff --git a/debian/rules b/debian/rules
index 7720a9f..c452242 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,10 +8,10 @@ DEB_JARS += /usr/share/java/postgresql.jar
 DEB_JARS += /usr/share/java/wstx-lgpl.jar
 DEB_JARS += /usr/share/java/junit4.jar
 DEB_JARS += /usr/share/java/ant-junit.jar
-DEB_JARS += /usr/share/java/spring-core.jar
-DEB_JARS += /usr/share/java/spring-jdbc.jar
-DEB_JARS += /usr/share/java/spring-beans.jar
-DEB_JARS += /usr/share/java/spring-tx.jar
+DEB_JARS += /usr/share/java/spring3-core.jar
+DEB_JARS += /usr/share/java/spring3-jdbc.jar
+DEB_JARS += /usr/share/java/spring3-beans.jar
+DEB_JARS += /usr/share/java/spring3-transaction.jar
 DEB_JARS += /usr/share/java/commons-dbcp.jar
 DEB_JARS += /usr/share/java/jpf.jar
 DEB_JARS += /usr/share/java/commons-compress.jar

-- 
Osmosis, an OSM data processor