subject:"\[josm\] 04\/08\: Refresh patches."

[josm] 04/08: Refresh patches.

2018-03-26 Thread Bas Couwenberg

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

sebastic pushed a commit to branch master
in repository josm.

commit a1c313707aee0bfb60229d2d83296aaa26f8081e
Author: Bas Couwenberg 
Date:   Tue Mar 27 07:20:30 2018 +0200

Refresh patches.
---
 debian/changelog  |  1 +
 debian/patches/00-build.patch | 30 +--
 debian/patches/04-use_system_jmapviewer.patch |  2 +-
 debian/patches/05-fix_version.patch   |  2 +-
 debian/patches/06-move_data_out_of_jar.patch  |  8 +++
 5 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e8dc369..3a538ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 josm (0.0.svn13576+dfsg-1) UNRELEASED; urgency=medium
 
   * New tested snapshot.
+  * Refresh patches.
 
  -- Bas Couwenberg   Tue, 27 Mar 2018 07:18:16 +0200
 
diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch
index da04514..329418e 100644
--- a/debian/patches/00-build.patch
+++ b/debian/patches/00-build.patch
@@ -9,7 +9,7 @@ Forwarded: not-needed
 
 --- a/build.xml
 +++ b/build.xml
-@@ -29,7 +29,8 @@
+@@ -30,7 +30,8 @@
  
  
  
@@ -19,9 +19,9 @@ Forwarded: not-needed
  
  
  
-@@ -55,6 +56,19 @@
- 
- 
+@@ -66,6 +67,19 @@
+ 
+ 
  
 +
 +
@@ -39,7 +39,7 @@ Forwarded: not-needed
  
  
  
-@@ -117,10 +131,9 @@
+@@ -128,10 +142,9 @@
  
@@ -52,7 +52,7 @@ Forwarded: not-needed
  
  
  
-@@ -131,8 +144,10 @@
+@@ -142,8 +155,10 @@
  
  # automatically generated by JOSM build.xml - do not edit
  Revision: ${version.entry.commit.revision}
@@ -64,7 +64,7 @@ Forwarded: not-needed
  
  
  
@@ -73,7 +73,7 @@ Forwarded: not-needed
  
  
  
-@@ -162,6 +177,8 @@ Build-Date: ${build.tstamp}
+@@ -173,6 +188,8 @@ Build-Date: ${build.tstamp}
  
  
  
@@ -82,7 +82,7 @@ Forwarded: not-needed
  
  
  
-@@ -236,43 +253,21 @@ Build-Date: ${build.tstamp}
+@@ -247,43 +264,21 @@ Build-Date: ${build.tstamp}
  
  
  
@@ -129,7 +129,7 @@ Forwarded: not-needed
  
  
  
-@@ -293,21 +288,15 @@ Build-Date: ${build.tstamp}
+@@ -304,21 +299,15 @@ Build-Date: ${build.tstamp}
  
  
  
@@ -154,7 +154,7 @@ Forwarded: not-needed
  
  
  
-@@ -321,19 +310,14 @@ Build-Date: ${build.tstamp}
+@@ -332,19 +321,14 @@ Build-Date: ${build.tstamp}
  
  
  
@@ -175,7 +175,7 @@ Forwarded: not-needed
  
  
  
-@@ -347,13 +331,6 @@ Build-Date: ${build.tstamp}
+@@ -358,13 +342,6 @@ Build-Date: ${build.tstamp}
  
  
  
@@ -189,7 +189,7 @@ Forwarded: not-needed
  
  
  
-@@ -368,6 +345,7 @@ Build-Date: ${build.tstamp}
+@@ -379,6 +356,7 @@ Build-Date: ${build.tstamp}
  
  
  
@@ -197,7 +197,7 @@ Forwarded: not-needed
  
  
  
  
  
@@ -205,7 +205,7 @@ Forwarded: not-needed
  
  
  
-@@ -913,6 +892,7 @@ Build-Date: ${build.tstamp}
+@@ -926,6 +905,7 @@ Build-Date: ${build.tstamp}
  
  
  
diff --git a/debian/patches/04-use_system_jmapviewer.patch 
b/debian/patches/04-use_system_jmapviewer.patch
index 570cac1..cd3da43 100644
--- a/debian/patches/04-use_system_jmapviewer.patch
+++ b/debian/patches/04-use_system_jmapviewer.patch
@@ -5,7 +5,7 @@ Forwarded: not-needed
 
 --- a/build.xml
 +++ b/build.xml
-@@ -187,7 +187,6 @@ Debian-Release: ${debian.version}
+@@ -198,7 +198,6 @@ Debian-Release: ${debian.version}
  
  
  
diff --git a/debian/patches/05-fix_version.patch 
b/debian/patches/05-fix_version.patch
index 4522a0d..381cafb 100644
--- a/debian/patches/05-fix_version.patch
+++ b/debian/patches/05-fix_version.patch
@@ -8,7 +8,7 @@ Forwarded: not-needed
 
 --- a/build.xml
 +++ b/build.xml
-@@ -172,7 +172,7 @@ Debian-Release: ${debian.version}
+@@ -183,7 +183,7 @@ Debian-Release: ${debian.version}
  
  
  
diff --git a/debian/patches/06-move_data_out_of_jar.patch 
b/debian/patches/06-move_data_out_of_jar.patch
index febd4e0..e06985c 100644
--- a/debian/patches/06-move_data_out_of_jar.patch
+++ b/debian/patches/06-move_data_out_of_jar.patch
@@ -6,7 +6,7 @@ Forwarded: not-needed
 
 --- a/build.xml
 +++ b/build.xml
-@@ -184,9 +184,6 @@ Debian-Release: ${debian.version}
+@@ -195,9 +195,6 @@ Debian-Release: ${debian.version}
  
  
  
@@ -24,9

[josm] 04/08: Refresh patches.

2017-07-30 Thread Bas Couwenberg

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

sebastic pushed a commit to branch master
in repository josm.

commit 22699ad26678e000124fc76ee0f10476f59314b4
Author: Bas Couwenberg 
Date:   Sun Jul 30 22:51:58 2017 +0200

Refresh patches.
---
 debian/changelog |  1 +
 debian/patches/00-build.patch| 23 +--
 debian/patches/06-move_data_out_of_jar.patch |  4 ++--
 debian/patches/08-use_noto_font.patch|  6 +++---
 4 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1c8630c..a152279 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 josm (0.0.svn12542+dfsg-1) UNRELEASED; urgency=medium
 
   * New tested snapshot.
+  * Refresh patches.
 
  -- Bas Couwenberg   Sun, 30 Jul 2017 22:47:05 +0200
 
diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch
index 3dfb061..d5c9d76 100644
--- a/debian/patches/00-build.patch
+++ b/debian/patches/00-build.patch
@@ -80,9 +80,9 @@ Forwarded: not-needed
 +
 +
  
- 
- 
-@@ -215,39 +232,21 @@ Build-Date: ${build.tstamp}
+ 
+ 
+@@ -215,42 +232,21 @@ Build-Date: ${build.tstamp}
  
  
  
@@ -105,6 +105,9 @@ Forwarded: not-needed
  destdir="build" target="1.8" source="1.8" debug="on" 
includeAntRuntime="false" createMissingPackageInfoClass="false">
  
  
+-
+-
+-
 -
 -
 -
@@ -117,15 +120,15 @@ Forwarded: not-needed
 -
 -
 -
--
 -
 -
 -
+-
 -
  
  
  
-@@ -268,19 +267,13 @@ Build-Date: ${build.tstamp}
+@@ -271,19 +267,13 @@ Build-Date: ${build.tstamp}
  
  
  
@@ -148,7 +151,7 @@ Forwarded: not-needed
  
  
  
-@@ -294,16 +287,12 @@ Build-Date: ${build.tstamp}
+@@ -297,16 +287,12 @@ Build-Date: ${build.tstamp}
  
  
  
@@ -166,7 +169,7 @@ Forwarded: not-needed
  
  
  
-@@ -317,12 +306,6 @@ Build-Date: ${build.tstamp}
+@@ -320,12 +306,6 @@ Build-Date: ${build.tstamp}
  
  
  
@@ -179,7 +182,7 @@ Forwarded: not-needed
  
  
  
-@@ -336,6 +319,7 @@ Build-Date: ${build.tstamp}
+@@ -339,6 +319,7 @@ Build-Date: ${build.tstamp}
  
  
  
@@ -187,7 +190,7 @@ Forwarded: not-needed
  
  
  
  
  
@@ -195,7 +198,7 @@ Forwarded: not-needed
  
  
  
-@@ -834,6 +819,7 @@ Build-Date: ${build.tstamp}
+@@ -839,6 +821,7 @@ Build-Date: ${build.tstamp}
  
  
  
diff --git a/debian/patches/06-move_data_out_of_jar.patch 
b/debian/patches/06-move_data_out_of_jar.patch
index 10b7eb8..725e9f2 100644
--- a/debian/patches/06-move_data_out_of_jar.patch
+++ b/debian/patches/06-move_data_out_of_jar.patch
@@ -7,8 +7,8 @@ Forwarded: not-needed
 --- a/build.xml
 +++ b/build.xml
 @@ -163,9 +163,9 @@ Debian-Release: ${debian.version}
- 
- 
+ 
+ 
  
 -
 -
diff --git a/debian/patches/08-use_noto_font.patch 
b/debian/patches/08-use_noto_font.patch
index 50c8202..5a55ed7 100644
--- a/debian/patches/08-use_noto_font.patch
+++ b/debian/patches/08-use_noto_font.patch
@@ -7,10 +7,10 @@ Forwarded: https://josm.openstreetmap.de/ticket/12085
 +++ b/src/org/openstreetmap/josm/gui/mappaint/styleelement/StyleElement.java
 @@ -160,7 +160,7 @@ public abstract class StyleElement imple
  synchronized (lock) {
- n = DEFAULT_FONT_NAME;
+ n = defaultFontName;
  if (n == null) {
--DEFAULT_FONT_NAME = n = Main.pref.get("mappaint.font", 
"Droid Sans");
-+DEFAULT_FONT_NAME = n = Main.pref.get("mappaint.font", 
"Noto Sans");
+-defaultFontName = n = Main.pref.get("mappaint.font", 
"Droid Sans");
++defaultFontName = n = Main.pref.get("mappaint.font", 
"Noto Sans");
  }
  }
  }

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

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

[josm] 04/08: Refresh patches.

[josm] 04/08: Refresh patches.

2 matches

Site Navigation

Mail list logo

Footer information