[Git][debian-gis-team/josm][master] 2 commits: Update xmlcore from 6.0.6 to 6.1.10.

[Bas Couwenberg]

Bas Couwenberg pushed to branch master at Debian GIS Project / josm


Commits:
c0154c50 by Bas Couwenberg at 2020-04-18T15:43:48+02:00
Update xmlcore from 6.0.6 to 6.1.10.

- - - - -
08e55030 by Bas Couwenberg at 2020-04-23T15:24:16+02:00
Re-enable OpenJFX support.

Revert "Disable OpenJFX support, uninstallable in unstable, see: #956585."

This reverts commit 8e436a8696155505c13a22165393638724f7fc69.

- - - - -


3 changed files:

- debian/changelog
- debian/control
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+josm (0.0.svn16239+dfsg-3) UNRELEASED; urgency=medium
+
+  * Update xmlcore from 6.0.6 to 6.1.10.
+  * Re-enable OpenJFX support.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sat, 18 Apr 2020 15:43:41 +0200
+
 josm (0.0.svn16239+dfsg-2) unstable; urgency=medium
 
   * Add missing OpeningHoursParser resources.


=====================================
debian/control
=====================================
@@ -17,7 +17,8 @@ Build-Depends: debhelper (>= 10~),
                libgettext-ant-tasks-java,
                libgettext-commons-java (>= 0.9.6),
                liboauth-signpost-java (>= 1.2),
-               libterm-readkey-perl
+               libterm-readkey-perl,
+               openjfx
 Standards-Version: 4.5.0
 Vcs-Browser: https://salsa.debian.org/debian-gis-team/josm
 Vcs-Git: https://salsa.debian.org/debian-gis-team/josm.git
@@ -32,6 +33,7 @@ Depends: default-jre (>= 2:1.9) | java9-runtime,
          libcommons-logging-java,
          libgettext-commons-java (>= 0.9.6),
          liboauth-signpost-java (>= 1.2),
+         openjfx,
          proj-data,
          ${misc:Depends}
 Recommends: josm-l10n (= ${source:Version})


=====================================
debian/rules
=====================================
@@ -31,7 +31,7 @@ override_dh_auto_build:
 	# Move translation causing build failure out of the way
 	mv i18n/po/ca at valencia.po .
 
-	dh_auto_build -- -v -d -Ddebian.version=${DEB_VERSION} -DnoJavaFX=true dist
+	dh_auto_build -- -v -d -Ddebian.version=${DEB_VERSION} dist
 
 	mv ca at valencia.po i18n/po/
 
@@ -82,7 +82,7 @@ get-orig-source:
 	@echo Extracting sources from JAR
 	cd ${DESTDIR}/src && jar -xf /tmp/josm-latest-sources.jar ch/poole com/drew javax/json org/apache/commons/jcs org/glassfish org/tukaani && cd $$OLDPWD
 	@echo Downloading xmpcore source JAR
-	wget https://repo1.maven.org/maven2/com/adobe/xmp/xmpcore/6.0.6/xmpcore-6.0.6-sources.jar -O /tmp/xmpcore-sources.jar
+	wget https://repo1.maven.org/maven2/com/adobe/xmp/xmpcore/6.1.10/xmpcore-6.1.10-sources.jar -O /tmp/xmpcore-sources.jar
 	@echo Extracting xmpcore sources from JAR
 	cd ${DESTDIR}/src && jar -xf /tmp/xmpcore-sources.jar com/adobe && cd $$OLDPWD
 	@echo Downloading annotations source JAR



View it on GitLab: https://salsa.debian.org/debian-gis-team/josm/-/compare/842d9800dfaa42a7a1b4197774c1bca943352e04...08e55030a2a8eccad80208fcf7703e39215112f7

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/josm/-/compare/842d9800dfaa42a7a1b4197774c1bca943352e04...08e55030a2a8eccad80208fcf7703e39215112f7
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20200424/b3527175/attachment-0001.html>