Jochen Sprickerhof pushed to branch master at Debian Java Maintainers / jameica
Commits: 696fdea4 by Jochen Sprickerhof at 2018-10-24T21:29:11Z Port to Eclipse 4 Closes: #908620 - - - - - 6780cb9d by Jochen Sprickerhof at 2018-10-24T21:29:20Z Update changelog for 2.8.2+dfsg-2 release - - - - - 5 changed files: - debian/changelog - debian/control - debian/patches/0001-Update-locations-of-Java-libraries.patch - debian/patches/0002-Adopt-build.xml.patch - debian/patches/0004-Add-mysql-connector-java.patch Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,9 @@ +jameica (2.8.2+dfsg-2) unstable; urgency=medium + + * Port to Eclipse 4 (Closes: #908620) + + -- Jochen Sprickerhof <[email protected]> Wed, 24 Oct 2018 23:29:18 +0200 + jameica (2.8.2+dfsg-1) unstable; urgency=medium * New upstream version 2.8.2+dfsg ===================================== debian/control ===================================== @@ -3,7 +3,7 @@ Section: misc Priority: optional Maintainer: Debian Java maintainers <[email protected]> Uploaders: Jochen Sprickerhof <[email protected]> -Build-Depends: debhelper (>= 11), default-jdk, javahelper, ant, eclipse-platform-data, eclipse-rcp, libcommons-cli-java, libbcpkix-java, libjameica-datasource-java, libnanoxml2-java, libpaperclips-java, velocity +Build-Depends: debhelper (>= 11), default-jdk, javahelper, ant, libeclipse-jface-databinding-java, libeclipse-ui-forms-java, libcommons-cli-java, libbcpkix-java, libjameica-datasource-java, libnanoxml2-java, libpaperclips-java, velocity Standards-Version: 4.2.1 Rules-Requires-Root: no Homepage: http://www.willuhn.de/products/jameica/ @@ -12,7 +12,7 @@ Vcs-Browser: https://salsa.debian.org/java-team/jameica Package: jameica Architecture: all -Depends: eclipse-platform-data, eclipse-rcp, libbcpkix-java, libbcprov-java, libcommons-cli-java, libcommons-collections3-java, libcommons-lang-java, libequinox-osgi-java, libicu4j-49-java, libjameica-datasource-java, libjameica-util-java, libnanoxml2-java, libpaperclips-java, velocity, ${misc:Depends}, libcommons-logging-java, libswtcalendar-java, libh2-java, libswt-cairo-gtk-4-jni, libswt-gtk2-4-jni, libmysql-java, libactivation-java, libjaxb-api-java, libjaxb-java, libgeronimo-annotation-1.3-spec-java, libistack-commons-java, libtxw2-java, +Depends: ${misc:Depends}, libeclipse-core-runtime-java, libeclipse-core-commands-java, libequinox-common-java, libeclipse-jface-databinding-java, libeclipse-ui-forms-java, libbcpkix-java, libbcprov-java, libcommons-cli-java, libcommons-collections3-java, libcommons-lang-java, libeclipse-osgi-java, libicu4j-49-java, libjameica-datasource-java, libjameica-util-java, libnanoxml2-java, libpaperclips-java, velocity, libcommons-logging-java, libswtcalendar-java, libh2-java, libswt-cairo-gtk-4-jni, libswt-gtk2-4-jni, libmysql-java, libactivation-java, libjaxb-api-java, libjaxb-java, libgeronimo-annotation-1.3-spec-java, libistack-commons-java, libtxw2-java, Recommends: ${java:Recommends} Description: Run-time system for Java applications runtime environment for Java applications, which are implemented as plugins. ===================================== debian/patches/0001-Update-locations-of-Java-libraries.patch ===================================== @@ -7,7 +7,7 @@ Subject: Update locations of Java libraries 1 file changed, 26 insertions(+), 28 deletions(-) diff --git a/build/build.properties b/build/build.properties -index a7b68c1..26a099b 100644 +index a7b68c1..62e33be 100644 --- a/build/build.properties +++ b/build/build.properties @@ -16,34 +16,32 @@ define.jarfilename.linux64 = ${define.projectname}-linux64.jar @@ -58,12 +58,12 @@ index a7b68c1..26a099b 100644 + /usr/share/java/commons-logging.jar \ + /usr/share/java/nanoxml.jar \ + /usr/share/java/paperclips.jar \ -+ /usr/lib/eclipse/plugins/org.eclipse.core.runtime_3.8.0.dist.jar \ -+ /usr/share/java/org.eclipse.core.commands.jar \ -+ /usr/share/java/org.eclipse.equinox.common.jar \ -+ /usr/share/java/org.eclipse.osgi.jar \ -+ /usr/share/java/org.eclipse.jface.jar \ -+ /usr/share/eclipse/plugins/org.eclipse.ui.forms_3.5.200.dist.jar \ ++ /usr/share/java/eclipse-core-runtime.jar \ ++ /usr/share/java/eclipse-core-commands.jar \ ++ /usr/share/java/equinox-common.jar \ ++ /usr/share/java/eclipse-osgi.jar \ ++ /usr/share/java/eclipse-jface.jar \ ++ /usr/share/java/eclipse-ui-forms.jar \ + /usr/share/java/icu4j-49.1.jar \ + /usr/share/java/swtcalendar.jar \ + /usr/share/java/velocity.jar \ ===================================== debian/patches/0002-Adopt-build.xml.patch ===================================== @@ -3,12 +3,12 @@ Date: Thu, 24 May 2018 23:26:28 +0200 Subject: Adopt build.xml --- - build/build.properties | 3 ++- - build/build.xml | 11 ++++++++--- - 2 files changed, 10 insertions(+), 4 deletions(-) + build/build.properties | 3 ++- + build/build.xml | 8 +++++--- + 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/build/build.properties b/build/build.properties -index 26a099b..04c9688 100644 +index 62e33be..bed0ada 100644 --- a/build/build.properties +++ b/build/build.properties @@ -49,7 +49,7 @@ define.commonlibs = /usr/share/java/bcpkix.jar \ @@ -29,7 +29,7 @@ index 26a099b..04c9688 100644 classpath.win64 = ${define.jarfilename} lib/swt/win64/swt.jar ${define.commonlibs} classpath.linux = ${define.jarfilename} lib/swt/linux/swt.jar ${define.commonlibs} diff --git a/build/build.xml b/build/build.xml -index 8de5d65..ee1d155 100755 +index 8de5d65..1472647 100755 --- a/build/build.xml +++ b/build/build.xml @@ -18,7 +18,7 @@ @@ -41,19 +41,16 @@ index 8de5d65..ee1d155 100755 <xmlproperty file="plugin.xml" collapseattributes="true" /> <!-- create scm tag --> -@@ -40,7 +40,10 @@ +@@ -40,7 +40,7 @@ <echo message="JAVA : ${java.version}" /> <path id="compilepath"> - <fileset dir="lib"> + <fileset dir="/usr/share/java"> -+ <include name="**/*.jar" /> -+ </fileset> -+ <fileset dir="/usr/share/eclipse/plugins"> <include name="**/*.jar" /> </fileset> </path> -@@ -104,6 +107,8 @@ +@@ -104,6 +104,8 @@ <attribute name="Implementation-Title" value="${define.projectname}" /> <attribute name="Implementation-Version" value="${system.version}" /> <attribute name="Implementation-Buildnumber" value="${build.number}" /> @@ -62,7 +59,7 @@ index 8de5d65..ee1d155 100755 </manifest> <fileset dir="${class.dir}" /> </jar> -@@ -464,7 +469,7 @@ +@@ -464,7 +466,7 @@ </target> ===================================== debian/patches/0004-Add-mysql-connector-java.patch ===================================== @@ -7,7 +7,7 @@ Subject: Add mysql-connector-java 1 file changed, 1 insertion(+) diff --git a/build/build.properties b/build/build.properties -index 04c9688..ce9c61e 100644 +index bed0ada..9055312 100644 --- a/build/build.properties +++ b/build/build.properties @@ -42,6 +42,7 @@ define.commonlibs = /usr/share/java/bcpkix.jar \ View it on GitLab: https://salsa.debian.org/java-team/jameica/compare/45adf12f68f8b6f0cf147aa191077443ed9e0cfe...6780cb9dbac4489fc468acd3f3ff412728b9dea5 -- View it on GitLab: https://salsa.debian.org/java-team/jameica/compare/45adf12f68f8b6f0cf147aa191077443ed9e0cfe...6780cb9dbac4489fc468acd3f3ff412728b9dea5 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
