[Git][java-team/batik][master] 10 commits: Raising d/watch version to 4

Pierre Gruet (@pgt) gitlab at salsa.debian.org
Mon Jul 18 23:21:16 BST 2022 


Pierre Gruet pushed to branch master at Debian Java Maintainers / batik


Commits:
9cd96e7b by Pierre Gruet at 2022-07-18T22:28:40+02:00
Raising d/watch version to 4

- - - - -
b40cc497 by Pierre Gruet at 2022-07-18T22:29:17+02:00
Raising Standards version to 4.6.1 (no change)

- - - - -
f022fe50 by Pierre Gruet at 2022-07-18T23:18:56+02:00
Refreshing d/copyright

- - - - -
bf9c0537 by Pierre Gruet at 2022-07-18T23:20:04+02:00
Getting rid of unndeeded versioned dependencies in d/control

- - - - -
fb3d15fa by Pierre Gruet at 2022-07-18T23:20:36+02:00
Using secure URI in d/watch

- - - - -
cd8788e6 by Pierre Gruet at 2022-07-18T23:26:04+02:00
Adding classpaths and main classes in the manifests of the built jars

- - - - -
b601cc1a by Pierre Gruet at 2022-07-18T23:29:06+02:00
Reordering jars in d/manifest

- - - - -
b746fbce by Pierre Gruet at 2022-07-18T23:31:23+02:00
Updating changelog

- - - - -
9a9f4bf6 by Pierre Gruet at 2022-07-18T23:48:42+02:00
Restoring versioned breaks in d/control

- - - - -
8954cf79 by Pierre Gruet at 2022-07-18T23:49:04+02:00
Upload to unstable

- - - - -


5 changed files:

- debian/changelog
- debian/control
- debian/copyright
- debian/manifest
- debian/watch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,9 +1,20 @@
-batik (1.14-2) UNRELEASED; urgency=medium
-
+batik (1.14-2) unstable; urgency=medium
+
+  * Team upload
+  * Adding classpaths and main classes in the manifests of the built jars
+    (Closes: #1013281)
+  * Reworking debian/watch:
+    - Raising its version to 4
+    - Using secure URI
+  * Raising Standards version to 4.6.1 (no change)
+  * Refreshing d/copyright
+  * Getting rid of unneeded versioned dependencies in d/control
+
+  [ Andrius Merkys ]
   * Remove Onkar Shinde from the uploaders list per request.
     Thanks for your contributions.
 
- -- Andrius Merkys <merkys at debian.org>  Mon, 30 May 2022 08:48:13 -0400
+ -- Pierre Gruet <pgt at debian.org>  Mon, 18 Jul 2022 23:48:46 +0200
 
 batik (1.14-1) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -14,10 +14,10 @@ Build-Depends:
  libmaven-dependency-plugin-java,
  libxalan2-java,
  libxml-commons-external-java,
- libxmlgraphics-commons-java (>= 2.0.1),
- maven-debian-helper (>= 2.2.3),
+ libxmlgraphics-commons-java,
+ maven-debian-helper,
  rhino
-Standards-Version: 4.5.0
+Standards-Version: 4.6.1
 Vcs-Git: https://salsa.debian.org/java-team/batik.git
 Vcs-Browser: https://salsa.debian.org/java-team/batik
 Homepage: https://xmlgraphics.apache.org/batik/


=====================================
debian/copyright
=====================================
@@ -12,17 +12,17 @@ Comment:
  Tue, 11 Jun 2002 10:52:34 -0400.
 
 Files: *
-Copyright: Apache Foundation
+Copyright: 1999-2020 Apache Foundation
 License: Apache-2.0
 
 Files: debian/*
-Copyright: 2002-2021 Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Copyright: 2002-2022 Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 License: Apache-2.0
 
-Files: ./debian/manpages/rasterizer.1
- ./debian/manpages/squiggle.1
- ./debian/manpages/svgpp.1
- ./debian/manpages/ttf2svg.1
+Files: debian/manpages/rasterizer.1
+       debian/manpages/squiggle.1
+       debian/manpages/svgpp.1
+       debian/manpages/ttf2svg.1
 Copyright: 2007 Vincent Fourmond  <fourmond at debian.org>
 License: Apache-2.0
 
@@ -30,15 +30,25 @@ Files: batik-svg-dom/src/main/resources/org/apache/batik/dom/svg/resources/*
 Copyright: 2000-2001 World Wide Web Consortium (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, Keio University)
 License: W3C-Documentation
 
-Files: ./batik-dom/src/main/java/org/apache/batik/dom/xbl/NodeXBL.java
- ./batik-dom/src/main/java/org/apache/batik/dom/xbl/OriginalEvent.java
- ./batik-dom/src/main/java/org/apache/batik/dom/xbl/ShadowTreeEvent.java
- ./batik-dom/src/main/java/org/apache/batik/dom/xbl/XBLShadowTreeElement.java
- batik-ext/src/main/java/org/w3c/dom/events/*
-  ./batik-svg-dom/src/main/java/org/apache/batik/dom/svg12/Global.java
- ./batik-svg-dom/src/main/java/org/apache/batik/dom/svg12/SVGGlobal.java
-License: W3C-Software
+Files: batik-dom/src/main/java/org/apache/batik/dom/xbl/NodeXBL.java
+       batik-dom/src/main/java/org/apache/batik/dom/xbl/OriginalEvent.java
+       batik-dom/src/main/java/org/apache/batik/dom/xbl/ShadowTreeEvent.java
+       batik-dom/src/main/java/org/apache/batik/dom/xbl/XBLShadowTreeElement.java
+       batik-ext/src/main/java/org/apache/batik/w3c/dom/events/*
+       batik-svg-dom/src/main/java/org/apache/batik/dom/svg12/Global.java
+       batik-svg-dom/src/main/java/org/apache/batik/dom/svg12/SVGGlobal.java
 Copyright: 2005-2006 World Wide Web Consortium (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, Keio University)
+License: W3C-Software
+
+Files: batik-svg-dom/src/main/resources/org/apache/batik/dom/svg/resources/svg11-basic-flat.dtd
+ batik-svg-dom/src/main/resources/org/apache/batik/dom/svg/resources/svg11-basic.dtd
+ batik-svg-dom/src/main/resources/org/apache/batik/dom/svg/resources/svg11-flat.dtd
+ batik-svg-dom/src/main/resources/org/apache/batik/dom/svg/resources/svg11-tiny-flat.dtd
+ batik-svg-dom/src/main/resources/org/apache/batik/dom/svg/resources/svg11-tiny.dtd
+ batik-svg-dom/src/main/resources/org/apache/batik/dom/svg/resources/svg11.dtd
+ batik-svg-dom/src/main/resources/org/apache/batik/dom/svg/resources/svg12-flat.dtd
+Copyright: 2001-2002 World Wide Web Consortium
+License: otherDTD
 
 Files: batik-svgbrowser/src/main/resources/org/apache/batik/apps/svgbrowser/resources/document-open.png
  batik-svgbrowser/src/main/resources/org/apache/batik/apps/svgbrowser/resources/document-print.png
@@ -68,8 +78,8 @@ Files: batik-svgbrowser/src/main/resources/org/apache/batik/apps/svgbrowser/reso
 Copyright: Pasodoble Icon Theme
 License: CC-BY-SA-2.5
 
-Files: ./samples/tests/resources/icc/changeColor.icm
-Copyright: Eastman Kodak Company, 1999
+Files: samples/tests/resources/icc/changeColor.icm
+Copyright: 1999 Eastman Kodak Company
 License: Apache-2.0
 Comment: License inferred from inclusion in project
 
@@ -425,3 +435,12 @@ License: CC-BY-SA-2.5
       here. Licensor shall not be bound by any additional provisions that may
       appear in any communication from You. This License may not be modified
       without the mutual written agreement of the Licensor and You.
+
+License: otherDTD
+ Permission to use, copy, modify and distribute the SVG DTD and its
+ accompanying documentation for any purpose and without fee is hereby
+ granted in perpetuity, provided that the above copyright notice and
+ this paragraph appear in all copies.  The copyright holders make no
+ representation about the suitability of the DTD for any purpose.
+ .
+ It is provided "as is" without expressed or implied warranty.


=====================================
debian/manifest
=====================================
@@ -1,43 +1,74 @@
+usr/share/java/batik-all.jar:
+ Class-Path: /usr/share/java/jaxp-1.4.jar /usr/share/java/rhino.jar /usr/share/java/xalan2.jar /usr/share/java/xmlgraphics-commons.jar
+
+usr/share/java/batik-anim.jar:
+ Class-Path: /usr/share/java/batik-css.jar /usr/share/java/batik-dom.jar /usr/share/java/batik-ext.jar /usr/share/java/batik-i18n.jar /usr/share/java/batik-parser.jar /usr/share/java/batik-util.jar /usr/share/java/jaxp-1.4.jar
+
+usr/share/java/batik-awt-util.jar:
+ Bundle-ManifestVersion: 2
+ Bundle-Name: Batik AWT Util
+ Bundle-Vendor: Debian.org
+ Bundle-SymbolicName: org.apache.batik.ext.awt
+ Bundle-Version: 1.12.0
+ Class-Path: /usr/share/java/batik-ext.jar /usr/share/java/batik-i18n.jar /usr/share/java/batik-util.jar /usr/share/java/xmlgraphics-commons.jar
+ Export-Package: org.apache.batik.ext.awt,org.apache.batik.ext.awt.color,org.apache.batik.ext.awt.font,org.apache.batik.ext.awt.g2d,org.apache.batik.ext.awt.geom,org.apache.batik.ext.awt.image,org.apache.batik.ext.awt.image.renderable,org.apache.batik.ext.awt.image.rendered,org.apache.batik.ext.awt.image.spi,org.apache.batik.ext.swing
+
 usr/share/java/batik-bridge.jar:
  Bundle-ManifestVersion: 2
  Bundle-Name: Batik Bridge
  Bundle-Vendor: Debian.org
  Bundle-SymbolicName: org.apache.batik.bridge
  Bundle-Version: 1.12.0
+ Class-Path: /usr/share/java/batik-anim.jar /usr/share/java/batik-awt-util.jar /usr/share/java/batik-constants.jar /usr/share/java/batik-css.jar /usr/share/java/batik-dom.jar /usr/share/java/batik-ext.jar /usr/share/java/batik-gvt.jar /usr/share/java/batik-i18n.jar /usr/share/java/batik-parser.jar /usr/share/java/batik-script.jar /usr/share/java/batik-util.jar /usr/share/java/batik-xml.jar /usr/share/java/jaxp-1.4.jar /usr/share/java/rhino.jar /usr/share/java/xalan2.jar /usr/share/java/xmlgraphics-commons.jar
  Export-Package: org.apache.batik.bridge,org.apache.batik.bridge.svg12
 
+usr/share/java/batik-codec.jar:
+ Class-Path: /usr/share/java/batik-ext.jar /usr/share/java/batik-i18n.jar /usr/share/java/batik-transcoder.jar /usr/share/java/batik-util.jar /usr/share/java/jaxp-1.4.jar
+
 usr/share/java/batik-css.jar:
  Bundle-ManifestVersion: 2
  Bundle-Name: Batik CSS
  Bundle-Vendor: Debian.org
  Bundle-SymbolicName: org.apache.batik.css
  Bundle-Version: 1.12.0
+ Class-Path: /usr/share/java/batik-constants.jar /usr/share/java/batik-i18n.jar /usr/share/java/batik-util.jar /usr/share/java/jaxp-1.4.jar /usr/share/java/xmlgraphics-commons.jar
  Require-Bundle: org.apache.batik.util;bundle-version="[1.7.0,1.12.1)",org.w3c.css.sac,org.apache.batik.i18n
  Export-Package: org.apache.batik.css.dom,org.apache.batik.css.engine,org.apache.batik.css.engine.sac,org.apache.batik.css.engine.value,org.apache.batik.css.engine.value.css2,org.apache.batik.css.engine.value.svg,org.apache.batik.css.engine.value.svg12,org.apache.batik.css.parser
 
-usr/share/java/batik-svg-dom.jar:
- Bundle-ManifestVersion: 2
- Bundle-Name: Batik SVG DOM
- Bundle-Vendor: Debian.org
- Bundle-SymbolicName: org.apache.batik.dom.svg
- Bundle-Version: 1.12.0
- Export-Package: org.apache.batik.dom.anim,org.apache.batik.dom.svg,org.apache.batik.dom.svg12
-
 usr/share/java/batik-dom.jar:
  Bundle-ManifestVersion: 2
  Bundle-Name: Batik DOM
  Bundle-Vendor: Debian.org
  Bundle-SymbolicName: org.apache.batik.dom
  Bundle-Version: 1.12.0
+ Class-Path: /usr/share/java/batik-constants.jar /usr/share/java/batik-css.jar /usr/share/java/batik-ext.jar /usr/share/java/batik-i18n.jar /usr/share/java/batik-util.jar /usr/share/java/jaxp-1.4.jar /usr/share/java/xalan2.jar
  Export-Package: org.apache.batik.dom,org.apache.batik.dom.events,org.apache.batik.dom.traversal,org.apache.batik.dom.util,org.apache.batik.dom.xbl
 
-usr/share/java/batik-awt-util.jar:
+usr/share/java/batik-ext.jar:
+ Class-Path: /usr/share/java/jaxp-1.4.jar
+
+usr/share/java/batik-extension.jar:
+ Class-Path: /usr/share/java/batik-anim.jar /usr/share/java/batik-bridge.jar /usr/share/java/batik-constants.jar /usr/share/java/batik-css.jar /usr/share/java/batik-dom.jar /usr/share/java/batik-ext.jar /usr/share/java/batik-gvt.jar /usr/share/java/batik-util.jar /usr/share/java/jaxp-1.4.jar
+
+usr/share/java/batik-gui-util.jar:
  Bundle-ManifestVersion: 2
- Bundle-Name: Batik AWT Util
+ Bundle-Name: Batik GUI Util
  Bundle-Vendor: Debian.org
- Bundle-SymbolicName: org.apache.batik.ext.awt
+ Bundle-SymbolicName: org.apache.batik.util.gui
  Bundle-Version: 1.12.0
- Export-Package: org.apache.batik.ext.awt,org.apache.batik.ext.awt.color,org.apache.batik.ext.awt.font,org.apache.batik.ext.awt.g2d,org.apache.batik.ext.awt.geom,org.apache.batik.ext.awt.image,org.apache.batik.ext.awt.image.renderable,org.apache.batik.ext.awt.image.rendered,org.apache.batik.ext.awt.image.spi,org.apache.batik.ext.swing
+ Class-Path: /usr/share/java/batik-util.jar /usr/share/java/batik-xml.jar
+ Export-Package: org.apache.batik.util.gui,org.apache.batik.util.gui.resource,org.apache.batik.util.gui.xmleditor
+
+usr/share/java/batik-gvt.jar:
+ Class-Path: /usr/share/java/batik-ext.jar /usr/share/java/batik-util.jar
+
+usr/share/java/batik-i18n.jar:
+ Bundle-ManifestVersion: 2
+ Bundle-Name: Batik i18n
+ Bundle-Vendor: Debian.org
+ Bundle-SymbolicName: org.apache.batik.i18n
+ Bundle-Version: 1.12.0
+ Export-Package: org.apache.batik.i18n
 
 usr/share/java/batik-parser.jar:
  Bundle-ManifestVersion: 2
@@ -45,31 +76,61 @@ usr/share/java/batik-parser.jar:
  Bundle-Vendor: Debian.org
  Bundle-SymbolicName: org.apache.batik.parser
  Bundle-Version: 1.12.0
+ Class-Path: /usr/share/java/batik-ext.jar /usr/share/java/batik-i18n.jar /usr/share/java/batik-util.jar /usr/share/java/batik-xml.jar /usr/share/java/jaxp-1.4.jar
  Export-Package: org.apache.batik.parser
 
+usr/share/java/batik-script.jar:
+ Class-Path: /usr/share/java/batik-anim.jar /usr/share/java/batik-i18n.jar /usr/share/java/batik-util.jar /usr/share/java/jaxp-1.4.jar /usr/share/java/rhino.jar
+
+usr/share/java/batik-slideshow.jar:
+ Class-Path: /usr/share/java/batik-bridge.jar /usr/share/java/batik-gvt.jar /usr/share/java/jaxp-1.4.jar
+ Main-Class: org.apache.batik.apps.slideshow.Main
+
+usr/share/java/batik-svg-dom.jar:
+ Bundle-ManifestVersion: 2
+ Bundle-Name: Batik SVG DOM
+ Bundle-Vendor: Debian.org
+ Bundle-SymbolicName: org.apache.batik.dom.svg
+ Bundle-Version: 1.12.0
+ Class-Path: /usr/share/java/batik-css.jar /usr/share/java/batik-dom.jar /usr/share/java/batik-ext.jar /usr/share/java/batik-parser.jar /usr/share/java/batik-util.jar /usr/share/java/jaxp-1.4.jar
+ Export-Package: org.apache.batik.dom.anim,org.apache.batik.dom.svg,org.apache.batik.dom.svg12
+
+usr/share/java/batik-svgbrowser.jar:
+ Class-Path: /usr/share/java/batik-anim.jar /usr/share/java/batik-bridge.jar /usr/share/java/batik-constants.jar /usr/share/java/batik-dom.jar /usr/share/java/batik-ext.jar /usr/share/java/batik-gvt.jar /usr/share/java/batik-i18n.jar /usr/share/java/batik-swing.jar /usr/share/java/batik-transcoder.jar /usr/share/java/batik-util.jar /usr/share/java/jaxp-1.4.jar
+ Main-Class: org.apache.batik.apps.svgbrowser.Main
+
 usr/share/java/batik-svggen.jar:
  Bundle-ManifestVersion: 2
  Bundle-Name: Batik SVG Gen
  Bundle-Vendor: Debian.org
  Bundle-SymbolicName: org.apache.batik.svggen
  Bundle-Version: 1.12.0
+ Class-Path: /usr/share/java/batik-constants.jar /usr/share/java/batik-ext.jar /usr/share/java/batik-i18n.jar /usr/share/java/batik-util.jar /usr/share/java/jaxp-1.4.jar
  Export-Package: org.apache.batik.svggen,org.apache.batik.svggen.font,org.apache.batik.svggen.font.table
 
+usr/share/java/batik-svgpp.jar:
+ Class-Path: /usr/share/java/batik-i18n.jar /usr/share/java/batik-transcoder.jar
+ Main-Class: org.apache.batik.apps.svgpp.Main
+
+usr/share/java/batik-svgrasterizer.jar:
+ Class-Path: /usr/share/java/batik-i18n.jar /usr/share/java/batik-parser.jar /usr/share/java/batik-transcoder.jar /usr/share/java/batik-util.jar
+ Main-Class: org.apache.batik.apps.rasterizer.Main
+
+usr/share/java/batik-swing.jar:
+ Class-Path: /usr/share/java/batik-anim.jar /usr/share/java/batik-bridge.jar /usr/share/java/batik-constants.jar /usr/share/java/batik-css.jar /usr/share/java/batik-dom.jar /usr/share/java/batik-ext.jar /usr/share/java/batik-gvt.jar /usr/share/java/batik-i18n.jar /usr/share/java/batik-script.jar /usr/share/java/batik-util.jar /usr/share/java/jaxp-1.4.jar
+
 usr/share/java/batik-transcoder.jar:
  Bundle-ManifestVersion: 2
  Bundle-Name: Batik Parser
  Bundle-Vendor: Debian.org
  Bundle-SymbolicName: org.apache.batik.transcoder
  Bundle-Version: 1.12.0
+ Class-Path: /usr/share/java/batik-anim.jar /usr/share/java/batik-bridge.jar /usr/share/java/batik-codec.jar /usr/share/java/batik-dom.jar /usr/share/java/batik-ext.jar /usr/share/java/batik-gvt.jar /usr/share/java/batik-i18n.jar /usr/share/java/batik-svggen.jar /usr/share/java/batik-svg-dom.jar /usr/share/java/batik-transcoder.jar /usr/share/java/batik-util.jar /usr/share/java/batik-xml.jar /usr/share/java/jaxp-1.4.jar
  Export-Package: org.apache.batik.transcoder,org.apache.batik.transcoder.image,org.apache.batik.transcoder.keys,org.apache.batik.transcoder.print,org.apache.batik.transcoder.svg2svg,org.apache.batik.transcoder.wmf,org.apache.batik.transcoder.wmf.tosvg
 
-usr/share/java/batik-gui-util.jar:
- Bundle-ManifestVersion: 2
- Bundle-Name: Batik GUI Util
- Bundle-Vendor: Debian.org
- Bundle-SymbolicName: org.apache.batik.util.gui
- Bundle-Version: 1.12.0
- Export-Package: org.apache.batik.util.gui,org.apache.batik.util.gui.resource,org.apache.batik.util.gui.xmleditor
+usr/share/java/batik-ttf2svg.jar:
+ Class-Path: /usr/share/java/batik-svggen.jar
+ Main-Class: org.apache.batik.apps.ttf2svg.Main
 
 usr/share/java/batik-util.jar:
  Bundle-ManifestVersion: 2
@@ -77,6 +138,7 @@ usr/share/java/batik-util.jar:
  Bundle-Vendor: Debian.org
  Bundle-SymbolicName: org.apache.batik.util
  Bundle-Version: 1.12.0
+ Class-Path: /usr/share/java/batik-constants.jar /usr/share/java/batik-i18n.jar
  Require-Bundle: org.apache.batik.util.gui;bundle-version="[1.7.0,1.12.1)"
  Export-Package: org.apache.batik,org.apache.batik.i18n,org.apache.batik.util,org.apache.batik.util.io,org.apache.batik.util.resources
 
@@ -86,12 +148,5 @@ usr/share/java/batik-xml.jar:
  Bundle-Vendor: Debian.org
  Bundle-SymbolicName: org.apache.batik.xml
  Bundle-Version: 1.12.0
+ Class-Path: /usr/share/java/batik-i18n.jar /usr/share/java/batik-util.jar
  Export-Package: org.apache.batik.xml
-
-usr/share/java/batik-i18n.jar:
- Bundle-ManifestVersion: 2
- Bundle-Name: Batik i18n
- Bundle-Vendor: Debian.org
- Bundle-SymbolicName: org.apache.batik.i18n
- Bundle-Version: 1.12.0
- Export-Package: org.apache.batik.i18n


=====================================
debian/watch
=====================================
@@ -1,3 +1,3 @@
-version=3
+version=4
 opts=pgpsigurlmangle=s/$/.asc/ \
-   http://archive.apache.org/dist/xmlgraphics/batik/source/batik-src-([\d.]+)\.tar\.gz
+   https://archive.apache.org/dist/xmlgraphics/batik/source/batik-src-([\d.]+)\.tar\.gz



View it on GitLab: https://salsa.debian.org/java-team/batik/-/compare/3e9e77645c76e0aaabe600e3f4ebf08b96d35820...8954cf7987c1453da425048c45282e0d4b7dd5fe

-- 
View it on GitLab: https://salsa.debian.org/java-team/batik/-/compare/3e9e77645c76e0aaabe600e3f4ebf08b96d35820...8954cf7987c1453da425048c45282e0d4b7dd5fe
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-java-commits/attachments/20220718/e94f3103/attachment.htm>

More information about the pkg-java-commits mailing list