[josm] 05/07: Improve DEP3 patch headers, use HTTPS URLS in BTS patch.

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Sat Oct 10 22:17:53 UTC 2015 

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

sebastic pushed a commit to branch master
in repository josm.

commit e787705d138c29a40950ef5cf5cd4689345df676
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Oct 10 19:46:03 2015 +0200

    Improve DEP3 patch headers, use HTTPS URLS in BTS patch.
---
 debian/changelog                              |  1 +
 debian/patches/00-build.patch                 | 15 ++++-----------
 debian/patches/01-bts.patch                   | 24 ++++++++----------------
 debian/patches/02-elemstyles.patch            | 18 +++++-------------
 debian/patches/03-default_look_and_feel.patch | 13 ++++---------
 debian/patches/04-use_system_jmapviewer.patch | 13 ++++---------
 debian/patches/05-fix_version.patch           | 15 ++++++---------
 debian/patches/06-move_data_out_of_jar.patch  | 15 ++++-----------
 debian/patches/07-use_system_fonts.patch      |  9 ++-------
 9 files changed, 38 insertions(+), 85 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e836634..89d8ae8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 josm (0.0.svn8800+dfsg3-1~exp1) UNRELEASED; urgency=medium
 
   * Also remove OSX support from upstream source.
+  * Improve DEP3 patch headers, use HTTPS URLS in BTS patch.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 10 Oct 2015 18:37:25 +0200
 
diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch
index 4c63fcd..9f7d21e 100644
--- a/debian/patches/00-build.patch
+++ b/debian/patches/00-build.patch
@@ -1,15 +1,8 @@
-From: Giovanni Mascellani <gio at debian.org>
-Subject: Adjustments to the ant build file
+Description: Adjustments to the ant build.xml file.
+ Mainly to use system-provided JARs and not depend on Internet connection.
+ Also adds support to build the translations in the i18n directory.
+Author: Giovanni Mascellani <gio at debian.org>
 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      |   40 +++++++++++++++++++++++-----------------
- i18n/build.xml |   33 ++++++++++++++++-----------------
- 2 files changed, 39 insertions(+), 34 deletions(-)
 
 --- a/build.xml
 +++ b/build.xml
diff --git a/debian/patches/01-bts.patch b/debian/patches/01-bts.patch
index 342b2b1..6ec0bf6 100644
--- a/debian/patches/01-bts.patch
+++ b/debian/patches/01-bts.patch
@@ -1,18 +1,10 @@
-From: Andreas Putzo <andreas at putzo.net>
-Subject: Include Debian version number and BTS link
+Description: Include Debian version number and BTS link.
+ 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.
+Author: Andreas Putzo <andreas at putzo.net>
 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 ++-
- src/org/openstreetmap/josm/actions/ShowStatusReportAction.java  |    3 -
- src/org/openstreetmap/josm/data/Version.java                    |    7 +++
- src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java |   23 ++--------
- 4 files changed, 20 insertions(+), 20 deletions(-)
-
 --- a/src/org/openstreetmap/josm/actions/AboutAction.java
 +++ b/src/org/openstreetmap/josm/actions/AboutAction.java
 @@ -9,6 +9,9 @@ import java.awt.Image;
@@ -40,7 +32,7 @@ bug triaging.
          info.add(new JLabel(tr("Bug Reports")), GBC.std().insets(10, 0, 10, 0));
 -        info.add(BugReportExceptionHandler.getBugReportUrlLabel(Utils.strip(ShowStatusReportAction.getReportHeader())),
 -                GBC.eol().fill(GBC.HORIZONTAL));
-+        info.add(new UrlLabel("http://bugs.debian.org", 2), GBC.eol().fill(GBC.HORIZONTAL));
++        info.add(new UrlLabel("https://bugs.debian.org/", 2), GBC.eol().fill(GBC.HORIZONTAL));
  
          about.addTab(tr("Info"), info);
          about.addTab(tr("Readme"), createScrollPane(readme));
@@ -83,7 +75,7 @@ bug triaging.
 -                            "This is always a coding error. If you are running the latest<br>" +
 -                            "version of JOSM, please consider being kind and file a bug report."
 +                            "Please consider being kind and file a bug report.<br>" +
-+                            "See http://bugs.debian.org for a guide how to do this."
++                            "See https://bugs.debian.org/ for a guide how to do this."
                              );
                      // Check user is running current tested version, the error may already be fixed
                      int josmVersion = Version.getInstance().getVersion();
@@ -131,7 +123,7 @@ bug triaging.
          switch (ed.showDialog().getValue()) {
              case 1: Utils.copyToClipboard(text.toString()); break;
 -            case 2: ReportBugAction.reportBug(reportHeader); break;
-+            case 2: OpenBrowser.displayUrl("http://bugs.debian.org"); break;
++            case 2: OpenBrowser.displayUrl("https://bugs.debian.org/"); break;
          }
      }
  }
diff --git a/debian/patches/02-elemstyles.patch b/debian/patches/02-elemstyles.patch
index 7a1ee27..7f94291 100644
--- a/debian/patches/02-elemstyles.patch
+++ b/debian/patches/02-elemstyles.patch
@@ -1,18 +1,10 @@
-From: Andreas Putzo <andreas at putzo.net>
-Subject: User openstreetmap-map-icons-* packages
-Last-Update: 2011-02-20
+Description: Use openstreetmap-map-icons-* packages.
+ Map icons in Debian are not distributed in the 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.
+Author: Andreas Putzo <andreas at putzo.net>
 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 ++++--
- src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java      |   14 ++++++--
- src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java |   17 ++++++++--
- 3 files changed, 33 insertions(+), 9 deletions(-)
-
 --- a/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
 +++ b/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
 @@ -230,14 +230,19 @@ public final class MapPaintStyles {
diff --git a/debian/patches/03-default_look_and_feel.patch b/debian/patches/03-default_look_and_feel.patch
index 7503362..42eb52b 100644
--- a/debian/patches/03-default_look_and_feel.patch
+++ b/debian/patches/03-default_look_and_feel.patch
@@ -1,14 +1,9 @@
-From: David Paleino <dapal at debian.org>
-Subject: Use GTK look and feel by default
+Description: 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>
+Author: David Paleino <dapal at debian.org>
 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 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
 --- a/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
 +++ b/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
 @@ -162,7 +162,7 @@ public class PlatformHookUnixoid impleme
diff --git a/debian/patches/04-use_system_jmapviewer.patch b/debian/patches/04-use_system_jmapviewer.patch
index 1afd126..88f1237 100644
--- a/debian/patches/04-use_system_jmapviewer.patch
+++ b/debian/patches/04-use_system_jmapviewer.patch
@@ -1,12 +1,7 @@
-From: David Paleino <dapal at debian.org>
-Subject: don't embed parts of jmapviewer in final josm JAR
-Origin: vendor
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=731029
-Forwarded: no
-
----
- build.xml |    1 -
- 1 file changed, 1 deletion(-)
+Description: Don't embed parts of jmapviewer in final josm JAR.
+Author: David Paleino <dapal at debian.org>
+Bug-Debian: https://bugs.debian.org/731029
+Forwarded: not-needed
 
 --- a/build.xml
 +++ b/build.xml
diff --git a/debian/patches/05-fix_version.patch b/debian/patches/05-fix_version.patch
index bf4e0e9..1ed057c 100644
--- a/debian/patches/05-fix_version.patch
+++ b/debian/patches/05-fix_version.patch
@@ -1,13 +1,10 @@
-From: Mario Izquierdo <mariodebian at gmail.com>
-Subject: fix version numbers to reflect upstream changes
-Origin: vendor
-Forwarded: not-needed
+Description: Fix version numbers to reflect upstream changes.
+ Appending SVN to version is not required for the Debian package build.
+ The Debian package build is identified using the Build-Name property in the
+ REVISION file (see 00-build.patch).
+Author: Mario Izquierdo <mariodebian at gmail.com>
 Bug-Debian: https://bugs.debian.org/598920
-
----
- build.xml                                    |    2 +-
- src/org/openstreetmap/josm/data/Version.java |    3 ---
- 2 files changed, 1 insertion(+), 4 deletions(-)
+Forwarded: not-needed
 
 --- a/build.xml
 +++ b/build.xml
diff --git a/debian/patches/06-move_data_out_of_jar.patch b/debian/patches/06-move_data_out_of_jar.patch
index 26c61e0..5fd6637 100644
--- a/debian/patches/06-move_data_out_of_jar.patch
+++ b/debian/patches/06-move_data_out_of_jar.patch
@@ -1,15 +1,8 @@
-From: David Paleino <dapal at debian.org>
- Paul Hartmann <phaaurlt at googlemail.com>
-Subject: move sharable data out of josm.jar
-Origin: vendor
+Description: Move sharable data out of josm.jar.
+Author: David Paleino <dapal at debian.org>
+Author: Paul Hartmann <phaaurlt at googlemail.com>
+Bug-Debian: https://bugs.debian.org/698608
 Forwarded: not-needed
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=698608
-
----
- build.xml                                     |    6 +++---
- src/org/openstreetmap/josm/io/CachedFile.java |   14 ++++++++++----
- src/org/openstreetmap/josm/tools/I18n.java    |    7 ++++++-
- 3 files changed, 19 insertions(+), 8 deletions(-)
 
 --- a/src/org/openstreetmap/josm/tools/I18n.java
 +++ b/src/org/openstreetmap/josm/tools/I18n.java
diff --git a/debian/patches/07-use_system_fonts.patch b/debian/patches/07-use_system_fonts.patch
index 1e2412f..d25daf8 100644
--- a/debian/patches/07-use_system_fonts.patch
+++ b/debian/patches/07-use_system_fonts.patch
@@ -1,12 +1,7 @@
-From: David Paleino <dapal at debian.org>
-Subject: use system droid fonts, instead of the embedded ones
-Origin: vendor
+Description: Use system droid fonts, instead of the embedded ones.
+Author: David Paleino <dapal at debian.org>
 Forwarded: not-needed
 
----
- src/org/openstreetmap/josm/tools/FontsManager.java |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
 --- a/src/org/openstreetmap/josm/tools/FontsManager.java
 +++ b/src/org/openstreetmap/josm/tools/FontsManager.java
 @@ -36,7 +36,7 @@ public final class FontsManager {

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

More information about the Pkg-grass-devel mailing list