diff -u azureus-2.5.0.4/azureus azureus-2.5.0.4/azureus
--- azureus-2.5.0.4/azureus
+++ azureus-2.5.0.4/azureus
@@ -1,6 +1,6 @@
 #!/bin/sh
 JAVA='java -Xmx1024M'
-. /usr/share/java-config/libswt-3.2-java
+SWT=/usr/lib/java/swt.jar
 if [ -d ~/.azureus ]; then
 	cd ~/.azureus
 else
@@ -11,2 +11,2 @@
-	-classpath Azureus2.jar:swt.jar:/usr/share/java/Azureus2.jar:$JARS \
-	org.gudy.azureus2.ui.common.Main "$@"
+	-classpath Azureus2.jar:$SWT:/usr/share/java/Azureus2.jar:$JARS \
+	org.gudy.azureus2.ui.swt.Main "$@"
diff -u azureus-2.5.0.4/Makefile azureus-2.5.0.4/Makefile
--- azureus-2.5.0.4/Makefile
+++ azureus-2.5.0.4/Makefile
@@ -1,6 +1,7 @@
+binjavadir=/usr/lib/java
 javadir=/usr/share/java
 JAVAC=javac -source 1.5 -target 1.5 -encoding ISO-8859-1 -nowarn \
-	-classpath .:$(javadir)/commons-cli-1.0.jar:$(javadir)/log4j-1.2.jar:$(javadir)/seda.jar:$(javadir)/swt.jar:$(javadir)/junit.jar
+	-classpath .:$(javadir)/commons-cli-1.0.jar:$(javadir)/log4j-1.2.jar:$(javadir)/seda.jar:$(binjavadir)/swt.jar:$(javadir)/junit.jar
 
 all: Azureus2.jar
 
diff -u azureus-2.5.0.4/debian/control azureus-2.5.0.4/debian/control
--- azureus-2.5.0.4/debian/control
+++ azureus-2.5.0.4/debian/control
@@ -1,18 +1,19 @@
 Source: azureus
 Section: net
 Priority: optional
-Maintainer: Shaun Jackman <sjackman@debian.org>
-Build-Depends-Indep: java-gcj-compat-dev | java2-compiler,
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+Original-Maintainer: Shaun Jackman <sjackman@debian.org>
+Build-Depends-Indep: icedtea-java7-jdk | java-gcj-compat-dev | java2-compiler,
  libcommons-cli-java, liblog4j1.2-java, libseda-java,
- libswt-gtk-3.2-java, fastjar, junit
+ libswt3.2-gtk-java, fastjar, junit
 Build-Depends: debhelper (>> 5)
 Standards-Version: 3.7.2.2
 
 Package: azureus
 Architecture: all
-Depends: java-gcj-compat | java-virtual-machine,
+Depends: icedtea-java7-jre | java-gcj-compat | java-virtual-machine,
  java-gcj-compat | java2-runtime, libcommons-cli-java,
- liblog4j1.2-java, libseda-java, libswt-gtk-3.2-java
+ liblog4j1.2-java, libseda-java, libswt3.2-gtk-java
 Description: BitTorrent client
  BitTorrent is a peer-to-peer file distribution tool.
  .
diff -u azureus-2.5.0.4/debian/changelog azureus-2.5.0.4/debian/changelog
--- azureus-2.5.0.4/debian/changelog
+++ azureus-2.5.0.4/debian/changelog
@@ -1,3 +1,14 @@
+azureus (2.5.0.4-1ubuntu1) hardy; urgency=low
+
+  * The "Ubuntu has working Azureus after 3 years" release
+  * Rebase Ubuntu packaging off Debian
+  * Fix launcher script and Makefile to use Ubuntu swt.jar path
+  * Fix launcher script to call the correct entry point
+  * Change build-deps to compile with icedtea stack
+  * Change build-deps on swt to match Ubuntu package names
+
+ -- jdong <jdong@ubuntu.com>  Sun, 21 Oct 2007 15:34:47 -0400
+
 azureus (2.5.0.4-1) unstable; urgency=low
 
   * New upstream release. Closes: #406914.