[pkg-java] r9946 - in trunk/azureus/debian: . wrappers

Adrian Perez adrianperez-guest at alioth.debian.org
Wed Aug 12 15:29:40 UTC 2009 

Author: adrianperez-guest
Date: 2009-08-12 15:29:40 +0000 (Wed, 12 Aug 2009)
New Revision: 9946

Added:
   trunk/azureus/debian/wrappers/
   trunk/azureus/debian/wrappers/azureus
Removed:
   trunk/azureus/debian/bin/
   trunk/azureus/debian/vuze.install
Modified:
   trunk/azureus/debian/NEWS.Debian
   trunk/azureus/debian/changelog
   trunk/azureus/debian/control
   trunk/azureus/debian/install
   trunk/azureus/debian/rules
   trunk/azureus/debian/vuze.links
Log:
* debian/changelog: Update entries.
* debian/control: Drop fastjar build dependency.
* debian/vuze.links: usr/bin/vuze is now a symbolic link to azureus.
* Use java-wrappers as launcher. Thanks to Onkar Shinde for the suggestion.
* debian/wrappers/azureus:
  - Detect installed JVM and set classpath.
  - User interface override applies only when vuze is not installed.

Modified: trunk/azureus/debian/NEWS.Debian
===================================================================
--- trunk/azureus/debian/NEWS.Debian	2009-08-11 23:18:21 UTC (rev 9945)
+++ trunk/azureus/debian/NEWS.Debian	2009-08-12 15:29:40 UTC (rev 9946)
@@ -11,5 +11,6 @@
     - Handle file associations and magnet URL links.
     - Refer to Vuze in menus.
     - No updates that break sync with the Debian package manager.
+    - Launcher automatically detects installed JVM and sets classpath.
 
- -- Adrian Perez <adrianperez.deb at gmail.com>  Wed, 29 Jul 2009 21:25:03 -0400
+ -- Adrian Perez <adrianperez.deb at gmail.com>  Wed, 12 Aug 2009 11:20:03 -0400

Modified: trunk/azureus/debian/changelog
===================================================================
--- trunk/azureus/debian/changelog	2009-08-11 23:18:21 UTC (rev 9945)
+++ trunk/azureus/debian/changelog	2009-08-12 15:29:40 UTC (rev 9946)
@@ -8,8 +8,9 @@
     - Update Vuze description to reflect some of it's new features and 
       the package role.
     - Build-Depends on ant, cdbs, quilt, debhelper (>= 7.0).
-    - Build-Depends-Indep on openjdk-6-jre | sun-java5-runtime | 
-      sun-java6-runtime. Closes: #515015, #398014.
+    - Build-Depends-Indep on openjdk-6-jre | sun-java5-jre | 
+      sun-java6-jre. Closes: #515015, #398014.
+    - Drop fastjar build dependency.
     - Add Vcs-Svn and Vcs-Browser fields.
   * debian/rules:
     - Use CDBS build system.
@@ -37,12 +38,10 @@
   * debian/azureus.desktop: 
     - Fix handling file associations. Closes: #491624.
       Thanks to Stefano Maioli.
-  * debian/azureus.template: User interface override applies only when
-    vuze is not installed.
-  * debian/bin/vuze: No longer need to set VUZE=1, just execute azureus.
+  * debian/vuze.links: usr/bin/vuze is now a symbolic link to azureus.
   * Import README.multiuser, which documents the multiuser patch.
-  * Use quilt patch system and add README.source.
-  * Update azureus and create vuze manpages.
+  * Use quilt patch system and add README.source documenting it.
+  * Update azureus and link vuze manpages.
   * Create new PNG files for Vuze and Vuze torrents, uuencoded in debian/.
   * Remove source.lintian-overrides, no longer necessary.
   * Import gconf schema for magnet URLs. Closes: #412213.
@@ -51,6 +50,10 @@
     update patches.
   * Add debian/NEWS.Debian.
   * Remove debian/dirs since it's unnecessary.
+  * Use java-wrappers as launcher. Thanks to Onkar Shinde for the suggestion.
+  * debian/wrappers/azureus:
+    - Detect installed JVM and set classpath.
+    - User interface override applies only when vuze is not installed.
   
  -- Adrian Perez <adrianperez.deb at gmail.com>  Tue, 11 Aug 2009 13:47:53 -0400
 

Modified: trunk/azureus/debian/control
===================================================================
--- trunk/azureus/debian/control	2009-08-11 23:18:21 UTC (rev 9945)
+++ trunk/azureus/debian/control	2009-08-12 15:29:40 UTC (rev 9946)
@@ -5,7 +5,7 @@
 Uploaders: Adrian Perez <adrianperez.deb at gmail.com>
 Build-Depends: ant, cdbs, quilt, debhelper (>= 7.0)
 Build-Depends-Indep: openjdk-6-jdk, libcommons-cli-java, liblog4j1.2-java, 
- libswt-gtk-3.4-java, fastjar, junit
+ libswt-gtk-3.4-java, junit
 Standards-Version: 3.8.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/azureus
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/azureus
@@ -14,7 +14,8 @@
 Package: azureus
 Architecture: all
 Depends: openjdk-6-jre | sun-java5-jre | sun-java6-jre, 
- libcommons-cli-java, liblog4j1.2-java, libswt-gtk-3.4-java, ${misc:Depends}
+ libcommons-cli-java, liblog4j1.2-java, libswt-gtk-3.4-java, 
+ java-wrappers, ${misc:Depends}
 Recommends: vuze
 Description: BitTorrent client
  BitTorrent is a peer-to-peer file distribution tool.

Modified: trunk/azureus/debian/install
===================================================================
--- trunk/azureus/debian/install	2009-08-11 23:18:21 UTC (rev 9945)
+++ trunk/azureus/debian/install	2009-08-12 15:29:40 UTC (rev 9946)
@@ -1,7 +1,7 @@
 debian/Azureus.png usr/share/pixmaps
 debian/Azureus.torrent.png usr/share/pixmaps
 dist/Azureus2.jar usr/share/java
-debian/bin/azureus usr/bin
+debian/wrappers/azureus usr/bin
 debian/azureus.desktop usr/share/applications
 debian/azureus.xpm usr/share/pixmaps
 debian/azureus.schemas usr/share/gconf/schemas

Modified: trunk/azureus/debian/rules
===================================================================
--- trunk/azureus/debian/rules	2009-08-11 23:18:21 UTC (rev 9945)
+++ trunk/azureus/debian/rules	2009-08-12 15:29:40 UTC (rev 9946)
@@ -5,22 +5,13 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 
-JAVA_HOME := /usr/lib/jvm/java-6-openjdk
-DEB_ANT_BUILDFILE := debian/build.xml
-DEB_ANT_BUILD_TARGET := package
-DEB_JARS = log4j commons-cli swt junit
-ANT_OPTS=-Xmx256m
+JAVA_HOME 		:= /usr/lib/jvm/java-6-openjdk
+DEB_ANT_BUILDFILE 	:= debian/build.xml
+DEB_ANT_BUILD_TARGET 	:= package
+DEB_JARS 		:= log4j commons-cli swt junit
+ANT_OPTS		:= -Xmx256m
 
-SUBSTVARS := debian/azureus.substvars
-BIN_FILE := debian/bin/azureus
-BIN_TEMPLATE := $(BIN_FILE).template
-
-
 build/azureus::
-	dpkg -S `readlink -f $$(which java)` | perl -pe 's|(.+):.+|jre:Depends=$$1|' > $(SUBSTVARS)
-	perl -i -pe 's/-headless//' $(SUBSTVARS)
-	perl -pe "s|%JAVA%|`readlink -f $$(which java)`|" $(BIN_TEMPLATE) > $(BIN_FILE)
-	
 	perl -ne 'print(unpack "u", $$_)' debian/Azureus.png.uu > \
 		debian/Azureus.png
 	perl -ne 'print(unpack "u", $$_)' debian/Azureus.torrent.png.uu > \

Deleted: trunk/azureus/debian/vuze.install
===================================================================
--- trunk/azureus/debian/vuze.install	2009-08-11 23:18:21 UTC (rev 9945)
+++ trunk/azureus/debian/vuze.install	2009-08-12 15:29:40 UTC (rev 9946)
@@ -1 +0,0 @@
-debian/bin/vuze usr/bin

Modified: trunk/azureus/debian/vuze.links
===================================================================
--- trunk/azureus/debian/vuze.links	2009-08-11 23:18:21 UTC (rev 9945)
+++ trunk/azureus/debian/vuze.links	2009-08-12 15:29:40 UTC (rev 9946)
@@ -1 +1,2 @@
 usr/share/man/man1/azureus.1.gz usr/share/man/man1/vuze.1.gz
+usr/bin/azureus usr/bin/vuze

Added: trunk/azureus/debian/wrappers/azureus
===================================================================
--- trunk/azureus/debian/wrappers/azureus	                        (rev 0)
+++ trunk/azureus/debian/wrappers/azureus	2009-08-12 15:29:40 UTC (rev 9946)
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+# Include java-wrappers
+. /usr/lib/java-wrappers/java-wrappers.sh
+
+JAVA_CLASSPATH="/usr/lib/jni:/usr/lib/java"
+VUZE_BIN="/usr/bin/vuze"
+
+find_java_runtime openjdk sunmin5
+
+find_jars Azureus2 log4j-1.2 commons-cli swt
+
+if [ ! -x $VUZE_BIN ]; then
+	UI=-Dforce.ui=az2
+fi
+
+run_java -Dazureus.install.path="$HOME/.azureus" $UI \
+    org.gudy.azureus2.ui.common.Main "$@"

More information about the pkg-java-commits mailing list