[med-svn] [Git][med-team/libjloda-java][master] 10 commits: routine-update: Packaging update

Lance Lin (@linqigang) gitlab at salsa.debian.org
Wed Feb 21 14:10:08 GMT 2024



Lance Lin pushed to branch master at Debian Med / libjloda-java


Commits:
15624bf1 by Lance Lin at 2024-02-20T21:19:39+07:00
routine-update: Packaging update

- - - - -
79ece775 by Lance Lin at 2024-02-20T21:20:05+07:00
routine-update: Standards-Version: 4.6.2

- - - - -
fa7f32c0 by Lance Lin at 2024-02-20T21:21:01+07:00
Set upstream metadata fields: Repository.

Changes-By: lintian-brush

- - - - -
526e7f47 by Lance Lin at 2024-02-20T21:24:42+07:00
Update upstream repository in d/control and d/watch

- - - - -
eace5ab3 by Lance Lin at 2024-02-21T20:19:52+07:00
d/clean: Remove generated files and dirs in antbuild/ (Closes: #1047938)

- - - - -
d8681f71 by Lance Lin at 2024-02-21T20:22:24+07:00
d/rules: Remove override for dh_clean, only use d/clean

- - - - -
fe966626 by Lance Lin at 2024-02-21T20:57:42+07:00
d/copyright: Change which jar files are removed from the tar file

- - - - -
b780557d by Lance Lin at 2024-02-21T20:59:48+07:00
jars/:Delete jar and license files that are not needed

- - - - -
705ae70a by Lance Lin at 2024-02-21T21:04:07+07:00
d/watch: Add missing repack suffix for Files-Excluded in d/copyright

- - - - -
f9b95bc1 by Lance Lin at 2024-02-21T21:06:26+07:00
d/patches: Update fix_build_xml.patch with xml-apis-ext.jar and set Forwarded field to not-needed

- - - - -


11 changed files:

- debian/changelog
- debian/clean
- debian/control
- debian/copyright
- debian/patches/fix_build_xml.patch
- debian/rules
- debian/upstream/metadata
- debian/watch
- − jars/VectorGraphics2D-0.13.jar
- − jars/VectorGraphics2D-License.txt
- − jars/xml-apis-ext-1.3.04.jar


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,19 @@
+libjloda-java (2.1+ds-3) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Standards-Version: 4.6.2 (routine-update)
+  * Set upstream metadata fields: Repository.
+  * Update upstream repository in d/control and d/watch
+  * d/clean: Remove generated files and dirs in antbuild/ (Closes: #1047938)
+  * d/rules: Remove override for dh_clean, only use d/clean
+  * d/copyright: Change which jar files are removed from the tar file
+  * jars/:Delete jar and license files that are not needed
+  * d/watch: Add missing repack suffix for Files-Excluded in d/copyright
+  * d/patches: Update fix_build_xml.patch with xml-apis-ext.jar and set
+    Forwarded field to not-needed
+
+ -- Lance Lin <lq27267 at gmail.com>  Tue, 20 Feb 2024 19:58:06 +0700
+
 libjloda-java (2.1-2) unstable; urgency=medium
 
   * Fix watch file


=====================================
debian/clean
=====================================
@@ -1 +1,5 @@
+antbuild/class
+antbuild/doc
+antbuild/modules/
+antbuild/src/
 antbuild/jloda.jar


=====================================
debian/control
=====================================
@@ -12,10 +12,10 @@ Build-Depends: debhelper-compat (= 13),
                libopenjfx-java,
                libvectorgraphics2d-java,
                libcontrolsfx-java
-Standards-Version: 4.6.1
+Standards-Version: 4.6.2
 Vcs-Browser: https://salsa.debian.org/med-team/libjloda-java
 Vcs-Git: https://salsa.debian.org/med-team/libjloda-java.git
-Homepage: https://github.com/danielhuson/jloda
+Homepage: https://github.com/husonlab/jloda
 Rules-Requires-Root: no
 
 Package: libjloda-java


=====================================
debian/copyright
=====================================
@@ -2,8 +2,8 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: JLODA
 Upstream-Contact: Daniel Huson <daniel.huson at uni-tuebingen.de>
 Source: https://github.com/danielhuson/jloda
-Files-Excluded: */jars/batik*
-                */jars/Jama-*
+Files-Excluded: */jars/VectorGraphics2D*
+                */jars/xml-apis-ext*
                 */.DS_Store
 
 Files: *


=====================================
debian/patches/fix_build_xml.patch
=====================================
@@ -1,5 +1,6 @@
 Author: Andreas Tille <tille at debian.org>
 Last-Update: Wed, 18 Nov 2020 17:51:16 +0100
+Forwarded: not-needed
 Description: Fix classpath
  We provide the extensive list of the needed jars instead of using the joker
  character, as several installed jars in /usr/share/java may provide the same
@@ -7,7 +8,7 @@ Description: Fix classpath
 
 --- a/antbuild/build.xml
 +++ b/antbuild/build.xml
-@@ -18,20 +18,34 @@
+@@ -18,20 +18,36 @@
  -->
  
  	<project name="JLODA" default="jar" basedir=".">
@@ -31,6 +32,7 @@ Description: Fix classpath
 +			<fileset dir="/usr/share/java"  includes="javafx-media.jar"/>
 +			<fileset dir="/usr/share/java"  includes="javafx-web.jar"/>
 +			<fileset dir="/usr/share/java"  includes="VectorGraphics2D.jar"/>
++			<fileset dir="/usr/share/java"  includes="xml-apis-ext.jar"/>
  		</path>
  
  		<path id="build.modulepath">
@@ -45,6 +47,7 @@ Description: Fix classpath
 +			<fileset dir="/usr/share/java"  includes="javafx-media.jar"/>
 +			<fileset dir="/usr/share/java"  includes="javafx-web.jar"/>
 +			<fileset dir="/usr/share/java"  includes="VectorGraphics2D.jar"/>
++			<fileset dir="/usr/share/java"  includes="xml-apis-ext.jar"/>
  		</path>
  
  		<target name="init">


=====================================
debian/rules
=====================================
@@ -8,10 +8,5 @@ export CLASSPATH=/usr/share/java/batik-all.jar:/usr/share/java/controlsfx.jar:/u
 %:
 	dh $@ --with javahelper
 
-override_dh_clean:
-	dh_clean
-	rm -rf antbuild/doc
-	rm -rf antbuild/class
-
 override_dh_auto_build:
 	ant -buildfile antbuild/build.xml jar


=====================================
debian/upstream/metadata
=====================================
@@ -12,5 +12,5 @@ Reference:
   DOI: 10.1101/050559
   URL: http://biorxiv.org/content/early/2016/04/27/050559
   eprint: http://biorxiv.org/content/early/2016/04/27/050559.full.pdf
-Repository: https://github.com/danielhuson/jloda.git
+Repository: https://github.com/husonlab/jloda.git
 Repository-Browse: https://github.com/husonlab/jloda


=====================================
debian/watch
=====================================
@@ -1,4 +1,5 @@
 version=4
 
-opts="filenamemangle=s%(?:.*?)?v(\d[\d.]*)\.tar\.gz%@PACKAGE at -$1.tar.gz%" \
-  https://github.com/danielhuson/jloda/tags .*/v?@ANY_VERSION@@ARCHIVE_EXT@
+opts="dversionmangle=s/\+(debian|dfsg|ds|deb)(\.\d+)?$//,repacksuffix=+ds, \
+filenamemangle=s%(?:.*?)?v(\d[\d.]*)\.tar\.gz%@PACKAGE at -$1.tar.gz%" \
+  https://github.com/husonlab/jloda/tags .*/v?@ANY_VERSION@@ARCHIVE_EXT@


=====================================
jars/VectorGraphics2D-0.13.jar deleted
=====================================
Binary files a/jars/VectorGraphics2D-0.13.jar and /dev/null differ


=====================================
jars/VectorGraphics2D-License.txt deleted
=====================================
@@ -1,133 +0,0 @@
-GNU LESSER GENERAL PUBLIC LICENSE
-
-Version 3, 29 June 2007
-
-Copyright © 2007 Free Software Foundation, Inc. <http://fsf.org/>
-
-Everyone is permitted to copy and distribute verbatim copies of this license 
-document, but changing it is not allowed.
-
-This version of the GNU Lesser General Public License incorporates the terms 
-and conditions of version 3 of the GNU General Public License, supplemented by 
-the additional permissions listed below.
-
-0. Additional Definitions.
-As used herein, “this License” refers to version 3 of the GNU Lesser General 
-Public License, and the “GNU GPL” refers to version 3 of the GNU General Public 
-License.
-
-“The Library” refers to a covered work governed by this License, other than an 
-Application or a Combined Work as defined below.
-
-An “Application” is any work that makes use of an interface provided by the 
-Library, but which is not otherwise based on the Library. Defining a subclass 
-of a class defined by the Library is deemed a mode of using an interface 
-provided by the Library.
-
-A “Combined Work” is a work produced by combining or linking an Application 
-with the Library. The particular version of the Library with which the Combined 
-Work was made is also called the “Linked Version”.
-
-The “Minimal Corresponding Source” for a Combined Work means the Corresponding 
-Source for the Combined Work, excluding any source code for portions of the 
-Combined Work that, considered in isolation, are based on the Application, and 
-not on the Linked Version.
-
-The “Corresponding Application Code” for a Combined Work means the object code 
-and/or source code for the Application, including any data and utility programs 
-needed for reproducing the Combined Work from the Application, but excluding 
-the System Libraries of the Combined Work.
-
-1. Exception to Section 3 of the GNU GPL.
-You may convey a covered work under sections 3 and 4 of this License without 
-being bound by section 3 of the GNU GPL.
-
-2. Conveying Modified Versions.
-If you modify a copy of the Library, and, in your modifications, a facility 
-refers to a function or data to be supplied by an Application that uses the 
-facility (other than as an argument passed when the facility is invoked), then 
-you may convey a copy of the modified version:
-
-a) under this License, provided that you make a good faith effort to ensure 
-that, in the event an Application does not supply the function or data, the 
-facility still operates, and performs whatever part of its purpose remains 
-meaningful, or
-b) under the GNU GPL, with none of the additional permissions of this License 
-applicable to that copy.
-3. Object Code Incorporating Material from Library Header Files.
-The object code form of an Application may incorporate material from a header 
-file that is part of the Library. You may convey such object code under terms 
-of your choice, provided that, if the incorporated material is not limited to 
-numerical parameters, data structure layouts and accessors, or small macros, 
-inline functions and templates (ten or fewer lines in length), you do both of 
-the following:
-
-a) Give prominent notice with each copy of the object code that the Library is 
-used in it and that the Library and its use are covered by this License.
-b) Accompany the object code with a copy of the GNU GPL and this license 
-document.
-4. Combined Works.
-You may convey a Combined Work under terms of your choice that, taken together, 
-effectively do not restrict modification of the portions of the Library 
-contained in the Combined Work and reverse engineering for debugging such 
-modifications, if you also do each of the following:
-
-a) Give prominent notice with each copy of the Combined Work that the Library 
-is used in it and that the Library and its use are covered by this License.
-b) Accompany the Combined Work with a copy of the GNU GPL and this license 
-document.
-c) For a Combined Work that displays copyright notices during execution, 
-include the copyright notice for the Library among these notices, as well as a 
-reference directing the user to the copies of the GNU GPL and this license 
-document.
-d) Do one of the following:
-0) Convey the Minimal Corresponding Source under the terms of this License, and 
-the Corresponding Application Code in a form suitable for, and under terms that 
-permit, the user to recombine or relink the Application with a modified version 
-of the Linked Version to produce a modified Combined Work, in the manner 
-specified by section 6 of the GNU GPL for conveying Corresponding Source.
-1) Use a suitable shared library mechanism for linking with the Library. A 
-suitable mechanism is one that (a) uses at run time a copy of the Library 
-already present on the user's computer system, and (b) will operate properly 
-with a modified version of the Library that is interface-compatible with the 
-Linked Version.
-e) Provide Installation Information, but only if you would otherwise be 
-required to provide such information under section 6 of the GNU GPL, and only 
-to the extent that such information is necessary to install and execute a 
-modified version of the Combined Work produced by recombining or relinking the 
-Application with a modified version of the Linked Version. (If you use option 
-4d0, the Installation Information must accompany the Minimal Corresponding 
-Source and Corresponding Application Code. If you use option 4d1, you must 
-provide the Installation Information in the manner specified by section 6 of 
-the GNU GPL for conveying Corresponding Source.)
-5. Combined Libraries.
-You may place library facilities that are a work based on the Library side by 
-side in a single library together with other library facilities that are not 
-Applications and are not covered by this License, and convey such a combined 
-library under terms of your choice, if you do both of the following:
-
-a) Accompany the combined library with a copy of the same work based on the 
-Library, uncombined with any other library facilities, conveyed under the terms 
-of this License.
-b) Give prominent notice with the combined library that part of it is a work 
-based on the Library, and explaining where to find the accompanying uncombined 
-form of the same work.
-6. Revised Versions of the GNU Lesser General Public License.
-The Free Software Foundation may publish revised and/or new versions of the GNU 
-Lesser General Public License from time to time. Such new versions will be 
-similar in spirit to the present version, but may differ in detail to address 
-new problems or concerns.
-
-Each version is given a distinguishing version number. If the Library as you 
-received it specifies that a certain numbered version of the GNU Lesser General 
-Public License “or any later version” applies to it, you have the option of 
-following the terms and conditions either of that published version or of any 
-later version published by the Free Software Foundation. If the Library as you 
-received it does not specify a version number of the GNU Lesser General Public 
-License, you may choose any version of the GNU Lesser General Public License 
-ever published by the Free Software Foundation.
-
-If the Library as you received it specifies that a proxy can decide whether 
-future versions of the GNU Lesser General Public License shall apply, that 
-proxy's public statement of acceptance of any version is permanent 
-authorization for you to choose that version for the Library.


=====================================
jars/xml-apis-ext-1.3.04.jar deleted
=====================================
Binary files a/jars/xml-apis-ext-1.3.04.jar and /dev/null differ



View it on GitLab: https://salsa.debian.org/med-team/libjloda-java/-/compare/591606e56f11c3cfd2fa2591e7ddbb88dfa7b432...f9b95bc122431f4ade15fac084a4f4c3613f383a

-- 
View it on GitLab: https://salsa.debian.org/med-team/libjloda-java/-/compare/591606e56f11c3cfd2fa2591e7ddbb88dfa7b432...f9b95bc122431f4ade15fac084a4f4c3613f383a
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/20240221/5cc27395/attachment-0001.htm>


More information about the debian-med-commit mailing list