[Pkg-osm-commits] [SCM] osmosis branch, master, updated. debian/0.39+ds1-3-2-g7287926

[David Paleino]

The following commit has been merged in the master branch:
commit 7287926667bb806e06d2fcc55df6c96e3deb172b
Author: David Paleino <dapal at 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 <dapal at debian.org>  Sat, 01 Oct 2011 21:29:22 +0200
+ -- David Paleino <dapal at 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