[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn4667+dfsg1-1-2-gc83c99d

[David Paleino]

The following commit has been merged in the master branch:
commit a77df4c8415f5e06866960f09d2f057710c293b2
Author: David Paleino <dapal at debian.org>
Date:   Fri Jan 27 17:42:46 2012 +0100

    Drop Build-Depends on libgdata-java

diff --git a/debian/changelog b/debian/changelog
index d426384..aabaa27 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+josm (0.0.svn4667+dfsg1-2) UNRELEASED; urgency=low
+
+  * Drop Build-Depends on libgdata-java
+
+ -- David Paleino <dapal at debian.org>  Fri, 27 Jan 2012 17:41:42 +0100
+
 josm (0.0.svn4667+dfsg1-1) unstable; urgency=low
 
   * New upstream snapshot
diff --git a/debian/control b/debian/control
index e9c6b94..a079a28 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,6 @@ Build-Depends:
  , libmetadata-extractor-java
  , libgettext-ant-tasks-java
  , liboauth-signpost-java (>= 1.2)
- , libgdata-java
  , libsvgsalamander-java
  , libterm-readkey-perl
 Standards-Version: 3.9.2
diff --git a/debian/patches/10-build.patch b/debian/patches/10-build.patch
index c68d1fb..eddcf56 100644
--- a/debian/patches/10-build.patch
+++ b/debian/patches/10-build.patch
@@ -7,9 +7,9 @@ Adjustements to the ant build.xml files, mainly to use system-provided
 JARs and not depend on Internet connection.
 
 ---
- build.xml      |   46 ++++++++++++++++++++++------------------------
+ build.xml      |   45 +++++++++++++++++++++------------------------
  i18n/build.xml |   33 ++++++++++++++++-----------------
- 2 files changed, 38 insertions(+), 41 deletions(-)
+ 2 files changed, 37 insertions(+), 41 deletions(-)
 
 --- josm.orig/build.xml
 +++ josm/build.xml
@@ -21,7 +21,7 @@ JARs and not depend on Internet connection.
      <!-- build parameter: compression level (ant -Dclevel=N)
               N ranges from 0 (no compression) to 9 (maximum compression)
               default: 9 -->
-@@ -23,10 +24,17 @@
+@@ -23,10 +24,16 @@
      </condition>
      <!-- Java classpath addition (all jar files to compile tests with this) -->
      <path id="classpath">
@@ -31,7 +31,6 @@ JARs and not depend on Internet connection.
 +			<include name="gettext-commons.jar"/>
 +			<include name="metadata-extractor.jar"/>
 +			<include name="svgSalamander.jar"/>
-+			<include name="gdata-core.jar"/>
 +			<include name="signpost-core.jar"/>
 +			<include name="ant.jar"/>
 +			<include name="commons-codec.jar"/>
@@ -41,7 +40,7 @@ JARs and not depend on Internet connection.
  
      <!--
  	  ** Used by Eclipse ant builder for updating
-@@ -41,14 +49,7 @@
+@@ -41,14 +48,7 @@
  	  -->
      <target name="create-revision">
          <property name="revision.dir" value="${build.dir}"/>
@@ -57,7 +56,7 @@ JARs and not depend on Internet connection.
          <tstamp>
              <format property="build.tstamp" pattern="yyyy-MM-dd HH:mm:ss"/>
          </tstamp>
-@@ -59,31 +60,29 @@
+@@ -59,31 +59,29 @@
  Revision: ${version.entry.commit.revision}
  Is-Local-Build: true
  Build-Date: ${build.tstamp}
@@ -95,7 +94,7 @@ JARs and not depend on Internet connection.
              </manifest>
              <zipfileset dir="images" prefix="images"/>
              <zipfileset dir="data" prefix="data"/>
-@@ -109,30 +108,29 @@ Build-Date: ${build.tstamp}
+@@ -109,30 +107,29 @@ Build-Date: ${build.tstamp}
      </target>
      <target name="javacc">
          <mkdir dir="${mapcss.dir}/parsergen"/>
diff --git a/debian/patches/90-fix_version.patch b/debian/patches/90-fix_version.patch
index eb96c42..31457d8 100644
--- a/debian/patches/90-fix_version.patch
+++ b/debian/patches/90-fix_version.patch
@@ -10,7 +10,7 @@ Forwarded: not-needed
 
 --- josm.orig/build.xml
 +++ josm/build.xml
-@@ -79,7 +79,7 @@ Debian-Release: ${debian.version}
+@@ -78,7 +78,7 @@ Debian-Release: ${debian.version}
              <!-- add attribute excludes="**/*BZip2*,**/*Bzip2*" to create a non-bzip2 supporting jar -->
              <manifest>
                  <attribute name="Main-class" value="JOSM"/>

-- 
Editor for OpenStreetMap