[SCM] Azureus/Vuze packaging for Debian branch, master, updated. debian/4.3.0.6-3-2-g142510f

[Andrew Ross]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Azureus/Vuze packaging for Debian".

The branch, master has been updated
       via  142510f31ed315c151418d868fea1c70bf762cac (commit)
      from  293c7cf35432306246c735aa5f0af4514376cd0e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 142510f31ed315c151418d868fea1c70bf762cac
Author: Andrew Ross <ubuntu at rossfamily.co.uk>
Date:   Fri Jul 1 20:07:17 2011 +0100

    Use webkit rather than xulrunner.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                     |    2 ++
 debian/control                       |    4 ++--
 debian/patches/fixes/no-mozilla.diff |   18 ++++++++++++++++++
 debian/patches/series                |    1 +
 4 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0ae749c..4917a06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ azureus (4.3.0.6-4) unstable; urgency=low
 
   * Team upload.
   * Update to build with latest swt-gtk.
+  * Use webkit rather than xulrunner (incorporate patch from Ubuntu)
+  * Bump standards version (no changes required).
 
  -- Andrew Ross <ubuntu at rossfamily.co.uk>  Fri, 01 Jul 2011 11:26:28 +0100
 
diff --git a/debian/control b/debian/control
index 619f71c..aa0f046 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ DM-Upload-Allowed: yes
 Build-Depends: ant, cdbs, debhelper (>= 7.0)
 Build-Depends-Indep: openjdk-6-jdk, libcommons-cli-java, liblog4j1.2-java, 
  libswt-gtk-3-java, junit
-Standards-Version: 3.8.3
+Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/git/pkg-java/azureus.git
 Vcs-Browser: http://git.debian.org/?p=pkg-java/azureus.git
 Homepage: http://azureus.sourceforge.net
@@ -29,7 +29,7 @@ Description: BitTorrent client
 Package: vuze
 Architecture: all
 Depends: azureus, libswt-cairo-gtk-3-jni, libswt-gnome-gtk-3-jni,
- libswt-mozilla-gtk-3-jni, ${misc:Depends}
+ libswt-webkit-gtk-3-jni, ${misc:Depends}
 Description: Multimedia BitTorrent client
  BitTorrent is a peer-to-peer file distribution tool.
  .
diff --git a/debian/patches/fixes/no-mozilla.diff b/debian/patches/fixes/no-mozilla.diff
new file mode 100644
index 0000000..69c668f
--- /dev/null
+++ b/debian/patches/fixes/no-mozilla.diff
@@ -0,0 +1,18 @@
+Use webkit rather than Mozilla specific code.
+
+--- azureus-4.3.0.6.orig/org/gudy/azureus2/ui/swt/Utils.java
++++ azureus-4.3.0.6/org/gudy/azureus2/ui/swt/Utils.java
+@@ -1903,12 +1903,7 @@ public class Utils
+ 	 * @return the style, possibly ORed with <code>SWT.MOZILLA</code>
+ 	 */
+ 	public static int getInitialBrowserStyle(int style) {
+-		if (!gotBrowserStyle) {
+-			browserStyle = COConfigurationManager.getBooleanParameter("swt.forceMozilla")
+-					? SWT.MOZILLA : SWT.NONE;
+-			gotBrowserStyle = true;
+-		}
+-		return style | browserStyle;
++		return style | SWT.NONE;
+ 	}
+ 
+ 	/**
diff --git a/debian/patches/series b/debian/patches/series
index e187fa2..ce962e3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,5 @@ debian/speedtest.diff -p1
 debian/update-disable.diff -p1
 fixes/multiuser.diff -p1
 fixes/platform.diff -p1
+fixes/no-mozilla.diff -p1
 debian/no-auto-update.patch


hooks/post-receive
-- 
Azureus/Vuze packaging for Debian