[Pkg-osm-commits] [SCM] osmosis branch, master, updated. debian/0.39+ds1-3-2-g7287926
The following commit has been merged in the master branch:
commit 7287926667bb806e06d2fcc55df6c96e3deb172b
Author: David Paleino da...@debian.org
Date: Sat Oct 1 21:32:30 2011 +0200
00-fix_build_system.patch updated: don't hardcode version number in jar
filenames.
diff --git a/debian/changelog b/debian/changelog
index 52b2a1d..ec71240 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
osmosis (0.39+ds1-4) UNRELEASED; urgency=low
+ * 00-fix_build_system.patch updated: don't hardcode version number
+in jar filenames.
* 01-fix_launcher.patch fixed: osmosis.jar doesn't exist anymore.
- -- David Paleino da...@debian.org Sat, 01 Oct 2011 21:29:22 +0200
+ -- David Paleino da...@debian.org Sat, 01 Oct 2011 21:32:04 +0200
osmosis (0.39+ds1-3) unstable; urgency=low
diff --git a/debian/patches/00-fix_build_system.patch
b/debian/patches/00-fix_build_system.patch
index c083647..979f055 100644
--- a/debian/patches/00-fix_build_system.patch
+++ b/debian/patches/00-fix_build_system.patch
@@ -108,7 +108,7 @@ Forwarded: not-needed
copy
file=build/binary/${project.name}.jar
-
tofile=distrib/jars/${project.name}-${project.version}.jar/
-+
tofile=${debian.dir}/../build/${project.name}-${project.version}.jar/
++ tofile=${debian.dir}/../build/${project.name}.jar/
/target
!-- Produces javadoc output from the source code. --
--
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-3-7-gc44b6ed
The following commit has been merged in the master branch: commit 1c06b0841e89488cd8f21b226916d150c73c1515 Author: David Paleino da...@debian.org Date: Sat Oct 1 22:04:53 2011 +0200 Don't create symlinks anymore diff --git a/debian/rules b/debian/rules index 31fc18b..c452242 100755 --- a/debian/rules +++ b/debian/rules @@ -49,12 +49,6 @@ override_dh_clean: override_dh_installchangelogs: dh_installchangelogs -- package/changes.txt -override_dh_link: - dh_link - for i in apidb areafilter core dataset extract hstore pbf pgsimple pgsnapshot replication set tagfilter xml; do \ - dh_link usr/share/osmosis/osmosis-$$i-$(CURVER).jar usr/share/osmosis/osmosis-$$i.jar; \ - done - get-orig-source: dh_testdir test -d ../tarballs/. || mkdir -p ../tarballs -- 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-3-7-gc44b6ed
The following commit has been merged in the master branch:
commit d70b4c033b43f0b08df410b72278271da9a7f171
Author: David Paleino da...@debian.org
Date: Sat Oct 1 21:39:41 2011 +0200
Remove version number from dependency requirement
diff --git a/debian/changelog b/debian/changelog
index 5d07996..41faf28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,7 @@ osmosis (0.39+ds1-4) UNRELEASED; urgency=low
* 02-fix_plexus.patch: use ${app.home} instead of hardcoding osmosis
path.
- -- David Paleino da...@debian.org Sat, 01 Oct 2011 21:33:15 +0200
+ -- David Paleino da...@debian.org Sat, 01 Oct 2011 21:47:11 +0200
osmosis (0.39+ds1-3) unstable; urgency=low
diff --git a/debian/ivysettings.xml b/debian/ivysettings.xml
index d9097f1..ffb7629 100644
--- a/debian/ivysettings.xml
+++ b/debian/ivysettings.xml
@@ -8,7 +8,7 @@
m2compatible=true
root=file:///usr/share/maven-repo/
filesystem name=local
- artifact
pattern=${debian.dir}/../build/[artifact]-[revision].[ext] /
+ artifact
pattern=${debian.dir}/../build/[artifact].[ext] /
/filesystem
filesystem name=share-java
artifact
pattern=/usr/share/java/[artifact](-[revision]).[ext] /
--
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-3-7-gc44b6ed
The following commit has been merged in the master branch:
commit c44b6ed026b18f80f4869edadb64ba6c1cc648a5
Author: David Paleino da...@debian.org
Date: Sat Oct 1 22:22:05 2011 +0200
Releasing to sid
diff --git a/debian/changelog b/debian/changelog
index 41faf28..e37a3d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-osmosis (0.39+ds1-4) UNRELEASED; urgency=low
+osmosis (0.39+ds1-4) unstable; urgency=low
* 00-fix_build_system.patch updated: don't hardcode version number
in jar filenames.
@@ -6,7 +6,7 @@ osmosis (0.39+ds1-4) UNRELEASED; urgency=low
* 02-fix_plexus.patch: use ${app.home} instead of hardcoding osmosis
path.
- -- David Paleino da...@debian.org Sat, 01 Oct 2011 21:47:11 +0200
+ -- David Paleino da...@debian.org Sat, 01 Oct 2011 22:21:58 +0200
osmosis (0.39+ds1-3) 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 annotated tag, debian/0.39+ds1-4, created. debian/0.39+ds1-4
The annotated tag, debian/0.39+ds1-4 has been created
at 1460d6c4a59d0108a5b93164f2868b39ab06aed9 (tag)
tagging c44b6ed026b18f80f4869edadb64ba6c1cc648a5 (commit)
replaces debian/0.39+ds1-3
tagged by David Paleino
on Sat Oct 1 22:35:42 2011 +0200
- Shortlog
Debian release
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
iEYEABECAAYFAk6HeZ4ACgkQ5qqQFxOSsXTx8wCfRJyo5UX0HMaQWHA9X7HIJFL1
3O0AnR4fQ3J3WKxAvmxskmsREY/9a0f3
=xX0+
-END PGP SIGNATURE-
David Paleino (7):
01-fix_launcher.patch fixed: osmosis.jar doesn't exist anymore.
00-fix_build_system.patch updated: don't hardcode version number in jar
filenames.
02-fix_plexus.patch: use ${app.home} instead of hardcoding osmosis path.
Remove version number
Remove version number from dependency requirement
Don't create symlinks anymore
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
