diff -Nru libjogl2-java-2.3.2+dfsg/debian/changelog libjogl2-java-2.3.2+dfsg/debian/changelog --- libjogl2-java-2.3.2+dfsg/debian/changelog 2015-10-29 18:30:27.000000000 +0000 +++ libjogl2-java-2.3.2+dfsg/debian/changelog 2016-08-04 11:01:14.000000000 +0000 @@ -1,3 +1,14 @@ +libjogl2-java (2.3.2+dfsg-5) unstable; urgency=medium + + * Team upload. + * Install the Maven artifacts (Closes: #712002) + * Transition to libswt-gtk-4-java + * Removed the explicit build dependency on quilt + * Standards-Version updated to 3.9.8 + * Use secure Vcs-* URLs + + -- Emmanuel Bourg Thu, 04 Aug 2016 13:01:14 +0200 + libjogl2-java (2.3.2+dfsg-4) unstable; urgency=medium * Team upload. diff -Nru libjogl2-java-2.3.2+dfsg/debian/control libjogl2-java-2.3.2+dfsg/debian/control --- libjogl2-java-2.3.2+dfsg/debian/control 2015-10-16 08:43:03.000000000 +0000 +++ libjogl2-java-2.3.2+dfsg/debian/control 2016-08-04 10:17:28.000000000 +0000 @@ -3,21 +3,38 @@ Priority: optional Maintainer: Debian Java Maintainers Uploaders: Sylvestre Ledru -Build-Depends: debhelper (>= 9~), cdbs, quilt, default-jdk, - libgluegen2-build-java (>= 2.3.2), libgluegen2-rt-java (>= 2.3.2), - ant-optional, libgl1-mesa-dev, libglu1-mesa-dev, libxxf86vm-dev, - x11proto-xf86vidmode-dev, libxt-dev, junit4, libswt-gtk-3-java, - ant-contrib, ant-contrib-cpptasks, libxinerama-dev, libxrandr-dev, - ant (>= 1.8), libxcursor-dev -Standards-Version: 3.9.6 -Vcs-Git: git://anonscm.debian.org/pkg-java/libjogl2-java.git -Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/libjogl2-java.git +Build-Depends: + ant (>= 1.8), + ant-contrib, + ant-contrib-cpptasks, + ant-optional, + cdbs, + debhelper (>= 9~), + default-jdk, + junit4, + libgl1-mesa-dev, + libglu1-mesa-dev, + libgluegen2-build-java (>= 2.3.2), + libgluegen2-rt-java (>= 2.3.2), + libswt-gtk-4-java, + libxcursor-dev, + libxinerama-dev, + libxrandr-dev, + libxt-dev, + libxxf86vm-dev, + maven-repo-helper, + x11proto-xf86vidmode-dev +Standards-Version: 3.9.8 +Vcs-Git: https://anonscm.debian.org/git/pkg-java/libjogl2-java.git +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libjogl2-java.git Homepage: http://jogamp.org Package: libjogl2-java Architecture: all -Depends: ${misc:Depends}, - libgluegen2-rt-java (>= 2.3.2), libjogl2-jni (>= ${source:Version}) +Depends: + libgluegen2-rt-java (>= 2.3.2), + libjogl2-jni (>= ${source:Version}), + ${misc:Depends} Suggests: libjogl2-java-doc Description: Java bindings for OpenGL API The JOGL project hosts the development version of the Java Bindings for diff -Nru libjogl2-java-2.3.2+dfsg/debian/libjogl2-java.install libjogl2-java-2.3.2+dfsg/debian/libjogl2-java.install --- libjogl2-java-2.3.2+dfsg/debian/libjogl2-java.install 2015-10-16 08:43:03.000000000 +0000 +++ libjogl2-java-2.3.2+dfsg/debian/libjogl2-java.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -build/jar/jogl2.jar /usr/share/java/ diff -Nru libjogl2-java-2.3.2+dfsg/debian/libjogl2-java.poms libjogl2-java-2.3.2+dfsg/debian/libjogl2-java.poms --- libjogl2-java-2.3.2+dfsg/debian/libjogl2-java.poms 1970-01-01 00:00:00.000000000 +0000 +++ libjogl2-java-2.3.2+dfsg/debian/libjogl2-java.poms 2016-08-04 10:18:48.000000000 +0000 @@ -0,0 +1 @@ +debian/pom.xml --java-lib --usj-name=jogl2 --artifact=build/jar/jogl-all.jar diff -Nru libjogl2-java-2.3.2+dfsg/debian/patches/swt.diff libjogl2-java-2.3.2+dfsg/debian/patches/swt.diff --- libjogl2-java-2.3.2+dfsg/debian/patches/swt.diff 2015-10-16 08:43:03.000000000 +0000 +++ libjogl2-java-2.3.2+dfsg/debian/patches/swt.diff 2016-08-04 08:35:51.000000000 +0000 @@ -15,7 +15,7 @@ - - - -+ ++ + + diff -Nru libjogl2-java-2.3.2+dfsg/debian/pom.xml libjogl2-java-2.3.2+dfsg/debian/pom.xml --- libjogl2-java-2.3.2+dfsg/debian/pom.xml 1970-01-01 00:00:00.000000000 +0000 +++ libjogl2-java-2.3.2+dfsg/debian/pom.xml 2015-10-10 14:35:57.000000000 +0000 @@ -0,0 +1,95 @@ + + + + + + + + 4.0.0 + org.jogamp.jogl + jogl-all + 2.3.2 + jar + JOGL + Java™ Binding for the OpenGL® API + http://jogamp.org/jogl/www/ + + + + + + BSD-2 License + http://www.opensource.org/licenses/BSD-2-Clause + + + BSD-3 License + http://www.opensource.org/licenses/BSD-3-Clause + + + SGI Free Software License B + http://oss.sgi.com/projects/FreeB + + + Apache License Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + + + Apache License Version 1.1 + http://www.apache.org/licenses/LICENSE-1.1 + + + Ubuntu Font Licence 1.0 + http://font.ubuntu.com/ufl/ubuntu-font-licence-1.0.txt + + + + + http://jogamp.org/git/?p=jogl.git/ + scm:git:http://jogamp.org/git/jogl.git/ + scm:git:http://jogamp.org/git/jogl.git/ + + + + + sgothel + Sven Gothel + sgothel@jausoft.com + http://blog.jausoft.com + + + + + http://jogamp.org/bugzilla/ + Bugzilla + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.4 + + + sign-artifacts + verify + + sign + + + + + + + + org.apache.maven.wagon + wagon-ssh + 2.4 + + + + + diff -Nru libjogl2-java-2.3.2+dfsg/debian/rules libjogl2-java-2.3.2+dfsg/debian/rules --- libjogl2-java-2.3.2+dfsg/debian/rules 2015-10-16 08:43:03.000000000 +0000 +++ libjogl2-java-2.3.2+dfsg/debian/rules 2016-08-04 11:00:26.000000000 +0000 @@ -2,16 +2,16 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/ant.mk -include /usr/share/cdbs/1/rules/patchsys-quilt.mk JAVA_HOME := /usr/lib/jvm/default-java/ -DEB_JARS := ant-contrib ant-contrib-cpptasks ant-nodeps antlr ant-antlr swt +DEB_JARS := ant-contrib ant-contrib-cpptasks ant-nodeps antlr ant-antlr swt4 DEB_ANT_ARGS := -Dsetup.noCDC=true -verbose -Dcommon.gluegen.build.done=true DEB_ANT_CLEAN_TARGET := clean DEB_ANT_BUILD_TARGET := all DEB_ANT_BUILDFILE := make/build.xml ENABLE_BUILD_HELP_ARCHS := amd64 i386 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +VERSION = $(shell dpkg-parsechangelog --show-field Version | sed 's/\+dfsg.*//') ifeq ($(DEB_HOST_ARCH),armhf) DEB_ANT_ARGS += -DisAbiEabiGnuArmhf=true @@ -26,11 +26,15 @@ export DH_OPTIONS += -Nlibjogl2-java-doc endif -common-install-prehook-indep:: - mv build/jar/jogl-all.jar build/jar/jogl2.jar +install/libjogl2-java:: + mh_install -plibjogl2-java clean:: $(RM) -r gluegen/build + mh_clean + +get-orig-pom: + wget https://repo1.maven.org/maven2/org/jogamp/jogl/jogl-all/$(VERSION)/jogl-all-$(VERSION).pom -O debian/pom.xml get-orig-source:: -uscan --verbose --upstream-version 0 --no-symlink