CVS batik/debian

Wolfgang B??r wbaer-guest at haydn.debian.org
Fri Oct 28 13:15:02 UTC 2005


Update of /cvsroot/pkg-java/batik/debian
In directory haydn:/tmp/cvs-serv1683/debian

Modified Files:
	changelog control copyright libbatik-java.README.Debian rules 
Added Files:
	README.Debian-source 
Removed Files:
	libbatik-java.install libbatik-java.links 
Log Message:
batik (1.6-2) unstable; urgency=low
  * Re-Introduce lost link batik.jar and add 02_fix_jar_target.patch 
    to fix library content (closes: #334878)
  * Thighten depends on avalon-framework (closes: #335883)
  * Corrected README.Debian
batik (1.6-1) unstable; urgency=low
  * New upstream release
    + Updated copyright to Apache 2.0 License
  * libant1.6-java to ant transition
  * Use JAVA_HOME dirs as generated by java-package (closes: #306639)
  * Include, build and ship the pdf-transcoder from fop CVS (closes: #327354)


--- /cvsroot/pkg-java/batik/debian/changelog	2005/03/21 15:11:59	1.4
+++ /cvsroot/pkg-java/batik/debian/changelog	2005/10/28 13:15:02	1.5
@@ -1,3 +1,29 @@
+batik (1.6-2) unstable; urgency=low
+
+  * Re-Introduce lost link batik.jar and add 02_fix_jar_target.patch 
+    to fix library content (closes: #334878)
+  * Thighten depends on avalon-framework (closes: #335883)
+  * Corrected README.Debian
+
+ -- Wolfgang Baer <WBaer at gmx.de>  Thu, 20 Oct 2005 17:17:28 +0200
+
+batik (1.6-1) unstable; urgency=low
+
+  * New upstream release
+    + Updated copyright to Apache 2.0 License
+  * libant1.6-java to ant transition
+  * Use JAVA_HOME dirs as generated by java-package (closes: #306639)
+  * Include, build and ship the pdf-transcoder from fop CVS (closes: #327354)
+    + See README.Debian-source for details about the transcoder source
+    + Added build-deps and depends on libavalon-framework-java, 
+      libcommons-io-java and libcommons-logging-java for the pdf-transcoder
+    + Patched build.xml to call the pdf-transcoder build target
+  * Removed Ola and Stephan from uploaders
+  * Extended description a little bit
+  * Standards-Version 3.6.2 (no changes)  
+
+ -- Wolfgang Baer <WBaer at gmx.de>  Mon,  3 Oct 2005 19:29:22 +0200
+
 batik (1.5.1-1) unstable; urgency=low
 
   * New upstream release - security fix [CAN-2005-0508] (closes: #288009)
--- /cvsroot/pkg-java/batik/debian/control	2005/03/21 15:11:59	1.4
+++ /cvsroot/pkg-java/batik/debian/control	2005/10/28 13:15:02	1.5
@@ -2,17 +2,24 @@
 Section: contrib/libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Ola Lundqvist <opal at debian.org>, Takashi Okamoto <tora at debian.org>, Stefan Gybas <sgybas at debian.org>, Arnaud Vandyck <avdyk at debian.org>, Wolfgang Baer <WBaer at gmx.de>
-Standards-Version: 3.6.1
-Build-Depends-Indep: debhelper (>= 4.2.30), j2sdk1.4 | java2-compiler, cdbs, libgnujaxp-java, libant1.6-java, libbsf-java, libxalan2-java, rhino
+Uploaders: Arnaud Vandyck <avdyk at debian.org>, Wolfgang Baer <WBaer at gmx.de>
+Standards-Version: 3.6.2
+Build-Depends-Indep: debhelper (>= 4.2.30), j2sdk1.4 | java2-compiler, cdbs, libgnujaxp-java, ant, libbsf-java, libxalan2-java, rhino, libavalon-framework-java (>= 4.2.0-1), libcommons-io-java, libcommons-logging-java
 
 Package: libbatik-java
 Section: contrib/libs
 Architecture: all
-Depends: j2re1.4 | j2re1.3 | java2-runtime, java-common, libxalan2-java, libbsf-java
+Depends: j2re1.4 | java2-runtime, libxalan2-java, libbsf-java, libavalon-framework-java (>= 4.2.0-1), libcommons-io-java, libcommons-logging-java
 Suggests: rhino
 Description: xml.apache.org SVG Library
- Batik is the Apache Project's SVG Library. SVG stands for "Scalable Vector
- Graphics".
+ Batik is a toolkit for applications or applets that want to use images
+ in the Scalable Vector Graphics (SVG) format for various purposes, such
+ as viewing, generation or manipulation.
+ .
+ Batik provides several modules to be used in applications:
+  * A SVG generator module, usable to export graphics into the SVG format.
+  * A SVG processor and SVG Viewing component for integrating SVG viewing.
+  * A module to convert SVG to various formats, such as raster images 
+    (JPEG, PNG or Tiff) and PS, PDF.
  .
  For detailed information, go to http://xml.apache.org/batik/
--- /cvsroot/pkg-java/batik/debian/copyright	2005/03/21 15:11:59	1.2
+++ /cvsroot/pkg-java/batik/debian/copyright	2005/10/28 13:15:02	1.3
@@ -1,51 +1,180 @@
 This package was debianized by Jeff Bailey <jbailey at debian.org> on
 Tue, 11 Jun 2002 10:52:34 -0400.
 
-It was downloaded from:
-        http://xml.apache.org/batik
+It was downloaded from <http://xml.apache.org/batik>.
 
- ============================================================================
-                   The Apache Software License, Version 1.1
- ============================================================================
- 
- Copyright (C) 2000 The Apache Software Foundation. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modifica-
- tion, are permitted provided that the following conditions are met:
- 
- 1. Redistributions of  source code must  retain the above copyright  notice,
-    this list of conditions and the following disclaimer.
- 
- 2. Redistributions in binary form must reproduce the above copyright notice,
-    this list of conditions and the following disclaimer in the documentation
-    and/or other materials provided with the distribution.
- 
- 3. The end-user documentation included with the redistribution, if any, must
-    include  the following  acknowledgment:  "This product includes  software
-    developed  by the  Apache Software Foundation  (http://www.apache.org/)."
-    Alternately, this  acknowledgment may  appear in the software itself,  if
-    and wherever such third-party acknowledgments normally appear.
- 
- 4. The names "Batik" and  "Apache Software Foundation"  must not be  used to
-    endorse  or promote  products derived  from this  software without  prior
-    written permission. For written permission, please contact
-    apache at apache.org.
- 
- 5. Products  derived from this software may not  be called "Apache", nor may
-    "Apache" appear  in their name,  without prior written permission  of the
-    Apache Software Foundation.
- 
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS  FOR A PARTICULAR  PURPOSE ARE  DISCLAIMED.  IN NO  EVENT SHALL  THE
- APACHE SOFTWARE  FOUNDATION  OR ITS CONTRIBUTORS  BE LIABLE FOR  ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLU-
- DING, BUT NOT LIMITED TO, PROCUREMENT  OF SUBSTITUTE GOODS OR SERVICES; LOSS
- OF USE, DATA, OR  PROFITS; OR BUSINESS  INTERRUPTION)  HOWEVER CAUSED AND ON
- ANY  THEORY OF LIABILITY,  WHETHER  IN CONTRACT,  STRICT LIABILITY,  OR TORT
- (INCLUDING  NEGLIGENCE OR  OTHERWISE) ARISING IN  ANY WAY OUT OF THE  USE OF
- THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- 
- This software  consists of voluntary contributions made  by many individuals
- on  behalf  of the Apache Software  Foundation. For more  information on the
- Apache Software Foundation, please see <http://www.apache.org/>.
+
+                                   Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
--- /cvsroot/pkg-java/batik/debian/libbatik-java.README.Debian	2005/03/21 15:11:59	1.2
+++ /cvsroot/pkg-java/batik/debian/libbatik-java.README.Debian	2005/10/28 13:15:02	1.3
@@ -1,9 +1,13 @@
-The files in /usr/share/java
+batik for Debian
+----------------
 
-batik.jar     (full library)
-batik-ext.jar (batik dom and sax bindings)
-batik-all.jar (batik without dom and sax bindings)
+Batik in Debian consists of the following jar files
+in /usr/share/java:
 
-The batik library currently needs a SUN JDK 1.4 for compilation 
-as it requires several swing stuff and DOM Level 2 interface 
-classes (org.w3c.dom) to compile against.
+batik.jar      (full batik library - link to batik-all.jar)
+batik-all.jar  (full batik library)
+batik-ext.jar  (batik dom and sax bindings)
+batik-libs.jar (batik without dom and sax bindings)
+
+fop-transcoder.jar (the ps/pdf transcoder for batik 
+                    from the fop project)
--- /cvsroot/pkg-java/batik/debian/rules	2005/03/21 15:11:59	1.3
+++ /cvsroot/pkg-java/batik/debian/rules	2005/10/28 13:15:02	1.4
@@ -4,24 +4,37 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This is the debhelper compatibility version to use.
-#export DH_COMPAT=4
+export VERSION = $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\-)
 
 export JITC_PROCESSOR_TYPE=6
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-JAVA_HOME_DIRS       := /usr/local/IBMJava2-ppc-141 /usr/local/IBMJava2-ppc-142 /usr/lib/j2sdk1.4-sun /usr/lib/j2se/1.4 /usr/lib/j2se/1.3 
-ANT_HOME             := /usr/share/ant1.6
-DEB_JARS             := /usr/share/ant1.6/lib/ant-launcher.jar bfs gnujaxp js xalan2
-#DEB_ANT_COMPILER     := jikes
+JAVA_HOME_DIRS       := /usr/lib/j2sdk1.4-sun /usr/lib/j2sdk1.4-ibm /usr/lib/j2sdk1.4-blackdown /usr/local/IBMJava2-ppc-142
+ANT_HOME             := /usr/share/ant
+DEB_JARS             := $(ANT_HOME)/lib/ant-launcher.jar bfs gnujaxp js xalan2 
 DEB_ANT_COMPILER     := modern
-DEB_ANT_BUILD_TARGET := all-jar libs-jar ext-jar
+DEB_ANT_BUILD_TARGET := all-jar libs-jar ext-jar transcoder
 DEB_BUILDDIR         := .
 DEB_ANT_BUILDFILE    := build.xml
 DEB_ANT_CLEAN_TARGET := clean
 
 LIBRARY=batik
-VERSION=1.5.1
+VERSION=1.6
 
+clean::
+	rm -Rf pdf-transcoder/build
+
+install/libbatik-java::
+	install -m 644 batik-1.6/lib/batik-libs.jar debian/libbatik-java/usr/share/java/batik-libs-$(VERSION).jar
+	install -m 644 batik-1.6/lib/batik-ext.jar debian/libbatik-java/usr/share/java/batik-ext-$(VERSION).jar
+	install -m 644 batik-1.6/lib/batik-all.jar debian/libbatik-java/usr/share/java/batik-all-$(VERSION).jar
+	install -m 644 pdf-transcoder/build/fop-transcoder.jar debian/libbatik-java/usr/share/java/fop-transcoder-$(VERSION).jar
+	ln -s batik-libs-$(VERSION).jar debian/libbatik-java/usr/share/java/batik-libs.jar
+	ln -s batik-ext-$(VERSION).jar debian/libbatik-java/usr/share/java/batik-ext.jar
+	ln -s batik-all-$(VERSION).jar debian/libbatik-java/usr/share/java/batik-all.jar
+	ln -s batik-all-$(VERSION).jar debian/libbatik-java/usr/share/java/batik.jar
+	ln -s batik-all-$(VERSION).jar debian/libbatik-java/usr/share/java/batik-$(VERSION).jar
+	ln -s fop-transcoder-$(VERSION).jar debian/libbatik-java/usr/share/java/fop-transcoder.jar



More information about the pkg-java-commits mailing list