[azureus] 03/04: Fixed the build failure with libswt-gtk-4-java 4.6
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Sat Nov 19 15:21:57 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository azureus.
commit f7b9f022ff55046642d3720dfba4733ecf4071fc
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Sat Nov 19 16:08:49 2016 +0100
Fixed the build failure with libswt-gtk-4-java 4.6
---
debian/control | 4 ++--
debian/patches/01_amend_build_classpath.patch | 4 ++--
debian/patches/04_unbundle_json.patch | 12 ++----------
debian/patches/05_unbundle_commons_lang.patch | 4 ++--
debian/patches/06_unbundle_bouncy_castle.patch | 4 ++--
5 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/debian/control b/debian/control
index 02d2ecc..c5912c7 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends: ant
, junit4
, libbcprov-java
, libjson-simple-java
- , libswt-gtk-4-java
+ , libswt-gtk-4-java (>= 4.6)
, libcommons-cli-java
, libcommons-lang3-java
, liblog4j1.2-java
@@ -28,7 +28,7 @@ Depends: default-jre | java7-runtime
, libcommons-lang3-java
, libjson-simple-java
, liblog4j1.2-java
- , libswt-gtk-4-java
+ , libswt-gtk-4-java (>= 4.6)
, libswt-cairo-gtk-4-jni
, ${java:Depends}
, ${misc:Depends}
diff --git a/debian/patches/01_amend_build_classpath.patch b/debian/patches/01_amend_build_classpath.patch
index 27f6a57..7095f0b 100644
--- a/debian/patches/01_amend_build_classpath.patch
+++ b/debian/patches/01_amend_build_classpath.patch
@@ -18,7 +18,7 @@
<path id="build.classpath">
- <fileset dir="${azureus2.dir}/lib" includes="*.jar" excludes="swt-carbon.jar"/>
-+ <fileset dir="/usr/share/java" includes="swt-gtk-4.3.jar,commons-cli.jar,log4j-1.2.jar,junit4.jar" />
++ <fileset dir="/usr/share/java" includes="swt-gtk-4.6.jar,commons-cli.jar,log4j-1.2.jar,junit4.jar" />
+ <!--<fileset dir="${azureus2.dir}/lib" includes="*.jar" excludes="swt-carbon.jar"/>
<fileset dir="${azureus3.dir}/lib" includes="*.jar" />
- <fileset dir="${uis.dir}/lib" includes="*.jar" />
@@ -40,7 +40,7 @@
<manifest>
<attribute name="Main-Class" value="org.gudy.azureus2.ui.common.Main" />
- <attribute name="Class-Path" value="swt.jar commons-cli.jar log4j.jar junit.jar" />
-+ <attribute name="Class-Path" value="swt-gtk-4.3.jar commons-cli.jar log4j.jar junit.jar" />
++ <attribute name="Class-Path" value="swt-gtk-4.6.jar commons-cli.jar log4j.jar junit.jar" />
<attribute name="Built-By" value="VZCB:${ant.project.name}:build.xml"/>
<attribute name="Build-Version" value="${build.ver}"/>
</manifest>
diff --git a/debian/patches/04_unbundle_json.patch b/debian/patches/04_unbundle_json.patch
index 921cea1..48d52ef 100644
--- a/debian/patches/04_unbundle_json.patch
+++ b/debian/patches/04_unbundle_json.patch
@@ -51,16 +51,8 @@
<!-- REUSABLE REFERENCES -->
<path id="build.classpath">
-- <fileset dir="/usr/share/java" includes="swt-gtk-4.3.jar,commons-cli.jar,log4j-1.2.jar,junit4.jar" />
-+ <fileset dir="/usr/share/java" includes="swt-gtk-4.3.jar,commons-cli.jar,log4j-1.2.jar,junit4.jar,json-simple.jar" />
+- <fileset dir="/usr/share/java" includes="swt-gtk-4.6.jar,commons-cli.jar,log4j-1.2.jar,junit4.jar" />
++ <fileset dir="/usr/share/java" includes="swt-gtk-4.6.jar,commons-cli.jar,log4j-1.2.jar,junit4.jar,json-simple.jar" />
<!--<fileset dir="${azureus2.dir}/lib" includes="*.jar" excludes="swt-carbon.jar"/>
<fileset dir="${azureus3.dir}/lib" includes="*.jar" />
<fileset dir="${uis.dir}/lib" includes="*.jar" />-->
-@@ -102,7 +102,6 @@
- <jar destfile="${dist.dir}/${build.name}.jar" basedir="${build.dir}" level="9" >
- <manifest>
- <attribute name="Main-Class" value="org.gudy.azureus2.ui.common.Main" />
-- <attribute name="Class-Path" value="swt-gtk-4.3.jar commons-cli.jar log4j.jar junit.jar" />
- <attribute name="Built-By" value="VZCB:${ant.project.name}:build.xml"/>
- <attribute name="Build-Version" value="${build.ver}"/>
- </manifest>
diff --git a/debian/patches/05_unbundle_commons_lang.patch b/debian/patches/05_unbundle_commons_lang.patch
index 977404b..1b7e982 100644
--- a/debian/patches/05_unbundle_commons_lang.patch
+++ b/debian/patches/05_unbundle_commons_lang.patch
@@ -129,8 +129,8 @@
<!-- REUSABLE REFERENCES -->
<path id="build.classpath">
-- <fileset dir="/usr/share/java" includes="swt-gtk-4.3.jar,commons-cli.jar,log4j-1.2.jar,junit4.jar,json-simple.jar" />
-+ <fileset dir="/usr/share/java" includes="swt-gtk-4.3.jar,commons-cli.jar,log4j-1.2.jar,junit4.jar,json-simple.jar,commons-lang3.jar" />
+- <fileset dir="/usr/share/java" includes="swt-gtk-4.6.jar,commons-cli.jar,log4j-1.2.jar,junit4.jar,json-simple.jar" />
++ <fileset dir="/usr/share/java" includes="swt-gtk-4.6.jar,commons-cli.jar,log4j-1.2.jar,junit4.jar,json-simple.jar,commons-lang3.jar" />
<!--<fileset dir="${azureus2.dir}/lib" includes="*.jar" excludes="swt-carbon.jar"/>
<fileset dir="${azureus3.dir}/lib" includes="*.jar" />
<fileset dir="${uis.dir}/lib" includes="*.jar" />-->
diff --git a/debian/patches/06_unbundle_bouncy_castle.patch b/debian/patches/06_unbundle_bouncy_castle.patch
index a0ded59..ec22f71 100644
--- a/debian/patches/06_unbundle_bouncy_castle.patch
+++ b/debian/patches/06_unbundle_bouncy_castle.patch
@@ -97,8 +97,8 @@
<!-- REUSABLE REFERENCES -->
<path id="build.classpath">
-- <fileset dir="/usr/share/java" includes="swt-gtk-4.3.jar,commons-cli.jar,log4j-1.2.jar,junit4.jar,json-simple.jar,commons-lang3.jar" />
-+ <fileset dir="/usr/share/java" includes="swt-gtk-4.3.jar,commons-cli.jar,log4j-1.2.jar,junit4.jar,json-simple.jar,commons-lang3.jar, bcprov.jar" />
+- <fileset dir="/usr/share/java" includes="swt-gtk-4.6.jar,commons-cli.jar,log4j-1.2.jar,junit4.jar,json-simple.jar,commons-lang3.jar" />
++ <fileset dir="/usr/share/java" includes="swt-gtk-4.6.jar,commons-cli.jar,log4j-1.2.jar,junit4.jar,json-simple.jar,commons-lang3.jar,bcprov.jar" />
<!--<fileset dir="${azureus2.dir}/lib" includes="*.jar" excludes="swt-carbon.jar"/>
<fileset dir="${azureus3.dir}/lib" includes="*.jar" />
<fileset dir="${uis.dir}/lib" includes="*.jar" />-->
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/azureus.git
More information about the pkg-java-commits
mailing list