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