[DebianGIS-dev] [SCM] osmosis branch, master, updated. debian/0.31.2-2-49-gb79425c
The following commit has been merged in the master branch: commit 6f276c70bbb6908008680500bfaa184742f914fe Author: Giovanni Mascellani mascell...@poisson.phc.unipi.it Date: Mon Dec 20 19:09:47 2010 +0100 My new email address. :-) diff --git a/debian/control b/debian/control index 5eb2c4e..6678f83 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: utils Priority: optional Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org Uploaders: - Giovanni Mascellani mascell...@poisson.phc.unipi.it + Giovanni Mascellani g...@debian.org , David Paleino da...@debian.org , Francesco Paolo Lovergine fran...@debian.org , Debian OpenStreetMap Team pkg-osm-ma...@lists.alioth.debian.org -- 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
[DebianGIS-dev] [SCM] osmosis branch, master, updated. debian/0.31.2-2-49-gb79425c
The following commit has been merged in the master branch: commit 62263bb70d9d4054b91268ce5538c27e3e5664f8 Author: Giovanni Mascellani mascell...@poisson.phc.unipi.it Date: Mon Dec 20 19:12:19 2010 +0100 Fixed changelog. diff --git a/debian/changelog b/debian/changelog index 5c2af46..edd6d3f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,17 +1,15 @@ -osmosis (0.38+ds1-1) UNRELEASED; urgency=low +osmosis (0.38-1) UNRELEASED; urgency=low + [ David Paleino ] * New upstream release * Fix get-orig-source target in debian/rules * Use debhelper compatibility 8 * Bump Standards-Version to 3.9.1, no changes needed - -- David Paleino da...@debian.org Fri, 26 Nov 2010 22:01:37 +0100 - -osmosis (0.34+ds1-2) unstable; urgency=low - + [ Giovanni Mascellani ] * debian/watch: updated - -- Giovanni Mascellani mascell...@poisson.phc.unipi.it Tue, 27 Apr 2010 11:30:22 +0200 + -- Giovanni Mascellani g...@debian.org Mon, 20 Dec 2010 19:12:10 +0100 osmosis (0.34+ds1-1) unstable; urgency=low -- 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
[DebianGIS-dev] [SCM] osmosis branch, master, updated. debian/0.31.2-2-49-gb79425c
The following commit has been merged in the master branch: commit b6d0e25734ab3751a2054856ea9f0fb05441ca2d Author: Giovanni Mascellani mascell...@poisson.phc.unipi.it Date: Mon Dec 20 19:13:53 2010 +0100 Closing relevant bug. diff --git a/debian/changelog b/debian/changelog index edd6d3f..4c87e1c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ osmosis (0.38-1) UNRELEASED; urgency=low [ David Paleino ] - * New upstream release + * New upstream release (closes: #605698) * Fix get-orig-source target in debian/rules * Use debhelper compatibility 8 * Bump Standards-Version to 3.9.1, no changes needed -- 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
[DebianGIS-dev] [SCM] osmosis branch, master, updated. debian/0.31.2-2-49-gb79425c
The following commit has been merged in the master branch:
commit 87a29cce1ae75df49b5aa5a2b8397ac110edf045
Author: Giovanni Mascellani mascell...@poisson.phc.unipi.it
Date: Tue Jan 11 18:39:52 2011 +0100
Fixed get-orig-source (the tarball returned by uscan doesn't contain
sources).
diff --git a/debian/rules b/debian/rules
index e59eb71..9a646b2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,37 +29,24 @@ DEB_INSTALL_CHANGELOGS_ALL := changes.txt
DB2MAN := /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl
XP := xsltproc -''-nonet -''-param man.charmap.use.subset 0
+CURVER := $(shell dpkg-parsechangelog | grep ^Version | cut -d\ -f2 | cut
-d- -f1 | cut -d+ -f1)
SVNBASE := http://svn.openstreetmap.org/applications/utils/osmosis/tags
-SVNREPO := ${SVNBASE}/${VERSION}
-DESTDIR := ../tarballs/osmosis-${VERSION}
-DESTTGZ := ../tarballs/osmosis_${VERSION}.orig.tar.gz
-CURVER := $(shell dpkg-parsechangelog | grep ^Version | cut -d\ -f2 | cut
-d- -f1)
+SVNREPO := ${SVNBASE}/${CURVER}
+DESTDIR := ../tarballs/osmosis-${CURVER}
+DESTTGZ := ../tarballs/osmosis_${CURVER}+ds1.orig.tar.gz
debian/osmosis.1: debian/osmosis.xml
$(XP) -o $@ $(DB2MAN) $
get-orig-source:
dh_testdir
-# test -d ../tarballs/. || mkdir -p ../tarballs
-# @echo Downloading osmosis from ${SVNREPO}
-# svn export ${SVNREPO} ${DESTDIR}
-# @echo Removing repo and debian directory
-# rm -rf ${DESTDIR}/repo ${DESTDIR}/debian
-# @echo Building snapshot tarball
-# tar czf ${DESTTGZ} -C `dirname ${DESTDIR}` `basename ${DESTDIR}`
-# @echo Cleaning up
-# rm -rf ${DESTDIR}
-# @echo .
-# @echo To update debian/changelog type
-# @echo dch -v ${VERSION}-1
-# @echo .
- uscan \
- --verbose \
- --destdir . \
- --force-download \
- --download-version $(CURVER)
- tar xvf osmosis-$(CURVER).tgz
- tar zcf osmosis_$(CURVER)+ds1.orig.tar.gz \
- --exclude *.jar \
- osmosis-$(CURVER)/
- rm -rf osmosis-$(CURVER).tgz osmosis-$(CURVER)/
+ test -d ../tarballs/. || mkdir -p ../tarballs
+ @echo Downloading osmosis from ${SVNREPO}
+ svn export ${SVNREPO} ${DESTDIR}
+ @echo Removing build-support/repo and debian directory
+ rm -rf ${DESTDIR}/build-support/repo ${DESTDIR}/debian
+ @echo Building snapshot tarball
+ tar czf ${DESTTGZ} -C `dirname ${DESTDIR}` `basename ${DESTDIR}`
+ @echo Cleaning up
+ rm -rf ${DESTDIR}
+
--
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
[DebianGIS-dev] [SCM] osmosis branch, master, updated. debian/0.31.2-2-49-gb79425c
The following commit has been merged in the master branch: commit 8b545db498fc59c69c41c794cd38f42d028955dc Merge: 87a29cce1ae75df49b5aa5a2b8397ac110edf045 2ab257cf7efef9f1bcd0fa839cca821573b4cc24 Author: Giovanni Mascellani mascell...@poisson.phc.unipi.it Date: Tue Jan 11 18:41:13 2011 +0100 Merge commit 'upstream/0.38+ds2' diff --combined package/bin/osmosis index aaa4394,f822571..aaa4394 --- a/package/bin/osmosis +++ b/package/bin/osmosis @@@ -18,6 -18,25 +18,6 @@@ if [ -z $JAVACMD ] ; the JAVACMD=java fi -## resolve links - $0 may be a link to application -PRG=$0 - -# if started without absolute path, but from PATH environment -if [ ! -s $PRG ] ; then -PRG=`which $PRG` -fi - -# need this for relative symlinks -while [ -h $PRG ] ; do - ls=`ls -ld $PRG` - link=`expr $ls : '.*- \(.*\)$'` - if expr $link : '/.*' /dev/null; then -PRG=$link - else -PRG=`dirname $PRG`/$link - fi -done - if [ x$1x = xx ] || echo $@ | grep -q -e '--help' ; then cat EOF osmosis -- 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
[DebianGIS-dev] [SCM] osmosis branch, master, updated. debian/0.31.2-2-49-gb79425c
The following commit has been merged in the master branch:
commit 752f0366873f4e1cebae2ce2d94b74704456b3a7
Author: Giovanni Mascellani mascell...@poisson.phc.unipi.it
Date: Tue Jan 11 18:58:08 2011 +0100
Patches updated.
diff --git a/debian/changelog b/debian/changelog
index 25d0d69..982f2bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,12 @@ osmosis (0.38+ds2-1) UNRELEASED; urgency=low
[ Giovanni Mascellani ]
* debian/watch: updated
+ * debian/patches:
+- 00-fix_build.patch: removed, build system has completely changed;
+- 01-fix_launcher.patch, 02-fix_plexus.patch: files moved, conflicts
+ resolved.
- -- Giovanni Mascellani g...@debian.org Tue, 11 Jan 2011 18:55:43 +0100
+ -- Giovanni Mascellani g...@debian.org Tue, 11 Jan 2011 18:56:28 +0100
osmosis (0.34+ds1-1) unstable; urgency=low
diff --git a/debian/patches/00-fix_build.patch
b/debian/patches/00-fix_build.patch
deleted file mode 100644
index 9edfa6a..000
--- a/debian/patches/00-fix_build.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From: David Paleino da...@debian.org
-Subject: fix FTBFS
-Forwarded: no
-
- build.xml |2 --
- 1 file changed, 2 deletions(-)
-
osmosis.orig/build.xml
-+++ osmosis/build.xml
-@@ -11,8 +11,6 @@
- property name=project.version.suffix value=/ !-- Can be
overriden to include extra info such as svn revision number. --
- property name=project.version value=0.34/
-
-- import file=build_support/build-ivy.xml/
--
- !-- Define classpaths for each of the lib directories. --
- path id=classpath.compile
- fileset dir=lib/compile includes=**/*.jar/
diff --git a/debian/patches/01-fix_launcher.patch
b/debian/patches/01-fix_launcher.patch
index c016813..31ec310 100644
--- a/debian/patches/01-fix_launcher.patch
+++ b/debian/patches/01-fix_launcher.patch
@@ -6,8 +6,8 @@ Forwarded: not-needed
bin/osmosis | 10 --
1 file changed, 4 insertions(+), 6 deletions(-)
osmosis.orig/bin/osmosis
-+++ osmosis/bin/osmosis
+--- osmosis.orig/package/bin/osmosis
osmosis/package/bin/osmosis
@@ -61,15 +61,13 @@ exit 1
fi
diff --git a/debian/patches/02-fix_plexus.patch
b/debian/patches/02-fix_plexus.patch
index 4b3f16d..76f53ab 100644
--- a/debian/patches/02-fix_plexus.patch
+++ b/debian/patches/02-fix_plexus.patch
@@ -6,15 +6,16 @@ Forwarded: not-needed
config/plexus.conf | 15 ---
1 file changed, 12 insertions(+), 3 deletions(-)
osmosis.orig/config/plexus.conf
-+++ osmosis/config/plexus.conf
-@@ -1,6 +1,15 @@
+Index: osmosis/package/config/plexus.conf
+===
+--- osmosis.orig/package/config/plexus.conf2011-01-11 18:41:58.0
+0100
osmosis/package/config/plexus.conf 2011-01-11 18:53:18.0 +0100
+@@ -1,5 +1,15 @@
main is org.openstreetmap.osmosis.core.Osmosis from osmosis.core
[osmosis.core]
--load ${app.home}/lib/*.jar
-load ${app.home}/lib/default/*.jar
--load ${app.home}/osmosis.jar
+-load ${app.home}/config
+load /usr/share/java/jpf.jar
+load /usr/share/java/commons-compress.jar
+load /usr/share/java/commons-codec.jar
diff --git a/debian/patches/series b/debian/patches/series
index a01c5ce..cfdb821 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-00-fix_build.patch
01-fix_launcher.patch
02-fix_plexus.patch
--
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
[DebianGIS-dev] [SCM] osmosis branch, master, updated. debian/0.31.2-2-49-gb79425c
The following commit has been merged in the master branch:
commit 5968e97d302f471781c371cfe83db19e6f8d4b80
Author: Giovanni Mascellani mascell...@poisson.phc.unipi.it
Date: Tue Jan 11 19:04:56 2011 +0100
New (so far incomplete) patch for the building system.
diff --git a/debian/patches/00-fix_build_system.patch
b/debian/patches/00-fix_build_system.patch
new file mode 100644
index 000..4fe5116
--- /dev/null
+++ b/debian/patches/00-fix_build_system.patch
@@ -0,0 +1,84 @@
+---
+ apidb/build.xml |2 ++
+ build-support/script/build-ivy-base.xml |6 +++---
+ build-support/script/build-java.xml |2 +-
+ extract/build.xml |2 ++
+ pgsnapshot/build.xml|2 ++
+ 5 files changed, 10 insertions(+), 4 deletions(-)
+
+Index: osmosis/apidb/build.xml
+===
+--- osmosis.orig/apidb/build.xml 2011-01-11 19:01:22.0 +0100
osmosis/apidb/build.xml2011-01-10 21:01:20.0 +0100
+@@ -1,6 +1,8 @@
+ ?xml version=1.0 encoding=utf-8 ?
+ project name=Osmosis.Apidb default=all basedir=.
+
++ property name=notests value=true/
++
+ !-- 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-11
19:01:12.0 +0100
osmosis/build-support/script/build-ivy-base.xml2011-01-10
19:45:30.0 +0100
+@@ -31,9 +31,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. --
+- available property=ivy.available file=${ivy.jar.file} /
++ !--available property=ivy.available file=${ivy.jar.file}
/--
+ !-- Download ivy. This will only execute if the ivy.available
property is not set. --
+- antcall target=download-ivy /
++ !--antcall target=download-ivy /--
+ !--
+ 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 @@
+ local lib dir.
+ --
+ path id=ivy.lib.path
+- fileset dir=${ivy.jar.dir} includes=*.jar /
++ file file=/usr/share/java/ivy.jar /
+ /path
+ taskdef resource=org/apache/ivy/ant/antlib.xml
uri=antlib:org.apache.ivy.ant
+ classpathref=ivy.lib.path /
+Index: osmosis/build-support/script/build-java.xml
+===
+--- osmosis.orig/build-support/script/build-java.xml 2011-01-11
19:01:22.0 +0100
osmosis/build-support/script/build-java.xml2011-01-10
21:00:02.0 +0100
+@@ -109,7 +109,7 @@
+ /target
+
+ !-- Runs all of the unit tests in the application. --
+- target name=test depends=build_test description=Run automated
test cases.
++ target name=test depends=build_test description=Run automated
test cases. unless=notests
+ mkdir dir=report/test/
+
+ !-- 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:01:31.0 +0100
osmosis/extract/build.xml 2011-01-10 21:04:25.0 +0100
+@@ -1,6 +1,8 @@
+ ?xml version=1.0 encoding=utf-8 ?
+ project name=Osmosis.Extract default=all basedir=.
+
++ property name=notests value=true/
++
+ !-- 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-11 19:01:31.0 +0100
osmosis/pgsnapshot/build.xml 2011-01-10 21:15:44.0 +0100
+@@ -1,5 +1,7 @@
+ ?xml version=1.0 encoding=utf-8 ?
+ project name=Osmosis.PgSnapshot default=all basedir=.
++
++ property name=notests value=true/
+
+ !-- Include common java build. --
+ property name=build-support.dir location=../build-support/
diff --git a/debian/patches/series b/debian/patches/series
index cfdb821..fe7ab08 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+00-fix_build_system.patch
01-fix_launcher.patch
02-fix_plexus.patch
[DebianGIS-dev] [SCM] osmosis branch, master, updated. debian/0.31.2-2-49-gb79425c
The following commit has been merged in the master branch:
commit 086083ff9d534cb5314ddaf0ad5d70b54cc9
Author: Giovanni Mascellani mascell...@poisson.phc.unipi.it
Date: Tue Jan 11 19:06:50 2011 +0100
Diffstats updated.
diff --git a/debian/patches/00-fix_build_system.patch
b/debian/patches/00-fix_build_system.patch
index 4fe5116..2ebe6ce 100644
--- a/debian/patches/00-fix_build_system.patch
+++ b/debian/patches/00-fix_build_system.patch
@@ -8,8 +8,8 @@
Index: osmosis/apidb/build.xml
===
osmosis.orig/apidb/build.xml 2011-01-11 19:01:22.0 +0100
-+++ osmosis/apidb/build.xml2011-01-10 21:01:20.0 +0100
+--- osmosis.orig/apidb/build.xml 2011-01-11 19:04:12.0 +0100
osmosis/apidb/build.xml2011-01-11 19:05:33.0 +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:01:12.0 +0100
-+++ osmosis/build-support/script/build-ivy-base.xml2011-01-10
19:45:30.0 +0100
+--- osmosis.orig/build-support/script/build-ivy-base.xml 2011-01-11
19:04:12.0 +0100
osmosis/build-support/script/build-ivy-base.xml2011-01-11
19:05:33.0 +0100
@@ -31,9 +31,9 @@
target name=init-ivy depends=init description=Registers ivy with
ant and initializes it. unless=ivy.initialized
@@ -46,8 +46,8 @@ Index: osmosis/build-support/script/build-ivy-base.xml
classpathref=ivy.lib.path /
Index: osmosis/build-support/script/build-java.xml
===
osmosis.orig/build-support/script/build-java.xml 2011-01-11
19:01:22.0 +0100
-+++ osmosis/build-support/script/build-java.xml2011-01-10
21:00:02.0 +0100
+--- osmosis.orig/build-support/script/build-java.xml 2011-01-11
19:04:12.0 +0100
osmosis/build-support/script/build-java.xml2011-01-11
19:05:33.0 +0100
@@ -109,7 +109,7 @@
/target
@@ -59,8 +59,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:01:31.0 +0100
-+++ osmosis/extract/build.xml 2011-01-10 21:04:25.0 +0100
+--- osmosis.orig/extract/build.xml 2011-01-11 19:04:12.0 +0100
osmosis/extract/build.xml 2011-01-11 19:05:33.0 +0100
@@ -1,6 +1,8 @@
?xml version=1.0 encoding=utf-8 ?
project name=Osmosis.Extract default=all basedir=.
@@ -72,8 +72,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:01:31.0 +0100
-+++ osmosis/pgsnapshot/build.xml 2011-01-10 21:15:44.0 +0100
+--- osmosis.orig/pgsnapshot/build.xml 2011-01-11 19:04:12.0 +0100
osmosis/pgsnapshot/build.xml 2011-01-11 19:05:33.0 +0100
@@ -1,5 +1,7 @@
?xml version=1.0 encoding=utf-8 ?
project name=Osmosis.PgSnapshot default=all basedir=.
diff --git a/debian/patches/01-fix_launcher.patch
b/debian/patches/01-fix_launcher.patch
index 31ec310..8331ea8 100644
--- a/debian/patches/01-fix_launcher.patch
+++ b/debian/patches/01-fix_launcher.patch
@@ -3,12 +3,14 @@ Subject: fix launcher to correctly point to installed files
Forwarded: not-needed
---
- bin/osmosis | 10 --
+ package/bin/osmosis | 10 --
1 file changed, 4 insertions(+), 6 deletions(-)
osmosis.orig/package/bin/osmosis
-+++ osmosis/package/bin/osmosis
-@@ -61,15 +61,13 @@ exit 1
+Index: osmosis/package/bin/osmosis
+===
+--- osmosis.orig/package/bin/osmosis 2011-01-11 19:05:21.0 +0100
osmosis/package/bin/osmosis2011-01-11 19:05:33.0 +0100
+@@ -61,15 +61,13 @@
fi
# make it fully qualified
diff --git a/debian/patches/02-fix_plexus.patch
b/debian/patches/02-fix_plexus.patch
index 76f53ab..cd4f643 100644
--- a/debian/patches/02-fix_plexus.patch
+++ b/debian/patches/02-fix_plexus.patch
@@ -3,13 +3,13 @@ Subject: fix Plexus configuration with the right paths
Forwarded: not-needed
---
- config/plexus.conf | 15 ---
- 1 file changed, 12 insertions(+), 3 deletions(-)
+
[DebianGIS-dev] [SCM] osmosis branch, master, updated. debian/0.31.2-2-49-gb79425c
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 000..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.0 +0100
-+++ osmosis/apidb/build.xml2011-01-11 19:05:33.0 +0100
+--- osmosis.orig/apidb/build.xml 2011-01-11 19:22:47.0 +0100
osmosis/apidb/build.xml2011-01-16 17:02:02.0 +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.0 +0100
-+++ osmosis/build-support/script/build-ivy-base.xml2011-01-11
19:05:33.0 +0100
+--- osmosis.orig/build-support/script/build-ivy-base.xml 2011-01-11
19:22:47.0 +0100
osmosis/build-support/script/build-ivy-base.xml2011-01-16
17:03:13.0 +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.0 +0100
-+++ osmosis/build-support/script/build-java.xml2011-01-11
19:05:33.0 +0100
+--- osmosis.orig/build-support/script/build-java.xml 2011-01-11
19:22:47.0 +0100
osmosis/build-support/script/build-java.xml2011-01-16
17:02:02.0 +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.0 +0100
-+++ osmosis/extract/build.xml 2011-01-11 19:05:33.0 +0100
+--- osmosis.orig/extract/build.xml 2011-01-11 19:22:47.0 +0100
osmosis/extract/build.xml 2011-01-16 17:02:02.0 +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
[DebianGIS-dev] [SCM] osmosis branch, master, updated. debian/0.31.2-2-49-gb79425c
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.0 +0100
-+++ osmosis/apidb/build.xml2011-01-16 17:02:02.0 +0100
+--- osmosis.orig/apidb/build.xml 2011-01-22 22:24:07.0 +0100
osmosis/apidb/build.xml2011-01-22 22:29:19.0 +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.0 +0100
-+++ osmosis/build-support/script/build-ivy-base.xml2011-01-16
17:03:13.0 +0100
-@@ -31,9 +31,9 @@
+--- osmosis.orig/build-support/script/build-ivy-base.xml 2011-01-22
22:24:07.0 +0100
osmosis/build-support/script/build-ivy-base.xml2011-01-22
22:29:19.0 +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.0 +0100
-+++ osmosis/build-support/script/build-java.xml2011-01-16
17:02:02.0 +0100
+--- osmosis.orig/build-support/script/build-java.xml 2011-01-22
22:24:07.0 +0100
osmosis/build-support/script/build-java.xml2011-01-22
22:29:19.0 +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.0 +0100
-+++ osmosis/extract/build.xml 2011-01-16 17:02:02.0 +0100
+---
[DebianGIS-dev] [SCM] osmosis branch, master, updated. debian/0.31.2-2-49-gb79425c
The following commit has been merged in the master branch: commit 90271d787b50b1e27ad9a502954378fb203200fe Author: Giovanni Mascellani mascell...@poisson.phc.unipi.it Date: Sat Jan 22 22:32:15 2011 +0100 Deleting old ant targets. diff --git a/debian/rules b/debian/rules index 9a646b2..e4b0dbf 100755 --- a/debian/rules +++ b/debian/rules @@ -20,10 +20,6 @@ DEB_JARS += /usr/share/java/jpf.jar DEB_JARS += /usr/share/java/commons-compress.jar DEB_JARS += /usr/share/java/commons-codec.jar -DEB_ANT_BUILD_TARGET := build_binary -#DEB_ANT_BUILD_TARGET := build_binary javadoc -#DEB_ANT_CHECK_TARGET := test - DEB_INSTALL_CHANGELOGS_ALL := changes.txt DB2MAN := /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl -- 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
[DebianGIS-dev] [SCM] osmosis branch, master, updated. debian/0.31.2-2-49-gb79425c
The following commit has been merged in the master branch:
commit 690ae9b01165e71030ac36569238fcdf7780eb9d
Author: Giovanni Mascellani mascell...@poisson.phc.unipi.it
Date: Sat Jan 22 22:41:01 2011 +0100
Disabling database access while testing units.
diff --git a/debian/patches/00-fix_build_system.patch
b/debian/patches/00-fix_build_system.patch
index 01ab963..c285bdb 100644
--- a/debian/patches/00-fix_build_system.patch
+++ b/debian/patches/00-fix_build_system.patch
@@ -2,16 +2,16 @@
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-support/script/build-java.xml | 10 +-
build.xml|1 +
extract/build.xml|2 ++
pgsnapshot/build.xml |2 ++
- 7 files changed, 14 insertions(+), 8 deletions(-)
+ 7 files changed, 18 insertions(+), 12 deletions(-)
Index: osmosis/apidb/build.xml
===
osmosis.orig/apidb/build.xml 2011-01-22 22:24:07.0 +0100
-+++ osmosis/apidb/build.xml2011-01-22 22:29:19.0 +0100
+--- osmosis.orig/apidb/build.xml 2011-01-22 22:31:27.0 +0100
osmosis/apidb/build.xml2011-01-22 22:40:01.0 +0100
@@ -1,6 +1,8 @@
?xml version=1.0 encoding=utf-8 ?
project name=Osmosis.Apidb default=all basedir=.
@@ -23,8 +23,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-22
22:24:07.0 +0100
-+++ osmosis/build-support/script/build-ivy-base.xml2011-01-22
22:29:19.0 +0100
+--- osmosis.orig/build-support/script/build-ivy-base.xml 2011-01-22
22:31:27.0 +0100
osmosis/build-support/script/build-ivy-base.xml2011-01-22
22:40:01.0 +0100
@@ -9,6 +9,7 @@
!-- Include common build components. --
property name=build-support.dir location=..//
@@ -64,9 +64,9 @@ Index: osmosis/build-support/script/build-ivy-base.xml
ivy:info /
Index: osmosis/build-support/script/build-java.xml
===
osmosis.orig/build-support/script/build-java.xml 2011-01-22
22:24:07.0 +0100
-+++ osmosis/build-support/script/build-java.xml2011-01-22
22:29:19.0 +0100
-@@ -109,7 +109,7 @@
+--- osmosis.orig/build-support/script/build-java.xml 2011-01-22
22:31:27.0 +0100
osmosis/build-support/script/build-java.xml2011-01-22
22:40:34.0 +0100
+@@ -109,12 +109,12 @@
/target
!-- Runs all of the unit tests in the application. --
@@ -75,10 +75,28 @@ Index: osmosis/build-support/script/build-java.xml
mkdir dir=report/test/
!-- Determine the location of the database authorisation file.
This can be overridden outside the build if necessary. --
+- property name=db.apidb.authfile
location=test/data/input/v0_6/apidb-authfile.txt/
+- property name=db.pgsql.authfile
location=test/data/input/v0_6/pgsql-authfile.txt/
++ !--property name=db.apidb.authfile
location=test/data/input/v0_6/apidb-authfile.txt/
++ property name=db.pgsql.authfile
location=test/data/input/v0_6/pgsql-authfile.txt/--
+
+ junit fork=no maxmemory=512m printsummary=on
haltonerror=off haltonfailure=off filtertrace=on
failureproperty=test.failure
+ formatter type=plain usefile=true/
+@@ -124,8 +124,8 @@
+ path location=build/src/
+ path location=build/test/
+ /classpath
+- sysproperty key=db.apidb.authfile
value=${db.apidb.authfile}/
+- sysproperty key=db.pgsql.authfile
value=${db.pgsql.authfile}/
++ !--sysproperty key=db.apidb.authfile
value=${db.apidb.authfile}/
++ sysproperty key=db.pgsql.authfile
value=${db.pgsql.authfile}/--
+ batchtest todir=report/test
+ fileset dir=build/test
+ include name=**/*Test*.class/
Index: osmosis/extract/build.xml
===
osmosis.orig/extract/build.xml 2011-01-22 22:24:07.0 +0100
-+++ osmosis/extract/build.xml 2011-01-22 22:29:19.0 +0100
+--- osmosis.orig/extract/build.xml 2011-01-22 22:31:27.0 +0100
