[Pkg-osm-commits] [SCM] osmosis branch, master, updated. debian/0.31.2-2-63-g393252a

[David Paleino]

The following commit has been merged in the master branch:
commit 393252a77ad5df8effdbd089fe23c7db8dc6d7be
Author: David Paleino 
Date:   Wed Sep 28 17:21:14 2011 +0200

Adapt files to new sources layout

diff --git a/debian/docs b/debian/docs
index 12db852..b9b6b47 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,2 +1,2 @@
-readme.txt
+package/readme.txt
 doc/*
diff --git a/debian/examples b/debian/examples
index 62ba33e..2e737d0 100644
--- a/debian/examples
+++ b/debian/examples
@@ -1 +1 @@
-script/*
+package/script/*
diff --git a/debian/install b/debian/install
index ccd910a..8845b3c 100644
--- a/debian/install
+++ b/debian/install
@@ -1,4 +1,4 @@
-build/binary/osmosis.jar usr/share/osmosis
-bin/osmosis usr/bin
+build/*.jar usr/share/osmosis
+package/bin/osmosis usr/bin
 
-config/plexus.conf etc/osmosis
+package/config/plexus.conf etc/osmosis

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

[David Paleino]

The following commit has been merged in the master branch:
commit 81b3345f15520b592e99406cfb8742b817e9e985
Author: David Paleino 
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