[josm-plugins] 57/369: Removed .rej file from patch

Bas Couwenberg sebastic at xs4all.nl
Sat Oct 18 12:03:25 UTC 2014


This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository josm-plugins.

commit 78559b844d6b1cf35ac854da36561e4443cbd02b
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Sat Apr 4 23:14:36 2009 +0000

    Removed .rej file from patch
---
 debian/patches/10_colorscheme.dpatch | 44 ------------------------------------
 1 file changed, 44 deletions(-)

diff --git a/debian/patches/10_colorscheme.dpatch b/debian/patches/10_colorscheme.dpatch
index f828f7c..fd512f3 100755
--- a/debian/patches/10_colorscheme.dpatch
+++ b/debian/patches/10_colorscheme.dpatch
@@ -6,47 +6,3 @@
 ## DP:  * Fix wrong classpath and dependencies
 
 @DPATCH@
-diff -urNad trunk~/colorscheme/build.xml trunk/colorscheme/build.xml
---- trunk~/colorscheme/build.xml	2009-01-01 18:55:45.000000000 +0100
-+++ trunk/colorscheme/build.xml	2009-02-15 19:57:22.000000000 +0100
-@@ -15,7 +15,7 @@
-     <property name="plugin.site.url" value="http://www.tegmento.org/~cdaller/josm/colorscheme/"/>
-     <property name="plugin.site.upload.target" value="cdaller at www.tegmento.org:public_html/josm/colorscheme/"/>
-     <property name="ant.build.javac.target" value="1.5"/>
--    <target name="dist" depends="compile, site">
-+    <target name="dist" depends="compile">
-         <echo message="creating ${plugin.jar}"/>
- <!-- images -->
- <!--
-@@ -29,14 +29,6 @@
-                 <include name="*.xml"/>
-             </fileset>
-         </copy>
--        <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
--            <env key="LANG" value="C"/>
--            <arg value="info"/>
--            <arg value="--xml"/>
--            <arg value="."/>
--        </exec>
--        <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
--        <delete file="REVISION"/>
- <!-- create jar file -->
-         <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
-             <manifest>
-@@ -48,14 +40,11 @@
-             </manifest>
-         </jar>
-     </target>
--    <target name="compile" depends="init">
-+    <target name="compile" depends="">
-         <mkdir dir="${plugin.build.dir}"/>
-         <javac srcdir="src" destdir="${plugin.build.dir}" debug="true" source="1.5" target="1.5">
-             <classpath>
--                <pathelement path="${josm.build.dir}/build"/>
--                <fileset dir="${josm.build.dir}/lib">
--                    <include name="**/*.jar"/>
--                </fileset>
-+                <pathelement path="${josm}"/>
-             </classpath>
-         </javac>
-     </target>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm-plugins.git



More information about the Pkg-grass-devel mailing list