[SCM] osmosis annotated tag, upstream/0.39+ds1, created. upstream/0.39+ds1

2011-09-28 Thread David Paleino
The annotated tag, upstream/0.39+ds1 has been created
at  9ca0523c1eb0a4970e456b587f689760754b4e5c (tag)
   tagging  0bbd28dc35026d86e1c81d48aff4918300397b56 (commit)
  replaces  upstream/0.31.2
 tagged by  David Paleino
on  Wed Sep 28 10:08:22 2011 +0200

- Shortlog 
Upstream version 0.39+ds1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)

iEYEABECAAYFAk6C1fYACgkQ5qqQFxOSsXQ7XQCfQiTbhqGQYxi6savv1PeM/jJr
oYoAn0St1TFTu450MYqIol1Oj9/1CPcQ
=zpcZ
-END PGP SIGNATURE-

David Paleino (3):
  Imported Upstream version 0.34+ds1
  Imported Upstream version 0.38+ds1
  Imported Upstream version 0.39+ds1

Giovanni Mascellani (1):
  Imported Upstream version 0.38+ds2

---

-- 
Osmosis, an OSM data processor

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel


[SCM] osmosis branch, master, updated. debian/0.31.2-2-58-g3adf508

2011-09-28 Thread David Paleino
The following commit has been merged in the master branch:
commit 3adf5081b49ddd087942dd6faafc08021a0220c0
Author: David Paleino da...@debian.org
Date:   Wed Sep 28 10:31:21 2011 +0200

Fix debian/rules to support multi-archified java

diff --git a/debian/changelog b/debian/changelog
index e879861..4b2b95e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ osmosis (0.39+ds2-1) UNRELEASED; urgency=low
   * Fix get-orig-source target in debian/rules
   * Use debhelper compatibility 8
   * Bump Standards-Version to 3.9.1, no changes needed
+  * Fix debian/rules to support multi-archified java
 
   [ Giovanni Mascellani ]
   * debian/watch: updated
@@ -15,7 +16,7 @@ osmosis (0.39+ds2-1) UNRELEASED; urgency=low
   * Depend on headless runtime environment and use default-jdk at
 building time (closes: #613135).
 
- -- Giovanni Mascellani g...@debian.org  Sun, 13 Feb 2011 10:20:06 +0100
+ -- David Paleino da...@debian.org  Wed, 28 Sep 2011 10:30:56 +0200
 
 osmosis (0.34+ds1-1) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 1ccb784..58dcb17 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 
-JAVA_HOME := /usr/lib/jvm/java-6-openjdk/
+JAVA_HOME := /usr/lib/jvm/java-6-openjdk-$(shell dpkg --print-architecture)/
 
 DEB_JARS := /usr/share/java/mysql-connector-java.jar
 DEB_JARS += /usr/share/java/postgis.jar

-- 
Osmosis, an OSM data processor

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel


[SCM] osmosis branch, master, updated. debian/0.31.2-2-58-g3adf508

2011-09-28 Thread David Paleino
The following commit has been merged in the master branch:
commit 48732c0107a7ef0c47029022debb0f4a9e4c25b2
Author: David Paleino da...@debian.org
Date:   Wed Sep 28 10:13:08 2011 +0200

Patches refreshed

diff --git a/debian/patches/00-fix_build_system.patch 
b/debian/patches/00-fix_build_system.patch
index bdcc178..bef05fb 100644
--- a/debian/patches/00-fix_build_system.patch
+++ b/debian/patches/00-fix_build_system.patch
@@ -2,17 +2,15 @@
  apidb/build.xml  |2 ++
  build-support/config/ant-build-common.properties |4 ++--
  build-support/script/build-ivy-base.xml  |   11 +--
- build-support/script/build-java.xml  |   10 +-
+ build-support/script/build-java.xml  |   12 ++--
  build.xml|1 +
  core/ivy.xml |2 +-
  extract/build.xml|2 ++
  pgsnapshot/build.xml |2 ++
- 8 files changed, 20 insertions(+), 14 deletions(-)
+ 8 files changed, 21 insertions(+), 15 deletions(-)
 
-Index: osmosis/apidb/build.xml
-===
 osmosis.orig/apidb/build.xml   2011-01-31 01:07:47.0 +0100
-+++ osmosis/apidb/build.xml2011-08-14 22:45:09.0 +0200
+--- osmosis.orig/apidb/build.xml
 osmosis/apidb/build.xml
 @@ -1,6 +1,8 @@
  ?xml version=1.0 encoding=utf-8 ?
  project name=Osmosis.Apidb default=all basedir=.
@@ -22,10 +20,8 @@ Index: osmosis/apidb/build.xml
!-- Include common java build. --
property name=build-support.dir location=../build-support/
import file=${build-support.dir}/script/build-java.xml/
-Index: osmosis/build-support/script/build-ivy-base.xml
-===
 osmosis.orig/build-support/script/build-ivy-base.xml   2011-01-31 
01:07:47.0 +0100
-+++ osmosis/build-support/script/build-ivy-base.xml2011-08-14 
22:45:09.0 +0200
+--- osmosis.orig/build-support/script/build-ivy-base.xml
 osmosis/build-support/script/build-ivy-base.xml
 @@ -9,6 +9,7 @@
!-- Include common build components. --
property name=build-support.dir location=..//
@@ -63,10 +59,8 @@ Index: osmosis/build-support/script/build-ivy-base.xml

!-- Retrieve ivy details from the config file. --
ivy:info /
-Index: osmosis/build-support/script/build-java.xml
-===
 osmosis.orig/build-support/script/build-java.xml   2011-08-14 
22:44:33.0 +0200
-+++ osmosis/build-support/script/build-java.xml2011-08-14 
22:45:31.0 +0200
+--- osmosis.orig/build-support/script/build-java.xml
 osmosis/build-support/script/build-java.xml
 @@ -109,12 +109,12 @@
/target

@@ -103,10 +97,8 @@ Index: osmosis/build-support/script/build-java.xml
fileset dir=test/data/input
include name=**/*/
/fileset
-Index: osmosis/extract/build.xml
-===
 osmosis.orig/extract/build.xml 2011-01-31 01:07:47.0 +0100
-+++ osmosis/extract/build.xml  2011-08-14 22:45:09.0 +0200
+--- osmosis.orig/extract/build.xml
 osmosis/extract/build.xml
 @@ -1,6 +1,8 @@
  ?xml version=1.0 encoding=utf-8 ?
  project name=Osmosis.Extract default=all basedir=.
@@ -116,10 +108,8 @@ Index: osmosis/extract/build.xml
!-- Include common java build. --
property name=build-support.dir location=../build-support/
import file=${build-support.dir}/script/build-java.xml/
-Index: osmosis/pgsnapshot/build.xml
-===
 osmosis.orig/pgsnapshot/build.xml  2011-01-31 01:07:47.0 +0100
-+++ osmosis/pgsnapshot/build.xml   2011-08-14 22:45:09.0 +0200
+--- osmosis.orig/pgsnapshot/build.xml
 osmosis/pgsnapshot/build.xml
 @@ -1,5 +1,7 @@
  ?xml version=1.0 encoding=utf-8 ?
  project name=Osmosis.PgSnapshot default=all basedir=.
@@ -128,10 +118,8 @@ Index: osmosis/pgsnapshot/build.xml

!-- Include common java build. --
property name=build-support.dir location=../build-support/
-Index: osmosis/build.xml
-===
 osmosis.orig/build.xml 2011-01-31 01:07:47.0 +0100
-+++ osmosis/build.xml  2011-08-14 22:45:09.0 +0200
+--- osmosis.orig/build.xml
 osmosis/build.xml
 @@ -10,6 +10,7 @@
fileset dir=.
include name=**/build.xml/
@@ -140,29 +128,25 @@ Index: osmosis/build.xml
/fileset
/ivy:buildlist
/target
-Index: 

[SCM] gdal branch, master, updated. upstream/1.8.1-57-g41b9f5e

2011-09-28 Thread Francesco Paolo Lovergine
The following commit has been merged in the master branch:
commit a9c90008452dcd656855d8d4c2290bea5e8b9308
Author: Francesco Paolo Lovergine fran...@debian.org
Date:   Wed Sep 28 11:45:02 2011 +0200

Fixed tagging for alternative archs.

diff --git a/debian/libgdal1-1.8.0.symbols b/debian/libgdal1-1.8.0.symbols
index 20864a4..5b6a960 100644
--- a/debian/libgdal1-1.8.0.symbols
+++ b/debian/libgdal1-1.8.0.symbols
@@ -2680,8 +2680,10 @@ libgdal1.8.0.so.1 libgdal1-1.8.0 #MINVER#
  viz_llz2xy@GDAL_1.8 1.8.0
  viz_xy2llz@GDAL_1.8 1.8.0
  wlon@GDAL_1.8 1.8.0
- (arch=i386 kfreebsd-i386)#include libgdal.symbols-i386
- (arch=amd64 kfreebsd-amd64)#include libgdal.symbols-amd64
+ (arch=i386)#include libgdal.symbols-i386
+ (arch=kfreebsd-i386)#include libgdal.symbols-i386
+ (arch=amd64)#include libgdal.symbols-amd64
+ (arch=kfreebsd-amd64)#include libgdal.symbols-amd64
  (arch=ia64)#include libgdal.symbols-ia64
  (arch=s390)#include libgdal.symbols-s390
  (arch=mips)#include libgdal.symbols-mips

-- 
GDAL/OGR library and tools

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel


Bug#643658: About geos C/C++ dependencies

2011-09-28 Thread Francesco P. Lovergine
Package: libgeos-dev
Version: 3.2.2-3
Severity: important

This is a reminder about a discussion I had with strk (geos and postgis 
contributor). Thanks for his summary.

---
So, I've realized Debian is shipping a single -dev package
for the GEOS library, while we have a separation between
a stable library and an unstable one.

The stable library is libgeos_c.{so,a} and has the same
SONAME since GEOS 2.2.0. This library goes with the
libgeos_c.h stable API header.

The unstable library is libgeos-xxx.{so,a}.

The C library is there for the specific purpose of
being stable and all applications are recommended to link
against _that_ library rather than againts the C++ one.

By shipping a single -dev package you can't encode the
fact that an application is dependent on the C library
but not on the C++ one. Also, you force installation
of a lot of header files which are only part of the C++
interface (not the C, stable, one).

Each libgeos-c package would depend on a specific version
of a libgeos package, and hopefully become the only package
dependent on it.

By having dependencies properly encoded, you'd save rebuild of
applications which only depend on the C, stable, library on
every new release of GEOS.
-


-- System Information:
Debian Release: wheezy/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'testing'), (1, 'experimental')
Architecture: i386 (i686)

Kernel: Linux 3.0.0-1-686-pae (SMP w/1 CPU core)
Locale: LANG=it_IT.UTF-8, LC_CTYPE=it_IT.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages libgeos-dev depends on:
ii  libgeos-3.2.2  3.2.2-3
ii  libgeos-c1 3.2.2-3

libgeos-dev recommends no packages.

Versions of packages libgeos-dev suggests:
ii  libgdal-doc  1.7.3-6

-- no debconf information

-- 
Francesco P. Lovergine



___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel


[SCM] osmosis branch, master, updated. debian/0.31.2-2-59-g53f46f8

2011-09-28 Thread David Paleino
The following commit has been merged in the master branch:
commit 53f46f87418a9874be9bf45b13e9bdd9ddcc8275
Author: David Paleino da...@debian.org
Date:   Wed Sep 28 14:13:04 2011 +0200

Fix FTBFS

diff --git a/debian/changelog b/debian/changelog
index 4b2b95e..50b17b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 osmosis (0.39+ds2-1) UNRELEASED; urgency=low
 
+  TODO: re-enable build tests, we should fix them instead of disabling.
+
   [ David Paleino ]
   * New upstream release (closes: #605698)
   * Fix get-orig-source target in debian/rules
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 000..18ccd18
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,2 @@
+core/src/org/openstreetmap/osmosis/core/OsmosisConstants.java
+core/src/org/openstreetmap/osmosis/core/plugin/plugin.xml
diff --git a/debian/control b/debian/control
index 7945c95..6fe860b 100644
--- a/debian/control
+++ b/debian/control
@@ -19,10 +19,18 @@ Build-Depends:
  , libmysql-java
  , libpostgis-java
  , libpg-java
- , libspring-beans-2.5-java
- , libspring-jdbc-2.5-java
+ , libspring-beans-java
+ , libspring-context-java
+ , libspring-jdbc-java
  , libspring-tx-2.5-java
  , libwoodstox-java
+ , libstax2-api-java
+ , libbatik-java
+ , libprotobuf-java
+ , libosmpbf-java
+ , checkstyle
+ , ivy
+ , junit4
  , default-jdk
 Standards-Version: 3.9.1
 Vcs-Git: git://git.debian.org/pkg-grass/osmosis.git
diff --git a/debian/ivysettings.xml b/debian/ivysettings.xml
index 9903307..d9097f1 100644
--- a/debian/ivysettings.xml
+++ b/debian/ivysettings.xml
@@ -7,7 +7,22 @@
name=debian-m2
m2compatible=true
root=file:///usr/share/maven-repo/
+   filesystem name=local
+   artifact 
pattern=${debian.dir}/../build/[artifact]-[revision].[ext] /
+   /filesystem
+   filesystem name=share-java
+   artifact 
pattern=/usr/share/java/[artifact](-[revision]).[ext] /
+   /filesystem
/resolvers
 
+   modules
+   module organisation=org.openstreetmap.osmosis 
resolver=local/
+
+   module organisation=postgresql name=postgresql 
resolver=share-java/
+   module organisation=com.google.protobuf name=protobuf 
resolver=share-java/
+   module organisation=crosby name=osmpbf 
resolver=share-java/
+   module organisation=org.postgis name=postgis 
resolver=share-java/
+   /modules
+
 /ivysettings
 
diff --git a/debian/patches/00-fix_build_system.patch 
b/debian/patches/00-fix_build_system.patch
index bef05fb..e25a0e0 100644
--- a/debian/patches/00-fix_build_system.patch
+++ b/debian/patches/00-fix_build_system.patch
@@ -1,13 +1,25 @@
 ---
- apidb/build.xml  |2 ++
- build-support/config/ant-build-common.properties |4 ++--
- build-support/script/build-ivy-base.xml  |   11 +--
- build-support/script/build-java.xml  |   12 ++--
- build.xml|1 +
- core/ivy.xml |2 +-
- extract/build.xml|2 ++
- pgsnapshot/build.xml |2 ++
- 8 files changed, 21 insertions(+), 15 deletions(-)
+ apidb/build.xml  |2 +
+ apidb/ivy.xml|2 -
+ areafilter/ivy.xml   |2 -
+ build-support/config/ant-build-common.properties |   34 
+++
+ build-support/script/build-ivy-base.xml  |   11 +++
+ build-support/script/build-java.xml  |   26 ++---
+ build.xml|1 
+ core/ivy.xml |4 +-
+ dataset/ivy.xml  |2 -
+ extract/build.xml|2 +
+ extract/ivy.xml  |2 -
+ hstore-jdbc/ivy.xml  |2 -
+ pbf/ivy.xml  |4 +-
+ pgsimple/ivy.xml |4 +-
+ pgsnapshot/build.xml |2 +
+ pgsnapshot/ivy.xml   |4 +-
+ replication/ivy.xml  |2 -
+ set/ivy.xml  |2 -
+ tagfilter/ivy.xml|2 -
+ xml/ivy.xml  |2 -
+ 20 files changed, 61 insertions(+), 51 deletions(-)
 
 --- osmosis.orig/apidb/build.xml
 +++ osmosis/apidb/build.xml
@@ -61,12 +73,45 @@
ivy:info /
 --- osmosis.orig/build-support/script/build-java.xml
 +++ osmosis/build-support/script/build-java.xml
-@@ -109,12 +109,12 @@
+@@ -23,6 +23,11 @@
+   /path
+   
+   target name=build_src depends=resolve 

Processing of gdal_1.8.1-2~exp1_i386.changes

2011-09-28 Thread Debian FTP Masters
gdal_1.8.1-2~exp1_i386.changes uploaded successfully to localhost
along with the files:
  gdal_1.8.1-2~exp1.dsc
  gdal_1.8.1-2~exp1.debian.tar.gz
  libgdal1-1.8.0_1.8.1-2~exp1_i386.deb
  libgdal1-dev_1.8.1-2~exp1_i386.deb
  gdal-bin_1.8.1-2~exp1_i386.deb
  python-gdal_1.8.1-2~exp1_i386.deb
  libgdal-perl_1.8.1-2~exp1_i386.deb
  libgdal-ruby1.8_1.8.1-2~exp1_i386.deb
  libgdal-ruby_1.8.1-2~exp1_i386.deb
  libgdal-doc_1.8.1-2~exp1_all.deb

Greetings,

Your Debian queue daemon (running on host franck.debian.org)

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel


gdal_1.8.1-2~exp1_i386.changes ACCEPTED into experimental

2011-09-28 Thread Debian FTP Masters



Accepted:
gdal-bin_1.8.1-2~exp1_i386.deb
  to main/g/gdal/gdal-bin_1.8.1-2~exp1_i386.deb
gdal_1.8.1-2~exp1.debian.tar.gz
  to main/g/gdal/gdal_1.8.1-2~exp1.debian.tar.gz
gdal_1.8.1-2~exp1.dsc
  to main/g/gdal/gdal_1.8.1-2~exp1.dsc
libgdal-doc_1.8.1-2~exp1_all.deb
  to main/g/gdal/libgdal-doc_1.8.1-2~exp1_all.deb
libgdal-perl_1.8.1-2~exp1_i386.deb
  to main/g/gdal/libgdal-perl_1.8.1-2~exp1_i386.deb
libgdal-ruby1.8_1.8.1-2~exp1_i386.deb
  to main/g/gdal/libgdal-ruby1.8_1.8.1-2~exp1_i386.deb
libgdal-ruby_1.8.1-2~exp1_i386.deb
  to main/g/gdal/libgdal-ruby_1.8.1-2~exp1_i386.deb
libgdal1-1.8.0_1.8.1-2~exp1_i386.deb
  to main/g/gdal/libgdal1-1.8.0_1.8.1-2~exp1_i386.deb
libgdal1-dev_1.8.1-2~exp1_i386.deb
  to main/g/gdal/libgdal1-dev_1.8.1-2~exp1_i386.deb
python-gdal_1.8.1-2~exp1_i386.deb
  to main/g/gdal/python-gdal_1.8.1-2~exp1_i386.deb


Override entries for your package:
gdal-bin_1.8.1-2~exp1_i386.deb - extra science
gdal_1.8.1-2~exp1.dsc - source science
libgdal-doc_1.8.1-2~exp1_all.deb - extra doc
libgdal-perl_1.8.1-2~exp1_i386.deb - extra perl
libgdal-ruby1.8_1.8.1-2~exp1_i386.deb - extra ruby
libgdal-ruby_1.8.1-2~exp1_i386.deb - extra ruby
libgdal1-1.8.0_1.8.1-2~exp1_i386.deb - extra libs
libgdal1-dev_1.8.1-2~exp1_i386.deb - extra libdevel
python-gdal_1.8.1-2~exp1_i386.deb - extra python

Announcing to debian-experimental-chan...@lists.debian.org
Announcing to debian-devel-chan...@lists.debian.org


Thank you for your contribution to Debian.

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel


Processed: fixed 642766 in osmosis/0.39+ds1-1, closing 642766

2011-09-28 Thread Debian Bug Tracking System
Processing commands for cont...@bugs.debian.org:

 fixed 642766 osmosis/0.39+ds1-1
Bug #642766 [src:osmosis] osmosis: FTBFS: You must specify a valid JAVA_HOME or 
JAVACMD
Bug Marked as fixed in versions osmosis/0.39+ds1-1.
 close 642766
Bug#642766: osmosis: FTBFS: You must specify a valid JAVA_HOME or JAVACMD
'close' is deprecated; see http://www.debian.org/Bugs/Developer#closing.
Bug closed, send any further explanations to Mònica Ramírez Arceda 
mon...@probeta.net

 thanks
Stopping processing here.

Please contact me if you need assistance.
-- 
642766: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=642766
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Bug#638539: marked as done (Switch dependencies on libspring-2.5-java to libspring-java)

2011-09-28 Thread Debian Bug Tracking System
Your message dated Wed, 28 Sep 2011 18:52:07 +
with message-id e1r8zel-0002e1...@franck.debian.org
and subject line Bug#638539: fixed in osmosis 0.39+ds1-2
has caused the Debian Bug report #638539,
regarding Switch dependencies on libspring-2.5-java to libspring-java
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)


-- 
638539: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=638539
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
---BeginMessage---
Package: osmosis
Version: 0.34+ds1-1
Severity: normal
Tags: patch

Hi folks,

libspring-2.5-java libraries are not going to be supported in
wheezy, so I'm filing bugs to coordinate the migration to the
new upstream version. libspring-java is perfectly compatible with
libspring-2.5-java.

I tried to build what you have (0.38+ds) in the git repo but I couldn't.
However, with the attached patch I'm switching the dependencies and
osmosis 0.34+ds-1 builds without problem.

Please test it and consider the patch.

Thanks,

-- System Information:
Debian Release: wheezy/sid
  APT prefers unstable
  APT policy: (800, 'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 3.0.0-1-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

-- 
Miguel Landaeta, miguel at miguel.cc
secure email with PGP 0x7D8967E9 available at http://keyserver.pgp.com/
Faith means not wanting to know what is true. -- Nietzsche
diff -Nru osmosis-0.34+ds1/debian/changelog osmosis-0.34+ds1/debian/changelog
--- osmosis-0.34+ds1/debian/changelog   2010-03-31 18:43:18.0 -0430
+++ osmosis-0.34+ds1/debian/changelog   2011-08-19 13:01:17.0 -0430
@@ -1,3 +1,10 @@
+osmosis (0.34+ds1-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Switch dependencies on Spring Framework 2.5 with 3.0. (Closes: #63).
+
+ -- Miguel Landaeta miguel@alice  Fri, 19 Aug 2011 13:05:55 -0430
+
 osmosis (0.34+ds1-1) unstable; urgency=low
 
   [ David Paleino ]
diff -Nru osmosis-0.34+ds1/debian/control osmosis-0.34+ds1/debian/control
--- osmosis-0.34+ds1/debian/control 2010-03-31 18:43:18.0 -0430
+++ osmosis-0.34+ds1/debian/control 2011-08-19 13:00:35.0 -0430
@@ -19,9 +19,9 @@
  , libmysql-java
  , libpostgis-java
  , libpg-java
- , libspring-beans-2.5-java
- , libspring-jdbc-2.5-java
- , libspring-tx-2.5-java
+ , libspring-beans-java
+ , libspring-jdbc-java
+ , libspring-transaction-java
  , libwoodstox-java
  , openjdk-6-jdk
 Standards-Version: 3.8.4
@@ -41,9 +41,9 @@
  , libmysql-java
  , libpostgis-java
  , libpg-java
- , libspring-beans-2.5-java
- , libspring-jdbc-2.5-java
- , libspring-tx-2.5-java
+ , libspring-beans-java
+ , libspring-jdbc-java
+ , libspring-transaction-java
  , libwoodstox-java
  , libplexus-classworlds-java
  , ${misc:Depends}
diff -Nru osmosis-0.34+ds1/debian/rules osmosis-0.34+ds1/debian/rules
--- osmosis-0.34+ds1/debian/rules   2010-03-31 18:43:18.0 -0430
+++ osmosis-0.34+ds1/debian/rules   2011-08-19 13:00:35.0 -0430
@@ -11,10 +11,10 @@
 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


signature.asc
Description: Digital signature
---End Message---
---BeginMessage---
Source: osmosis
Source-Version: 0.39+ds1-2

We believe that the bug you reported is fixed in the latest version of
osmosis, which is due to be installed in the Debian FTP archive:

osmosis_0.39+ds1-2.debian.tar.gz
  to main/o/osmosis/osmosis_0.39+ds1-2.debian.tar.gz
osmosis_0.39+ds1-2.dsc
  to main/o/osmosis/osmosis_0.39+ds1-2.dsc
osmosis_0.39+ds1-2_all.deb
  to main/o/osmosis/osmosis_0.39+ds1-2_all.deb



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 638...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
David Paleino da...@debian.org (supplier of updated osmosis package)

(This message was generated