[Git][debian-gis-team/josm][experimental] 2 commits: Add patch to use javax.json instead of jakarta.json.

[Bas Couwenberg (@sebastic)]

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


Commits:
98ac5a87 by Bas Couwenberg at 2023-06-06T11:45:21+02:00
Add patch to use javax.json instead of jakarta.json.

- - - - -
5e78b2c9 by Bas Couwenberg at 2023-06-06T12:06:11+02:00
Set distribution to experimental.

- - - - -


5 changed files:

- debian/changelog
- debian/patches/00-build.patch
- + debian/patches/javax-json.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+josm (0.0.svn18746+dfsg-1~exp2) experimental; urgency=medium
+
+  * Add patch to use javax.json instead of jakarta.json.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Tue, 06 Jun 2023 12:06:01 +0200
+
 josm (0.0.svn18746+dfsg-1~exp1) experimental; urgency=medium
 
   * New tested snapshot.


=====================================
debian/patches/00-build.patch
=====================================
@@ -145,7 +145,7 @@ Forwarded: not-needed
 +    </target>
 +    <target name="compile-cots" depends="init,javacc-openinghoursparser" description="Compile third-party dependencies not retrieved with Ivy">
 +        <!-- COTS -->
-+        <javac srcdir="${src.dir}" classpathref="classpath" includes="ch/**,com/**,jakarta/**,javax/**,oauth/signpost/**,org/apache/commons/**,org/glassfish/**,org/jetbrains/annotations/**,org/tukaani/**" excludes="**/package-info.java" nowarn="on" encoding="iso-8859-1"
++        <javac srcdir="${src.dir}" classpathref="classpath" includes="ch/**,com/**,javax/**,oauth/signpost/**,org/apache/commons/**,org/glassfish/**,org/jetbrains/annotations/**,org/tukaani/**" excludes="**/package-info.java" nowarn="on" encoding="iso-8859-1"
 +            destdir="${build.dir}" release="${java.lang.version}" debug="on" includeAntRuntime="false">
 +            <!-- get rid of "internal proprietary API" warning -->
 +            <compilerarg value="-XDignore.symbol.file"/>


=====================================
debian/patches/javax-json.patch
=====================================
The diff for this file was not included because it is too large.

=====================================
debian/patches/series
=====================================
@@ -5,3 +5,4 @@
 07-use_system_fonts.patch
 08-use_noto_font.patch
 09-no-java-8.patch
+javax-json.patch


=====================================
debian/rules
=====================================
@@ -83,7 +83,7 @@ get-orig-source:
 	@echo Downloading source JAR
 	wget https://josm.openstreetmap.de/download/josm-snapshot-${SVNREV}-sources.jar -O /tmp/josm-sources.jar
 	@echo Extracting sources from JAR
-	cd ${DESTDIR}/src && jar -xf /tmp/josm-sources.jar ch/poole com/drew com/google com/kitfox jakarta/json javax/annotation javax/json oauth/signpost org/apache/commons/jcs org/glassfish org/tukaani && cd $$OLDPWD
+	cd ${DESTDIR}/src && jar -xf /tmp/josm-sources.jar ch/poole com/drew com/google com/kitfox javax/annotation javax/json oauth/signpost org/apache/commons/jcs org/glassfish org/tukaani && cd $$OLDPWD
 	grep "Generated By:JavaCC:" ${DESTDIR}/src/ch/poole -r | cut -d: -f1 | sort -u | xargs rm -v
 	cd ${DESTDIR}/resources && jar -xf /tmp/josm-sources.jar META-INF/resources/webjars/tag2link && cd $$OLDPWD
 	find ${DESTDIR}/resources/META-INF/resources/webjars/tag2link -type f -not -name index.json -delete



View it on GitLab: https://salsa.debian.org/debian-gis-team/josm/-/compare/2d64783d38b649a4405a6a2efb65403f09d426a4...5e78b2c95a4a2c053e295588e445c617422d2215

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/josm/-/compare/2d64783d38b649a4405a6a2efb65403f09d426a4...5e78b2c95a4a2c053e295588e445c617422d2215
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/20230606/c0d30c36/attachment-0001.htm>