[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn4399+dfsg2-1-3-gb46ffe1
The following commit has been merged in the master branch: commit 03c2b01519b5ff64256b6bae8326629cc7ece7f9 Author: Damien Raude-Morvan draz...@debian.org Date: Fri Sep 9 23:26:00 2011 +0200 Drop CLASSPATH setting from debian/josm.sh as Class-Path is already set in josm.jar. diff --git a/debian/changelog b/debian/changelog index a2bc17d..8562aea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ josm (0.0.svn4399+dfsg2-2) UNRELEASED; urgency=low [ Damien Raude-Morvan ] * Add missing dependency on commons-codec, fixing exceptions during upload. + * Drop CLASSPATH setting from debian/josm.sh as Class-Path is already +set in josm.jar. -- David Paleino da...@debian.org Wed, 28 Sep 2011 11:31:57 +0200 diff --git a/debian/josm.sh b/debian/josm.sh index 14c9117..fa5b18f 100644 --- a/debian/josm.sh +++ b/debian/josm.sh @@ -16,7 +16,6 @@ else JAVA_CMDS=$JAVA_HOME/bin/java /usr/lib/jvm/java-6-sun/bin/java fi -export CLASSPATH=/usr/share/java/gettext-commons.jar:/usr/share/java/metadata-extractor.jar:/usr/share/java/svgSalamander.jar:/usr/share/java/gdata-core.jara:/usr/share/java/signpost-core.jar:/usr/share/java/ant.jar JAVA_OPTS=$JAVA_OPTS -Djava.net.preferIPv4Stack=true -Djava.net.useSystemProxies=true for jcmd in $JAVA_CMDS; do -- Editor for OpenStreetMap ___ 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] josm branch, master, updated. debian/0.0.svn4399+dfsg2-1-3-gb46ffe1
The following commit has been merged in the master branch: commit b46ffe1398c5ff65e9b6e62c2b0ce534aed7e6d9 Author: Damien Raude-Morvan draz...@debian.org Date: Fri Sep 9 23:40:29 2011 +0200 Add support for openjdk-7. diff --git a/debian/changelog b/debian/changelog index 8562aea..f35c457 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ josm (0.0.svn4399+dfsg2-2) UNRELEASED; urgency=low upload. * Drop CLASSPATH setting from debian/josm.sh as Class-Path is already set in josm.jar. + * Add support for openjdk-7. -- David Paleino da...@debian.org Wed, 28 Sep 2011 11:31:57 +0200 diff --git a/debian/control b/debian/control index 35eaa69..970d07c 100644 --- a/debian/control +++ b/debian/control @@ -32,7 +32,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-osm/josm.git Package: josm Architecture: all Depends: - openjdk-6-jre | sun-java6-jre + openjdk-6-jre | sun-java6-jre | openjdk-7 , libcommons-codec-java , libgettext-commons-java (= 0.9.6) , libmetadata-extractor-java diff --git a/debian/josm.sh b/debian/josm.sh index fa5b18f..970f597 100644 --- a/debian/josm.sh +++ b/debian/josm.sh @@ -11,7 +11,7 @@ ARCH=`dpkg --print-architecture` # If OpenJDK 6 is only available headless, do not try it if dpkg --get-selections openjdk-6-jre | grep install$ /dev/null ; then - JAVA_CMDS=$JAVA_HOME/bin/java /usr/lib/jvm/java-6-openjdk/bin/java /usr/lib/jvm/java-6-openjdk-$ARCH/bin/java /usr/lib/jvm/java-6-sun/bin/java + JAVA_CMDS=$JAVA_HOME/bin/java /usr/lib/jvm/java-7-openjdk-$ARCH/bin/java /usr/lib/jvm/java-6-openjdk/bin/java /usr/lib/jvm/java-6-openjdk-$ARCH/bin/java /usr/lib/jvm/java-6-sun/bin/java else JAVA_CMDS=$JAVA_HOME/bin/java /usr/lib/jvm/java-6-sun/bin/java fi -- Editor for OpenStreetMap ___ 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] josm branch, master, updated. debian/0.0.svn4399+dfsg2-1-3-gb46ffe1
The following commit has been merged in the master branch:
commit 4b2e933d75d4db97c3f0f7f4184e440d3a02aa8d
Author: David Paleino da...@debian.org
Date: Wed Sep 28 11:32:47 2011 +0200
Add missing dependency on commons-codec, fixing exceptions during upload.
diff --git a/debian/changelog b/debian/changelog
index deb5e1a..a2bc17d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+josm (0.0.svn4399+dfsg2-2) UNRELEASED; urgency=low
+
+ [ Damien Raude-Morvan ]
+ * Add missing dependency on commons-codec, fixing exceptions during
+upload.
+
+ -- David Paleino da...@debian.org Wed, 28 Sep 2011 11:31:57 +0200
+
josm (0.0.svn4399+dfsg2-1) unstable; urgency=low
* Reintroduce ntf_r93_b.gsb in the package: its removal should be
diff --git a/debian/control b/debian/control
index 6ba2e55..35eaa69 100644
--- a/debian/control
+++ b/debian/control
@@ -16,6 +16,7 @@ Build-Depends:
, debhelper (= 8~)
, gettext
, default-jdk
+ , libcommons-codec-java
, libgettext-commons-java (= 0.9.6)
, libmetadata-extractor-java
, libgettext-ant-tasks-java
@@ -32,6 +33,7 @@ Package: josm
Architecture: all
Depends:
openjdk-6-jre | sun-java6-jre
+ , libcommons-codec-java
, libgettext-commons-java (= 0.9.6)
, libmetadata-extractor-java
, liboauth-signpost-java (= 1.2)
diff --git a/debian/patches/10-build.patch b/debian/patches/10-build.patch
index 8a4cbdb..9e7f288 100644
--- a/debian/patches/10-build.patch
+++ b/debian/patches/10-build.patch
@@ -7,14 +7,12 @@ Adjustements to the ant build.xml files, mainly to use
system-provided
JARs and not depend on Internet connection.
---
- build.xml | 34 +++---
- i18n/build.xml | 26 +-
- 2 files changed, 32 insertions(+), 28 deletions(-)
+ build.xml | 48
+ i18n/build.xml | 26 --
+ 2 files changed, 40 insertions(+), 34 deletions(-)
-Index: josm/build.xml
-===
josm.orig/build.xml2011-08-08 12:50:14.0 +0200
-+++ josm/build.xml 2011-08-08 12:52:01.0 +0200
+--- josm.orig/build.xml
josm/build.xml
@@ -15,6 +15,7 @@
property name=build.dir location=build/
property name=javacc.home location=tools/
@@ -23,7 +21,7 @@ Index: josm/build.xml
!-- build parameter: compression level (ant -Dclevel=N)
N ranges from 0 (no compression) to 9 (maximum compression)
default: 9 --
-@@ -23,10 +24,16 @@
+@@ -23,10 +24,17 @@
/condition
!-- Java classpath addition (all jar files to compile tests with this)
--
path id=classpath
@@ -36,13 +34,14 @@ Index: josm/build.xml
+ include name=gdata-core.jar/
+ include name=signpost-core.jar/
+ include name=ant.jar/
++ include name=commons-codec.jar/
/fileset
/path
+property name=classpathprop-colon refid=classpath/
!--
** Used by Eclipse ant builder for updating
-@@ -41,14 +48,7 @@
+@@ -41,14 +49,7 @@
--
target name=create-revision
property name=revision.dir value=${build.dir}/
@@ -58,7 +57,7 @@ Index: josm/build.xml
tstamp
format property=build.tstamp pattern=-MM-dd HH:mm:ss/
/tstamp
-@@ -59,31 +59,31 @@
+@@ -59,31 +60,31 @@
Revision: ${version.entry.commit.revision}
Is-Local-Build: true
Build-Date: ${build.tstamp}
@@ -98,7 +97,7 @@ Index: josm/build.xml
/manifest
zipfileset dir=images prefix=images/
zipfileset dir=data prefix=data/
-@@ -109,30 +109,29 @@
+@@ -109,30 +110,29 @@ Build-Date: ${build.tstamp}
/target
target name=javacc
mkdir dir=${mapcss.dir}/parsergen/
@@ -134,10 +133,8 @@ Index: josm/build.xml
/target
path id=test.classpath
fileset dir=${test.dir}/lib
-Index: josm/i18n/build.xml
-===
josm.orig/i18n/build.xml 2011-08-08 12:50:14.0 +0200
-+++ josm/i18n/build.xml2011-08-08 12:51:03.0 +0200
+--- josm.orig/i18n/build.xml
josm/i18n/build.xml
@@ -1,7 +1,7 @@
?xml version=1.0 encoding=utf-8?
project name=JOSM i18n default=build basedir=.
diff --git a/debian/patches/90-fix_version.patch
b/debian/patches/90-fix_version.patch
index d4b5de0..91b5ad9 100644
--- a/debian/patches/90-fix_version.patch
+++ b/debian/patches/90-fix_version.patch
@@ -8,11 +8,9 @@ Forwarded: not-needed
src/org/openstreetmap/josm/data/Version.java |3 ---
2 files changed, 1 insertion(+), 4 deletions(-)
-Index: josm/build.xml
-===
josm.orig/build.xml2011-08-08 12:50:06.0 +0200
-+++ josm/build.xml 2011-08-08 12:50:06.0 +0200
-@@ -80,7 +80,7 @@
+---
[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn4399+dfsg2-1-4-g98b11e7
The following commit has been merged in the master branch: commit 98b11e7ddf773350ad56ad92434c981d69977f53 Author: David Paleino da...@debian.org Date: Wed Sep 28 11:46:01 2011 +0200 Releasing to sid diff --git a/debian/changelog b/debian/changelog index f35c457..e94819b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -josm (0.0.svn4399+dfsg2-2) UNRELEASED; urgency=low +josm (0.0.svn4399+dfsg2-2) unstable; urgency=low [ Damien Raude-Morvan ] * Add missing dependency on commons-codec, fixing exceptions during @@ -7,7 +7,7 @@ josm (0.0.svn4399+dfsg2-2) UNRELEASED; urgency=low set in josm.jar. * Add support for openjdk-7. - -- David Paleino da...@debian.org Wed, 28 Sep 2011 11:31:57 +0200 + -- David Paleino da...@debian.org Wed, 28 Sep 2011 11:35:21 +0200 josm (0.0.svn4399+dfsg2-1) unstable; urgency=low -- Editor for OpenStreetMap ___ 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] josm annotated tag, debian/0.0.svn4399+dfsg2-2, created. debian/0.0.svn4399+dfsg2-2
The annotated tag, debian/0.0.svn4399+dfsg2-2 has been created at 2b008e34829d20384acc8ef93a286ef3385dcb61 (tag) tagging 98b11e7ddf773350ad56ad92434c981d69977f53 (commit) replaces debian/0.0.svn4399+dfsg2-1 tagged by David Paleino on Wed Sep 28 11:46:10 2011 +0200 - Shortlog Debian release -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iEYEABECAAYFAk6C7OIACgkQ5qqQFxOSsXTGcQCdFzwkVFakawcIjFUM3kH1yVCt pmIAnid9TB11DC+4/x+RJa3iDRB/CPJE =WXVq -END PGP SIGNATURE- Damien Raude-Morvan (2): Drop CLASSPATH setting from debian/josm.sh as Class-Path is already set in josm.jar. Add support for openjdk-7. David Paleino (2): Add missing dependency on commons-codec, fixing exceptions during upload. Releasing to sid --- -- Editor for OpenStreetMap ___ 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.31.2-2-63-g393252a
The following commit has been merged in the master branch:
commit 81b3345f15520b592e99406cfb8742b817e9e985
Author: David Paleino da...@debian.org
Date: Wed Sep 28 17:05:25 2011 +0200
Correctly set project version
diff --git a/debian/rules b/debian/rules
index 070286d..e0c26e5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,6 +35,8 @@ SVNREPO := ${SVNBASE}/${CURVER}
DESTDIR := ../tarballs/osmosis-${CURVER}
DESTTGZ := ../tarballs/osmosis_${CURVER}+ds1.orig.tar.gz
+DEB_ANT_ARGS := -Dproject.version=$(CURVER)
+
debian/osmosis.1: debian/osmosis.xml
$(XP) -o $@ $(DB2MAN) $
--
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.31.2-2-65-g87e8a42
The following commit has been merged in the master branch: commit 87e8a42a46b156837ba66ac30a1d6ca49d627535 Author: David Paleino da...@debian.org Date: Wed Sep 28 17:35:03 2011 +0200 Use default-java in debian/rules diff --git a/debian/rules b/debian/rules index e0c26e5..41a1c81 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/ant.mk -JAVA_HOME := /usr/lib/jvm/java-6-openjdk-$(shell dpkg --print-architecture)/ +JAVA_HOME := /usr/lib/jvm/default-java/ DEB_JARS := /usr/share/java/mysql-connector-java.jar DEB_JARS += /usr/share/java/postgis.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.31.2-2-66-g8b0479c
The following commit has been merged in the master branch:
commit 8b0479c7e09bc097e13c357314eb169bb04d3641
Author: David Paleino da...@debian.org
Date: Wed Sep 28 17:56:02 2011 +0200
Package switched from cdbs to dh7
diff --git a/debian/changelog b/debian/changelog
index 223b4f5..e543b05 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ osmosis (0.39+ds2-1) UNRELEASED; urgency=low
* Bump Standards-Version to 3.9.2, no changes needed
* Fix debian/rules to support multi-archified java
* Package moved from pkg-grass to pkg-osm
+ * Package switched from cdbs to dh7
[ Giovanni Mascellani ]
* debian/watch: updated
@@ -19,7 +20,7 @@ osmosis (0.39+ds2-1) UNRELEASED; urgency=low
* Depend on headless runtime environment and use default-jdk at
building time (closes: #613135).
- -- David Paleino da...@debian.org Wed, 28 Sep 2011 16:41:09 +0200
+ -- David Paleino da...@debian.org Wed, 28 Sep 2011 17:55:42 +0200
osmosis (0.34+ds1-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 3df9e69..c8fb14c 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,6 @@ Uploaders:
Build-Depends:
ant
, ant-optional
- , cdbs
, debhelper (= 8~)
, libcommons-codec-java
, libcommons-compress-java
diff --git a/debian/rules b/debian/rules
index 41a1c81..7720a9f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,6 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-
-JAVA_HOME := /usr/lib/jvm/default-java/
+export JAVA_HOME := /usr/lib/jvm/default-java/
DEB_JARS := /usr/share/java/mysql-connector-java.jar
DEB_JARS += /usr/share/java/postgis.jar
@@ -24,7 +21,7 @@ DEB_JARS += /usr/share/java/batik-ext.jar
# Plugins for ant
DEB_JARS += /usr/share/java/ant-nodeps.jar
-DEB_INSTALL_CHANGELOGS_ALL := package/changes.txt
+export CLASSPATH=$(shell echo $(DEB_JARS) | sed -e 's/ /:/g')
DB2MAN := /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl
XP := xsltproc -''-nonet -''-param man.charmap.use.subset 0
@@ -35,11 +32,23 @@ SVNREPO := ${SVNBASE}/${CURVER}
DESTDIR := ../tarballs/osmosis-${CURVER}
DESTTGZ := ../tarballs/osmosis_${CURVER}+ds1.orig.tar.gz
-DEB_ANT_ARGS := -Dproject.version=$(CURVER)
-
debian/osmosis.1: debian/osmosis.xml
$(XP) -o $@ $(DB2MAN) $
+%:
+ dh $@
+
+override_dh_auto_build:
+ echo $(CLASSPATH)
+ dh_auto_build -- -Dproject.version=$(CURVER)
+
+override_dh_clean:
+ dh_clean
+ rm -rf build/ package/build/ package/lib/
+
+override_dh_installchangelogs:
+ dh_installchangelogs -- package/changes.txt
+
get-orig-source:
dh_testdir
test -d ../tarballs/. || mkdir -p ../tarballs
@@ -51,4 +60,3 @@ get-orig-source:
tar czf ${DESTTGZ} -C `dirname ${DESTDIR}` `basename ${DESTDIR}`
@echo Cleaning up
rm -rf ${DESTDIR}
-
--
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.31.2-2-69-ga41a885
The following commit has been merged in the master branch: commit a41a885d86ff8ae38c41ec61cdef560a21e21423 Author: David Paleino da...@debian.org Date: Wed Sep 28 18:02:58 2011 +0200 Refresh patch diff --git a/debian/patches/01-fix_launcher.patch b/debian/patches/01-fix_launcher.patch index 01416fe..a7780c9 100644 --- a/debian/patches/01-fix_launcher.patch +++ b/debian/patches/01-fix_launcher.patch @@ -8,7 +8,7 @@ Forwarded: not-needed --- osmosis.orig/package/bin/osmosis +++ osmosis/package/bin/osmosis -@@ -61,15 +61,13 @@ exit 1 +@@ -80,15 +80,13 @@ exit 1 fi # make it fully qualified -- 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.31.2-2-72-g952bdf4
The following commit has been merged in the master branch: commit d487127e466b2c53cabc3cc203799575cd79f624 Author: David Paleino da...@debian.org Date: Wed Sep 28 18:16:09 2011 +0200 Missing dep diff --git a/debian/control b/debian/control index c8fb14c..98437bd 100644 --- a/debian/control +++ b/debian/control @@ -25,6 +25,7 @@ Build-Depends: , libbatik-java , libprotobuf-java , libosmpbf-java + , libplexus-classworlds-java , checkstyle , ivy , junit4 -- 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.31.2-2-74-g20fb5ba
The following commit has been merged in the master branch: commit 20fb5ba61e2ce3d44a506873bed7810a1d7cb0b6 Author: David Paleino da...@debian.org Date: Wed Sep 28 19:03:19 2011 +0200 Releasing to sid diff --git a/debian/changelog b/debian/changelog index baaa3f6..e8c8a8b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,4 @@ -osmosis (0.39+ds1-1) UNRELEASED; urgency=low - - TODO: re-enable build tests, we should fix them instead of disabling. +osmosis (0.39+ds1-1) unstable; urgency=low [ David Paleino ] * New upstream release (closes: #605698) @@ -20,7 +18,7 @@ osmosis (0.39+ds1-1) UNRELEASED; urgency=low * Depend on headless runtime environment and use default-jdk at building time (closes: #613135). - -- David Paleino da...@debian.org Wed, 28 Sep 2011 17:55:42 +0200 + -- David Paleino da...@debian.org Wed, 28 Sep 2011 19:03:10 +0200 osmosis (0.34+ds1-1) unstable; urgency=low -- 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.31.2-2-74-g20fb5ba
The following commit has been merged in the master branch:
commit cc0a04426b6aaa134b2a9fbcb43c4500db511b6d
Author: David Paleino da...@debian.org
Date: Wed Sep 28 18:55:36 2011 +0200
Create per-jar MANIFEST.MF
diff --git a/debian/patches/03-create_manifest.patch
b/debian/patches/03-create_manifest.patch
new file mode 100644
index 000..267d857
--- /dev/null
+++ b/debian/patches/03-create_manifest.patch
@@ -0,0 +1,92 @@
+From: David Paleino da...@debian.org
+Subject: write Class-Path into per-jar MANIFEST.MF
+Origin: vendor
+Forwarded: not-needed
+
+---
+ apidb/jar.properties|1 +
+ areafilter/jar.properties |1 +
+ build-support/script/build-java.xml |5 -
+ core/jar.properties |1 +
+ dataset/jar.properties |1 +
+ extract/jar.properties |1 +
+ hstore-jdbc/jar.properties |1 +
+ pbf/jar.properties |1 +
+ pgsimple/jar.properties |1 +
+ pgsnapshot/jar.properties |1 +
+ replication/jar.properties |1 +
+ set/jar.properties |1 +
+ tagfilter/jar.properties|1 +
+ xml/jar.properties |1 +
+ 14 files changed, 17 insertions(+), 1 deletion(-)
+
+--- osmosis.orig/build-support/script/build-java.xml
osmosis/build-support/script/build-java.xml
+@@ -72,11 +72,14 @@
+ target name=_build depends=build_src description=Generates the
binaries for the distribution.
+ !-- Create the binary directory --
+ mkdir dir=build/binary/
+-
++
++ property file=jar.properties /
++
+ !-- Create a manifest for the jar file. --
+ manifest file=build/binary/jar.txt
+ attribute name=Main-Class
value=org.openstreetmap.osmosis.core.Osmosis/
+ attribute name=Built-By value=${user.name}/
++ attribute name=Class-Path value=${jar.classpath}/
+ attribute name=Implementation-Title value=Osmosis
Library/
+ attribute name=Implementation-Version
value=${project.version} (${TODAY})/
+ attribute name=Implementation-Vendor value=Brett
Henderson/
+--- /dev/null
osmosis/apidb/jar.properties
+@@ -0,0 +1 @@
++jar.classpath=/usr/share/osmosis/osmosis-core.jar
/usr/share/osmosis/osmosis-replication.jar /usr/share/osmosis/osmosis-xml.jar
/usr/share/java/spring-jdbc.jar /usr/share/java/commons-dbcp.jar
/usr/share/java/postgresql.jar /usr/share/java/mysql-connector-java.jar
+--- /dev/null
osmosis/areafilter/jar.properties
+@@ -0,0 +1 @@
++jar.classpath=/usr/share/osmosis/osmosis-core.jar
/usr/share/osmosis/osmosis-xml.jar /usr/share/java/postgresql.jar
/usr/share/java/mysql-connector-java.jar
+--- /dev/null
osmosis/core/jar.properties
+@@ -0,0 +1 @@
++jar.classpath=/usr/share/java/jpf.jar /usr/share/java/wstx-lgpl.jar
/usr/share/java/stax2-api.jar /usr/share/java/commons-compress.jar
/usr/share/java/xercesImpl.jar
+--- /dev/null
osmosis/dataset/jar.properties
+@@ -0,0 +1 @@
++jar.classpath=/usr/share/osmosis/osmosis-core.jar
/usr/share/osmosis/osmosis-xml.jar
+--- /dev/null
osmosis/extract/jar.properties
+@@ -0,0 +1 @@
++jar.classpath=/usr/share/osmosis/osmosis-core.jar
/usr/share/osmosis/osmosis-apidb.jar /usr/share/osmosis/osmosis-replication.jar
/usr/share/osmosis/osmosis-xml.jar
+--- /dev/null
osmosis/hstore-jdbc/jar.properties
+@@ -0,0 +1 @@
++jar.classpath=/usr/share/java/postgresql.jar
+--- /dev/null
osmosis/pbf/jar.properties
+@@ -0,0 +1 @@
++jar.classpath=/usr/share/osmosis/osmosis-core.jar
/usr/share/java/protobuf.jar /usr/share/java/osmpbf.jar
+--- /dev/null
osmosis/pgsimple/jar.properties
+@@ -0,0 +1 @@
++jar.classpath=/usr/share/osmosis-core.jar /usr/share/osmosis-dataset.jar
/usr/share/osmosis-xml.jar /usr/share/java/spring-jdbc.jar
/usr/share/java/commons-dbcp.jar /usr/share/java/postgresql.jar
/usr/share/java/postgis.jar
+--- /dev/null
osmosis/pgsnapshot/jar.properties
+@@ -0,0 +1 @@
++jar.classpath=/usr/share/osmosis/osmosis-core.jar
/usr/share/osmosis/osmosis-hstore.jar /usr/share/osmosis/osmosis-dataset.jar
/usr/share/osmosis/osmosis-xml.jar /usr/share/java/spring-jdbc.jar
/usr/share/java/commons-dbcp.jar /usr/share/java/postgresql.jar
/usr/share/java/postgis.jar
+--- /dev/null
osmosis/replication/jar.properties
+@@ -0,0 +1 @@
++jar.classpath=/usr/share/osmosis/osmosis-core.jar
/usr/share/osmosis/osmosis-set.jar /usr/share/osmosis/osmosis-xml.jar
+--- /dev/null
osmosis/set/jar.properties
+@@ -0,0 +1 @@
++jar.classpath=/usr/share/osmosis/osmosis-core.jar
/usr/share/osmosis/osmosis-xml.jar
+--- /dev/null
osmosis/tagfilter/jar.properties
+@@ -0,0 +1 @@
++jar.classpath=/usr/share/osmosis/osmosis-core.jar
/usr/share/osmosis/osmosis-xml.jar
+--- /dev/null
osmosis/xml/jar.properties
+@@ -0,0 +1 @@
[Pkg-osm-commits] [SCM] osmosis annotated tag, debian/0.34+ds1-1, created. debian/0.34+ds1-1
The annotated tag, debian/0.34+ds1-1 has been created at 9a36fbcdfc5ffb61abfe1764c3bd431427aac24c (tag) tagging d427fa66294b894a57ee0c2c7d7c185449609490 (commit) replaces debian/0.31.2-2 tagged by David Paleino on Wed Sep 28 19:12:46 2011 +0200 - Shortlog Debian release -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iEYEABECAAYFAk6DVY4ACgkQ5qqQFxOSsXRingCfUm+IXTiSweT7I5vKryzWjP6R HcEAoMSbtEFg5Kggf0j0FT7cytZi14Gd =nJu4 -END PGP SIGNATURE- David Paleino (25): debian/control: updated my e-mail address, DMUA removed debian/rules: updated get-orig-source target to strip unwanted *.jar files Imported Upstream version 0.34+ds1 Merge commit 'upstream/0.34+ds1' New upstream version debian/copyright updated debian/source/format added, using 3.0 (quilt) added missing Build-Dependencies: libcommons-compress-java debian/patches/00-fix_build.patch added, fixes FTBFS because of missing file in upstream tarball added missing Build-Dependencies: libcommons-codec-java Fix version number Cosmetic changes to README.source debian/osmosis.1 statically generated, so to remove unneeded Build-Dependencies added pkg-osm to Uploaders Standards-Version bumped to 3.8.4, no changes needed debian/control: rewrapped for easier diff'ing debian/watch: use dversionmangle add alternative openjdk-6-jre dependency to java6-runtime debian/install: install plexus.conf in /etc/osmosis/ 01-fix_launcher.patch added, correctly point to the right paths 02-fix_plexus.patch added, fix Plexus configuration with the right paths Complete plexus.conf with missing jars add dependency on libplexus-classworlds-java add dependency on libcommons-codec-java and libcommons-compress-java Releasing to sid Giovanni Mascellani (2): Updated my email address debian/watch: updated to new upstream distribution location --- -- 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 annotated tag, upstream/0.38+ds1, created. upstream/0.38+ds1
The annotated tag, upstream/0.38+ds1 has been created at ba84f1e310834d8da12d21f3d7b3e45a5e307c96 (tag) tagging a96e9934f700f2922e072f2e72e7662b1b98afb0 (commit) replaces upstream/0.34+ds1 tagged by David Paleino on Wed Sep 28 19:13:46 2011 +0200 - Shortlog Imported upstream version 0.38+ds1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iEYEABECAAYFAk6DVcoACgkQ5qqQFxOSsXRWSQCfYzUYxqKHp1oIXKVAqZ+MXVWk PG8AoL44xmbYH+xsvrvF7GqjREwB05eO =J5jz -END PGP SIGNATURE- David Paleino (1): Imported Upstream version 0.38+ds1 --- -- 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 annotated tag, upstream/0.34+ds1, created. upstream/0.34+ds1
The annotated tag, upstream/0.34+ds1 has been created at 644804bb29c001ae4c06db19f45fb12e8583dac5 (tag) tagging 860bcf1235102ec9e2fd7521a9e9242461958554 (commit) replaces upstream/0.31.2 tagged by David Paleino on Wed Sep 28 19:13:33 2011 +0200 - Shortlog Imported upstream version 0.34+ds1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iEYEABECAAYFAk6DVb0ACgkQ5qqQFxOSsXRUXQCcDxVgG6wjzFaeTkRLqYkZjnJA 7Q4AnRPCwkKddBArrtnxV1wSqI9g8X0B =vHA1 -END PGP SIGNATURE- David Paleino (1): Imported Upstream version 0.34+ds1 --- -- 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.39+ds1-1-1-g951cbd2
The following commit has been merged in the master branch: commit 951cbd208c87e35db810ebefa3b84a667fc8d48e Author: David Paleino da...@debian.org Date: Wed Sep 28 19:52:23 2011 +0200 Complete switch from Spring Framework 2.5 to 3.0 (Closes: #638539) diff --git a/debian/changelog b/debian/changelog index e8c8a8b..58db5ca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +osmosis (0.39+ds1-2) UNRELEASED; urgency=low + + * Complete switch from Spring Framework 2.5 to 3.0 (Closes: #638539) + + -- David Paleino da...@debian.org Wed, 28 Sep 2011 19:51:44 +0200 + osmosis (0.39+ds1-1) unstable; urgency=low [ David Paleino ] diff --git a/debian/control b/debian/control index 98437bd..7fbdb68 100644 --- a/debian/control +++ b/debian/control @@ -19,7 +19,7 @@ Build-Depends: , libspring-beans-java , libspring-context-java , libspring-jdbc-java - , libspring-tx-2.5-java + , libspring-transaction-java , libwoodstox-java , libstax2-api-java , libbatik-java diff --git a/debian/patches/03-create_manifest.patch b/debian/patches/03-create_manifest.patch index 267d857..4341d4d 100644 --- a/debian/patches/03-create_manifest.patch +++ b/debian/patches/03-create_manifest.patch @@ -41,7 +41,7 @@ Forwarded: not-needed --- /dev/null +++ osmosis/apidb/jar.properties @@ -0,0 +1 @@ -+jar.classpath=/usr/share/osmosis/osmosis-core.jar /usr/share/osmosis/osmosis-replication.jar /usr/share/osmosis/osmosis-xml.jar /usr/share/java/spring-jdbc.jar /usr/share/java/commons-dbcp.jar /usr/share/java/postgresql.jar /usr/share/java/mysql-connector-java.jar ++jar.classpath=/usr/share/osmosis/osmosis-core.jar /usr/share/osmosis/osmosis-replication.jar /usr/share/osmosis/osmosis-xml.jar /usr/share/java/spring3-jdbc.jar /usr/share/java/commons-dbcp.jar /usr/share/java/postgresql.jar /usr/share/java/mysql-connector-java.jar --- /dev/null +++ osmosis/areafilter/jar.properties @@ -0,0 +1 @@ @@ -69,11 +69,11 @@ Forwarded: not-needed --- /dev/null +++ osmosis/pgsimple/jar.properties @@ -0,0 +1 @@ -+jar.classpath=/usr/share/osmosis-core.jar /usr/share/osmosis-dataset.jar /usr/share/osmosis-xml.jar /usr/share/java/spring-jdbc.jar /usr/share/java/commons-dbcp.jar /usr/share/java/postgresql.jar /usr/share/java/postgis.jar ++jar.classpath=/usr/share/osmosis-core.jar /usr/share/osmosis-dataset.jar /usr/share/osmosis-xml.jar /usr/share/java/spring3-jdbc.jar /usr/share/java/commons-dbcp.jar /usr/share/java/postgresql.jar /usr/share/java/postgis.jar --- /dev/null +++ osmosis/pgsnapshot/jar.properties @@ -0,0 +1 @@ -+jar.classpath=/usr/share/osmosis/osmosis-core.jar /usr/share/osmosis/osmosis-hstore.jar /usr/share/osmosis/osmosis-dataset.jar /usr/share/osmosis/osmosis-xml.jar /usr/share/java/spring-jdbc.jar /usr/share/java/commons-dbcp.jar /usr/share/java/postgresql.jar /usr/share/java/postgis.jar ++jar.classpath=/usr/share/osmosis/osmosis-core.jar /usr/share/osmosis/osmosis-hstore.jar /usr/share/osmosis/osmosis-dataset.jar /usr/share/osmosis/osmosis-xml.jar /usr/share/java/spring3-jdbc.jar /usr/share/java/commons-dbcp.jar /usr/share/java/postgresql.jar /usr/share/java/postgis.jar --- /dev/null +++ osmosis/replication/jar.properties @@ -0,0 +1 @@ diff --git a/debian/rules b/debian/rules index 7720a9f..c452242 100755 --- a/debian/rules +++ b/debian/rules @@ -8,10 +8,10 @@ DEB_JARS += /usr/share/java/postgresql.jar DEB_JARS += /usr/share/java/wstx-lgpl.jar DEB_JARS += /usr/share/java/junit4.jar DEB_JARS += /usr/share/java/ant-junit.jar -DEB_JARS += /usr/share/java/spring-core.jar -DEB_JARS += /usr/share/java/spring-jdbc.jar -DEB_JARS += /usr/share/java/spring-beans.jar -DEB_JARS += /usr/share/java/spring-tx.jar +DEB_JARS += /usr/share/java/spring3-core.jar +DEB_JARS += /usr/share/java/spring3-jdbc.jar +DEB_JARS += /usr/share/java/spring3-beans.jar +DEB_JARS += /usr/share/java/spring3-transaction.jar DEB_JARS += /usr/share/java/commons-dbcp.jar DEB_JARS += /usr/share/java/jpf.jar DEB_JARS += /usr/share/java/commons-compress.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 annotated tag, debian/0.39+ds1-2, created. debian/0.39+ds1-2
The annotated tag, debian/0.39+ds1-2 has been created at f1be9270ea3fc8982b998b18db28ea24ca03384a (tag) tagging 0c2265467a8b4757c1dc37828057767ea938c3bb (commit) replaces debian/0.39+ds1-1 tagged by David Paleino on Wed Sep 28 20:39:16 2011 +0200 - Shortlog Debian release -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iEYEABECAAYFAk6DadQACgkQ5qqQFxOSsXSnRgCfTUvYnJWoALXisJo3rKc/+RJt EQIAnj+svYeN0/oedypnFnTHsv7TNw7X =usLu -END PGP SIGNATURE- David Paleino (3): Complete switch from Spring Framework 2.5 to 3.0 (Closes: #638539) Add unversioned .jar symlinks to /usr/share/osmosis/ Releasing to sid --- -- 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
