[Git][java-team/libxml-java][master] 11 commits: Converted debian/copyright to the Copyright Format 1.0
Emmanuel Bourg
gitlab at salsa.debian.org
Mon Feb 22 14:41:56 GMT 2021
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / libxml-java
Commits:
f5ea7fab by Emmanuel Bourg at 2021-02-22T15:23:46+01:00
Converted debian/copyright to the Copyright Format 1.0
- - - - -
7a00bead by Emmanuel Bourg at 2021-02-22T15:23:51+01:00
Added a watch file
- - - - -
dad294c3 by Emmanuel Bourg at 2021-02-22T15:23:51+01:00
Standards-Version updated to 4.5.1
- - - - -
1ab87035 by Emmanuel Bourg at 2021-02-22T15:23:51+01:00
Wrap and sort
- - - - -
9849f44a by Emmanuel Bourg at 2021-02-22T15:23:51+01:00
Switch to debhelper level 13 (Closes: #965699)
- - - - -
26c65076 by Emmanuel Bourg at 2021-02-22T15:23:51+01:00
Use salsa.debian.org Vcs-* URLs
- - - - -
d177823d by Emmanuel Bourg at 2021-02-22T15:23:51+01:00
Added the Homepage field
- - - - -
0ceca36c by Emmanuel Bourg at 2021-02-22T15:35:55+01:00
Build with the DH sequencer instead of CDBS
- - - - -
e2c97b44 by Emmanuel Bourg at 2021-02-22T15:37:08+01:00
New upstream version 1.1.7
- - - - -
31a9ed59 by Emmanuel Bourg at 2021-02-22T15:37:08+01:00
Update upstream source from tag 'upstream/1.1.7'
Update to upstream version '1.1.7'
with Debian dir 287e13f95a36d6e05b2122ccd75e7663025fee18
- - - - -
5e6ef8a1 by Emmanuel Bourg at 2021-02-22T15:40:36+01:00
New upstream release (1.1.7)
- - - - -
13 changed files:
- ChangeLog.txt
- README.txt
- − ant/build-lib.xml
- debian/changelog
- − debian/compat
- debian/control
- debian/copyright
- − debian/dirs
- + debian/libxml-java.classpath
- + debian/libxml-java.jlibs
- debian/rules
- + debian/watch
- source/org/pentaho/reporting/libraries/xmlns/common/AttributeMap.java
Changes:
=====================================
ChangeLog.txt
=====================================
@@ -3,10 +3,51 @@
---------------
A list of changes in recent versions:
-0.99.0: (30-May-2008)
+1.1.7:
+ * [BUG] PRD-2647: AttributeMap made it possible to contain <null> entries, although
+ these entries should not exist.
+
+1.1.6: (2010-04-26)
+ * PRD-2584: Improved performance of AttributeMap by having a better internal structure.
+
+1.1.5: (2010-01-15)
+1.1.4: (2009-12-15)
+ * Added a more relaxed boolean parsing code, so that boolean parsing is case
+ insensitive and thus the same as in the past.
+
+1.1.3: (2009-11-13)
+ * API change from LibLoader: Caching was not working correctly and thus created
+ stale entries in the cache and thus a memory leak.
+
+1.1.2: (2009-09-25)
+ * Certain characters are invalid in XML and cannot be represented in any way in
+ XML documents. They must be filtered out completely.
+
+1.1.1: (2009-08-21)
+ * Added support to parse DOM trees via LibLoader to allow LibLoader's caching to
+ kick in.
+
+1.1.0: (2009-07-29)
+ * Improved error messages on parse errors in AbstractXmlReadHandler.
+
+ * LibXml now uses Ivy
+
+ * [BUG] When using Xerces, passing <null> as URI is not allowed, even when Xerces
+ reports the Namespace URI as <null>.
+
+ * When writing XML documents, the XML namespace is implicitly defined and must not
+ be declared.
+
+1.0.0: (2008-07-28)
+ * [API] Allow implementations to wrap SAX-attributes into their own implementation.
+
+ * All code moved from org.jfree.xmlns package space to
+ org.pentaho.reporting.libraries.xmlns.
+
+0.99.0: (30-May-2008)
* [BUG] AbstractReadHandlerFactory must not reset the default handler if the
current configuration does not provide one.
-
+
* Switched from JCommon to LibBase. All version information is now contained in
the manifest. The Project-Info implementation reads the version numbers from
the Jar's Manifest or the compiler-output-directory.
@@ -18,8 +59,8 @@ A list of changes in recent versions:
* [BUG] DefaultTagDescription assumed that undefined elements were safe to have
indentions. This created beautiful documents, but sadly the added spaces broke
many of these generated documents.
-
- A empty configuration passed into the configure() method no longer causes
+
+ A empty configuration passed into the configure() method no longer causes
the tag-description to treat all elements as indentable.
* Added better logging to assist the user in case of parsing errors. The current
@@ -29,18 +70,18 @@ A list of changes in recent versions:
- AttributeMap is no longer synchronized, as synchronization has to
happen in a larger context most of the time.
- Added streaming writer methods so that attribute values can be normalized
- while being sent to the stream instead of having to create temporary strings.
+ while being sent to the stream instead of having to create temporary strings.
0.9.11: (02-Nov-2007)
* Upgraded to jcommon-1.0.12
0.9.10: (29-Oct-2007)
* Performance Update
-
+
* [BUG] XML-writer without encoding produced invalid xml-header.
DefaultTagDescription can now be configured using Java-Calls
AttributeList.setAttribute() with null-value is now the same as removeAttribute
-
+
0.9.9: (16-Oct-2007)
* The build-system now uses the modular build again. By default the
@@ -122,4 +163,3 @@ A list of changes in recent versions:
0.1.0: (29-Jun-2006)
* Initial release of LibXML
-
\ No newline at end of file
=====================================
README.txt
=====================================
@@ -1,10 +1,8 @@
-************************
-* LibXML 0.99.0 *
-************************
+LibXML
+======
-30 May 2008
-1. INTRODUCTION
+1. Introduction
---------------
LibXML is a namespace aware SAX-Parser utility library. It eases the
@@ -20,7 +18,7 @@ For the latest news and information about libXML, please refer to:
http://reporting.pentaho.org/libxml/
-2. SUPPORT
+2. Support
----------
Free support is available via the JFreeReport forum, follow the link
from the LibXml home page. Please note that questions are
@@ -32,13 +30,13 @@ If you post a message in the forum, then everyone can see the
question, and everyone can see the answer.
-3. REPORTING BUGS
+3. Reporting Bugs
-----------------
If you find bugs in LibXml, we'd like to hear about it so that we
can improve future releases of LibXml. Please post a bug report
to the JIRA bug-tracker at Pentaho.org:
- http://jira.pentaho.org/
+ http://jira.pentaho.com/
Please be sure to provide as much information as you can. We need to
know the version of LibXml that you are using, the JDK version,
@@ -61,7 +59,7 @@ Ant is licensed under the terms of the Apache Software License (a
popular open source software license).
-5. OTHER FEEDBACK
+5. Other Feedback
-----------------
For other feedback and comments, please post a message on the
Pentaho forums. The Forum is available at
=====================================
ant/build-lib.xml deleted
=====================================
@@ -1,715 +0,0 @@
-<!-- An ANT build file for the Pentaho-Reporting-Projects. -->
-<!--
- This file defines some general macros. It is used in most jfree.org
- projects to simplify the module handling (which can become a real
- pain).
-
- This is no standalone file and is intended to be included by other
- build files.
-
- Changes:
-
- 2007-10-15: Added modular retro-builds;
- Allowed to exclude files for the monolithic builds
- Standarized Maven-POM file name
- Bug-Fix in ClassPath setting of isClassAvailable
- 2007-10-16: Added separate retro-build-target as newer JDKs are no
- longer able to generate JDK 1.2.2 binary class files
- 2007-12-15: Added support for Manifest-Version Information
- Manifest is created if it does not exist beforehand
- 2008-03-31: Integration build support added.
- 2008-04-30: MANIFEST.INF must be called MANIFEST.MF instead
--->
-<project name="module-support" basedir="..">
-
- <!--
- This target tests whether a given class is available.
- -->
- <macrodef name="isClassAvailable">
- <attribute name="property-name"
- description="The property that will receive the result."/>
- <attribute name="class-name" description="The class to test for"/>
- <element name="test-classpath" optional="true"
- description="The classpath used for the testing"/>
- <sequential>
- <condition property="@{property-name}">
- <available classname="@{class-name}">
- <classpath>
- <test-classpath/>
- </classpath>
- </available>
- </condition>
- </sequential>
- </macrodef>
-
- <!--
- This target tests whether a given class and its library file is available.
- -->
- <macrodef name="isClassAndFileAvailable">
- <attribute name="property-name"
- description="The property that will receive the result."/>
- <attribute name="class-name" description="The class to test for"/>
- <attribute name="file-name" description="The file which we test for"/>
- <element name="test-classpath" optional="true"
- description="The classpath used for the testing"/>
- <sequential>
- <condition property="@{property-name}">
- <and>
- <available file="@{file-name}"/>
- <available classname="@{class-name}">
- <classpath>
- <pathelement location="@{file-name}"/>
- <test-classpath/>
- </classpath>
- </available>
- </and>
- </condition>
- </sequential>
- </macrodef>
-
- <!--
- This target tests whether a given class is available, and includes other
- tests as well, which also have to evaluate to true to pass this test.
- -->
- <macrodef name="isClassAvailableEx">
- <attribute name="property-name"
- description="The property that will receive the result."/>
- <attribute name="class-name" description="The class to test for"/>
- <element name="additional-tests" optional="true"
- description="Additional tests, which have to evaluate to true."/>
- <element name="test-classpath" optional="true"
- description="The classpath used for the testing"/>
- <sequential>
- <condition property="@{property-name}">
- <and>
- <additional-tests/>
- <available classname="@{class-name}">
- <classpath>
- <test-classpath/>
- </classpath>
- </available>
- </and>
- </condition>
- </sequential>
- </macrodef>
-
-
- <!--
- This target builds a single module. The module is specified by its path
- inside the source directory.
-
- -->
- <macrodef name="build-retro-module">
- <attribute name="jdk-dir"
- description="The directory where you installed JDK 1.2.2 (or whatever you are testing against)"/>
- <attribute name="module-path"
- description="The package name of the module"/>
- <attribute name="source-dir" description="The source directory"/>
- <attribute name="target-jar"
- description="The name of the resulting jar-file"/>
- <attribute name="builddir" default="build"
- description="The temporary build directory"/>
- <attribute name="manifest-location"
- description="The (optional) name of the manifest file used as base."
- default="devresource/META-INF/MANIFEST.MF"/>
- <element name="module-classpath"
- description="The classpath for building this module."/>
- <element name="module-resources"
- description="Additional resources to be copied."/>
- <element name="jar-args" optional="true"
- description="Parameters for the 'jar' task"/>
- <element name="manifest-args" optional="true"
- description="An optiona 'manifest' creation task"/>
- <sequential>
- <!-- prune possibly existing entries from temp build directory -->
- <delete dir="@{builddir}"/>
-
- <!-- create a temp build directory -->
- <mkdir dir="@{builddir}"/>
- <mkdir dir="@{builddir}/src"/>
- <mkdir dir="@{builddir}/bin"/>
-
- <!-- import all java files for compilation -->
- <copy todir="@{builddir}/src/@{module-path}/">
- <fileset dir="@{source-dir}/@{module-path}">
- <exclude name="**/junit/**"/>
- <include name="*.java"/>
- </fileset>
- </copy>
-
- <!-- compile the source -->
- <javac fork="true"
- memoryInitialSize="160m"
- memoryMaximumSize="160m"
- srcdir="${builddir}/src"
- destdir="${builddir}/bin"
- compiler="jikes"
- nowarn="on"
- includeAntRuntime="false"
- includeJavaRuntime="false"
- deprecation="${build.deprecation}"
- debug="${build.debug}"
- optimize="${build.optimize}"
- target="${build.retro.target}">
- <classpath>
- <module-classpath/>
- </classpath>
- </javac>
-
- <!-- copy across required resource files -->
- <copy todir="@{builddir}/bin/@{module-path}">
- <fileset dir="@{source-dir}/@{module-path}">
- <module-resources/>
- </fileset>
- </copy>
-
- <!-- make the jar -->
- <copy file="@{manifest-location}" tofile="@{builddir}/manifest.tmp" failonerror="false"/>
- <manifest file="@{builddir}/manifest.tmp" mode="update">
- <manifest-args/>
- </manifest>
-
- <jar jarfile="@{target-jar}" basedir="@{builddir}/bin" manifest="@{builddir}/manifest.tmp">
- <jar-args/>
- </jar>
-
- <!-- delete the temp directory -->
- <delete dir="@{builddir}"/>
- </sequential>
- </macrodef>
-
-
- <!--
- This target builds a single module. The module is specified by its path
- inside the source directory.
-
- -->
- <macrodef name="build-module">
- <attribute name="module-path"
- description="The package name of the module"/>
- <attribute name="source-dir" description="The source directory"/>
- <attribute name="target-jar"
- description="The name of the resulting jar-file"/>
- <attribute name="builddir" default="build"
- description="The temporary build directory"/>
- <attribute name="manifest-location"
- description="The (optional) name of the manifest file used as base."
- default="devresource/META-INF/MANIFEST.MF"/>
- <element name="module-classpath"
- description="The classpath for building this module."/>
- <element name="module-resources"
- description="Additional resources to be copied."/>
- <element name="jar-args" optional="true"
- description="Parameters for the 'jar' task"/>
- <element name="manifest-args" optional="true"
- description="An optiona 'manifest' creation task"/>
- <sequential>
- <!-- prune possibly existing entries from temp build directory -->
- <delete dir="@{builddir}"/>
-
- <!-- create a temp build directory -->
- <mkdir dir="@{builddir}"/>
- <mkdir dir="@{builddir}/src"/>
- <mkdir dir="@{builddir}/bin"/>
-
- <!-- import all java files for compilation -->
- <copy todir="@{builddir}/src/@{module-path}/">
- <fileset dir="@{source-dir}/@{module-path}">
- <exclude name="**/junit/**"/>
- <include name="*.java"/>
- </fileset>
- </copy>
-
- <!-- compile the source -->
- <javac
- srcdir="@{builddir}/src"
- destdir="@{builddir}/bin"
-
- deprecation="${build.deprecation}"
- debug="${build.debug}"
- optimize="${build.optimize}"
- target="${build.target}"
- source="${build.source}">
- <classpath>
- <module-classpath/>
- </classpath>
- </javac>
-
- <!-- copy across required resource files -->
- <copy todir="@{builddir}/bin/@{module-path}">
- <fileset dir="@{source-dir}/@{module-path}">
- <module-resources/>
- </fileset>
- </copy>
-
- <copy file="@{manifest-location}" tofile="@{builddir}/manifest.tmp" failonerror="false"/>
- <manifest file="@{builddir}/manifest.tmp" mode="update">
- <manifest-args/>
- </manifest>
-
- <jar jarfile="@{target-jar}" basedir="@{builddir}/bin" manifest="@{builddir}/manifest.tmp">
- <jar-args/>
- </jar>
-
- <!-- delete the temp directory -->
- <delete dir="@{builddir}"/>
- </sequential>
- </macrodef>
-
-
- <!--
- This target builds the core classes. All classes outside the modules
- directory are considered core classes.
- -->
- <macrodef name="build-retro-core">
- <attribute name="jdk-dir"
- description="The directory where you installed JDK 1.2.2 (or whatever you are testing against)"/>
- <attribute name="module-path"
- description="The package name of the modules"/>
- <attribute name="source-dir"
- description="The source directory"/>
- <attribute name="target-jar"
- description="The name of the resulting jar-file"/>
- <attribute name="builddir" default="build"
- description="The temporary build directory"/>
- <attribute name="manifest-location"
- description="The (optional) name of the manifest file used as base."
- default="devresource/META-INF/MANIFEST.MF"/>
- <element name="core-classpath"
- description="The classpath for the build process"/>
- <element name="core-resources"
- description="The resources to be included in the file jar file."/>
- <element name="jar-args" optional="true"
- description="Parameters for the 'jar' task"/>
- <element name="manifest-args" optional="true"
- description="An optiona 'manifest' creation task"/>
- <sequential>
- <!-- prune possibly existing entries from temp build directory -->
- <delete dir="@{builddir}"/>
-
- <!-- create a temp build directory -->
- <mkdir dir="@{builddir}"/>
- <mkdir dir="@{builddir}/src"/>
- <mkdir dir="@{builddir}/bin"/>
-
- <!-- import all java files for compilation -->
- <copy todir="@{builddir}/src">
- <fileset dir="@{source-dir}">
- <exclude name="**/junit/**"/>
- <exclude name="@{module-path}/**"/>
- <include name="**/*.java"/>
- </fileset>
- </copy>
-
- <javac fork="true"
- memoryInitialSize="160m"
- memoryMaximumSize="160m"
- srcdir="${builddir}/src"
- destdir="${builddir}/bin"
- compiler="jikes"
- nowarn="on"
- includeAntRuntime="false"
- includeJavaRuntime="false"
- deprecation="${build.deprecation}"
- debug="${build.debug}"
- optimize="${build.optimize}"
- target="${build.retro.target}">
- <classpath>
- <core-classpath/>
- </classpath>
- </javac>
-
-
- <copy todir="@{builddir}/bin">
- <fileset dir="@{source-dir}">
- <exclude name="@{module-path}/**"/>
- <core-resources/>
- </fileset>
- </copy>
-
- <copy file="@{manifest-location}" tofile="@{builddir}/manifest.tmp" failonerror="false"/>
- <manifest file="@{builddir}/manifest.tmp" mode="update">
- <manifest-args/>
- </manifest>
-
- <jar jarfile="@{target-jar}" basedir="@{builddir}/bin" manifest="@{builddir}/manifest.tmp">
- <jar-args/>
- </jar>
-
- <!-- delete the temp directory -->
- <delete dir="@{builddir}"/>
- </sequential>
- </macrodef>
-
- <!--
- This target builds the core classes. All classes outside the modules
- directory are considered core classes.
- -->
- <macrodef name="build-core">
- <attribute name="module-path"
- description="The package name of the modules"/>
- <attribute name="source-dir"
- description="The source directory"/>
- <attribute name="target-jar"
- description="The name of the resulting jar-file"/>
- <attribute name="builddir" default="build"
- description="The temporary build directory"/>
- <attribute name="manifest-location"
- description="The (optional) name of the manifest file used as base."
- default="devresource/META-INF/MANIFEST.MF"/>
- <element name="core-classpath"
- description="The classpath for the build process"/>
- <element name="core-resources"
- description="The resources to be included in the file jar file."/>
- <element name="jar-args" optional="true"
- description="Parameters for the 'jar' task"/>
- <element name="manifest-args" optional="true"
- description="An optiona 'manifest' creation task"/>
- <sequential>
- <!-- prune possibly existing entries from temp build directory -->
- <delete dir="@{builddir}"/>
-
- <!-- create a temp build directory -->
- <mkdir dir="@{builddir}"/>
- <mkdir dir="@{builddir}/src"/>
- <mkdir dir="@{builddir}/bin"/>
-
- <!-- import all java files for compilation -->
- <copy todir="@{builddir}/src">
- <fileset dir="@{source-dir}">
- <exclude name="**/junit/**"/>
- <exclude name="@{module-path}/**"/>
- <include name="**/*.java"/>
- </fileset>
- </copy>
-
- <javac
- srcdir="@{builddir}/src"
- destdir="@{builddir}/bin"
-
- deprecation="${build.deprecation}"
- debug="${build.debug}"
- optimize="${build.optimize}"
- target="${build.target}"
- source="${build.source}">
- <classpath>
- <core-classpath/>
- </classpath>
- </javac>
-
-
- <copy todir="@{builddir}/bin">
- <fileset dir="@{source-dir}">
- <exclude name="@{module-path}/**"/>
- <core-resources/>
- </fileset>
- </copy>
-
- <copyfile src="@{manifest-location}" dest="@{builddir}/manifest.tmp"/>
- <manifest file="@{builddir}/manifest.tmp" mode="update">
- <manifest-args/>
- </manifest>
-
- <jar jarfile="@{target-jar}" basedir="@{builddir}/bin" manifest="@{builddir}/manifest.tmp">
- <jar-args/>
- </jar>
-
- <!-- delete the temp directory -->
- <delete dir="@{builddir}"/>
- </sequential>
- </macrodef>
-
-
- <!--
- This target builds the complete project.
- -->
- <macrodef name="build-retro">
- <attribute name="source-dir" description="The source directory"/>
- <attribute name="jdk-dir"
- description="The directory where you installed JDK 1.2.2 (or whatever you are testing against)"/>
- <attribute name="target-jar"
- description="The name of the resulting jar-file"/>
- <attribute name="manifest-location"
- description="The (optional) name of the manifest file used as base."
- default="devresource/META-INF/MANIFEST.MF"/>
- <element name="all-classpath"
- description="The classpath for the build process"/>
- <element name="all-resources"
- description="The resources to be included in the file jar file."/>
- <element name="jar-args" optional="true"
- description="Parameters for the 'jar' task"/>
- <element name="manifest-args" optional="true"
- description="An optiona 'manifest' creation task"/>
- <attribute name="builddir" default="build"
- description="The temporary build directory"/>
- <element name="all-sources" optional="true"
- description="Optional include or exclude definitions for the source-fileset"/>
- <sequential>
- <!-- prune possibly existing entries from temp build directory -->
- <delete dir="@{builddir}"/>
-
- <!-- create a temp build directory -->
- <mkdir dir="@{builddir}"/>
- <mkdir dir="@{builddir}/src"/>
- <mkdir dir="@{builddir}/bin"/>
-
- <!-- import all java files for compilation -->
- <copy todir="@{builddir}/src">
- <fileset dir="@{source-dir}">
- <exclude name="**/junit/**"/>
- <include name="**/*.java"/>
- <all-sources/>
- </fileset>
- </copy>
-
- <javac fork="true"
- memoryInitialSize="160m"
- memoryMaximumSize="160m"
- srcdir="${builddir}/src"
- destdir="${builddir}/bin"
- compiler="jikes"
- nowarn="on"
- includeAntRuntime="false"
- includeJavaRuntime="false"
- deprecation="${build.deprecation}"
- debug="${build.debug}"
- optimize="${build.optimize}"
- target="${build.retro.target}">
- <bootclasspath>
- <pathelement location="@{jdk-dir}/jre/lib/rt.jar"/>
- </bootclasspath>
- <classpath>
- <all-classpath/>
- </classpath>
- </javac>
-
-
- <copy todir="${builddir}/bin">
- <fileset dir="@{source-dir}">
- <all-resources/>
- </fileset>
- </copy>
-
- <copy file="@{manifest-location}" tofile="@{builddir}/manifest.tmp" failonerror="false"/>
- <manifest file="@{builddir}/manifest.tmp" mode="update">
- <manifest-args/>
- </manifest>
-
- <jar jarfile="@{target-jar}" basedir="@{builddir}/bin" manifest="@{builddir}/manifest.tmp">
- <jar-args/>
- </jar>
-
- <!-- delete the temp directory -->
- <delete dir="@{builddir}"/>
- </sequential>
- </macrodef>
-
-
- <!--
- This target builds the complete project.
- -->
- <macrodef name="build-all">
- <attribute name="source-dir" description="The source directory"/>
- <attribute name="target-jar"
- description="The name of the resulting jar-file"/>
- <attribute name="builddir" default="build"
- description="The temporary build directory"/>
- <attribute name="manifest-location"
- description="The (optional) name of the manifest file used as base."
- default="devresource/META-INF/MANIFEST.MF"/>
- <element name="all-classpath"
- description="The classpath for the build process"/>
- <element name="all-resources"
- description="The resources to be included in the file jar file."/>
- <element name="jar-args" optional="true"
- description="Parameters for the 'jar' task"/>
- <element name="manifest-args" optional="true"
- description="An optiona 'manifest' creation task"/>
- <element name="all-sources" optional="true"
- description="Optional include or exclude definitions for the source-fileset"/>
- <sequential>
- <!-- prune possibly existing entries from temp build directory -->
- <delete dir="@{builddir}"/>
-
- <!-- create a temp build directory -->
- <mkdir dir="@{builddir}"/>
- <mkdir dir="@{builddir}/src"/>
- <mkdir dir="@{builddir}/bin"/>
-
- <!-- import all java files for compilation -->
- <copy todir="@{builddir}/src">
- <fileset dir="@{source-dir}">
- <exclude name="**/junit/**"/>
- <include name="**/*.java"/>
- <all-sources/>
- </fileset>
- </copy>
-
- <javac
- srcdir="@{builddir}/src"
- destdir="@{builddir}/bin"
-
- deprecation="${build.deprecation}"
- debug="${build.debug}"
- optimize="${build.optimize}"
- target="${build.target}"
- source="${build.source}">
- <classpath>
- <all-classpath/>
- </classpath>
- </javac>
-
-
- <copy todir="@{builddir}/bin">
- <fileset dir="@{source-dir}">
- <all-resources/>
- </fileset>
- </copy>
-
-
- <copy file="@{manifest-location}" tofile="@{builddir}/manifest.tmp" failonerror="false"/>
- <manifest file="@{builddir}/manifest.tmp" mode="update">
- <manifest-args/>
- </manifest>
-
- <jar jarfile="@{target-jar}" basedir="@{builddir}/bin" manifest="@{builddir}/manifest.tmp">
- <jar-args/>
- </jar>
-
- <!-- delete the temp directory -->
- <delete dir="@{builddir}"/>
- </sequential>
- </macrodef>
-
- <!--
- This target builds the distribution-zip file. It depends on the existence
- of a 'fill-dist-dir' target.
- -->
- <macrodef name="make-zip">
- <attribute name="lib.version"
- default="The version of the resulting zip file."/>
- <attribute name="lib.name"
- default="The name prefix of the resulting zip file."/>
- <attribute name="dist-dir" default="distribution"
- description="The name of the distribution (temporary build) directory. "/>
- <attribute name="target-dir" default=""
- description="The directory where to write the tgz file"/>
- <sequential>
- <!-- make a temporary distribution directory -->
- <mkdir dir="@{dist-dir}"/>
-
- <antcall target="fill-dist-dir">
- <param name="dist-dir" value="@{dist-dir}"/>
- </antcall>
-
- <!-- convert end-of-line characters in text files -->
- <fixcrlf srcdir="@{dist-dir}/source"
- eol="crlf" eof="remove">
- <include name="**/*.java"/>
- <include name="**/*.properties"/>
- <include name="**/*.html"/>
- <include name="**/*.xml"/>
- <include name="**/*.txt"/>
- <include name="**/*.css"/>
- </fixcrlf>
-
- <!-- make the zip file -->
- <zip zipfile="@{target-dir}@{lib.name}-@{lib.version}.zip">
- <zipfileset dir="@{dist-dir}"
- prefix="@{lib.name}-@{lib.version}"/>
- </zip>
-
- <!-- delete the temporary distribution directory -->
- <delete dir="@{dist-dir}"/>
- </sequential>
-
- </macrodef>
-
- <!--
- This target builds the distribution-tar-gz file. It depends on the existence
- of a 'fill-dist-dir' target.
- -->
- <macrodef name="make-targz">
- <attribute name="lib.version"
- default="The version of the resulting zip file."/>
- <attribute name="lib.name"
- default="The name prefix of the resulting zip file."/>
- <attribute name="dist-dir" default="distribution"
- description="The name of the distribution (temporary build) directory. "/>
- <attribute name="target-dir" default=""
- description="The directory where to write the tgz file"/>
- <sequential>
- <!-- Make .tar.gz distribution for libfonts -->
- <!-- make a temporary distribution directory -->
- <mkdir dir="@{dist-dir}"/>
-
- <antcall target="fill-dist-dir">
- <param name="dist-dir" value="@{dist-dir}"/>
- </antcall>
-
- <!-- convert end-of-line characters in text files -->
- <fixcrlf srcdir="@{dist-dir}/source"
- eol="lf" eof="remove">
- <include name="**/*.java"/>
- <include name="**/*.properties"/>
- <include name="**/*.html"/>
- <include name="**/*.xml"/>
- <include name="**/*.txt"/>
- <include name="**/*.css"/>
- </fixcrlf>
-
- <!-- make the tar.gz file -->
- <tar tarfile="@{target-dir}@{lib.name}-@{lib.version}.tar">
- <tarfileset dir="@{dist-dir}"
- prefix="@{lib.name}-@{lib.version}"/>
- </tar>
- <gzip zipfile="@{target-dir}@{lib.name}-@{lib.version}.tar.gz"
- src="@{target-dir}@{lib.name}-@{lib.version}.tar"/>
- <delete file="@{target-dir}@{lib.name}-@{lib.version}.tar"/>
-
- <!-- delete the temporary distribution directory -->
- <delete dir="@{dist-dir}"/>
- </sequential>
-
- </macrodef>
-
- <macrodef name="make-maven-bundle">
- <attribute name="lib.version"
- default="The version of the resulting zip file."/>
- <attribute name="lib.name"
- default="The name prefix of the resulting zip file."/>
- <attribute name="dist-dir" default="distribution"
- description="The name of the distribution (temporary build) directory. "/>
- <attribute name="lib.file"
- description="The name of the binary jar to be included in the bundle. "/>
- <attribute name="target" description="The name of the resulting jar file"/>
- <attribute name="licence-file" default="licence-LGPL.txt"/>
- <sequential>
- <!-- make a temporary distribution directory -->
- <mkdir dir="@{dist-dir}"/>
- <!-- copy across LICENCE -->
- <copy file="@{licence-file}" tofile="distribution/LICENSE.txt"/>
-
- <filterchain id="version.filters">
- <replacetokens>
- <token key="VERSION" value="@{lib.version}"/>
- </replacetokens>
- </filterchain>
- <copy file="maven-project.xml" tofile="distribution/project.xml">
- <filterchain refid="version.filters"/>
- </copy>
-
- <!-- copy across runtime jar file -->
- <copy file="@{lib.file}" tofile="@{dist-dir}/@{lib.file}"/>
-
- <!-- make the jar -->
- <jar jarfile="@{target}" basedir="@{dist-dir}"/>
-
- <!-- delete the temporary distribution directory -->
- <delete dir="@{dist-dir}"/>
-
- </sequential>
-
- </macrodef>
-
-</project>
=====================================
debian/changelog
=====================================
@@ -1,3 +1,17 @@
+libxml-java (1.1.7-1) unstable; urgency=medium
+
+ * Team upload.
+ * New upstream release
+ * Build with the DH sequencer instead of CDBS
+ * Converted debian/copyright to the Copyright Format 1.0
+ * Added a watch file
+ * Standards-Version updated to 4.5.1
+ * Switch to debhelper level 13 (Closes: #965699)
+ * Use salsa.debian.org Vcs-* URLs
+ * Added the Homepage field
+
+ -- Emmanuel Bourg <ebourg at apache.org> Mon, 22 Feb 2021 15:40:27 +0100
+
libxml-java (1.1.6.dfsg-3) unstable; urgency=low
[Miguel Landaeta]
=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-5
=====================================
debian/control
=====================================
@@ -3,11 +3,24 @@ Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Rene Engelhard <rene at debian.org>
-Build-Depends: debhelper (>= 4.2.30), cdbs, default-jdk, ant, libjcommon-java (>= 1.0.10), libloader-java, libbase-java, libcommons-logging-java, javahelper, junit, ant-contrib, ant-optional
-Build-Conflicts: liboscache-java
-Standards-Version: 3.9.2
-Vcs-Git: git://git.debian.org/git/pkg-java/libxml-java.git
-Vcs-Browser: http://git.debian.org/?p=pkg-java/libxml-java.git
+Build-Depends:
+ ant,
+ ant-contrib,
+ ant-optional,
+ debhelper-compat (= 13),
+ default-jdk,
+ javahelper,
+ junit,
+ libbase-java,
+ libcommons-logging-java,
+ libjcommon-java (>= 1.0.10),
+ libloader-java
+Build-Conflicts:
+ liboscache-java
+Standards-Version: 4.5.1
+Vcs-Git: https://salsa.debian.org/java-team/libxml-java.git
+Vcs-Browser: https://salsa.debian.org/java-team/libxml-java
+Homepage: https://sourceforge.net/projects/jfreereport/
Package: libxml-java
Architecture: all
@@ -19,4 +32,3 @@ Description: namespace aware SAX-Parser utility library
JCommon library.
.
LibXML replaces the JCommon-XML classes, which were not namespace aware..
-
=====================================
debian/copyright
=====================================
@@ -1,23 +1,25 @@
-This package was debianized by Rene Engelhard <rene at debian.org>
-Tue, 21 Aug 2007 01:25:55 +0200
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: https://sourceforge.net/projects/jfreereport/
+Files-Excluded: *.jar
-It was downloaded from <http://sourceforge.net/projects/jfreereport/>
+Files: *
+Copyright: 2006-2010, Pentaho Corporation and Contributors
+License: LGPL-2.1+
-Upstream Authors: Thomas Morgner, David Gilbert and others
+Files: debian/*
+Copyright: 2007, Rene Engelhard
+License: LGPL-2.1+
-Copyright:
-
- (C) Copyright 2006, by Pentaho Corporation and Contributors.
-
- This package is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
-On Debian systems, the complete text of the GNU Lesser General
-Public License can be found in `/usr/share/common-licenses/LGPL'.
+License: LGPL-2.1+
+ This package is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+ .
+ On Debian systems, the complete text of the GNU Lesser General
+ Public License can be found in `/usr/share/common-licenses/LGPL'.
=====================================
debian/dirs deleted
=====================================
@@ -1 +0,0 @@
-usr/share/java
=====================================
debian/libxml-java.classpath
=====================================
@@ -0,0 +1 @@
+/usr/share/java/libxml.jar: /usr/share/java/jcommon.jar /usr/share/java/libloader.jar
=====================================
debian/libxml-java.jlibs
=====================================
@@ -0,0 +1 @@
+dist/libxml.jar
=====================================
debian/rules
=====================================
@@ -1,29 +1,15 @@
#!/usr/bin/make -f
-# debian/rules file for libfonts-java (uses cdbs)
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+export CLASSPATH=/usr/share/java/libloader.jar:/usr/share/java/libbase.jar:/usr/share/java/commons-logging.jar
-JAVA_HOME := /usr/lib/jvm/default-java
-ANT_HOME := /usr/share/ant
+%:
+ dh $@ --with javahelper
-DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar jcommon libloader pixie libbase commons-logging junit ant-contrib ant-junit
-DEB_ANT_BUILDFILE := build.xml
-DEB_ANT_BUILD_TARGET := compile jar javadoc
-DEB_ANT_CHECK_TARGET := test
-
-DEB_UPSTREAM_VERSION := 1.1-SNAPSHOT
-
-clean::
- -rm -rf build
- -rm -rf javadoc
- -rm -f libxml-$(DEB_UPSTREAM_VERSION).jar
- # don't use them, go sure
- -rm -f lib/* lib/optional/* test-lib/*
-
-install/libxml-java::
- install -m 644 dist/libxml-$(DEB_UPSTREAM_VERSION).jar debian/libxml-java/usr/share/java/libxml-$(DEB_UPSTREAM_VERSION).jar
- ln -s libxml-$(DEB_UPSTREAM_VERSION).jar debian/libxml-java/usr/share/java/libxml.jar
- jh_classpath -plibxml-java --classpath="/usr/share/java/jcommon.jar /usr/share/java/libloader.jar" debian/libxml-java/usr/share/java/libxml-$(DEB_UPSTREAM_VERSION).jar
- jh_depends
+override_dh_auto_build:
+ dh_auto_build
+ mv dist/libxml-*.jar dist/libxml.jar
+override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+ dh_auto_build -- test
+endif
=====================================
debian/watch
=====================================
@@ -0,0 +1,3 @@
+version=4
+opts="repack,compression=xz" \
+https://sf.net/jfreereport/ .*/libxml-([\d\.]+).zip
=====================================
source/org/pentaho/reporting/libraries/xmlns/common/AttributeMap.java
=====================================
@@ -135,20 +135,37 @@ public class AttributeMap implements Serializable, Cloneable
throw new NullPointerException("Attribute name must not be null");
}
+
if (singletonNamespace == null)
{
- singletonNamespace = namespace;
- singletonContent = new HashMap();
- singletonContent.put(attribute, value);
+ if (value != null)
+ {
+ singletonNamespace = namespace;
+ singletonContent = new HashMap();
+ singletonContent.put(attribute, value);
+ }
return null;
}
+
if (namespace.equals(singletonNamespace))
{
- return singletonContent.put(attribute, value);
+ if (value == null)
+ {
+ return singletonContent.remove(attribute);
+ }
+ else
+ {
+ return singletonContent.put(attribute, value);
+ }
}
if (namespaces == null)
{
+ if (value == null)
+ {
+ return null;
+ }
+
namespaces = new HashMap();
}
View it on GitLab: https://salsa.debian.org/java-team/libxml-java/-/compare/dba38941b1985315edcb6e84254a2b5b4ac4af5b...5e6ef8a180736b24ff48ecefb14b7cce82d5b672
--
View it on GitLab: https://salsa.debian.org/java-team/libxml-java/-/compare/dba38941b1985315edcb6e84254a2b5b4ac4af5b...5e6ef8a180736b24ff48ecefb14b7cce82d5b672
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/20210222/99e33487/attachment.htm>
More information about the pkg-java-commits
mailing list