The following commit has been merged in the master branch:
commit 514c9335f09b5c987243d84e5fc429b95de46b82
Author: Giovanni Mascellani <mascell...@poisson.phc.unipi.it>
Date:   Sat Jan 22 01:06:19 2011 +0100

    Use local maven repository when building the package.

diff --git a/debian/ivysettings.xml b/debian/ivysettings.xml
new file mode 100644
index 0000000..9903307
--- /dev/null
+++ b/debian/ivysettings.xml
@@ -0,0 +1,13 @@
+<ivysettings>
+
+       <settings defaultResolver="debian-m2"/>
+
+       <resolvers>
+               <ibiblio
+                       name="debian-m2"
+                       m2compatible="true"
+                       root="file:///usr/share/maven-repo"/>
+       </resolvers>
+
+</ivysettings>
+
diff --git a/debian/patches/00-fix_build_system.patch 
b/debian/patches/00-fix_build_system.patch
index 2ebe6ce..5adffde 100644
--- a/debian/patches/00-fix_build_system.patch
+++ b/debian/patches/00-fix_build_system.patch
@@ -1,15 +1,15 @@
 ---
  apidb/build.xml                         |    2 ++
- build-support/script/build-ivy-base.xml |    6 +++---
+ 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, 10 insertions(+), 4 deletions(-)
+ 5 files changed, 11 insertions(+), 7 deletions(-)
 
 Index: osmosis/apidb/build.xml
 ===================================================================
---- osmosis.orig/apidb/build.xml       2011-01-11 19:04:12.000000000 +0100
-+++ osmosis/apidb/build.xml    2011-01-11 19:05:33.000000000 +0100
+--- 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
 @@ -1,6 +1,8 @@
  <?xml version="1.0" encoding="utf-8" ?>
  <project name="Osmosis.Apidb" default="all" basedir=".">
@@ -21,8 +21,8 @@ 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:04:12.000000000 +0100
-+++ osmosis/build-support/script/build-ivy-base.xml    2011-01-11 
19:05:33.000000000 +0100
+--- 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 @@
  
        <target name="init-ivy" depends="init" description="Registers ivy with 
ant and initializes it." unless="ivy.initialized">
@@ -35,7 +35,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,7 +42,7 @@
+@@ -42,14 +42,12 @@
                        local lib dir.
                -->
                <path id="ivy.lib.path">
@@ -44,10 +44,18 @@ Index: osmosis/build-support/script/build-ivy-base.xml
                </path>
                <taskdef resource="org/apache/ivy/ant/antlib.xml" 
uri="antlib:org.apache.ivy.ant"
                        classpathref="ivy.lib.path" />
+               
+-              <!-- 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"/>
+               
+               <!-- 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:04:12.000000000 +0100
-+++ osmosis/build-support/script/build-java.xml        2011-01-11 
19:05:33.000000000 +0100
+--- 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
 @@ -109,7 +109,7 @@
        </target>
        
@@ -59,8 +67,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:04:12.000000000 +0100
-+++ osmosis/extract/build.xml  2011-01-11 19:05:33.000000000 +0100
+--- 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
 @@ -1,6 +1,8 @@
  <?xml version="1.0" encoding="utf-8" ?>
  <project name="Osmosis.Extract" default="all" basedir=".">
@@ -72,8 +80,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:04:12.000000000 +0100
-+++ osmosis/pgsnapshot/build.xml       2011-01-11 19:05:33.000000000 +0100
+--- 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
 @@ -1,5 +1,7 @@
  <?xml version="1.0" encoding="utf-8" ?>
  <project name="Osmosis.PgSnapshot" default="all" basedir=".">

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