[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn4064-3-9-g3d3dbac

[Giovanni Mascellani]

The following commit has been merged in the master branch:
commit a5f45be2bc5f33ec4b939ab9cbae6868d686dec0
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Sun Aug 7 14:47:20 2011 +0200

    Patches descriptions improved.

diff --git a/debian/changelog b/debian/changelog
index af1f5dd..a5fe46a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,10 +3,11 @@ josm (0.0.svn4279-1) UNRELEASED; urgency=low
   * New upstream release (closes: #636345).
   * debian/patches:
     - refreshed and modified according new upstream version
+    - descriptions improved
     - 50-preferences_world_readable.patch: removed, integrated
       upstream
 
- -- Giovanni Mascellani <gio at debian.org>  Sun, 07 Aug 2011 11:20:28 +0200
+ -- Giovanni Mascellani <gio at debian.org>  Sun, 07 Aug 2011 14:47:07 +0200
 
 josm (0.0.svn4064-3) unstable; urgency=low
 
diff --git a/debian/patches/10-build.patch b/debian/patches/10-build.patch
index a33a12a..2521f72 100644
--- a/debian/patches/10-build.patch
+++ b/debian/patches/10-build.patch
@@ -1,7 +1,10 @@
-From: Andreas Putzo <andreas at putzo.net>
-Subject: adjustments to the ant build file, mainly to not include
- the dependencies into the target jar file.
-Forwarded: no
+From: Giovanni Mascellani <gio at debian.org>
+Subject: Adjustments to the ant build file
+Forwarded: not-needed
+Last-Update: 2011-08-07
+
+Adjustements to the ant build.xml files, mainly to use system-provided
+JARs and not depend on Internet connection.
 
 ---
  build.xml      |   34 +++++++++++-----------------------
diff --git a/debian/patches/20-bts.patch b/debian/patches/20-bts.patch
index 40b1b86..62e4b40 100644
--- a/debian/patches/20-bts.patch
+++ b/debian/patches/20-bts.patch
@@ -1,7 +1,10 @@
 From: Andreas Putzo <andreas at putzo.net>
-Subject: point to the debian BTS for bug reports.
- Pattern match debian version in about dialog.
-Forwarded: no
+Subject: Include Debian version number and BTS link
+Forwarded: not-needed
+
+Bugs for the Josm version present in Debian have to be filed in Debian's
+BTS and not upstream. Also include the Debian version number for better
+bug triaging.
 
 ---
  src/org/openstreetmap/josm/actions/AboutAction.java             |    7 +++
diff --git a/debian/patches/40-elemstyles.patch b/debian/patches/40-elemstyles.patch
index ebf6c9e..b7df07b 100644
--- a/debian/patches/40-elemstyles.patch
+++ b/debian/patches/40-elemstyles.patch
@@ -1,6 +1,11 @@
 From: Andreas Putzo <andreas at putzo.net>
-Date: Sun, 20 Feb 2011 10:15:10 +0100
-Subject: the icons have been removed from the JAR file because they are already provided by the openstreetmap-map-icons-* packages. Point josm to the correct directory so that the icons are found.
+Subject: User openstreetmap-map-icons-* packages
+Last-Update: 2011-02-20
+Forwarded: not-needed
+
+Map icons in Debian are not distributed in Josm package, but in
+the openstreetmap-map-icons-* packages, so they can be used also by other
+applications. This patch points josm to the shared directories.
 
 ---
  src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java |   11 +++++++---
diff --git a/debian/patches/70-default_look_and_feel.patch b/debian/patches/70-default_look_and_feel.patch
index c09e79e..80fe671 100644
--- a/debian/patches/70-default_look_and_feel.patch
+++ b/debian/patches/70-default_look_and_feel.patch
@@ -1,9 +1,9 @@
 From: David Paleino <dapal at debian.org>
-Subject: use GTK look and feel by default
- patch rewritten for new code, original patch was from Ubuntu's
- 01-default-look-and-feel.dpatch by Mathieu Trudel
- <mathieu.tl at gmail.com>
-Forwarded: no
+Subject: Use GTK look and feel by default
+Forwarded: not-needed
+
+Patch rewritten for new code, original patch was from Ubuntu's
+01-default-look-and-feel.dpatch by Mathieu Trudel <mathieu.tl at gmail.com>
 
 ---
  src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java |    2 +-
diff --git a/debian/patches/80-fix_images.patch b/debian/patches/80-fix_images.patch
index ffad3cb..1f8c1f3 100644
--- a/debian/patches/80-fix_images.patch
+++ b/debian/patches/80-fix_images.patch
@@ -1,7 +1,7 @@
 From: David Paleino <dapal at debian.org>
 Subject: use empty icons, instead of giving errors
  It should really use icons from openstreetmap-map-icons-* packages
-Forwarded: no
+Forwarded: not-needed
 
 ---
  data/defaultpresets.xml |    4 ++--
diff --git a/debian/patches/90-fix_version.patch b/debian/patches/90-fix_version.patch
index 1b61ff3..2fcf622 100644
--- a/debian/patches/90-fix_version.patch
+++ b/debian/patches/90-fix_version.patch
@@ -1,7 +1,7 @@
 From: Mario Izquierdo <mariodebian at gmail.com>
 Subject: fix version numbers to reflect upstream changes
 Origin: vendor
-Forwarded: no
+Forwarded: not-needed
 
 ---
  build.xml                                    |    2 +-

-- 
Editor for OpenStreetMap