This is an automated email from the git hooks/post-receive script. menosmalo-guest pushed a commit to branch master in repository stegosuite.
commit ebc16373aff3726ca57b3869189eb78ee2ab8e34 Author: Tobias Ilte <tob...@stegosuite.org> Date: Fri Oct 13 14:10:26 2017 +0200 update patches --- debian/patches/fix-pom-for-debian.patch | 8 ++++---- debian/patches/fix-runscript-for-debian.patch | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/patches/fix-pom-for-debian.patch b/debian/patches/fix-pom-for-debian.patch index 30f6441..d4c7da0 100644 --- a/debian/patches/fix-pom-for-debian.patch +++ b/debian/patches/fix-pom-for-debian.patch @@ -4,7 +4,7 @@ adjusted swt dependency and maven-jar-plugin for debian @@ -75,12 +75,16 @@ <plugin> <artifactId>maven-jar-plugin</artifactId> - <version>2.6</version> + <version>3.0.2</version> - <executions> - <execution> - <id>default-jar</id> @@ -17,7 +17,7 @@ adjusted swt dependency and maven-jar-plugin for debian + <addClasspath>true</addClasspath> + <mainClass>org.stegosuite.Stegosuite</mainClass> + <classpathLayoutType>custom</classpathLayoutType> -+ <customClasspathLayout>/usr/share/java/$${artifact.artifactId}$${dashClassifier?}.jar</customClasspathLayout> ++ <customClasspathLayout>/usr/share/java/$${artifact.artifactId}$${dashClassifier?}.jar</customClasspathLayout> + </manifest> + </archive> + </configuration> @@ -32,6 +32,6 @@ adjusted swt dependency and maven-jar-plugin for debian - <artifactId>${swt.artifactId}</artifactId> + <groupId>org.eclipse.swt</groupId> + <artifactId>org.eclipse.swt</artifactId> - <version>4.5.2</version> + <version>4.6</version> </dependency> - + <dependency> diff --git a/debian/patches/fix-runscript-for-debian.patch b/debian/patches/fix-runscript-for-debian.patch index 6873f9b..be827ec 100644 --- a/debian/patches/fix-runscript-for-debian.patch +++ b/debian/patches/fix-runscript-for-debian.patch @@ -9,8 +9,8 @@ added gtk2 fallback for certain configurations +gtk3_version=`dpkg -s libgtk-3-0|grep '^Version' | cut -d'.' -f2` +swt4_version=`dpkg -s libswt-gtk-4-java|grep '^Version' | cut -d'.' -f2` + -+# Run with GTK2-fallback if swt<=4.5 and gtk>=3.20 -+if [ \( "$gtk3_version" -ge 20 \) -a \( "$swt4_version" -le 5 \) ]; then ++# Run with GTK2-fallback if swt<=4.8 and gtk>=3.22 ++if [ \( "$gtk3_version" -ge 22 \) -a \( "$swt4_version" -le 8 \) ]; then + env SWT_GTK3=0 java -jar $STEGOSUITE_CLASSPATH $@ +else + java -jar $STEGOSUITE_CLASSPATH $@ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/stegosuite.git _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits