[DebianGIS-dev] r2446 - in packages/josm-plugins/trunk/debian: . patches

[gmascellani-guest at alioth.debian.org]

Author: gmascellani-guest
Date: 2009-09-14 14:13:22 +0000 (Mon, 14 Sep 2009)
New Revision: 2446

Modified:
   packages/josm-plugins/trunk/debian/changelog
   packages/josm-plugins/trunk/debian/patches/100_surveyor.dpatch
   packages/josm-plugins/trunk/debian/patches/60_wmsplugin.dpatch
Log:
Patched updated to latest revision


Modified: packages/josm-plugins/trunk/debian/changelog
===================================================================
--- packages/josm-plugins/trunk/debian/changelog	2009-09-14 13:56:51 UTC (rev 2445)
+++ packages/josm-plugins/trunk/debian/changelog	2009-09-14 14:13:22 UTC (rev 2446)
@@ -1,4 +1,4 @@
-josm-plugins (0.0.svn16517-1) UNRELEASED; urgency=low
+josm-plugins (0.0.svn17608-1) UNRELEASED; urgency=low
 
   [ Giovanni Mascellani ]
   * New upstream revision
@@ -23,9 +23,9 @@
   [ Andreas Putzo ]
   * Update packaging copyright year.
   * Mention added plugins in long description.
-  * Use openjdk in debian/rules to be consistent with build dependency. 
+  * Use openjdk in debian/rules to be consistent with build dependency.
 
- -- Giovanni Mascellani <g.mascellani at gmail.com>  Fri, 11 Sep 2009 11:09:49 +0200
+ -- Giovanni Mascellani <g.mascellani at gmail.com>  Mon, 14 Sep 2009 16:05:56 +0200
 
 josm-plugins (0.0.0.20080518-1) unstable; urgency=low
 

Modified: packages/josm-plugins/trunk/debian/patches/100_surveyor.dpatch
===================================================================
--- packages/josm-plugins/trunk/debian/patches/100_surveyor.dpatch	2009-09-14 13:56:51 UTC (rev 2445)
+++ packages/josm-plugins/trunk/debian/patches/100_surveyor.dpatch	2009-09-14 14:13:22 UTC (rev 2446)
@@ -6,21 +6,9 @@
 ## DP:  * Backport recent code
 
 @DPATCH@
-diff -urNad trunk~/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java trunk/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java
---- trunk~/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java	2009-06-06 22:25:31.000000000 +0200
-+++ trunk/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java	2009-07-17 15:55:16.000000000 +0200
-@@ -102,7 +102,7 @@
-     private void openAsData(File file) throws SAXException, IOException, FileNotFoundException {
-         String fn = file.getName();
-         if (new OsmImporter().acceptFile(file)) {
--            DataSet dataSet = OsmReader.parseDataSet(new FileInputStream(file), null, Main.pleaseWaitDlg);
-+            DataSet dataSet = OsmReader.parseDataSet(new FileInputStream(file), Main.pleaseWaitDlg);
-             OsmDataLayer layer = new OsmDataLayer(dataSet, fn, file);
-             Main.main.addLayer(layer);
-         }
 diff -urNad trunk~/surveyor/build.xml trunk/surveyor/build.xml
---- trunk~/surveyor/build.xml	2009-07-09 14:36:03.000000000 +0200
-+++ trunk/surveyor/build.xml	2009-07-17 15:54:41.000000000 +0200
+--- trunk~/surveyor/build.xml	2009-08-30 18:28:38.000000000 +0200
++++ trunk/surveyor/build.xml	2009-09-14 16:09:57.000000000 +0200
 @@ -19,7 +19,7 @@
              </classpath>
          </javac>

Modified: packages/josm-plugins/trunk/debian/patches/60_wmsplugin.dpatch
===================================================================
--- packages/josm-plugins/trunk/debian/patches/60_wmsplugin.dpatch	2009-09-14 13:56:51 UTC (rev 2445)
+++ packages/josm-plugins/trunk/debian/patches/60_wmsplugin.dpatch	2009-09-14 14:13:22 UTC (rev 2446)
@@ -6,14 +6,14 @@
 
 @DPATCH@
 diff -urNad trunk~/wmsplugin/build.xml trunk/wmsplugin/build.xml
---- trunk~/wmsplugin/build.xml	2009-07-04 20:28:12.000000000 +0200
-+++ trunk/wmsplugin/build.xml	2009-07-17 15:48:28.000000000 +0200
-@@ -14,7 +14,7 @@
+--- trunk~/wmsplugin/build.xml	2009-09-09 00:30:10.000000000 +0200
++++ trunk/wmsplugin/build.xml	2009-09-14 16:09:32.000000000 +0200
+@@ -43,7 +43,7 @@
              <compilerarg value="-Xlint:unchecked"/>
          </javac>
      </target>
 -    <target name="dist" depends="compile,revision">
 +    <target name="dist" depends="compile">
+     	<echo message="building ${plugin.jar} with version ${version.entry.commit.revision} for JOSM version ${josm.reference.release} "/>
          <copy todir="${plugin.build.dir}/images">
              <fileset dir="images"/>
-         </copy>