[med-svn] [Git][java-team/libpdfbox-graphics2d-java][master] 7 commits: Refreshing d/copyright

Pierre Gruet (@pgt) gitlab at salsa.debian.org
Sat Jan 29 22:48:03 GMT 2022



Pierre Gruet pushed to branch master at Debian Java Maintainers / libpdfbox-graphics2d-java


Commits:
f53ce647 by Pierre Gruet at 2022-01-29T14:41:04+01:00
Refreshing d/copyright

- - - - -
3518565f by Pierre Gruet at 2022-01-29T23:02:29+01:00
Correcting a path in d/copyright

- - - - -
09c57642 by Pierre Gruet at 2022-01-29T23:03:02+01:00
Listing POMs

- - - - -
26275659 by Pierre Gruet at 2022-01-29T23:03:44+01:00
Listing dependencies, defining Maven rules and ignoreRules accordingly

- - - - -
335c74a1 by Pierre Gruet at 2022-01-29T23:04:29+01:00
Writing patches to run the tests and setting the scope of the test dependencies

- - - - -
defb4f59 by Pierre Gruet at 2022-01-29T23:05:06+01:00
Omitting the installation of the jar and artifacts linked to extended-tests, which is for testing purposes only

- - - - -
432cf403 by Pierre Gruet at 2022-01-29T23:44:50+01:00
Installing the jar with a name consistent with the package name

- - - - -


9 changed files:

- debian/control
- debian/copyright
- + debian/libpdfbox-graphics2d-java.poms
- + debian/maven.ignoreRules
- + debian/maven.rules
- + debian/patches/jaxb_in_test.patch
- + debian/patches/missing_test_scope.patch
- + debian/patches/series
- debian/rules


Changes:

=====================================
debian/control
=====================================
@@ -4,7 +4,18 @@ Uploaders: Andreas Tille <tille at debian.org>,
             Pierre Gruet <pgt at debian.org>
 Section: java
 Priority: optional
-Build-Depends: debhelper-compat (= 13)
+Build-Depends: debhelper-compat (= 13),
+               default-jdk,
+               junit4 <!nocheck>,
+               libapache-poi-java <!nocheck>,
+               libbatik-java <!nocheck>,
+               libjaxb-java <!nocheck>,
+               libjaxb-api-java <!nocheck>,
+               libjfreechart-java <!nocheck>,
+               libpdfbox2-java,
+               libtwelvemonkeys-java <!nocheck>,
+               libxmlgraphics-commons-java <!nocheck>,
+               maven-debian-helper
 Standards-Version: 4.6.0
 Vcs-Browser: https://salsa.debian.org/java-team/libpdfbox-graphics2d-java
 Vcs-Git: https://salsa.debian.org/java-team/libpdfbox-graphics2d-java.git
@@ -13,7 +24,7 @@ Rules-Requires-Root: no
 
 Package: libpdfbox-graphics2d-java
 Architecture: all
-Depends: ${java:Depends},
+Depends: ${maven:Depends},
          ${misc:Depends}
 Description: embed those graphics as vector drawing in a PDF
  Using this library you can use any Graphics2D API based SVG / graph /


=====================================
debian/copyright
=====================================
@@ -6,10 +6,110 @@ Files: *
 Copyright: 2017 Emmeran Seehuber
 License: Apache-2.0
 
+Files: graphics2d/src/test/resources/de/rototor/pdfbox/graphics2d/antonio/*
+Copyright: 2011-2012 vernon adams <vern at newtypography.co.uk>
+License: OFL-1.1
+
 Files: debian/*
 Copyright: 2022 Andreas Tille <tille at debian.org>
+           2022 Pierre Gruet <pgt at debian.org>
 License: Apache-2.0
 
 License: Apache-2.0
  On Debian systems you can find the full text of the Apache License
  Version 2.0 at /usr/share/common-licenses/Apache-2.0.
+
+License: OFL-1.1
+ This Font Software is licensed under the SIL Open Font License, Version 1.1.
+ This license is copied below, and is also available with a FAQ at:
+ http://scripts.sil.org/OFL
+ .
+ -----------------------------------------------------------
+ SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+ -----------------------------------------------------------
+ PREAMBLE
+ .
+ The goals of the Open Font License (OFL) are to stimulate worldwide
+ development of collaborative font projects, to support the font
+ creation efforts of academic and linguistic communities, and to provide
+ a free and open framework in which fonts may be shared and improved in
+ partnership with others.
+ .
+ The OFL allows the licensed fonts to be used, studied, modified and
+ redistributed freely as long as they are not sold by themselves. The
+ fonts, including any derivative works, can be bundled, embedded,
+ redistributed and/or sold with any software provided that any reserved
+ names are not used by derivative works. The fonts and derivatives,
+ however, cannot be released under any other type of license. The
+ requirement for fonts to remain under this license does not apply to
+ any document created using the fonts or their derivatives.
+ .
+ DEFINITIONS
+ .
+ "Font Software" refers to the set of files released by the Copyright
+ Holder(s) under this license and clearly marked as such. This may
+ include source files, build scripts and documentation.
+ .
+ "Reserved Font Name" refers to any names specified as such after the
+ copyright statement(s).
+ .
+ "Original Version" refers to the collection of Font Software components
+ as distributed by the Copyright Holder(s).
+ .
+ "Modified Version" refers to any derivative made by adding to,deleting,
+ or substituting -- in part or in whole -- any of the components of the
+ Original Version, by changing formats or by porting the Font Software
+ to a new environment.
+ .
+ "Author" refers to any designer, engineer, programmer, technical writer
+ or other person who contributed to the Font Software.
+ .
+ PERMISSION & CONDITIONS
+ .
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of the Font Software, to use, study, copy, merge, embed, modify,
+ redistribute, and sell modified and unmodified copies of the Font
+ Software, subject to the following conditions:
+ .
+ 1) Neither the Font Software nor any of its individual components, in
+ Original or Modified Versions, may be sold by itself.
+ .
+ 2) Original or Modified Versions of the Font Software may be bundled,
+ redistributed and/or sold with any software, provided that each copy
+ contains the above copyright notice and this license. These can be
+ included either as stand-alone text files, human-readable headers or in
+ the appropriate machine-readable metadata fields within text or binary
+ files as long as those fields can be easily viewed by the user.
+ .
+ 3) No Modified Version of the Font Software may use the Reserved Font
+ Name(s) unless explicit written permission is granted by the
+ corresponding Copyright Holder. This restriction only applies to the
+ primary font name as presented to the users.
+ .
+ 4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+ Software shall not be used to promote, endorse or advertise any
+ Modified Version, except to acknowledge the contribution(s) of the
+ Copyright Holder(s) and the Author(s) or with their explicit written
+ permission.
+ .
+ 5) The Font Software, modified or unmodified, in part or in whole, must
+ be distributed entirely under this license, and must not be distributed
+ under any other license. The requirement for fonts to remain under this
+ license does not apply to any document created using the Font Software.
+ .
+ TERMINATION
+ .
+ This license becomes null and void if any of the above conditions are
+ not met.
+ .
+ DISCLAIMER
+ .
+ THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+ OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+ COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+ DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+ OTHER DEALINGS IN THE FONT SOFTWARE.


=====================================
debian/libpdfbox-graphics2d-java.poms
=====================================
@@ -0,0 +1,30 @@
+# List of POM files for the package
+# Format of this file is:
+# <path to pom file> [option]*
+# where option can be:
+#   --ignore: ignore this POM and its artifact if any
+#   --ignore-pom: don't install the POM. To use on POM files that are created
+#     temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
+#   --no-parent: remove the <parent> tag from the POM
+#   --package=<package>: an alternative package to use when installing this POM
+#      and its artifact
+#   --has-package-version: to indicate that the original version of the POM is the same as the upstream part
+#      of the version for the package.
+#   --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
+#      during a clean operation with mh_cleanpom or mh_installpom
+#   --artifact=<path>: path to the build artifact associated with this POM,
+#      it will be installed when using the command mh_install. [mh_install]
+#   --java-lib: install the jar into /usr/share/java to comply with Debian
+#      packaging guidelines
+#   --usj-name=<name>: name to use when installing the library in /usr/share/java
+#   --usj-version=<version>: version to use when installing the library in /usr/share/java
+#   --no-usj-versionless: don't install the versionless link in /usr/share/java
+#   --dest-jar=<path>: the destination for the real jar.
+#     It will be installed with mh_install. [mh_install]
+#   --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
+#   --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
+#     Empty by default. [mh_install]
+#
+pom.xml
+graphics2d/pom.xml --usj-name=pdfbox-graphics2d
+extended-tests/pom.xml


=====================================
debian/maven.ignoreRules
=====================================
@@ -0,0 +1,7 @@
+
+jakarta.xml.bind jakarta.xml.bind-api * * * *
+org.apache.maven.plugins maven-gpg-plugin * * * *
+org.apache.maven.plugins maven-javadoc-plugin * * * *
+org.apache.maven.plugins maven-release-plugin * * * *
+org.apache.maven.plugins maven-source-plugin * * * *
+org.sonatype.plugins nexus-staging-maven-plugin * * * *


=====================================
debian/maven.rules
=====================================
@@ -0,0 +1,9 @@
+
+com.twelvemonkeys.imageio imageio-jpeg * s/.*/debian/ * *
+junit junit * s/4.*/4.x/ * *
+org.apache.pdfbox pdfbox * s/2.*/2.x/ * *
+org.apache.poi poi * s/.*/debian/ * *
+org.apache.poi poi-ooxml * s/.*/debian/ * *
+org.apache.xmlgraphics batik-swing * s/.*/debian/ * *
+org.apache.xmlgraphics xmlgraphics-commons * s/.*/debian/ * *
+org.jfree jfreechart * s/.*/debian/ * *


=====================================
debian/patches/jaxb_in_test.patch
=====================================
@@ -0,0 +1,21 @@
+Description: adding jaxb-api as a dependency in extended-tests
+ jaxb-api is not part of openjdk, starting from openjdk-11.
+Author: Pierre Gruet <pgt at debian.org>
+Forwarded: no
+Last-Update: 2022-01-29
+
+--- a/extended-tests/pom.xml
++++ b/extended-tests/pom.xml
+@@ -40,6 +40,12 @@
+ 			<artifactId>jaxb-runtime</artifactId>
+ 			<version>2.3.2</version>
+ 		</dependency>
++		<dependency>
++			<groupId>javax.xml.bind</groupId>
++			<artifactId>jaxb-api</artifactId>
++			<version>debian</version>
++                        <scope>test</scope>
++		</dependency>
+ 	</dependencies>
+ 
+ 	<properties>


=====================================
debian/patches/missing_test_scope.patch
=====================================
@@ -0,0 +1,33 @@
+Description: adding test scope where it is missing
+Author: Pierre Gruet <pgt at debian.org>
+Forwarded: no
+Last-Update: 2022-01-29
+
+--- a/extended-tests/pom.xml
++++ b/extended-tests/pom.xml
+@@ -24,21 +24,25 @@
+ 			<groupId>org.apache.poi</groupId>
+ 			<artifactId>poi</artifactId>
+ 			<version>${poi.version}</version>
++                        <scope>test</scope>
+ 		</dependency>
+ 		<dependency>
+ 			<groupId>org.apache.poi</groupId>
+ 			<artifactId>poi-ooxml</artifactId>
+ 			<version>${poi.version}</version>
++                        <scope>test</scope>
+ 		</dependency>
+ 		<dependency>
+ 			<groupId>jakarta.xml.bind</groupId>
+ 			<artifactId>jakarta.xml.bind-api</artifactId>
+ 			<version>2.3.2</version>
++                        <scope>test</scope>
+ 		</dependency>
+ 		<dependency>
+ 			<groupId>org.glassfish.jaxb</groupId>
+ 			<artifactId>jaxb-runtime</artifactId>
+ 			<version>2.3.2</version>
++                        <scope>test</scope>
+ 		</dependency>
+ 		<dependency>
+ 			<groupId>javax.xml.bind</groupId>


=====================================
debian/patches/series
=====================================
@@ -0,0 +1,2 @@
+jaxb_in_test.patch
+missing_test_scope.patch


=====================================
debian/rules
=====================================
@@ -5,3 +5,10 @@ export LC_ALL=C.UTF-8
 
 %:
 	dh $@
+
+override_dh_auto_install:
+	dh_auto_install
+	# Removing the jar and Maven artifacts linked to extended-tests, which is just
+	# for testing purposes
+	rm debian/libpdfbox-graphics2d-java/usr/share/java/extended-tests* 
+	rm -rf debian/libpdfbox-graphics2d-java/usr/share/maven-repo/de/rototor/pdfbox/extended-tests/



View it on GitLab: https://salsa.debian.org/java-team/libpdfbox-graphics2d-java/-/compare/b1fa6b90b17267c9016c5bc38c4048cb8fa67cb3...432cf40316c4ac4c4e5c8e016e1f53322692e1dd

-- 
View it on GitLab: https://salsa.debian.org/java-team/libpdfbox-graphics2d-java/-/compare/b1fa6b90b17267c9016c5bc38c4048cb8fa67cb3...432cf40316c4ac4c4e5c8e016e1f53322692e1dd
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/20220129/da74e7d1/attachment-0001.htm>


More information about the debian-med-commit mailing list