build.sh

@@ -195,7 +195,7 @@ case $SWT_OS.$SWT_ARCH in
 			export CC=gcc
 		fi
 		if [ "${JAVA_HOME}" = "" ]; then
-			export JAVA_HOME="/bluebird/teamswt/swt-builddir/JDKs/PPC64/ibm-java2-ppc64-50"
+			export JAVA_HOME="/bluebird/teamswt/swt-builddir/JDKs/PPC64/jre5u10"
 		fi
 		if [ "${MOZILLA_SDK}" = "" ]; then
 			export MOZILLA_SDK=" /bluebird/teamswt/swt-builddir/mozilla/1.7/ppc64/mozilla/dist/sdk"

debian/Makefile

@@ -3,12 +3,12 @@ JAVA=swt-gtk-$(RELEASE).jar
 CLEANFILES=*.files *.jar *-stamp
 
 JAR=fastjar
-JAVAC=javac -classpath . -source 1.5 -target 1.5
+JAVAC=javac -classpath . -source 1.8 -target 1.8
 RM=rm -f
 
 all: $(JAVA)
 	$(MAKE) -f make_linux.mak make_atk make_awt make_cairo make_glx \
-		make_gnome make_swt make_webkit
+		make_swt make_webkit
 
 clean distclean:
 	$(RM) $(CLEANFILES)

debian/NEWS.Debian

-swt-gtk (3.5.1-2) unstable; urgency=low
-
-  * Update packaging for being the only source of the SWT libraries in
-    Debian, effectively dropping the tight connection with the eclipse
-    package.
-    - Drop eclipse binary packages for SWT and maintain only the swt-gtk
-    generated packages.
-
-    - This was influenced by many arguments from different people, notably:
-
-      + Myself (swt-gtk maintainer and eclipse co-maintainer).
-      + Benjamin Drung and Niels Thykier (eclipse co-maintainers).
-      + Onkar Shinde.
-      + Maykel Koch.
-
-    - The main arguments is that this is a commonly used library which is used
-      more and more commonly outside the eclipse environment.
-      We don't want cases such as SWT being blocked by eclipse, or uploading
-      a new eclipse version for just including a SWT bugfix and viceversa,
-      among others.
-
- -- Adrian Perez <adrianperez.deb@gmail.com>  Thu, 17 Dec 2009 19:55:19 -0500

debian/README.Debian

@@ -12,7 +12,6 @@ Currently, the full SWT distribution is provided by the following packages
  * libswt-glx-gtk-X.Y-jni: GLX JNI libraries.
  * libswt-gnome-gtk-X.Y-jni: GNOME JNI Library.
  * libswt-gtk-X.Y-java: SWT JAR libraries.
- * libswt-gtk-X.Y-java-gcj: native libraries built with gcj.
  * libswt-gtk-X.Y-jni: SWT JNI libraries.
  * libswt-mozilla-gtk-X.Y-jni: Mozilla JNI libraries.
 

debian/changelog

-swt-gtk (3.8.0~rc4-1) UNRELEASED; urgency=low
+swt-gtk (3.8.2-5) unstable; urgency=medium
+
+  * Team upload.
+  * Fixed the build failure with Java 9 (Closes: #893420)
+  * Standards-Version updated to 4.1.3
+  * Use secure Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Thu, 29 Mar 2018 10:51:46 +0200
+
+swt-gtk (3.8.2-4.3) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Drop libswt-gnome-gtk-3-jni (Closes: #868406)
+
+ -- Jeremy Bicha <jbicha@debian.org>  Sun, 18 Feb 2018 21:20:55 -0500
+
+swt-gtk (3.8.2-4.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * libswt-webkit-gtk-3-jni: Add the missing dependency
+    on libwebkitgtk-1.0-0. (Closes: #879170)
+
+ -- Adrian Bunk <bunk@debian.org>  Sun, 29 Oct 2017 08:52:32 +0200
+
+swt-gtk (3.8.2-4.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Drop unnecessary Build-Depends on libwebkitgtk-dev (Closes: #871964)
+
+ -- Jeremy Bicha <jbicha@debian.org>  Tue, 24 Oct 2017 15:18:42 -0400
+
+swt-gtk (3.8.2-4) unstable; urgency=medium
+
+  * Team upload.
+  * Removed the GCJ package
+  * Standards-Version updated to 3.9.8
+  * Switch to debhelper level 10
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Mon, 19 Jun 2017 00:37:42 +0200
+
+swt-gtk (3.8.2-3) unstable; urgency=low
+
+  * Fix FTBFS with glib 2.35 (Closes: #710649).
+
+ -- Jakub Adam <jakub.adam@ktknet.cz>  Wed, 26 Jun 2013 14:49:25 +0200
+
+swt-gtk (3.8.2-2) unstable; urgency=low
+
+  * Team upload.
+  * Upload to unstable.
+
+ -- tony mancill <tmancill@debian.org>  Tue, 14 May 2013 22:07:29 -0700
+
+swt-gtk (3.8.2-1) experimental; urgency=low
+
+  * New upstream release.
+  * Add fix for compatibility with libwebkitgtk-1.0-0 1.11.91-1
+    (Closes: #704516).
+  * Updated arch64.diff patch for new upstream release.
+  * Reconsidered package description (Closes: #681417).
+  * Bump Standards-Version to 3.9.4.
+  * Use xz compression for orig tarball.
+  * Override hardening-no-fortify-functions false positives.
+  * Removed obsolete d/NEWS.Debian file.
+
+ -- Jakub Adam <jakub.adam@ktknet.cz>  Thu, 04 Apr 2013 17:40:20 +0200
+
+swt-gtk (3.8.0~rc4-1) unstable; urgency=low
 
   * New upstream release.
   * Ensure CFLAGS from d/rules are really used.
 
- -- Jakub Adam <jakub.adam@ktknet.cz>  Wed, 20 Jun 2012 20:25:20 +0200
+ -- Jakub Adam <jakub.adam@ktknet.cz>  Fri, 29 Jun 2012 10:53:16 +0200
 
 swt-gtk (3.8.0~rc2-3) unstable; urgency=low
 

debian/compat

-9
+10

debian/control

@@ -2,118 +2,111 @@ Source: swt-gtk
 Section: libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
-Uploaders: Adrian Perez <blackxored@debian.org>,
+Uploaders:
+ Adrian Perez <blackxored@debian.org>,
  أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy@sabily.org>,
  Jakub Adam <jakub.adam@ktknet.cz>,
  Niels Thykier <niels@thykier.net>
-DM-Upload-Allowed: yes
-Build-Depends: default-jdk, gcj-native-helper, libgnomeui-dev, libxtst-dev,
- libxcb-render-util0-dev, libxt-dev,
- libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev,
- fastjar, cdbs, patchutils, debhelper (>= 9), libwebkitgtk-dev, javahelper,
- dpkg-dev (>= 1.16.1~)
-Standards-Version: 3.9.3
-Vcs-Git: git://git.debian.org/git/pkg-java/swt-gtk.git
-Vcs-Browser: http://git.debian.org/?p=pkg-java/swt-gtk.git
+Build-Depends:
+ cdbs,
+ debhelper (>= 10),
+ default-jdk,
+ dpkg-dev (>= 1.16.1~),
+ fastjar,
+ javahelper,
+ libgl1-mesa-dev | libgl-dev,
+ libglib2.0-dev (>= 2.35),
+ libglu1-mesa-dev | libglu-dev,
+ libgtk2.0-dev,
+ libxcb-render-util0-dev,
+ libxt-dev,
+ libxtst-dev,
+ patchutils
+Standards-Version: 4.1.3
+Vcs-Git: https://anonscm.debian.org/git/pkg-java/swt-gtk.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/swt-gtk.git
 Homepage: http://www.eclipse.org/swt/
 
 Package: libswt-gtk-3-java
 Architecture: any
 Section: java
-Depends: libswt-gtk-3-jni (= ${binary:Version}), ${misc:Depends}
-Suggests: libswt-gtk-3-java-gcj
-Conflicts: libswt3.2-gtk-jni,
-           libswt3.2-gtk-java,
+Depends:
+ libswt-gtk-3-jni (= ${binary:Version}),
+ ${misc:Depends}
+Conflicts:
+ libswt-cairo-gtk-3.5-jni,
+ libswt-gnome-gtk-3.5-jni,
  libswt-gtk-3.4-java,
  libswt-gtk-3.4-jni,
  libswt-gtk-3.5-jni,
-           libswt-gnome-gtk-3.5-jni,
-           libswt-cairo-gtk-3.5-jni,
-           libswt-mozilla-gtk-3.5-jni
-Breaks: libswt-gnome-gtk-3-jni (<< 3.8.0~rc2-2~),
+ libswt-mozilla-gtk-3.5-jni,
+ libswt3.2-gtk-java,
+ libswt3.2-gtk-jni
+Breaks:
+ eclipse-rcp (<< 3.8),
  libswt-cairo-gtk-3-jni (<< 3.8.0~rc2-2~),
  libswt-glx-gtk-3-jni (<< 3.8.0~rc2-2~),
-        libswt-webkit-gtk-3-jni (<< 3.8.0~rc2-2~),
-        eclipse-rcp (<< 3.8)
+ libswt-gnome-gtk-3-jni (<< 3.8.0~rc2-2~),
+ libswt-webkit-gtk-3-jni (<< 3.8.0~rc2-2~)
 Description: Standard Widget Toolkit for GTK+ Java library
- The Standard Widget Toolkit (SWT) is a fast and rich GUI toolkit for the Java
- programming language. SWT provides efficient, portable and fast access to
- native controls and user interface facilities on the platforms where it has
- been implemented.
- .
- This package includes the SWT JAR libraries.
+ The Standard Widget Toolkit (SWT) is a fast and rich Java GUI toolkit.
+ For platforms with existing SWT implementations it provides efficient, portable
+ and fast access to native controls and user interface facilities.
 
 Package: libswt-gtk-3-jni
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: libswt-gnome-gtk-3-jni
-Breaks: libswt-gtk-3-java (<< ${binary:Version}), libswt-gtk-3-java (>> ${binary:Version})
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
+Breaks:
+ libswt-gtk-3-java (<< ${binary:Version}),
+ libswt-gtk-3-java (>> ${binary:Version})
 Description: Standard Widget Toolkit for GTK+ JNI library
- The Standard Widget Toolkit (SWT) is a fast and rich GUI toolkit for the Java
- programming language. SWT provides efficient, portable and fast access to
- native controls and user interface facilities on the platforms where it has
- been implemented.
+ The Standard Widget Toolkit (SWT) is a fast and rich Java GUI toolkit.
+ For platforms with existing SWT implementations it provides efficient, portable
+ and fast access to native controls and user interface facilities.
  .
  This package includes the JNI libraries (atk, awt, gtk, pi).
 
-Package: libswt-gnome-gtk-3-jni
-Architecture: any
-Depends: libswt-gtk-3-jni (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: Standard Widget Toolkit for GTK+ GNOME JNI library
- The Standard Widget Toolkit (SWT) is a fast and rich GUI toolkit for the Java
- programming language. SWT provides efficient, portable and fast access to
- native controls and user interface facilities on the platforms where it has
- been implemented.
- .
- This package includes the GNOME JNI library.
-
 Package: libswt-cairo-gtk-3-jni
 Architecture: any
-Depends: libswt-gtk-3-jni (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ libswt-gtk-3-jni (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: Standard Widget Toolkit for GTK+ Cairo JNI library
- The Standard Widget Toolkit (SWT) is a fast and rich GUI toolkit for the Java
- programming language. SWT provides efficient, portable and fast access to
- native controls and user interface facilities on the platforms where it has
- been implemented.
+ The Standard Widget Toolkit (SWT) is a fast and rich Java GUI toolkit.
+ For platforms with existing SWT implementations it provides efficient, portable
+ and fast access to native controls and user interface facilities.
  .
  This package includes the Cairo JNI libraries.
 
 Package: libswt-glx-gtk-3-jni
 Architecture: any
-Depends: libswt-gtk-3-jni (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ libswt-gtk-3-jni (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: Standard Widget Toolkit for GTK+ GLX JNI library
- The Standard Widget Toolkit (SWT) is a fast and rich GUI toolkit for the Java
- programming language. SWT provides efficient, portable and fast access to
- native controls and user interface facilities on the platforms where it has
- been implemented.
+ The Standard Widget Toolkit (SWT) is a fast and rich Java GUI toolkit.
+ For platforms with existing SWT implementations it provides efficient, portable
+ and fast access to native controls and user interface facilities.
  .
  This package includes the GLX JNI libraries.
 
 Package: libswt-webkit-gtk-3-jni
 Architecture: any
-Depends: libswt-gtk-3-jni (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Breaks: libswt-gtk-3-java (<< ${binary:Version}), libswt-gtk-3-java (>> ${binary:Version})
+Depends:
+ libswt-gtk-3-jni (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
+ libwebkitgtk-1.0-0
+Breaks:
+ libswt-gtk-3-java (<< ${binary:Version}),
+ libswt-gtk-3-java (>> ${binary:Version})
 Description: Standard Widget Toolkit for GTK+ WebKit JNI library
- The Standard Widget Toolkit (SWT) is a fast and rich GUI toolkit for the Java
- programming language. SWT provides efficient, portable and fast access to
- native controls and user interface facilities on the platforms where it has
- been implemented.
+ The Standard Widget Toolkit (SWT) is a fast and rich Java GUI toolkit.
+ For platforms with existing SWT implementations it provides efficient, portable
+ and fast access to native controls and user interface facilities.
  .
  This package includes the WebKit JNI libraries.
-
-Package: libswt-gtk-3-java-gcj
-Architecture: any
-Section: java
-Depends: ${misc:Depends}, ${shlibs:Depends},
-	  libswt-cairo-gtk-3-jni (= ${binary:Version}),
-	  libswt-glx-gtk-3-jni (= ${binary:Version}),
-	  libswt-gnome-gtk-3-jni (= ${binary:Version}),
-	  libswt-gtk-3-jni (= ${binary:Version}),
-	  libswt-webkit-gtk-3-jni (= ${binary:Version})
-Description: Standard Widget Toolkit for GTK+ native library
- The Standard Widget Toolkit (SWT) is a fast and rich GUI toolkit for the Java
- programming language. SWT provides efficient, portable and fast access to
- native controls and user interface facilities on the platforms where it has
- been implemented.
- .
- This package contains a native library built using gcj.

debian/copyright

-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0
 Upstream-Name: SWT
 Upstream-Contact: The Eclipse Foundation <platform-swt-dev@eclipse.org>
 Source: http://www.eclipse.org/swt/

debian/gbp.conf

 [DEFAULT]
 pristine-tar = True
+compression=xz

debian/java-config/libswt-gtk-3-java

-JARS=/usr/lib/java/swt-gtk-3.8.0.jar
+JARS=/usr/lib/java/swt-gtk-3.8.2.jar

debian/libswt-cairo-gtk-3-jni.lintian-overrides

+libswt-cairo-gtk-3-jni: hardening-no-fortify-functions usr/lib/jni/libswt-cairo-gtk-*.so

debian/libswt-glx-gtk-3-jni.lintian-overrides

+libswt-glx-gtk-3-jni: hardening-no-fortify-functions usr/lib/jni/libswt-glx-gtk-*.so

debian/libswt-gnome-gtk-3-jni.install

-libswt-gnome-*[0-9].so usr/lib/jni

debian/libswt-gtk-3-java.install

-swt-gtk-*.jar usr/lib/java
 debian/java-config/libswt-gtk* usr/share/java-config
+swt-gtk-*.jar usr/lib/java

debian/libswt-gtk-3-java.links

-usr/lib/java/swt-gtk-3.8.0.jar usr/share/java/swt-gtk-3.8.jar
-usr/lib/java/swt-gtk-3.8.0.jar usr/share/java/swt.jar
+usr/lib/java/swt-gtk-3.8.2.jar usr/share/java/swt-gtk-3.8.jar
+usr/lib/java/swt-gtk-3.8.2.jar usr/share/java/swt.jar

debian/libswt-gtk-3-java.lintian-overrides

 # swt-gtk-3.jar is architecture-dependent:
-libswt-gtk-3-java: jar-not-in-usr-share usr/lib/java/swt-gtk-3.8.0.jar
+libswt-gtk-3-java: jar-not-in-usr-share usr/lib/java/swt-gtk-*.jar

debian/libswt-gtk-3-jni.lintian-overrides

+libswt-gtk-3-jni: hardening-no-fortify-functions usr/lib/jni/libswt-atk-gtk-*.so
+libswt-gtk-3-jni: hardening-no-fortify-functions usr/lib/jni/libswt-gtk-*.so

debian/libswt-webkit-gtk-3-jni.lintian-overrides

+libswt-webkit-gtk-3-jni: hardening-no-fortify-functions usr/lib/jni/libswt-webkit-gtk-*.so

debian/manifest

@@ -3,7 +3,7 @@ usr/share/java/swt-gtk-3.8.jar:
  Bundle-Name: Standard Widget Toolkit
  Bundle-SymbolicName: org.eclipse.swt; singleton:=true
  Bundle-Vendor: Eclipse.org
- Bundle-Version: 3.8.0
+ Bundle-Version: 3.8.2
  Bundle-Localization: plugin
  Export-Package: org.eclipse.swt,org.eclipse.swt.accessibility,org.eclipse.swt.awt,org.eclipse.swt.browser,org.eclipse.swt.custom,org.eclipse.swt.dnd,org.eclipse.swt.events,org.eclipse.swt.graphics,org.eclipse.swt.layout,org.eclipse.swt.opengl,org.eclipse.swt.printing,org.eclipse.swt.program,org.eclipse.swt.widgets,org.eclipse.swt.internal;x-friends:="org.eclipse.ui",org.eclipse.swt.internal.image; x-internal:=true,org.eclipse.swt.internal.theme; x-internal:=true
  DynamicImport-Package: org.eclipse.swt.accessibility2, org.mozilla.xpcom