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

[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  d853424273b48b71157e53883e5de51409f52235 (commit)
      from  142510f31ed315c151418d868fea1c70bf762cac (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 d853424273b48b71157e53883e5de51409f52235
Author: Andrew Ross <ubuntu at rossfamily.co.uk>
Date:   Fri Jul 1 22:08:47 2011 +0100

    Updated with suggested changes.

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

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

diff --git a/debian/changelog b/debian/changelog
index 4917a06..af47711 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +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)
+  * Allow webkit instead of xulrunner
+  * Fix debian/rules to clean icons.
   * 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 aa0f046..579060f 100644
--- a/debian/control
+++ b/debian/control
@@ -29,7 +29,7 @@ Description: BitTorrent client
 Package: vuze
 Architecture: all
 Depends: azureus, libswt-cairo-gtk-3-jni, libswt-gnome-gtk-3-jni,
- libswt-webkit-gtk-3-jni, ${misc:Depends}
+ libswt-webkit-gtk-3-jni | libswt-mozilla-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
deleted file mode 100644
index 69c668f..0000000
--- a/debian/patches/fixes/no-mozilla.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-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 ce962e3..e187fa2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,5 +2,4 @@ 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
diff --git a/debian/rules b/debian/rules
index 309beda..2102ea8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,3 +18,6 @@ build/azureus::
 	perl -ne 'print(unpack "u", $$_)' debian/Azureus.torrent.png.uu > \
 		debian/Azureus.torrent.png
 
+clean::
+	-rm -f debian/Azureus.png
+	-rm -f debian/Azureus.torrent.png


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