[med-svn] [Git][med-team/king][master] 3 commits: Update d/p/use_debian_packaged_jars.patch to use more jars needed

[Nilesh Patra (@nilesh)]

Nilesh Patra pushed to branch master at Debian Med / king


Commits:
efa0d310 by Nilesh Patra at 2022-01-29T01:01:09+05:30
Update d/p/use_debian_packaged_jars.patch to use more jars needed

- - - - -
425da31d by Nilesh Patra at 2022-01-29T01:01:09+05:30
d/control: Add B-D on libpdfbox2-java and libfontbox-java

- - - - -
1670f84c by Nilesh Patra at 2022-01-29T01:01:44+05:30
Update changelog

- - - - -


3 changed files:

- debian/changelog
- debian/control
- debian/patches/use_debian_packaged_jars.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,13 +1,20 @@
 king (2.24+dfsg-1) UNRELEASED; urgency=medium
 
+  [ Andreas Tille ]
   * New upstream version
   * Upstream moved to Github
   * Update Files-Excluded
   * Remove trailing whitespace in debian/rules (routine-update)
   * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository,
     Repository-Browse.
+  * Update patches
+  * Fix clean target
+
+  [ Nilesh Patra ]
+  * Update d/p/use_debian_packaged_jars.patch to use more jars needed
+  * d/control: Add B-D on libpdfbox2-java and libfontbox-java
 
- -- Andreas Tille <tille at debian.org>  Fri, 28 Jan 2022 17:29:15 +0100
+ -- Andreas Tille <tille at debian.org>  Sat, 29 Jan 2022 01:01:12 +0530
 
 king (2.23.161103+dfsg2-1) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -9,7 +9,9 @@ Build-Depends: debhelper-compat (= 13),
                ant,
                inkscape,
                libitext-java,
-               libjogl2-java
+               libjogl2-java,
+               libpdfbox2-java,
+               libfontbox-java
 Standards-Version: 4.6.0
 Vcs-Browser: https://salsa.debian.org/med-team/king
 Vcs-Git: https://salsa.debian.org/med-team/king.git


=====================================
debian/patches/use_debian_packaged_jars.patch
=====================================
@@ -4,7 +4,32 @@ Forwarded: not-needed
 
 --- a/king/build.xml
 +++ b/king/build.xml
-@@ -109,8 +109,8 @@
+@@ -69,10 +69,6 @@
+     <ant antfile="../driftwood/build.xml" inheritAll="false" target="compile">
+         <!-- inherited properties go here -->
+     </ant>
+-    <copy file="../lib/pdfbox/pdfbox-2.0.19.jar" tofile="${basedir}/pdfbox.jar" failonerror="false"/>
+-    <copy file="../lib/pdfbox/fontbox-2.0.19.jar" tofile="${basedir}/fontbox.jar" failonerror="false"/>
+-    <copy file="../lib/pdfbox/pdfbox-graphics2d/target/graphics2d-0.26-SNAPSHOT.jar" tofile="${basedir}/pdfbox-graphics2d.jar" failonerror="false"/>
+-    <copy file="../lib/pdfbox/commons-logging-1.2/commons-logging-1.2.jar" tofile="${basedir}/commons-logging-1.2.jar" failonerror="false"/>
+     <mkdir dir="${build}"/>
+     <javac srcdir="${src}" destdir="${build}" debug="on" debuglevel="lines,source" target="1.8" source="1.8">
+          <include name="**/*.java"/>
+@@ -82,10 +78,10 @@
+          <exclude name="**/dive/"/>
+          <classpath>
+             <pathelement location="../driftwood/build"/>
+-            <pathelement location="pdfbox.jar"/>             <!-- Required for PDF export -->
+-            <pathelement location="fontbox.jar"/>
++            <pathelement location="/usr/share/java/pdfbox2.jar"/>             <!-- Required for PDF export -->
++            <pathelement location="/usr/share/java/fontbox.jar"/>
+             <pathelement location="pdfbox-graphics2d.jar"/>
+-            <pathelement location="commons-logging-1.2.jar"/>
++            <pathelement location="/usr/share/java/commons-logging.jar"/>
+          </classpath>
+     </javac>
+ </target>
+@@ -109,8 +105,8 @@
           <classpath>
              <pathelement location="${build}"/>
              <pathelement location="../driftwood/build"/>
@@ -15,7 +40,7 @@ Forwarded: not-needed
           </classpath>
      </javac>
  </target>
-@@ -134,13 +134,6 @@
+@@ -134,13 +130,6 @@
          <zipfileset dir="../molikin/dist/" includes="molikin/"/> 
          <zipfileset dir="../rdcvis/dist/" includes="rdcvis/"/>
          <zipfileset dir="../lib/" prefix="lib/">



View it on GitLab: https://salsa.debian.org/med-team/king/-/compare/6b514500880cfc10c7f0a334a21f9b0afd5239b2...1670f84c2b5281d41ddb2742e1e30f0eb017f1bc

-- 
View it on GitLab: https://salsa.debian.org/med-team/king/-/compare/6b514500880cfc10c7f0a334a21f9b0afd5239b2...1670f84c2b5281d41ddb2742e1e30f0eb017f1bc
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/debian-med-commit/attachments/20220128/b40140eb/attachment-0001.htm>