[Pkg-osm-commits] [SCM] osmosis branch, master, updated. debian/0.40.1+ds1-5-7-g780608e
The following commit has been merged in the master branch: commit 780608eb7a2dc0cbb53912f1f8005bee159e3034 Author: Giovanni Mascellani Date: Fri Jun 15 12:42:56 2012 +0200 Fix protobuf.jar file name. diff --git a/debian/patches/02-fix_plexus.patch b/debian/patches/02-fix_plexus.patch index a7addc4..d51d7b0 100644 --- a/debian/patches/02-fix_plexus.patch +++ b/debian/patches/02-fix_plexus.patch @@ -6,8 +6,10 @@ Forwarded: not-needed package/config/plexus.conf | 18 -- 1 file changed, 16 insertions(+), 2 deletions(-) osmosis.orig/package/config/plexus.conf -+++ osmosis/package/config/plexus.conf +Index: osmosis/package/config/plexus.conf +=== +--- osmosis.orig/package/config/plexus.conf2012-06-15 12:18:41.0 +0200 osmosis/package/config/plexus.conf 2012-06-15 12:42:47.0 +0200 @@ -1,5 +1,19 @@ main is org.openstreetmap.osmosis.core.Osmosis from osmosis.core @@ -26,7 +28,7 @@ Forwarded: not-needed +load /usr/share/java/spring3-jdbc.jar +load /usr/share/java/spring3-transaction.jar +load /usr/share/java/batik-ext.jar -+load /usr/share/java/protobuf-java.jar ++load /usr/share/java/protobuf.jar +load /usr/share/java/osmpbf.jar +load /usr/share/java/commons-pool.jar +load /usr/share/osmosis/*.jar -- Osmosis, an OSM data processor ___ Pkg-osm-commits mailing list Pkg-osm-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits
[Pkg-osm-commits] [SCM] osmosis branch, master, updated. debian/0.40.1+ds1-5-7-g780608e
The following commit has been merged in the master branch: commit 3e196064642e55d5cb4545f06f3a40a0754f3ea6 Author: Giovanni Mascellani Date: Fri Jun 15 12:31:32 2012 +0200 Some documentation about ivysettings.xml. diff --git a/debian/ivysettings.xml b/debian/ivysettings.xml index 5494702..8961d3b 100644 --- a/debian/ivysettings.xml +++ b/debian/ivysettings.xml @@ -3,24 +3,40 @@ + + + + + + + + + + + + -- Osmosis, an OSM data processor ___ Pkg-osm-commits mailing list Pkg-osm-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits
[Pkg-osm-commits] [SCM] osmosis branch, master, updated. debian/0.40.1+ds1-5-7-g780608e
The following commit has been merged in the master branch: commit 6cb0ed1ea9a7a4a417e883aa3a4b67f14069c3a6 Author: Giovanni Mascellani Date: Fri Jun 15 12:01:47 2012 +0200 Don't use the user cache. diff --git a/debian/ivysettings.xml b/debian/ivysettings.xml index 25f5579..c95e81e 100644 --- a/debian/ivysettings.xml +++ b/debian/ivysettings.xml @@ -15,6 +15,9 @@ + + + -- Osmosis, an OSM data processor ___ Pkg-osm-commits mailing list Pkg-osm-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits
[Pkg-osm-commits] [SCM] osmosis branch, master, updated. debian/0.40.1+ds1-5-7-g780608e
The following commit has been merged in the master branch: commit 74134fc5cebcfb509870efd66a0dcf0d94a3ed70 Author: Giovanni Mascellani Date: Fri Jun 15 12:26:27 2012 +0200 Other changelog. diff --git a/debian/changelog b/debian/changelog index 22d61c6..6cbdc77 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ osmosis (0.40.1+ds1-6) unstable; urgency=low * Use a dedicate ivy cache, to don't interfere with user cache. + * Fix some mistakes in dependency resolution, that led to FTBFS +(closes: #674314). -- Giovanni Mascellani Fri, 15 Jun 2012 12:24:22 +0200 -- Osmosis, an OSM data processor ___ Pkg-osm-commits mailing list Pkg-osm-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits
[Pkg-osm-commits] [SCM] osmosis branch, master, updated. debian/0.40.1+ds1-5-7-g780608e
The following commit has been merged in the master branch: commit 545618da7d4c862bdf22ddb7471c9f8852efcd02 Author: Giovanni Mascellani Date: Fri Jun 15 12:19:34 2012 +0200 Some packages got their POMs. diff --git a/debian/ivysettings.xml b/debian/ivysettings.xml index c95e81e..5494702 100644 --- a/debian/ivysettings.xml +++ b/debian/ivysettings.xml @@ -22,10 +22,8 @@ - - -- Osmosis, an OSM data processor ___ Pkg-osm-commits mailing list Pkg-osm-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits
[Pkg-osm-commits] [SCM] osmosis branch, master, updated. debian/0.40.1+ds1-5-7-g780608e
The following commit has been merged in the master branch: commit 4cc667d07a8332f13311f43f904dee1479334a25 Author: Giovanni Mascellani Date: Fri Jun 15 12:11:25 2012 +0200 Set versions for a few dependencies to "debian". diff --git a/debian/patches/04-fix_dependencies_versions.patch b/debian/patches/04-fix_dependencies_versions.patch index 4f8a8c2..7ae2bde 100644 --- a/debian/patches/04-fix_dependencies_versions.patch +++ b/debian/patches/04-fix_dependencies_versions.patch @@ -10,16 +10,18 @@ Forwarded: not-needed Index: osmosis/build-support/config/ant-build-common.properties === osmosis.orig/build-support/config/ant-build-common.properties 2012-01-11 17:13:08.0 +0100 -+++ osmosis/build-support/config/ant-build-common.properties 2012-01-11 17:17:54.0 +0100 +--- osmosis.orig/build-support/config/ant-build-common.properties 2012-06-15 12:13:49.0 +0200 osmosis/build-support/config/ant-build-common.properties 2012-06-15 12:15:52.0 +0200 @@ -2,19 +2,18 @@ # 3rd Party Library Versions dependency.version.checkstyle=5.4 -dependency.version.classworlds=2.4 +-dependency.version.commons-codec=1.5 +-dependency.version.commons-compress=1.2 +dependency.version.classworlds=debian - dependency.version.commons-codec=1.5 - dependency.version.commons-compress=1.2 ++dependency.version.commons-codec=debian ++dependency.version.commons-compress=debian dependency.version.commons-dbcp=1.4 -dependency.version.osmpbf=1.1.1-754a33af +dependency.version.osmpbf= @@ -29,11 +31,12 @@ Index: osmosis/build-support/config/ant-build-common.properties -dependency.version.mysql=5.1.18 -dependency.version.postgis=1.3.3 -dependency.version.postgresql=9.0-801.jdbc4 +-dependency.version.protobuf=2.4.1 +dependency.version.junit=4.x +dependency.version.mysql=debian +dependency.version.postgis= +dependency.version.postgresql= - dependency.version.protobuf=2.4.1 ++dependency.version.protobuf=debian dependency.version.spring=3.0.6.RELEASE -dependency.version.woodstox-core=4.1.2 dependency.version.woodstox-stax2=3.1.1 diff --git a/debian/patches/06-no-woodstox.patch b/debian/patches/06-no-woodstox.patch index 80656d3..f562c72 100644 --- a/debian/patches/06-no-woodstox.patch +++ b/debian/patches/06-no-woodstox.patch @@ -6,8 +6,10 @@ Forwarded: no core/ivy.xml |4 1 file changed, 4 deletions(-) osmosis.orig/core/ivy.xml -+++ osmosis/core/ivy.xml +Index: osmosis/core/ivy.xml +=== +--- osmosis.orig/core/ivy.xml 2012-06-15 12:01:32.0 +0200 osmosis/core/ivy.xml 2012-06-15 12:08:29.0 +0200 @@ -25,10 +25,6 @@ -- Osmosis, an OSM data processor ___ Pkg-osm-commits mailing list Pkg-osm-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits
[Pkg-osm-commits] [SCM] osmosis branch, master, updated. debian/0.40.1+ds1-5-7-g780608e
The following commit has been merged in the master branch: commit 79c7530933778734b17c77fc30db1e0ac6bfea2c Author: Giovanni Mascellani Date: Fri Jun 15 12:25:24 2012 +0200 Use a dedicated ivy cache. diff --git a/debian/changelog b/debian/changelog index c2a3768..22d61c6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +osmosis (0.40.1+ds1-6) unstable; urgency=low + + * Use a dedicate ivy cache, to don't interfere with user cache. + + -- Giovanni Mascellani Fri, 15 Jun 2012 12:24:22 +0200 + osmosis (0.40.1+ds1-5) unstable; urgency=low * Bump dependency on libcommons-compress-java (Closes: #664597) diff --git a/debian/rules b/debian/rules index 33220aa..852ffd7 100755 --- a/debian/rules +++ b/debian/rules @@ -40,7 +40,7 @@ override_dh_auto_build: override_dh_clean: dh_clean - rm -rf build/ package/build/ package/lib/ + rm -rf build/ package/build/ package/lib/ debian/ivy-cache/ override_dh_installchangelogs: dh_installchangelogs -- package/changes.txt -- Osmosis, an OSM data processor ___ Pkg-osm-commits mailing list Pkg-osm-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits
