[DebianGIS-dev] r1417 - in packages/josm-plugins/trunk: . debian debian/patches
nd-guest at alioth.debian.org
nd-guest at alioth.debian.org
Mon Mar 17 19:43:03 UTC 2008
Author: nd-guest
Date: 2008-03-17 19:43:02 +0000 (Mon, 17 Mar 2008)
New Revision: 1417
Added:
packages/josm-plugins/trunk/debian/
packages/josm-plugins/trunk/debian/changelog
packages/josm-plugins/trunk/debian/compat
packages/josm-plugins/trunk/debian/control
packages/josm-plugins/trunk/debian/copyright
packages/josm-plugins/trunk/debian/josm-plugins.dirs
packages/josm-plugins/trunk/debian/josm-plugins.install
packages/josm-plugins/trunk/debian/patches/
packages/josm-plugins/trunk/debian/patches/00list
packages/josm-plugins/trunk/debian/patches/10_build.dpatch
packages/josm-plugins/trunk/debian/patches/20_validator.dpatch
packages/josm-plugins/trunk/debian/patches/30_utilsplugin.dpatch
packages/josm-plugins/trunk/debian/patches/40_wmsplugin.dpatch
packages/josm-plugins/trunk/debian/rules
Log:
[svn-inject] Applying Debian modifications to trunk
Property changes on: packages/josm-plugins/trunk/debian
___________________________________________________________________
Name: mergeWithUpstream
+ 1
Added: packages/josm-plugins/trunk/debian/changelog
===================================================================
--- packages/josm-plugins/trunk/debian/changelog (rev 0)
+++ packages/josm-plugins/trunk/debian/changelog 2008-03-17 19:43:02 UTC (rev 1417)
@@ -0,0 +1,42 @@
+josm-plugins (0.0.0.20080316-2) unstable; urgency=low
+
+ * Added wmsplugin
+
+ -- Giovanni Mascellani <g.mascellani at gmail.com> Sun, 16 Mar 2008 22:20:55 +0100
+
+josm-plugins (0.0.0.20080316-1) unstable; urgency=low
+
+ * Update to latest SVN release
+
+ -- Giovanni Mascellani <g.mascellani at gmail.com> Sun, 16 Mar 2008 15:30:26 +0100
+
+josm-plugins (0.0.0.20080311-5) unstable; urgency=low
+
+ * Splitted patch 10_build in separate patch, one per plugin
+
+ -- Giovanni Mascellani <g.mascellani at gmail.com> Sun, 16 Mar 2008 13:50:06 +0100
+
+josm-plugins (0.0.0.20080311-4) unstable; urgency=low
+
+ * Fixed out-of-dpatch changes
+
+ -- Giovanni Mascellani <g.mascellani at gmail.com> Sun, 16 Mar 2008 11:25:18 +0100
+
+josm-plugins (0.0.0.20080311-3) unstable; urgency=low
+
+ * The plugins built so far are effectively installed, and not only built!
+ ;-)
+
+ -- Giovanni Mascellani <g.mascellani at gmail.com> Thu, 13 Mar 2008 00:13:17 +0100
+
+josm-plugins (0.0.0.20080311-2) unstable; urgency=low
+
+ * Switched to dpatch
+
+ -- Giovanni Mascellani <g.mascellani at gmail.com> Wed, 12 Mar 2008 23:39:20 +0100
+
+josm-plugins (0.0.0.20080311-1) unstable; urgency=low
+
+ * Initial release (Closes: #nnnn)
+
+ -- Giovanni Mascellani <g.mascellani at gmail.com> Wed, 12 Mar 2008 23:38:55 +0100
Added: packages/josm-plugins/trunk/debian/compat
===================================================================
--- packages/josm-plugins/trunk/debian/compat (rev 0)
+++ packages/josm-plugins/trunk/debian/compat 2008-03-17 19:43:02 UTC (rev 1417)
@@ -0,0 +1 @@
+5
Added: packages/josm-plugins/trunk/debian/control
===================================================================
--- packages/josm-plugins/trunk/debian/control (rev 0)
+++ packages/josm-plugins/trunk/debian/control 2008-03-17 19:43:02 UTC (rev 1417)
@@ -0,0 +1,24 @@
+Source: josm-plugins
+Section: contrib/utils
+Priority: extra
+Maintainer: Giovanni Mascellani <g.mascellani at gmail.com>
+Build-Depends: debhelper (>= 5), cdbs, dpatch, josm
+Standards-Version: 3.7.3
+Homepage: http://josm.openstreetmap.de
+
+Package: josm-plugins
+Architecture: all
+Depends: josm
+Description: JOSM plugins
+ JOSM (Java OpenStreetMap) plugin collection.
+ .
+ JOSM is an editor for OpenStreetMap (OSM) written in Java.
+ The current version supports stand alone GPX tracks, GPX track data
+ from OSM database and existing nodes, line segments and metadata tags
+ from the OSM database.
+ .
+ OpenStreetMap is a project aimed squarely at creating and providing
+ free geographic data such as street maps to anyone who wants them.
+ The project was started because most maps you think of as free actually
+ have legal or technical restrictions on their use, holding back people
+ from using them in creative, productive or unexpected ways.
Added: packages/josm-plugins/trunk/debian/copyright
===================================================================
--- packages/josm-plugins/trunk/debian/copyright (rev 0)
+++ packages/josm-plugins/trunk/debian/copyright 2008-03-17 19:43:02 UTC (rev 1417)
@@ -0,0 +1,24 @@
+This package was debianized by Giovanni Mascellani <g.mascellani at gmail.com> on
+Tue, 11 Mar 2008 19:06:41 +0100.
+
+It was downloaded from <url://example.com>
+
+Upstream Author(s):
+
+ <put author's name and email here>
+ <likewise for another author>
+
+Copyright:
+
+ <Copyright (C) YYYY Name OfAuthor>
+ <likewise for another author>
+
+License:
+
+ <Put the license of the package here indented by 4 spaces>
+
+The Debian packaging is (C) 2008, Giovanni Mascellani <g.mascellani at gmail.com> and
+is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+
+# Please also look if there are files or directories which have a
+# different copyright/license attached and list them here.
Added: packages/josm-plugins/trunk/debian/josm-plugins.dirs
===================================================================
--- packages/josm-plugins/trunk/debian/josm-plugins.dirs (rev 0)
+++ packages/josm-plugins/trunk/debian/josm-plugins.dirs 2008-03-17 19:43:02 UTC (rev 1417)
@@ -0,0 +1 @@
+usr/share/josm/plugins
Added: packages/josm-plugins/trunk/debian/josm-plugins.install
===================================================================
--- packages/josm-plugins/trunk/debian/josm-plugins.install (rev 0)
+++ packages/josm-plugins/trunk/debian/josm-plugins.install 2008-03-17 19:43:02 UTC (rev 1417)
@@ -0,0 +1 @@
+dist/* usr/share/josm/plugins
Added: packages/josm-plugins/trunk/debian/patches/00list
===================================================================
--- packages/josm-plugins/trunk/debian/patches/00list (rev 0)
+++ packages/josm-plugins/trunk/debian/patches/00list 2008-03-17 19:43:02 UTC (rev 1417)
@@ -0,0 +1,4 @@
+10_build
+20_validator
+30_utilsplugin
+40_wmsplugin
Added: packages/josm-plugins/trunk/debian/patches/10_build.dpatch
===================================================================
--- packages/josm-plugins/trunk/debian/patches/10_build.dpatch (rev 0)
+++ packages/josm-plugins/trunk/debian/patches/10_build.dpatch 2008-03-17 19:43:02 UTC (rev 1417)
@@ -0,0 +1,87 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_build.dpatch by <g.mascellani at gmail.com>
+##
+## DP: Patch for the main build.xml
+
+ at DPATCH@
+diff -urNad josm-plugins-0.0.0.20080316~/build.xml josm-plugins-0.0.0.20080316/build.xml
+--- josm-plugins-0.0.0.20080316~/build.xml 2008-03-16 22:19:52.000000000 +0100
++++ josm-plugins-0.0.0.20080316/build.xml 2008-03-16 22:20:25.000000000 +0100
+@@ -1,43 +1,49 @@
+ <project name="josm-plugins" default="build" basedir=".">
+
++ <property name="josm" location="/usr/share/josm/josm.jar" />
++ <property name="plugin.dist.dir" location="dist" />
++ <property name="ant.build.javac.target" value="1.5"/>
++ <property name="svn.info" location="svn-info.xml" />
+
++<!-- Not used in Debian
+ <target name="compile_josm">
+ <ant dir="../core" target="dist" />
+ </target>
+
+ <target name="compile" depends="compile_josm">
+ </target>
++-->
+
+ <target name="build" depends="dist">
+ </target>
+
+- <target name="dist" depends="compile">
+- <mkdir dir="../dist"/>
+- <ant dir="colorscheme" antfile="build.xml" target="dist"/>
+- <!--ant dir="duplicateway" antfile="build.xml" target="dist"/ code still uses API 0.4 -->
+- <ant dir="lang" antfile="build.xml" target="dist"/>
++ <target name="dist">
++ <mkdir dir="${plugin.dist.dir}"/>
++ <!-- <ant dir="colorscheme" antfile="build.xml" target="dist"/> -->
++ <!-- <ant dir="duplicateway" antfile="build.xml" target="dist"/ code still uses API 0.4 -->
++ <!-- <ant dir="lang" antfile="build.xml" target="dist"/>
+ <ant dir="namefinder" antfile="build.xml" target="dist"/>
+ <ant dir="nearclick" antfile="build.xml" target="dist"/>
+ <ant dir="openvisible" antfile="build.xml" target="dist"/>
+ <ant dir="osmarender" antfile="build.xml" target="dist"/>
+ <ant dir="plastic_laf" antfile="build.xml" target="dist"/>
+ <ant dir="slippymap" antfile="build.xml" target="dist"/>
+- <ant dir="tagging-preset-tester" antfile="build.xml" target="dist"/>
++ <ant dir="tagging-preset-tester" antfile="build.xml" target="dist"/>-->
+ <ant dir="utilsplugin" antfile="build.xml" target="dist"/>
+ <ant dir="validator" antfile="build.xml" target="dist"/>
+ <ant dir="wmsplugin" antfile="build.xml" target="dist"/>
+- <ant dir="ywms" antfile="build.xml" target="dist"/>
++ <!-- <ant dir="ywms" antfile="build.xml" target="dist"/>
+
+ <ant dir="livegps" antfile="build.xml" target="dist"/>
+- <ant dir="surveyor" antfile="build.xml" target="dist"/>
++ <ant dir="surveyor" antfile="build.xml" target="dist"/> -->
+ </target>
+
+- <target name="build_defect" depends="compile">
+- <ant dir="lakewalker" antfile="build.xml" target="dist"/>
++ <target name="build_defect">
++ <!--<ant dir="lakewalker" antfile="build.xml" target="dist"/>
+ <ant dir="navigator" antfile="build.xml" target="dist"/>
+ <ant dir="pluginmanager" antfile="build.xml" target="dist"/>
+ <ant dir="waypoints" antfile="build.xml" target="dist"/>
+- <ant dir="grid" antfile="build.xml" target="dist"/>
++ <ant dir="grid" antfile="build.xml" target="dist"/>-->
+ </target>
+
+ <target name="clean">
+@@ -63,12 +69,16 @@
+
+ <ant dir="surveyor" antfile="build.xml" target="clean"/>
+ <ant dir="livegps" antfile="build.xml" target="clean"/>
++
++ <delete dir="${plugin.dist.dir}"/>
+ </target>
+
++<!-- Not used in Debian
+ <target name="clean_install">
+ </target>
+
+ <target name="install" depends="dist">
+ </target>
++-->
+
+ </project>
Property changes on: packages/josm-plugins/trunk/debian/patches/10_build.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: packages/josm-plugins/trunk/debian/patches/20_validator.dpatch
===================================================================
--- packages/josm-plugins/trunk/debian/patches/20_validator.dpatch (rev 0)
+++ packages/josm-plugins/trunk/debian/patches/20_validator.dpatch 2008-03-17 19:43:02 UTC (rev 1417)
@@ -0,0 +1,83 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_build.dpatch by <g.mascellani at gmail.com>
+##
+## DP: Patch for plugin validator
+
+ at DPATCH@
+diff -urNad josm-plugins-0.0.0.20080316~/validator/build.xml josm-plugins-0.0.0.20080316/validator/build.xml
+--- josm-plugins-0.0.0.20080316~/validator/build.xml 2008-03-16 15:45:08.000000000 +0100
++++ josm-plugins-0.0.0.20080316/validator/build.xml 2008-03-16 15:50:39.000000000 +0100
+@@ -1,41 +1,48 @@
+ <project name="validator" default="dist" basedir=".">
+
+ <!-- compilation properties -->
++<!-- Not used in Debian
+ <property name="josm.build.dir" value="../../core"/>
+ <property name="josm.home.dir" value="${user.home}/.josm"/>
+ <property name="josm" location="../../core/dist/josm-custom.jar" />
+ <property name="plugin.build.dir" value="build"/>
+ <property name="plugin.dist.dir" value="../../dist"/>
++-->
+ <property name="plugin.name" value="${ant.project.name}"/>
+- <property name="plugin.jar" value="../../dist/${plugin.name}.jar"/>
++ <property name="plugin.jar" value="${plugin.dist.dir}/${plugin.name}.jar"/>
+
+ <!-- point to your JOSM directory -->
++<!-- Not used in Debian
+ <property name="josm" location="../../core/dist/josm-custom.jar" />
++-->
+
+ <property name="ant.build.javac.target" value="1.5"/>
+
+ <target name="init">
+- <mkdir dir="${plugin.build.dir}"/>
++ <mkdir dir="build"/>
+ </target>
+
+ <target name="compile" depends="init">
+ <javac srcdir="src" classpath="${josm}" destdir="build" debug="true">
+- <include name="**/*.java" />
++<!-- <include name="**/*.java" /> -->
+ </javac>
+ </target>
+
+- <target name="dist" depends="clean, compile">
++ <target name="dist" depends="compile">
+ <copy todir="build/images">
+ <fileset dir="images"/>
+ </copy>
++<!-- Not used in Debian
+ <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
+ <env key="LANG" value="C"/>
+ <arg value="info"/>
+- <arg value="--xml"/>
++ <arg value="-xml"/> Add another -
+ <arg value="."/>
+ </exec>
+ <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
+ <delete file="REVISION"/>
++-->
++ <xmlproperty file="${svn.info}" prefix="version" keepRoot="false" collapseAttributes="true"/>
+ <jar destfile="${plugin.jar}" basedir="build">
+ <manifest>
+ <attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.validator.OSMValidatorPlugin"/>
+@@ -49,10 +56,11 @@
+
+ <!-- clean target -->
+ <target name="clean">
+- <delete dir="${plugin.build.dir}" />
++ <delete dir="build" />
+ <delete file="${plugin.jar}" />
+ </target>
+
++<!-- Not used in Debian
+ <target name="install" depends="dist">
+ <copy file="${plugin.jar}" todir="${user.home}/.josm/plugins"/>
+ </target>
+@@ -61,5 +69,6 @@
+ <java jar="${josm}" fork="true">
+ </java>
+ </target>
++-->
+
+ </project>
Property changes on: packages/josm-plugins/trunk/debian/patches/20_validator.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: packages/josm-plugins/trunk/debian/patches/30_utilsplugin.dpatch
===================================================================
--- packages/josm-plugins/trunk/debian/patches/30_utilsplugin.dpatch (rev 0)
+++ packages/josm-plugins/trunk/debian/patches/30_utilsplugin.dpatch 2008-03-17 19:43:02 UTC (rev 1417)
@@ -0,0 +1,61 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_build.dpatch by <g.mascellani at gmail.com>
+##
+## DP: Patch for plugin utilsplugin
+
+ at DPATCH@
+diff -urNad josm-plugins-0.0.0.20080311~/utilsplugin/build.xml josm-plugins-0.0.0.20080311/utilsplugin/build.xml
+--- josm-plugins-0.0.0.20080311~/utilsplugin/build.xml 2008-03-16 11:24:34.000000000 +0100
++++ josm-plugins-0.0.0.20080311/utilsplugin/build.xml 2008-03-16 11:24:50.000000000 +0100
+@@ -1,21 +1,25 @@
+ <project name="utilsplugin" default="dist" basedir=".">
+
+ <!-- josm "user home" directory depends on the platform used (windows has a different place than unix/linux) -->
++<!-- Not used in Debian
+ <property environment="env"/>
+ <condition property="josm.home.dir" value="${env.APPDATA}/JOSM" else="${user.home}/.josm">
+ <and>
+ <os family="windows"/>
+ </and>
+ </condition>
++-->
+
+ <!-- compilation properties -->
++<!-- Not used in Debian
+ <property name="josm.build.dir" value="../../core"/>
+ <property name="josm.plugins.dir" value="${josm.home.dir}/plugins"/>
+ <property name="josm" location="../../core/dist/josm-custom.jar" />
+ <property name="plugin.build.dir" value="build"/>
+ <property name="plugin.dist.dir" value="../../dist"/>
++-->
+ <property name="plugin.name" value="${ant.project.name}"/>
+- <property name="plugin.jar" value="../../dist/${plugin.name}.jar"/>
++ <property name="plugin.jar" value="${plugin.dist.dir}/${plugin.name}.jar"/>
+
+ <property name="ant.build.javac.target" value="1.5"/>
+
+@@ -27,7 +31,7 @@
+ <javac srcdir="src" classpath="${josm}" destdir="build" debug="true"/>
+ </target>
+
+- <target name="dist" depends="clean, compile">
++ <target name="dist" depends="compile">
+ <copy todir="build/images">
+ <fileset dir="images"/>
+ </copy>
+@@ -43,11 +47,14 @@
+ </target>
+
+ <target name="clean">
+- <delete dir="${plugin.build.dir}" />
++ <delete dir="build" />
+ <delete file="${plugin.jar}" />
+ </target>
+
++<!-- Not used in Debian
+ <target name="install" depends="dist">
+ <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
+ </target>
++-->
++
+ </project>
Property changes on: packages/josm-plugins/trunk/debian/patches/30_utilsplugin.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: packages/josm-plugins/trunk/debian/patches/40_wmsplugin.dpatch
===================================================================
--- packages/josm-plugins/trunk/debian/patches/40_wmsplugin.dpatch (rev 0)
+++ packages/josm-plugins/trunk/debian/patches/40_wmsplugin.dpatch 2008-03-17 19:43:02 UTC (rev 1417)
@@ -0,0 +1,66 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 40_wmsplugin.dpatch by <g.mascellani at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad josm-plugins-0.0.0.20080316~/wmsplugin/build.xml josm-plugins-0.0.0.20080316/wmsplugin/build.xml
+--- josm-plugins-0.0.0.20080316~/wmsplugin/build.xml 2008-02-04 15:18:27.000000000 +0100
++++ josm-plugins-0.0.0.20080316/wmsplugin/build.xml 2008-03-16 22:18:42.000000000 +0100
+@@ -1,32 +1,36 @@
+ <project name="wmsplugin" default="dist" basedir=".">
+
+ <!-- josm "user home" directory depends on the platform used (windows has a different place than unix/linux) -->
++<!-- Not used in Debian
+ <property environment="env"/>
+ <condition property="josm.home.dir" value="${env.APPDATA}/JOSM" else="${user.home}/.josm">
+ <and>
+ <os family="windows"/>
+ </and>
+ </condition>
++-->
+
+ <!-- compilation properties -->
++<!-- Not used in Debian
+ <property name="josm.build.dir" value="../../core"/>
+ <property name="josm.plugins.dir" value="${josm.home.dir}/plugins"/>
+ <property name="josm" location="../../core/dist/josm-custom.jar" />
+ <property name="plugin.build.dir" value="build"/>
+ <property name="plugin.dist.dir" value="../../dist"/>
++-->
+ <property name="plugin.name" value="${ant.project.name}"/>
+- <property name="plugin.jar" value="../../dist/${plugin.name}.jar"/>
++ <property name="plugin.jar" value="${plugin.dist.dir}/${plugin.name}.jar"/>
+
+ <property name="ant.build.javac.target" value="1.5"/>
+
+ <target name="init">
+ <mkdir dir="build"></mkdir>
+- <mkdir dir="dist"></mkdir>
++<!-- <mkdir dir="dist"></mkdir>-->
+ </target>
+
+ <target name="compile" depends="init">
+ <javac srcdir="src" classpath="${josm}" debug="true" destdir="build">
+- <include name="**/*.java" />
++<!-- <include name="**/*.java" />-->
+ </javac>
+ </target>
+
+@@ -44,12 +48,14 @@
+ </target>
+
+ <target name="clean">
+- <delete dir="${plugin.build.dir}" />
++ <delete dir="build" />
+ <delete file="${plugin.jar}" />
+ </target>
+
++<!-- Not used in Debian
+ <target name="install" depends="dist">
+ <copy file="${plugin.jar}" todir="${josm.plugins.dir}"/>
+ </target>
++-->
+
+ </project>
Property changes on: packages/josm-plugins/trunk/debian/patches/40_wmsplugin.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: packages/josm-plugins/trunk/debian/rules
===================================================================
--- packages/josm-plugins/trunk/debian/rules (rev 0)
+++ packages/josm-plugins/trunk/debian/rules 2008-03-17 19:43:02 UTC (rev 1417)
@@ -0,0 +1,33 @@
+#!/usr/bin/make -f
+# debian/rules file for josm-plugins (uses cdbs)
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
+
+JAVA_HOME_DIRS := /usr/lib/jvm/java-6-sun/ /usr/lib/jvm/java-1.5.0-sun/
+DEB_ANT_BUILD_TARGET := dist
+DEB_ANT_CLEAN_TARGET := clean
+
+SVNREPO := http://svn.openstreetmap.org/applications/editors/josm/plugins/
+DATE := $(shell date +%Y%m%d)
+
+get-orig-source:
+ dh_testdir
+ test -d ../tarballs/. || mkdir -p ../tarballs
+ @echo Downloading josm-plugins from ${SVNREPO}
+ svn export -r HEAD ${SVNREPO} ../tarballs/josm-plugins-0.0.0.${DATE}
+ svn info --xml http://svn.openstreetmap.org/applications/editors/josm/plugins/ > ../tarballs/josm-plugins-0.0.0.${DATE}/svn-info.xml
+ #@echo Removing jar files and test data
+ #find ../tarballs/josm-plugins-0.0.0.${DATE} -name "*.jar" -exec rm {} \;
+ #rm -f ../tarballs/josm-plugins-0.0.0.${DATE}/data/*
+ @echo Building snapshot tarball
+ tar czf ../tarballs/josm-plugins_0.0.0.${DATE}.orig.tar.gz -C ../tarballs josm-plugins-0.0.0.${DATE}
+ @echo Cleaning up
+ rm -rf ../tarballs/josm-plugins-0.0.0.${DATE}
+ @echo .
+ @echo To update debian/changelog type
+ @echo dch -v 0.0.0.${DATE}-1
+ @echo .
+
+.PHONY: get-orig-source
Property changes on: packages/josm-plugins/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
More information about the Pkg-grass-devel
mailing list