[libbrowserlauncher-java] 02/05: Remove release number from jar name

[Ole Streicher]

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

olebole pushed a commit to branch master
in repository libbrowserlauncher-java.

commit e8e93af065fad9135162bcb18f57d03861d49f91
Author: Ole Streicher <olebole at debian.org>
Date:   Wed Mar 29 16:11:11 2017 +0200

    Remove release number from jar name
    
    Closes: #859001
---
 .../Remove-release-number-from-jar-name.patch      | 23 ++++++++++++++++++++++
 debian/patches/browser_choice.patch                | 16 +++++++++++----
 debian/patches/series                              |  1 +
 debian/patches/utf-8.patch                         | 12 ++++++++---
 4 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/debian/patches/Remove-release-number-from-jar-name.patch b/debian/patches/Remove-release-number-from-jar-name.patch
new file mode 100644
index 0000000..c27225d
--- /dev/null
+++ b/debian/patches/Remove-release-number-from-jar-name.patch
@@ -0,0 +1,23 @@
+From: Ole Streicher <olebole at debian.org>
+Date: Wed, 29 Mar 2017 16:09:20 +0200
+Subject: Remove release number from jar name
+
+The release number is added by javahelper.
+Closes: #859001
+---
+ build.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/build.xml b/build.xml
+index 0bbf084..00de02a 100644
+--- a/build.xml
++++ b/build.xml
+@@ -9,7 +9,7 @@
+     <property name="lib.dir" value="lib" />
+     <property name="deployment.dir" value="deployment" />
+     <property name="api.dir" value="api" />
+-    <property name="archive.runtime" value="${deployment.dir}/BrowserLauncher2-${release.number}.jar" />
++    <property name="archive.runtime" value="${deployment.dir}/BrowserLauncher2.jar" />
+     <property name="archive.all" value="${deployment.dir}/BrowserLauncher2-all-${release.number}.jar" />
+     <property name="optimize" value="on" />
+     <property name="app.manifest" value="${deployment.dir}/manifest.mf" />
diff --git a/debian/patches/browser_choice.patch b/debian/patches/browser_choice.patch
index bf5539b..edec989 100644
--- a/debian/patches/browser_choice.patch
+++ b/debian/patches/browser_choice.patch
@@ -1,8 +1,14 @@
-Description: Try harder to find a valid browser on a Debian system
-  Unfortunately this insists in starting netscape.  Any idea???
-Author: Andreas Tille <tille at debian.org>
-Last-Update: Wed, 11 May 2016 13:31:20 +0200
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Wed, 29 Mar 2017 15:42:04 +0200
+Subject: browser_choice
 
+---
+ edu/stanford/ejalbert/launching/misc/linuxUnixConfig.properties      | 5 +++--
+ .../edu/stanford/ejalbert/launching/misc/linuxUnixConfig.properties  | 4 ++--
+ 2 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/edu/stanford/ejalbert/launching/misc/linuxUnixConfig.properties b/edu/stanford/ejalbert/launching/misc/linuxUnixConfig.properties
+index ff858fb..a6deb3e 100644
 --- a/edu/stanford/ejalbert/launching/misc/linuxUnixConfig.properties
 +++ b/edu/stanford/ejalbert/launching/misc/linuxUnixConfig.properties
 @@ -24,10 +24,11 @@ delimchar=;
@@ -19,6 +25,8 @@ Last-Update: Wed, 11 May 2016 13:31:20 +0200
  browser.epiphany=Epiphany;epiphany;<browser> <url>;<browser> --new-tab <url>
 +browser.default=DebianDefaultBrowser;www-browser;<browser> <url>;<browser> <url>
 +
+diff --git a/source/edu/stanford/ejalbert/launching/misc/linuxUnixConfig.properties b/source/edu/stanford/ejalbert/launching/misc/linuxUnixConfig.properties
+index ff858fb..d58fdad 100644
 --- a/source/edu/stanford/ejalbert/launching/misc/linuxUnixConfig.properties
 +++ b/source/edu/stanford/ejalbert/launching/misc/linuxUnixConfig.properties
 @@ -24,10 +24,10 @@ delimchar=;
diff --git a/debian/patches/series b/debian/patches/series
index d936de0..0b9c7f4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 utf-8.patch
 browser_choice.patch
+Remove-release-number-from-jar-name.patch
diff --git a/debian/patches/utf-8.patch b/debian/patches/utf-8.patch
index 742213b..a146854 100644
--- a/debian/patches/utf-8.patch
+++ b/debian/patches/utf-8.patch
@@ -1,7 +1,13 @@
-Author: Andreas Tille <tille at debian.org>
-Last-Update: Mon, 18 Jan 2016 09:37:27 +0100
-Description: Fix: unmappable character for encoding ASCII
+From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Date: Wed, 29 Mar 2017 15:42:04 +0200
+Subject: utf-8
 
+---
+ source/at/jta/Regor.java | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/source/at/jta/Regor.java b/source/at/jta/Regor.java
+index 94e75b4..a9034b7 100644
 --- a/source/at/jta/Regor.java
 +++ b/source/at/jta/Regor.java
 @@ -352,7 +352,7 @@ final public class Regor

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