The following commit has been merged in the master branch:
commit 491ad603c76bc54d0369cae2b8e6cd31f56baab0
Author: Giovanni Mascellani <mascell...@poisson.phc.unipi.it>
Date:   Sat Jan 22 22:32:40 2011 +0100

    Trying to make the build system work with Debian local Maven repository.

diff --git a/debian/patches/00-fix_build_system.patch 
b/debian/patches/00-fix_build_system.patch
index 5adffde..01ab963 100644
--- a/debian/patches/00-fix_build_system.patch
+++ b/debian/patches/00-fix_build_system.patch
@@ -1,15 +1,17 @@
 ---
- apidb/build.xml                         |    2 ++
- build-support/script/build-ivy-base.xml |   10 ++++------
- build-support/script/build-java.xml     |    2 +-
- extract/build.xml                       |    2 ++
- pgsnapshot/build.xml                    |    2 ++
- 5 files changed, 11 insertions(+), 7 deletions(-)
+ apidb/build.xml                                  |    2 ++
+ build-support/config/ant-build-common.properties |    2 +-
+ build-support/script/build-ivy-base.xml          |   11 +++++------
+ build-support/script/build-java.xml              |    2 +-
+ build.xml                                        |    1 +
+ extract/build.xml                                |    2 ++
+ pgsnapshot/build.xml                             |    2 ++
+ 7 files changed, 14 insertions(+), 8 deletions(-)
 
 Index: osmosis/apidb/build.xml
 ===================================================================
---- osmosis.orig/apidb/build.xml       2011-01-11 19:22:47.000000000 +0100
-+++ osmosis/apidb/build.xml    2011-01-16 17:02:02.000000000 +0100
+--- osmosis.orig/apidb/build.xml       2011-01-22 22:24:07.000000000 +0100
++++ osmosis/apidb/build.xml    2011-01-22 22:29:19.000000000 +0100
 @@ -1,6 +1,8 @@
  <?xml version="1.0" encoding="utf-8" ?>
  <project name="Osmosis.Apidb" default="all" basedir=".">
@@ -21,9 +23,17 @@ Index: osmosis/apidb/build.xml
        <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-11 
19:22:47.000000000 +0100
-+++ osmosis/build-support/script/build-ivy-base.xml    2011-01-16 
17:03:13.000000000 +0100
-@@ -31,9 +31,9 @@
+--- osmosis.orig/build-support/script/build-ivy-base.xml       2011-01-22 
22:24:07.000000000 +0100
++++ osmosis/build-support/script/build-ivy-base.xml    2011-01-22 
22:29:19.000000000 +0100
+@@ -9,6 +9,7 @@
+       <!-- Include common build components. -->
+       <property name="build-support.dir" location="../"/>
+       <import file="${build-support.dir}/script/build-init.xml"/>
++      <property name="debian.dir" location="${build-support.dir}/../debian/"/>
+ 
+       <property name="ivy.version" value="2.1.0" />
+       <property name="ivy.jar.dir" value="${build-support.dir}/ivy" />
+@@ -31,9 +32,9 @@
  
        <target name="init-ivy" depends="init" description="Registers ivy with 
ant and initializes it." unless="ivy.initialized">
                <!-- Determine if the ivy jar is already available. -->
@@ -35,7 +45,7 @@ Index: osmosis/build-support/script/build-ivy-base.xml
                <!--
                        Try to load ivy in case the user has not already
                        dropped it into ant's lib dir (note that the latter 
copy will always
-@@ -42,14 +42,12 @@
+@@ -42,14 +43,12 @@
                        local lib dir.
                -->
                <path id="ivy.lib.path">
@@ -48,14 +58,14 @@ Index: osmosis/build-support/script/build-ivy-base.xml
 -              <!-- Override the shared repo location to point at the 
svn-based ivy repo. -->
 -              <property name="ivy.shared.default.root" 
location="${build-support.dir}/repo"/>
 -              <ivy:configure />
-+              <ivy:configure file="debian/ivysettings.xml"/>
++              <ivy:configure file="${debian.dir}/ivysettings.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-01-11 
19:22:47.000000000 +0100
-+++ osmosis/build-support/script/build-java.xml        2011-01-16 
17:02:02.000000000 +0100
+--- osmosis.orig/build-support/script/build-java.xml   2011-01-22 
22:24:07.000000000 +0100
++++ osmosis/build-support/script/build-java.xml        2011-01-22 
22:29:19.000000000 +0100
 @@ -109,7 +109,7 @@
        </target>
        
@@ -67,8 +77,8 @@ Index: osmosis/build-support/script/build-java.xml
                <!-- Determine the location of the database authorisation file. 
 This can be overridden outside the build if necessary. -->
 Index: osmosis/extract/build.xml
 ===================================================================
---- osmosis.orig/extract/build.xml     2011-01-11 19:22:47.000000000 +0100
-+++ osmosis/extract/build.xml  2011-01-16 17:02:02.000000000 +0100
+--- osmosis.orig/extract/build.xml     2011-01-22 22:24:07.000000000 +0100
++++ osmosis/extract/build.xml  2011-01-22 22:29:19.000000000 +0100
 @@ -1,6 +1,8 @@
  <?xml version="1.0" encoding="utf-8" ?>
  <project name="Osmosis.Extract" default="all" basedir=".">
@@ -80,8 +90,8 @@ Index: osmosis/extract/build.xml
        <import file="${build-support.dir}/script/build-java.xml"/>
 Index: osmosis/pgsnapshot/build.xml
 ===================================================================
---- osmosis.orig/pgsnapshot/build.xml  2011-01-11 19:22:47.000000000 +0100
-+++ osmosis/pgsnapshot/build.xml       2011-01-16 17:02:02.000000000 +0100
+--- osmosis.orig/pgsnapshot/build.xml  2011-01-22 22:24:07.000000000 +0100
++++ osmosis/pgsnapshot/build.xml       2011-01-22 22:29:19.000000000 +0100
 @@ -1,5 +1,7 @@
  <?xml version="1.0" encoding="utf-8" ?>
  <project name="Osmosis.PgSnapshot" default="all" basedir=".">
@@ -90,3 +100,28 @@ 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-22 22:29:39.000000000 +0100
++++ osmosis/build.xml  2011-01-22 22:29:41.000000000 +0100
+@@ -10,6 +10,7 @@
+                       <fileset dir=".">
+                               <include name="**/build.xml"/>
+                               <exclude name="build.xml"/>
++                              <exclude name=".pc/**/build.xml"/>
+                       </fileset>
+               </ivy:buildlist>
+       </target>
+Index: osmosis/build-support/config/ant-build-common.properties
+===================================================================
+--- osmosis.orig/build-support/config/ant-build-common.properties      
2011-01-22 22:30:58.000000000 +0100
++++ osmosis/build-support/config/ant-build-common.properties   2011-01-22 
22:31:13.000000000 +0100
+@@ -10,7 +10,7 @@
+ dependency.version.osmosis-hstore=0.2
+ dependency.version.ivy=2.1.0
+ dependency.version.jpf=1.5
+-dependency.version.junit=4.8.1
++dependency.version.junit=latest.integration
+ dependency.version.mysql=5.1.10
+ dependency.version.postgis=1.3.3
+ dependency.version.postgresql=8.4-701.jdbc4

-- 
Osmosis, an OSM data processor

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

Reply via email to