The following commit has been merged in the master branch:
commit 0c200459838ba9198690a87973583a3b68d65fba
Author: David Paleino <da...@debian.org>
Date:   Thu Dec 29 21:32:35 2011 +0100

    added 04-fix_dependencies_versions.patch and 
05-workaround_missing_junit4.10.patch

diff --git a/debian/changelog b/debian/changelog
index 78de916..d80b6c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,10 +3,12 @@ osmosis (0.40.1+ds1-1) UNRELEASED; urgency=low
   * New upstream version
   * Fix debian/watch and debian/rules' get-orig-source to point to github
   * Refresh patches to apply to the new source
+    - added 04-fix_dependencies_versions.patch and
+      05-workaround_missing_junit4.10.patch
   * Bump B-D on libwoodstox-java to >= 4.12, and junit4 to >= 4.10
   * Fix links to protobuf's jar (Closes: #650617, #652754)
 
- -- David Paleino <da...@debian.org>  Thu, 29 Dec 2011 19:00:58 +0100
+ -- David Paleino <da...@debian.org>  Thu, 29 Dec 2011 21:31:34 +0100
 
 osmosis (0.39+ds1-6) unstable; urgency=low
 
diff --git a/debian/ivysettings.xml b/debian/ivysettings.xml
index 1861b3c..25f5579 100644
--- a/debian/ivysettings.xml
+++ b/debian/ivysettings.xml
@@ -22,6 +22,7 @@
                <module organisation="com.google.protobuf" name="protobuf-java" 
resolver="share-java"/>
                <module organisation="crosby" name="osmpbf" 
resolver="share-java"/>
                <module organisation="org.postgis" name="postgis" 
resolver="share-java"/>
+               <module organisation="org.apache.commons" 
name="commons-compress" resolver="share-java"/>
        </modules>
 
 </ivysettings>
diff --git a/debian/patches/00-fix_build_system.patch 
b/debian/patches/00-fix_build_system.patch
index a69fba9..a08ed37 100644
--- a/debian/patches/00-fix_build_system.patch
+++ b/debian/patches/00-fix_build_system.patch
@@ -13,7 +13,8 @@ Forwarded: not-needed
  pgsimple/ivy.xml                        |    2 +-
  pgsnapshot/build.xml                    |    2 ++
  pgsnapshot/ivy.xml                      |    2 +-
- 9 files changed, 26 insertions(+), 16 deletions(-)
+ xml/ivy.xml                             |    1 +
+ 10 files changed, 27 insertions(+), 16 deletions(-)
 
 --- osmosis.orig/apidb/build.xml
 +++ osmosis/apidb/build.xml
@@ -199,3 +200,12 @@ Forwarded: not-needed
                <exclude module="postgis-stubs"/>
          </dependency>
          
+--- osmosis.orig/xml/ivy.xml
++++ osmosis/xml/ivy.xml
+@@ -31,5 +31,6 @@
+         <dependency org="org.openstreetmap.osmosis" name="osmosis-testutil" 
rev="${project.version}" conf="test->default" changing="true"/>
+         <dependency org="junit" name="junit" 
rev="${dependency.version.junit}" conf="test->default"/>
+       <dependency org="com.puppycrawl.tools" name="checkstyle" 
rev="${dependency.version.checkstyle}" conf="test->default"/>
++      <dependency org="org.apache.commons" name="commons-compress" 
rev="${dependency.version.commons-compress}" conf="compile->default"/>
+     </dependencies>
+ </ivy-module>
diff --git a/debian/patches/03-create_manifest.patch 
b/debian/patches/03-create_manifest.patch
index ccc1847..5418709 100644
--- a/debian/patches/03-create_manifest.patch
+++ b/debian/patches/03-create_manifest.patch
@@ -89,4 +89,4 @@ Forwarded: not-needed
 --- /dev/null
 +++ osmosis/xml/jar.properties
 @@ -0,0 +1 @@
-+jar.classpath=/usr/share/osmosis/osmosis-core.jar 
/usr/share/java/commons-codec.jar
++jar.classpath=/usr/share/osmosis/osmosis-core.jar 
/usr/share/java/commons-codec.jar /usr/share/java/commons-compress.jar
diff --git a/debian/patches/04-fix_dependencies_versions.patch 
b/debian/patches/04-fix_dependencies_versions.patch
new file mode 100644
index 0000000..4925979
--- /dev/null
+++ b/debian/patches/04-fix_dependencies_versions.patch
@@ -0,0 +1,39 @@
+From: David Paleino <da...@debian.org>
+Subject: fix needed versions of packages, so that they match the ones
+ available in Debian
+Origin: vendor
+Forwarded: not-needed
+
+---
+ build-support/config/ant-build-common.properties |   14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+--- osmosis.orig/build-support/config/ant-build-common.properties
++++ osmosis/build-support/config/ant-build-common.properties
+@@ -2,19 +2,19 @@
+ 
+ # 3rd Party Library Versions
+ dependency.version.checkstyle=5.4
+-dependency.version.classworlds=2.4
++dependency.version.classworlds=debian
+ dependency.version.commons-codec=1.5
+ dependency.version.commons-compress=1.2
+ dependency.version.commons-dbcp=1.4
+-dependency.version.osmpbf=1.1.1-754a33af
++dependency.version.osmpbf=
+ dependency.version.ivy=2.2.0
+ dependency.version.jpf=1.5
+-dependency.version.junit=4.10
+-dependency.version.mysql=5.1.18
+-dependency.version.postgis=1.3.3
+-dependency.version.postgresql=9.0-801.jdbc4
++dependency.version.junit=4.x
++dependency.version.mysql=debian
++dependency.version.postgis=
++dependency.version.postgresql=
+ dependency.version.protobuf=2.4.1
+ dependency.version.spring=3.0.6.RELEASE
+-dependency.version.woodstox-core=4.1.2
++dependency.version.woodstox-core=debian
+ dependency.version.woodstox-stax2=3.1.1
+ dependency.version.xerces=2.9.1
diff --git a/debian/patches/05-workaround_missing_junit4.10.patch 
b/debian/patches/05-workaround_missing_junit4.10.patch
new file mode 100644
index 0000000..691a7e1
--- /dev/null
+++ b/debian/patches/05-workaround_missing_junit4.10.patch
@@ -0,0 +1,238 @@
+From: David Paleino <da...@debian.org>
+Subject: Debian doesn't have junit 4.10 yet, so make it useless :)
+Origin: vendor
+Forwarded: not-needed
+
+---
+ apidb/src/test/java/org/openstreetmap/osmosis/apidb/v0_6/ApiDbTest.java       
         |    2 -
+ 
apidb/src/test/java/org/openstreetmap/osmosis/apidb/v0_6/ApidbFileReplicatorTest.java
  |    6 +++--
+ 
areafilter/src/test/java/org/openstreetmap/osmosis/areafilter/v0_6/AreaFilterTest.java
 |   12 +++++-----
+ 
dataset/src/test/java/org/openstreetmap/osmosis/dataset/v0_6/CustomDbTest.java  
       |    4 ++-
+ 
pgsnapshot/src/test/java/org/openstreetmap/osmosis/pgsnapshot/v0_6/PostgreSqlTest.java
 |    8 +++---
+ set/src/test/java/org/openstreetmap/osmosis/set/v0_6/ChangeAppenderTest.java  
         |    2 -
+ 
set/src/test/java/org/openstreetmap/osmosis/set/v0_6/ChangeSimplifierTest.java  
       |    2 -
+ 
tagfilter/src/test/java/org/openstreetmap/osmosis/tagfilter/v0_6/TagRemoverTest.java
   |    4 +--
+ 
testutil/src/main/java/org/openstreetmap/osmosis/testutil/TestDataUtilities.java
       |    2 -
+ 
xml/src/test/java/org/openstreetmap/osmosis/xml/v0_6/XmlChangeReaderWriterTest.java
    |    2 -
+ xml/src/test/java/org/openstreetmap/osmosis/xml/v0_6/XmlReaderWriterTest.java 
         |    6 +++--
+ 11 files changed, 28 insertions(+), 22 deletions(-)
+
+--- 
osmosis.orig/testutil/src/main/java/org/openstreetmap/osmosis/testutil/TestDataUtilities.java
++++ 
osmosis/testutil/src/main/java/org/openstreetmap/osmosis/testutil/TestDataUtilities.java
+@@ -51,7 +51,7 @@ public class TestDataUtilities extends T
+                                       "/data/template/" + dataFileName), 
UTF8));
+ 
+                       // Create a temporary file and open it.
+-                      tmpFile = newFile();
++                      tmpFile = File.createTempFile("junit", null);
+                       dataWriter = new BufferedWriter(new 
OutputStreamWriter(new FileOutputStream(tmpFile), UTF8));
+ 
+                       // Copy all data into the temp file replacing the 
version string.
+--- 
osmosis.orig/xml/src/test/java/org/openstreetmap/osmosis/xml/v0_6/XmlChangeReaderWriterTest.java
++++ 
osmosis/xml/src/test/java/org/openstreetmap/osmosis/xml/v0_6/XmlChangeReaderWriterTest.java
+@@ -32,7 +32,7 @@ public class XmlChangeReaderWriterTest e
+               File outputFile;
+               
+               inputFile = 
dataUtils.createDataFile("v0_6/xml-task-tests-v0_6.osc");
+-              outputFile = dataUtils.newFile();
++              outputFile = File.createTempFile("junit", null);
+               
+               // Create and connect the xml tasks.
+               xmlReader = new XmlChangeReader(inputFile, true, 
CompressionMethod.None);
+--- 
osmosis.orig/xml/src/test/java/org/openstreetmap/osmosis/xml/v0_6/XmlReaderWriterTest.java
++++ 
osmosis/xml/src/test/java/org/openstreetmap/osmosis/xml/v0_6/XmlReaderWriterTest.java
+@@ -30,7 +30,7 @@ public class XmlReaderWriterTest extends
+               
+               // Generate input files.
+               inputFile = 
dataUtils.createDataFile("v0_6/xml-task-tests-v0_6.osm");
+-              outputFile = dataUtils.newFile();
++              outputFile = File.createTempFile("junit", null);
+               
+               // Run the pipeline.
+               Osmosis.run(
+@@ -64,7 +64,9 @@ public class XmlReaderWriterTest extends
+               
+               // Generate input files.
+               uncompressedFile = 
dataUtils.createDataFile("v0_6/xml-task-tests-v0_6.osm");
+-              workingFolder = dataUtils.newFolder();
++              workingFolder = File.createTempFile("junit", "");
++              workingFolder.delete();
++              workingFolder.mkdir();
+               inputFile = new File(workingFolder, "testin.osm.gz");
+               outputFile = new File(workingFolder, "testout.osm.gz");
+               dataUtils.compressFile(uncompressedFile, inputFile);
+--- 
osmosis.orig/set/src/test/java/org/openstreetmap/osmosis/set/v0_6/ChangeAppenderTest.java
++++ 
osmosis/set/src/test/java/org/openstreetmap/osmosis/set/v0_6/ChangeAppenderTest.java
+@@ -33,7 +33,7 @@ public class ChangeAppenderTest extends
+               sourceFile1 = 
dataUtils.createDataFile("v0_6/append-change-in1.osc");
+               sourceFile2 = 
dataUtils.createDataFile("v0_6/append-change-in2.osc");
+               expectedOutputFile = 
dataUtils.createDataFile("v0_6/append-change-out.osc");
+-              actualOutputFile = dataUtils.newFile();
++              actualOutputFile = File.createTempFile("junit", null);
+               
+               // Append the two source files into the destination file.
+               Osmosis.run(
+--- 
osmosis.orig/set/src/test/java/org/openstreetmap/osmosis/set/v0_6/ChangeSimplifierTest.java
++++ 
osmosis/set/src/test/java/org/openstreetmap/osmosis/set/v0_6/ChangeSimplifierTest.java
+@@ -29,7 +29,7 @@ public class ChangeSimplifierTest extend
+               // Generate files.
+               sourceFile = 
dataUtils.createDataFile("v0_6/simplify-change-in.osc");
+               expectedOutputFile = 
dataUtils.createDataFile("v0_6/simplify-change-out.osc");
+-              actualOutputFile = dataUtils.newFile();
++              actualOutputFile = File.createTempFile("junit", null);
+               
+               // Append the two source files into the destination file.
+               Osmosis.run(
+--- 
osmosis.orig/apidb/src/test/java/org/openstreetmap/osmosis/apidb/v0_6/ApiDbTest.java
++++ 
osmosis/apidb/src/test/java/org/openstreetmap/osmosis/apidb/v0_6/ApiDbTest.java
+@@ -57,7 +57,7 @@ public class ApiDbTest extends AbstractD
+         // Generate input files.
+         authFile = dbUtils.getAuthorizationFile();
+         inputFile = dataUtils.createDataFile("v0_6/db-snapshot.osm");
+-        outputFile = dataUtils.newFile();
++        outputFile = File.createTempFile("junit", null);
+ 
+         // Remove all existing data from the database.
+         dbUtils.truncateDatabase();
+--- 
osmosis.orig/apidb/src/test/java/org/openstreetmap/osmosis/apidb/v0_6/ApidbFileReplicatorTest.java
++++ 
osmosis/apidb/src/test/java/org/openstreetmap/osmosis/apidb/v0_6/ApidbFileReplicatorTest.java
+@@ -35,8 +35,10 @@ public class ApidbFileReplicatorTest ext
+         authFile = dbUtils.getAuthorizationFile();
+         snapshotFile = dataUtils.createDataFile("v0_6/db-snapshot.osm");
+         changesetFile = 
dataUtils.createDataFile("v0_6/db-replicate-changeset.osc");
+-        outputFile = dataUtils.newFile();
+-        workingDirectory = dataUtils.newFolder();
++        outputFile = File.createTempFile("junit", null);
++        workingDirectory = File.createTempFile("junit", "");
++        workingDirectory.delete();
++        workingDirectory.mkdir();
+ 
+         // Remove all existing data from the database.
+         dbUtils.truncateDatabase();
+--- 
osmosis.orig/areafilter/src/test/java/org/openstreetmap/osmosis/areafilter/v0_6/AreaFilterTest.java
++++ 
osmosis/areafilter/src/test/java/org/openstreetmap/osmosis/areafilter/v0_6/AreaFilterTest.java
+@@ -29,7 +29,7 @@ public class AreaFilterTest extends Abst
+               // Generate input files.
+               inputFile = dataUtils.createDataFile("v0_6/areafilter-in.osm");
+               expectedOutputFile = 
dataUtils.createDataFile("v0_6/areafilter-out-whole.osm");
+-              actualOutputFile = dataUtils.newFile();
++              actualOutputFile = File.createTempFile("junit", null);
+               
+               // Load the database with a dataset.
+               Osmosis.run(
+@@ -64,7 +64,7 @@ public class AreaFilterTest extends Abst
+               // Generate input files.
+               inputFile = dataUtils.createDataFile("v0_6/areafilter-in.osm");
+               expectedOutputFile = 
dataUtils.createDataFile("v0_6/areafilter-out-standard.osm");
+-              actualOutputFile = dataUtils.newFile();
++              actualOutputFile = File.createTempFile("junit", null);
+               
+               // Load the database with a dataset.
+               Osmosis.run(
+@@ -98,7 +98,7 @@ public class AreaFilterTest extends Abst
+               // Generate input files.
+               inputFile = dataUtils.createDataFile("v0_6/areafilter-in.osm");
+               expectedOutputFile = 
dataUtils.createDataFile("v0_6/areafilter-out-cascadingrelations.osm");
+-              actualOutputFile = dataUtils.newFile();
++              actualOutputFile = File.createTempFile("junit", null);
+               
+               // Load the database with a dataset.
+               Osmosis.run(
+@@ -133,7 +133,7 @@ public class AreaFilterTest extends Abst
+               // Generate input files.
+               inputFile = dataUtils.createDataFile("v0_6/areafilter-in.osm");
+               expectedOutputFile = 
dataUtils.createDataFile("v0_6/areafilter-out-completeways.osm");
+-              actualOutputFile = dataUtils.newFile();
++              actualOutputFile = File.createTempFile("junit", null);
+               
+               // Load the database with a dataset.
+               Osmosis.run(
+@@ -168,7 +168,7 @@ public class AreaFilterTest extends Abst
+               // Generate input files.
+               inputFile = dataUtils.createDataFile("v0_6/areafilter-in.osm");
+               expectedOutputFile = 
dataUtils.createDataFile("v0_6/areafilter-out-completerelations.osm");
+-              actualOutputFile = dataUtils.newFile();
++              actualOutputFile = File.createTempFile("junit", null);
+               
+               // Load the database with a dataset.
+               Osmosis.run(
+@@ -203,7 +203,7 @@ public class AreaFilterTest extends Abst
+               // Generate input files.
+               inputFile = dataUtils.createDataFile("v0_6/areafilter-in.osm");
+               expectedOutputFile = 
dataUtils.createDataFile("v0_6/areafilter-out-clipincompleteentities.osm");
+-              actualOutputFile = dataUtils.newFile();
++              actualOutputFile = File.createTempFile("junit", null);
+               
+               // Load the database with a dataset.
+               Osmosis.run(
+--- 
osmosis.orig/dataset/src/test/java/org/openstreetmap/osmosis/dataset/v0_6/CustomDbTest.java
++++ 
osmosis/dataset/src/test/java/org/openstreetmap/osmosis/dataset/v0_6/CustomDbTest.java
+@@ -32,7 +32,9 @@ public class CustomDbTest extends Abstra
+               // Generate input files.
+               inputFile = 
dataUtils.createDataFile("v0_6/customdb-snapshot.osm");
+               outputFile = File.createTempFile("test", ".osm");
+-              dataDir = dataUtils.newFolder();
++              dataDir = File.createTempFile("junit", "");
++              dataDir.delete();
++              dataDir.mkdir();
+               
+               // Load the database with a dataset.
+               Osmosis.run(
+--- 
osmosis.orig/pgsnapshot/src/test/java/org/openstreetmap/osmosis/pgsnapshot/v0_6/PostgreSqlTest.java
++++ 
osmosis/pgsnapshot/src/test/java/org/openstreetmap/osmosis/pgsnapshot/v0_6/PostgreSqlTest.java
+@@ -37,7 +37,7 @@ public class PostgreSqlTest extends Abst
+               // Generate input files.
+               authFile = getAuthFile();
+               inputFile = dataUtils.createDataFile("v0_6/db-snapshot.osm");
+-              outputFile = dataUtils.newFile();
++              outputFile = File.createTempFile("junit", null);
+               
+               // Remove all existing data from the database.
+               Osmosis.run(
+@@ -97,7 +97,7 @@ public class PostgreSqlTest extends Abst
+               snapshotFile = dataUtils.createDataFile("v0_6/db-snapshot.osm");
+               changesetFile = 
dataUtils.createDataFile("v0_6/db-changeset.osc");
+               expectedResultFile = 
dataUtils.createDataFile("v0_6/db-changeset-expected.osm");
+-              actualResultFile = dataUtils.newFile();
++              actualResultFile = File.createTempFile("junit", null);
+               
+               // Remove all existing data from the database.
+               Osmosis.run(
+@@ -166,7 +166,7 @@ public class PostgreSqlTest extends Abst
+               authFile = getAuthFile();
+               snapshotFile = dataUtils.createDataFile("v0_6/db-snapshot.osm");
+               expectedResultFile = 
dataUtils.createDataFile("v0_6/db-dataset-expected.osm");
+-              actualResultFile = dataUtils.newFile();
++              actualResultFile = File.createTempFile("junit", null);
+               
+               // Remove all existing data from the database.
+               Osmosis.run(
+@@ -235,7 +235,7 @@ public class PostgreSqlTest extends Abst
+               // Generate input files.
+               authFile = getAuthFile();
+               inputFile = dataUtils.createDataFile("v0_6/db-snapshot.osm");
+-              outputFile = dataUtils.newFile();
++              outputFile = File.createTempFile("junit", null);
+               
+               // Remove all existing data from the database.
+               Osmosis.run(
+--- 
osmosis.orig/tagfilter/src/test/java/org/openstreetmap/osmosis/tagfilter/v0_6/TagRemoverTest.java
++++ 
osmosis/tagfilter/src/test/java/org/openstreetmap/osmosis/tagfilter/v0_6/TagRemoverTest.java
+@@ -30,7 +30,7 @@ public class TagRemoverTest extends Abst
+               
+               inputFile = 
dataUtils.createDataFile("v0_6/tag-remove-snapshot.osm");
+               expectedResultFile = 
dataUtils.createDataFile("v0_6/tag-remove-expected.osm");
+-              outputFile = dataUtils.newFile();
++              outputFile = File.createTempFile("junit", null);
+               
+               // Remove all created_by tags.
+               Osmosis.run(
+@@ -64,7 +64,7 @@ public class TagRemoverTest extends Abst
+               
+               inputFile = 
dataUtils.createDataFile("v0_6/tag-remove-snapshot.osm");
+               expectedResultFile = 
dataUtils.createDataFile("v0_6/tag-remove-expected.osm");
+-              outputFile = dataUtils.newFile();
++              outputFile = File.createTempFile("junit", null);
+               
+               // Remove all created_by tags.
+               Osmosis.run(
diff --git a/debian/patches/series b/debian/patches/series
index 764fd8d..5353d38 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,5 @@
 01-fix_launcher.patch
 02-fix_plexus.patch
 03-create_manifest.patch
+04-fix_dependencies_versions.patch
+05-workaround_missing_junit4.10.patch

-- 
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

Reply via email to