tag 495514 + patch
thanks
Here's a debdiff that fixes #495514 by using openjdk-6-jdk as the
default JDK, while still giving a user the option to rebuild with any
JDK he likes, without changing debian/{rules,control}.I've just uploaded 3.1.1.0-3.0 to DELAYED/7, so feel free to take that debdiff and massage it any way you see fit, if something in there is not quite to your liking :) Cheers, --Seb
diff -u azureus-3.1.1.0/debian/rules azureus-3.1.1.0/debian/rules
--- azureus-3.1.1.0/debian/rules
+++ azureus-3.1.1.0/debian/rules
@@ -1,8 +1,12 @@
#!/usr/bin/make -f
+SUBSTVARS := debian/azureus.substvars
+
build: dist/Azureus2.jar
dist/Azureus2.jar:
+ dpkg -S `readlink -f $$(which javac)` | perl -pe
's|(.+):.+|jre:Depends=$$1|' > $(SUBSTVARS)
+
mkdir -p build/libs
ln -s \
/usr/share/java/commons-cli.jar \
@@ -20,11 +24,10 @@
clean:
dh_clean
- rm -rf build/libs
+ rm -rf build/libs $(SUBSTVARS)
ant clean
binary-indep: build
- dh_clean -k
dh_install -i
dh_installchangelogs -i
dh_installdocs -i
@@ -33,30 +36,13 @@
dh_compress -i
dh_desktop -i
dh_fixperms -i
+ dh_lintian -i
dh_installdeb -i
dh_gencontrol -i
dh_md5sums -i
dh_builddeb -i
-include /usr/share/gcj/debian_defaults
-
-binary-arch: build
- dh_clean -k
- dh_install -a
- dh_installchangelogs -a
- dh_installdocs -a
-ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs)))
- dh_install -i
- dh_nativejava -a
-endif
- dh_compress -a
- dh_fixperms -a
- dh_strip -a
- dh_installdeb -a
- dh_shlibdeps -a
- dh_gencontrol -a
- dh_md5sums -a
- dh_builddeb -a
+binary-arch:
binary: binary-indep binary-arch
diff -u azureus-3.1.1.0/debian/control azureus-3.1.1.0/debian/control
--- azureus-3.1.1.0/debian/control
+++ azureus-3.1.1.0/debian/control
@@ -2,17 +2,16 @@
Section: net
Priority: optional
Maintainer: Shaun Jackman <[EMAIL PROTECTED]>
-Build-Depends: default-jdk-builddep | java2-compiler, ant,
- libcommons-cli-java, liblog4j1.2-java, libswt-gtk-3.4-java,
- fastjar, junit, debhelper (>> 5)
+Build-Depends: openjdk-6-jdk | sun-java6-compiler | java2-compiler, ant,
debhelper (>= 6.0.7~)
+Build-Depends-Indep: libcommons-cli-java, liblog4j1.2-java,
+ libswt-gtk-3.4-java, fastjar, junit
Standards-Version: 3.8.0.1
Package: azureus
Architecture: all
-Depends: java-gcj-compat | java-virtual-machine,
- java-gcj-compat | java2-runtime, libcommons-cli-java,
- liblog4j1.2-java, libswt-gtk-3.4-java
-Suggests: vuze, azureus-gcj
+Depends: ${jre:Depends}, libcommons-cli-java, liblog4j1.2-java,
+ libswt-gtk-3.4-java
+Suggests: vuze
Description: BitTorrent client
BitTorrent is a peer-to-peer file distribution tool.
.
@@ -21,13 +20,6 @@
access to numerous pieces of information about your torrents. Azureus
now features an embedded tracker easily set up and ready to use.
-Package: azureus-gcj
-Architecture: any
-Depends: azureus (>= ${source:Version}), azureus (<< ${source:Version}.1~),
- ${misc:Depends}, ${shlibs:Depends}
-Description: native binary of Azureus
- This package contains a native binary of Azureus built using GCJ.
-
Package: vuze
Architecture: all
Depends: azureus, libswt-cairo-gtk-3.4-jni, libswt-gnome-gtk-3.4-jni,
diff -u azureus-3.1.1.0/debian/changelog azureus-3.1.1.0/debian/changelog
--- azureus-3.1.1.0/debian/changelog
+++ azureus-3.1.1.0/debian/changelog
@@ -1,3 +1,14 @@
+azureus (3.1.1.0-3.0) unstable; urgency=low
+
+ * Tentative NMU.
+ * Build with openjdk-6-jdk by default (but allows for user rebuilds
+ using any JDK), and remove azureus-gcj altogether (Closes: #495514).
+ * Add a lintian override to signify that java and ant are indeed needed
+ as Build-Depends-Indep even though we do not build any arch-dependent
+ binary packages.
+
+ -- Sebastien Delafond <[EMAIL PROTECTED]> Mon, 18 Aug 2008 16:45:49 -0700
+
azureus (3.1.1.0-3) unstable; urgency=medium
* Remove the four non-latin characters in DateParserRegex.java.
only in patch2:
unchanged:
--- azureus-3.1.1.0.orig/debian/source.lintian-overrides
+++ azureus-3.1.1.0/debian/source.lintian-overrides
@@ -0,0 +1,2 @@
+# java and ant are required to run clean
+azureus source: build-depends-without-arch-dep
signature.asc
Description: Digital signature
