[dbus-java] 05/06: Update no-translations.patch to ignore resources bundle (Closes: #893208)

[tony mancill]

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

tmancill pushed a commit to branch master
in repository dbus-java.

commit 32e719f0448abd72d25d04f2b8aa69080049aabf
Author: tony mancill <tmancill at debian.org>
Date:   Sun Mar 18 20:36:07 2018 -0700

    Update no-translations.patch to ignore resources bundle (Closes: #893208)
---
 debian/patches/no-translations.patch | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/debian/patches/no-translations.patch b/debian/patches/no-translations.patch
index d881255..6b6dae6 100644
--- a/debian/patches/no-translations.patch
+++ b/debian/patches/no-translations.patch
@@ -6,10 +6,10 @@ Subject: no translations
  Makefile | 4 +---
  1 file changed, 1 insertion(+), 3 deletions(-)
 
-diff --git a/Makefile b/Makefile
-index 48921cb..1380838 100644
---- a/Makefile
-+++ b/Makefile
+Index: dbus-java/Makefile
+===================================================================
+--- dbus-java.orig/Makefile
++++ dbus-java/Makefile
 @@ -79,8 +79,6 @@ binclasses: .binclasses
  .classes: $(SRCDIR)/*.java $(SRCDIR)/dbus/*.java $(SRCDIR)/dbus/exceptions/*.java $(SRCDIR)/dbus/types/*.java translations/*.po
  	mkdir -p classes
@@ -19,7 +19,7 @@ index 48921cb..1380838 100644
  	touch .classes
  
  translations/en_GB.po: $(SRCDIR)/*.java $(SRCDIR)/dbus/*.java $(SRCDIR)/dbus/exceptions/*.java $(SRCDIR)/dbus/types/*.java $(SRCDIR)/dbus/bin/*.java $(SRCDIR)/dbus/viewer/*.java
-@@ -89,7 +87,7 @@ translations/en_GB.po: $(SRCDIR)/*.java $(SRCDIR)/dbus/*.java $(SRCDIR)/dbus/exc
+@@ -89,7 +87,7 @@ translations/en_GB.po: $(SRCDIR)/*.java
  
  libdbus-java-$(VERSION).jar: .classes
  	echo "Class-Path: ${JAVAUNIXJARDIR}/unix.jar ${JAVAUNIXJARDIR}/hexdump.jar ${JAVAUNIXJARDIR}/debug-$(DEBUG).jar" > Manifest
@@ -28,3 +28,22 @@ index 48921cb..1380838 100644
  dbus-java-test-$(VERSION).jar: .testclasses
  	echo "Class-Path: ${JARPREFIX}/libdbus-java-$(VERSION).jar" > Manifest
  	(cd classes; $(JAR) -cfm ../$@ ../Manifest org/freedesktop/dbus/test/*.class)
+Index: dbus-java/org/freedesktop/dbus/Gettext.java
+===================================================================
+--- dbus-java.orig/org/freedesktop/dbus/Gettext.java
++++ dbus-java/org/freedesktop/dbus/Gettext.java
+@@ -22,9 +22,11 @@ import java.util.ResourceBundle;
+ 
+ public class Gettext
+ {
+-   private static ResourceBundle myResources =
+-      ResourceBundle.getBundle("dbusjava_localized");
++   // Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=893208
++   //private static ResourceBundle myResources =
++   //   ResourceBundle.getBundle("dbusjava_localized");
+    public static String _(String s) {
+-      return myResources.getString(s);
++      //return myResources.getString(s);
++      return s;
+    }
+ }

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