[med-svn] [visad] 01/15: First pass at visad
Andreas Tille
tille at debian.org
Sat Dec 30 13:05:28 UTC 2017
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository visad.
commit fef2942b61ead7c160af2204cae890c1220ce1ef
Author: Mathieu Malaterre <malat at debian.org>
Date: Mon Sep 12 16:13:44 2011 +0000
First pass at visad
---
debian/README.source | 4 +
debian/changelog | 5 +
debian/compat | 1 +
debian/control | 34 ++++
debian/copyright | 352 ++++++++++++++++++++++++++++++++++
debian/get-orig-source | 29 +++
debian/libjai-core-java-doc.javadoc | 1 +
debian/libjai-core-java.install | 1 +
debian/libjai-core-java.jlibs | 1 +
debian/patches/remove_jpegparam.patch | 223 +++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 12 ++
debian/source/format | 1 +
13 files changed, 665 insertions(+)
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..411b786
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,4 @@
+This package is also available under the JDL license. However this is clearly impossible to have it in debian.
+Package is thus released under JRL
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Mon, 12 Sep 2011 09:56:16 +0200
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..4de0b9b
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+visad (2.0-1) unstable; urgency=low
+
+ * Initial Debian Upload (Closes: #)
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Mon, 12 Sep 2011 09:56:16 +0200
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..45a4fb7
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+8
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..0dcde02
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,34 @@
+Source: visad
+Priority: optional
+Section: non-free/java
+Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
+DM-Upload-Allowed: yes
+Uploaders: Mathieu Malaterre <mathieu.malaterre at gmail.com>
+Build-Depends: debhelper (>= 8), javahelper (>=0.25)
+Build-Depends-Indep: default-jdk, default-jdk-doc, ant
+Standards-Version: 3.9.2
+Homepage: http://java.net/projects/jai-core/
+Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/jai-core/trunk/
+Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/jai-core/trunk/
+
+
+Package: libjai-core-java
+Architecture: i386 amd64
+Depends: ${java:Depends}, ${misc:Depends}, ${shlibs:Depends}
+Recommends: ${java:Recommends}
+Description: Java Advanced Imaging API reference implementation
+ This project contains the source code for the core Java Advanced Imaging API
+ reference implementation containing the packages javax.media.jai.* and
+ com.sun.media.jai.*.
+
+Package: libjai-core-java-doc
+Section: non-free/doc
+Architecture: all
+Depends: ${java:Depends}, ${misc:Depends}
+Recommends: ${java:Recommends}
+Description: Java Advanced Imaging API reference implementation (documentation)
+ This project contains the source code for the core Java Advanced Imaging API
+ reference implementation containing the packages javax.media.jai.* and
+ com.sun.media.jai.*.
+ .
+ This package provides the documentation for the library
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..d02ddb6
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,352 @@
+Format: http://dep.debian.net/deps/dep5/
+Upstream-Name: Jai-core
+Source: http://java.net/projects/jai-core
+
+Files: *
+Copyright: © 2005 Sun Microsystems, Inc. All rights reserved.
+Licence: JRL Version 1.5
+ I. DEFINITIONS.
+
+ "Licensee " means You and any other party that has entered into and has
+ in effect a version of this License.
+
+ "Modifications" means any (a) change or addition to the Technology or
+ (b) new source or object code implementing any portion of the
+ Technology.
+
+ "Sun" means Sun Microsystems, Inc. and its successors and assignees.
+
+ "Research Use" means research, evaluation, or development for the
+ purpose of advancing knowledge, teaching, learning, or customizing the
+ Technology or Modifications for personal use. Research Use expressly
+ excludes use or distribution for direct or indirect commercial
+ (including strategic) gain or advantage.
+
+ "Technology" means the source code, object code and specifications of
+ the technology made available by Sun pursuant to this License.
+
+ "Technology Site" means the website designated by Sun for accessing the
+ Technology.
+
+ "You" means the individual executing this License or the legal entity or
+ entities represented by the individual executing this License.
+
+ II. PURPOSE.
+
+ Sun is licensing the Technology under this Java Research License (the
+ "License") to promote research, education, innovation, and development
+ using the Technology.
+
+ COMMERCIAL USE AND DISTRIBUTION OF TECHNOLOGY AND MODIFICATIONS IS
+ PERMITTED ONLY UNDER A SUN COMMERCIAL LICENSE.
+
+ III. RESEARCH USE RIGHTS.
+
+ A. License Grant. Subject to the conditions contained herein, Sun
+ grants to You a non-exclusive, non-transferable, worldwide, and
+ royalty-free license to do the following for Your Research Use only:
+
+ 1. Reproduce, create Modifications of, and use the Technology alone, or
+ with Modifications;
+
+ 2. Share source code of the Technology alone, or with Modifications,
+ with other Licensees; and
+
+ 3. Distribute object code of the Technology, alone, or with
+ Modifications, to any third parties for Research Use only, under a
+ license of Your choice that is consistent with this License; and publish
+ papers and books discussing the Technology which may include relevant
+ excerpts that do not in the aggregate constitute a significant portion
+ of the Technology.
+
+ B. Residual Rights. You may use any information in intangible form that
+ you remember after accessing the Technology, except when such use
+ violates Sun's copyrights or patent rights.
+
+ C. No Implied Licenses. Other than the rights granted herein, Sun
+ retains all rights, title, and interest in Technology, and You retain
+ all rights, title, and interest in Your Modifications and associated
+ specifications, subject to the terms of this License.
+
+ D. Open Source Licenses. Portions of the Technology may be provided
+ with notices and open source licenses from open source communities and
+ third parties that govern the use of those portions, and any licenses
+ granted hereunder do not alter any rights and obligations you may have
+ under such open source licenses, however, the disclaimer of warranty and
+ limitation of liability provisions in this License will apply to all
+ Technology in this distribution.
+
+ IV. INTELLECTUAL PROPERTY REQUIREMENTS
+
+ As a condition to Your License, You agree to comply with the following
+ restrictions and responsibilities:
+
+ A. License and Copyright Notices. You must include a copy of this Java
+ Research License in a Readme file for any Technology or Modifications
+ you distribute. You must also include the following statement, "Use and
+ distribution of this technology is subject to the Java Research License
+ included herein", (a) once prominently in the source code tree and/or
+ specifications for Your source code distributions, and (b) once in the
+ same file as Your copyright or proprietary notices for Your binary code
+ distributions. You must cause any files containing Your Modification to
+ carry prominent notice stating that You changed the files. You must not
+ remove or alter any copyright or other proprietary notices in the
+ Technology.
+
+ B. Licensee Exchanges. Any Technology and Modifications You receive
+ from any Licensee are governed by this License.
+
+ V. GENERAL TERMS.
+
+ A. Disclaimer Of Warranties.
+
+ THE TECHNOLOGY IS PROVIDED "AS IS", WITHOUT WARRANTIES OF ANY KIND,
+ EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT
+ THE TECHNOLOGY IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR
+ PURPOSE, OR NON-INFRINGING OF THIRD PARTY RIGHTS. YOU AGREE THAT YOU
+ BEAR THE ENTIRE RISK IN CONNECTION WITH YOUR USE AND DISTRIBUTION OF ANY
+ AND ALL TECHNOLOGY UNDER THIS LICENSE.
+
+ B. Infringement; Limitation Of Liability.
+
+ 1. If any portion of, or functionality implemented by, the Technology
+ becomes the subject of a claim or threatened claim of infringement
+ ("Affected Materials"), Sun may, in its unrestricted discretion, suspend
+ Your rights to use and distribute the Affected Materials under this
+ License. Such suspension of rights will be effective immediately upon
+ Sun's posting of notice of suspension on the Technology Site.
+
+ 2. IN NO EVENT WILL SUN BE LIABLE FOR ANY DIRECT, INDIRECT, PUNITIVE,
+ SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES IN CONNECTION WITH OR
+ ARISING OUT OF THIS LICENSE (INCLUDING, WITHOUT LIMITATION, LOSS OF
+ PROFITS, USE, DATA, OR ECONOMIC ADVANTAGE OF ANY SORT), HOWEVER IT
+ ARISES AND ON ANY THEORY OF LIABILITY (including negligence), WHETHER OR
+ NOT SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. LIABILITY
+ UNDER THIS SECTION V.B.2 SHALL BE SO LIMITED AND EXCLUDED,
+ NOTWITHSTANDING FAILURE OF THE ESSENTIAL PURPOSE OF ANY REMEDY.
+
+ C. Termination.
+
+ 1. You may terminate this License at any time by notifying Sun in writing.
+
+ 2. All Your rights will terminate under this License if You fail to
+ comply with any of its material terms or conditions and do not cure such
+ failure within thirty (30) days after becoming aware of such
+ noncompliance.
+
+ 3. Upon termination, You must discontinue all uses and distribution of
+ the Technology, and all provisions of this Section V ("General Terms")
+ shall survive termination.
+
+ D. Miscellaneous.
+
+ 1. Trademark. You agree to comply with Sun's Trademark & Logo Usage
+ Requirements, as modified from time to time, available at
+ http://www.sun.com/policies/trademarks/. Except as expressly provided
+ in this License, You are granted no rights in or to any Sun trademarks
+ now or hereafter used or licensed by Sun.
+
+ 2. Integration. This License represents the complete agreement of the
+ parties concerning its subject matter.
+
+ 3. Severability. If any provision of this License is held
+ unenforceable, such provision shall be reformed to the extent necessary
+ to make it enforceable unless to do so would defeat the intent of the
+ parties, in which case, this License shall terminate.
+
+ 4. Governing Law. This License is governed by the laws of the United
+ States and the State of California, as applied to contracts entered into
+ and performed in California between California residents. In no event
+ shall this License be construed against the drafter.
+
+ 5. Export Control. As further described at http://www.sun.com/its, you
+ agree to comply with the U.S. export controls and trade laws of other
+ countries that apply to Technology and Modifications.
+
+Licence: JDL Version 1.1.X
+
+
+Files: src/share/mediaLib/linux/*/libmlib_jai.so
+Copyright: Sun Microsystems, Inc.
+License:
+ READ THE TERMS OF THIS AGREEMENT AND ANY PROVIDED SUPPLEMENTAL LICENSE
+ TERMS (COLLECTIVELY "AGREEMENT") CAREFULLY BEFORE OPENING THE SOFTWARE
+ MEDIA PACKAGE. BY OPENING THE SOFTWARE MEDIA PACKAGE, YOU AGREE TO THE
+ TERMS OF THIS AGREEMENT. IF YOU ARE ACCESSING THE SOFTWARE
+ ELECTRONICALLY, INDICATE YOUR ACCEPTANCE OF THESE TERMS BY SELECTING THE
+ "ACCEPT" BUTTON AT THE END OF THIS AGREEMENT. IF YOU DO NOT AGREE TO
+ ALL THESE TERMS, PROMPTLY RETURN THE UNUSED SOFTWARE TO YOUR PLACE OF
+ PURCHASE FOR A REFUND OR, IF THE SOFTWARE IS ACCESSED ELECTRONICALLY,
+ SELECT THE "DECLINE" BUTTON AT THE END OF THIS AGREEMENT.
+
+ 1. LICENSE TO USE. Sun grants you a non-exclusive and non-transferable
+ license for the internal use only of the accompanying software and
+ documentation,the Java Advanced and any error corrections provided by
+ Sun (collectively "Software"), by the number of users and the class of
+ computer hardware for which the corresponding fee has been paid.
+
+ 2. RESTRICTIONS. Software is confidential and copyrighted. Title to
+ Software and all associated intellectual property rights is retained by
+ Sun and/or its licensors. Except as specifically authorized in any
+ Supplemental License Terms, you may not make copies of Software, other
+ than a single copy of Software for archival purposes. Unless
+ enforcement is prohibited by applicable law, you may not modify,
+ decompile, or reverse engineer Software. Licensee acknowledges that
+ Software is not designed or intended for use in the design,
+ construction, operation or maintenance of any nuclear facility. Sun
+ Microsystems, Inc. disclaims any express or implied warranty of fitness
+ for such uses. No right, title or interest in or to any trademark,
+ service mark, logo or trade name of Sun or its licensors is granted
+ under this Agreement.
+
+ 3. LIMITED WARRANTY. Sun warrants to you that for a period of ninety
+ (90) days from the date of purchase, as evidenced by a copy of the
+ receipt, the media on which Software is furnished (if any) will be free
+ of defects in materials and workmanship under normal use. Except for the
+ foregoing, Software is provided "AS IS". Your exclusive remedy and
+ Sun's entire liability under this limited warranty will be at Sun's
+ option to replace Software media or refund the fee paid for Software.
+
+ 4. DISCLAIMER OF WARRANTY. UNLESS SPECIFIED IN THIS AGREEMENT, ALL
+ EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING
+ ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+ PURPOSE OR NON-INFRINGEMENT ARE DISCLAIMED, EXCEPT TO THE EXTENT THAT
+ THESE DISCLAIMERS ARE HELD TO BE LEGALLY INVALID.
+
+ 5. LIMITATION OF LIABILITY. TO THE EXTENT NOT PROHIBITED BY LAW, IN NO
+ EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT
+ OR DATA, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
+ DAMAGES, HOWEVER CAUSED REGARDLESS OF THE THEORY OF LIABILITY, ARISING
+ OUT OF OR RELATED TO THE USE OF OR INABILITY TO USE SOFTWARE, EVEN IF
+ SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. In no event
+ will Sun's liability to you, whether in contract, tort (including
+ negligence), or otherwise, exceed the amount paid by you for Software
+ under this Agreement. The foregoing limitations will apply even if the
+ above stated warranty fails of its essential purpose.
+
+ 6. Termination. This Agreement is effective until terminated. You may
+ terminate this Agreement at any time by destroying all copies of
+ Software. This Agreement will terminate immediately without notice from
+ Sun if you fail to comply with any provision of this Agreement. Upon
+ Termination, you must destroy all copies of Software.
+
+ 7. Export Regulations. All Software and technical data delivered under
+ this Agreement are subject to US export control laws and may be subject
+ to export or import regulations in other countries. You agree to comply
+ strictly with all such laws and regulations and acknowledge that you
+ have the responsibility to obtain such licenses to export, re-export, or
+ import as may be required after delivery to you.
+
+ 8. U.S. Government Restricted Rights. If Software is being acquired by
+ or on behalf of the U.S. Government or by a U.S. Government prime
+ contractor or subcontractor (at any tier), then the Government's rights
+ in Software and accompanying documentation will be only as set forth in
+ this Agreement; this is in accordance with 48 CFR 227.7201 through
+ 227.7202-4 (for Department of Defense (DOD) acquisitions) and with 48
+ CFR 2.101 and 12.212 (for non-DOD acquisitions).
+
+ 9. Governing Law. Any action related to this Agreement will be
+ governed by California law and controlling U.S. federal law. No choice
+ of law rules of any jurisdiction will apply.
+
+ 10. Severability. If any provision of this Agreement is held to be
+ unenforceable, this Agreement will remain in effect with the provision
+ omitted, unless omission would frustrate the intent of the parties, in
+ which case this Agreement will immediately terminate.
+
+ 11. Integration. This Agreement is the entire agreement between you and
+ Sun relating to its subject matter. It supersedes all prior or
+ contemporaneous oral or written communications, proposals,
+ representations and warranties and prevails over any conflicting or
+ additional terms of any quote, order, acknowledgment, or other
+ communication between the parties relating to its subject matter during
+ the term of this Agreement. No modification of this Agreement will be
+ binding, unless in writing and signed by an authorized representative of
+ each party.
+
+
+ MEDIALIB FOR JAI
+
+ SUPPLEMENTAL LICENSE TERMS
+
+ These supplemental license terms ("Supplemental Terms") add to or modify
+ the terms of the Binary Code License Agreement (collectively, the
+ "Agreement"). Capitalized terms not defined in these Supplemental Terms
+ shall have the same meanings ascribed to them in the Agreement. These
+ Supplemental Terms shall supersede any inconsistent or conflicting terms
+ in the Agreement, or in any license contained within the Software.
+
+ 1. Software Internal Use and Development License Grant. Subject to the
+ terms and conditions of this Agreement, including, but not limited to
+ Section 3 (Java Technology Restrictions) of these Supplemental Terms,
+ Sun grants you a non-exclusive, non-transferable, limited license to
+ reproduce internally and use internally the binary form of the Software
+ and the Java Advanced Imaging and the JAI Image I/O Open Source Project,
+ complete and unmodified, for the sole purpose of designing, developing
+ and testing your Java applets and applications ("Programs").
+
+ 2. License to Distribute Software. In addition to the license granted
+ in Section 1 (Software Internal Use and Development License Grant) of
+ these Supplemental Terms, subject to the terms and conditions of this
+ Agreement, including but not limited to, Section 3 (Java Technology
+ Restrictions) of these Supplemental Terms, Sun grants you a
+ non-exclusive, non-transferable, limited license to reproduce and
+ distribute the Software in binary code form only, provided that you (i)
+ distribute the Software complete and unmodified and only bundled as part
+ of your Programs, (ii) do not distribute additional software intended to
+ replace any component(s) of the Software, (iii) do not remove or alter
+ any proprietary legends or notices contained in the Software, (iv) only
+ distribute the Software subject to a license agreement that protects
+ Sun's interests consistent with the terms contained in this Agreement,
+ (v) agree to defend and indemnify Sun and its licensors from and against
+ any damages, costs, liabilities, settlement amounts and/or expenses
+ (including attorneys' fees) incurred in connection with any claim,
+ lawsuit or action by any third party that arises or results from the use
+ or distribution of any and all Programs and/or Software, and (vi) bundle
+ the Software with the implementation of the Java Advanced Imaging and
+ the JAI Image I/O Open Source Project.
+
+ 3. Java Technology Restrictions. You may not modify the Java Platform
+ Interface ("JPI", identified as classes contained within the "java"
+ package or any subpackages of the "java" package), by creating
+ additional classes within the JPI or otherwise causing the addition to
+ or modification of the classes in the JPI. In the event that you create
+ an additional class and associated API(s) which (i) extends the
+ functionality of the Java platform, and (ii) is exposed to third party
+ software developers for the purpose of developing additional software
+ which invokes such additional API, you must promptly publish broadly an
+ accurate specification for such API for free use by all developers. You
+ may not create, or authorize your licensees to create additional
+ classes, interfaces, or subpackages that are in any way identified as
+ "java", "javax", "sun" or similar convention as specified by Sun in any
+ naming convention designation.
+
+ 4. Java Runtime Availability. Refer to the appropriate version of the
+ Java Runtime Environment binary code license (currently located at
+ http://www.java.sun.com/jdk/index.html) for the availability of runtime
+ code which may be distributed with Java applets and applications.
+
+ 5. Trademarks and Logos. You acknowledge and agree as between you and
+ Sun that Sun owns the SUN, SOLARIS, JAVA, JINI, FORTE, and iPLANET
+ trademarks and all SUN, SOLARIS, JAVA, JINI, FORTE, and iPLANET-related
+ trademarks, service marks, logos and other brand designations ("Sun
+ Marks"), and you agree to comply with the Sun Trademark and Logo Usage
+ Requirements currently located at
+ http://www.sun.com/policies/trademarks. Any use you make of the Sun
+ Marks inures to Sun's benefit.
+
+ 6. Source Code. Software may contain source code that is provided solely
+ for reference purposes pursuant to the terms of this Agreement. Source
+ code may not be redistributed unless expressly provided for in this
+ Agreement.
+
+ 7. Termination for Infringement. Either party may terminate this
+ Agreement immediately should any Software become, or in either party's
+ opinion be likely to become, the subject of a claim of infringement of
+ any intellectual property right.
+
+
+Files: debian/*
+Copyright: © 2011 Mathieu Malaterre <mathieu.malaterre at gmail.com>
+License: PD
+ The packaging work is in the public domain unless stated otherwise.
diff --git a/debian/get-orig-source b/debian/get-orig-source
new file mode 100755
index 0000000..7a3bc1a
--- /dev/null
+++ b/debian/get-orig-source
@@ -0,0 +1,29 @@
+#!/bin/sh
+set -ex
+
+PACKAGE=visad
+
+VERSION=${VERSION:-$2}
+TARFILE=${TARFILE:-$3}
+
+if [ -z ${VERSION}]; then
+VERSION=`dpkg-parsechangelog | sed -n -e 's/^Version: \(.*\)-[^-]*$/\1/p'`
+fi
+
+REVISION=`echo $VERSION | sed -e 's/^.*svn//g'`
+
+
+if [ -z ${TARFILE}]; then
+TARFILE=${PACKAGE}_${VERSION}.orig.tar.gz
+fi
+
+FOLDER=${PACKAGE}-${VERSION}
+
+wget -c ftp://ftp.ssec.wisc.edu/pub/visad-2.0/visad_src.jar
+mkdir ${FOLDER}
+cd ${FOLDER}
+jar xvf ../visad_src.jar
+cd ..
+
+GZIP="--best --no-name" tar czf ${TARFILE} ${FOLDER}
+rm -rf ${FOLDER}
diff --git a/debian/libjai-core-java-doc.javadoc b/debian/libjai-core-java-doc.javadoc
new file mode 100644
index 0000000..646a3e2
--- /dev/null
+++ b/debian/libjai-core-java-doc.javadoc
@@ -0,0 +1 @@
+build/linux-amd64/javadocs/docs-jcp usr/share/doc/libjai-core-java/api
diff --git a/debian/libjai-core-java.install b/debian/libjai-core-java.install
new file mode 100644
index 0000000..0f65fb3
--- /dev/null
+++ b/debian/libjai-core-java.install
@@ -0,0 +1 @@
+build/linux-*/opt/lib/*/libmlib_jai.so usr/lib/jni
diff --git a/debian/libjai-core-java.jlibs b/debian/libjai-core-java.jlibs
new file mode 100644
index 0000000..0eb2d1c
--- /dev/null
+++ b/debian/libjai-core-java.jlibs
@@ -0,0 +1 @@
+build/linux-*/opt/lib/ext/*.jar
diff --git a/debian/patches/remove_jpegparam.patch b/debian/patches/remove_jpegparam.patch
new file mode 100644
index 0000000..f8c5e47
--- /dev/null
+++ b/debian/patches/remove_jpegparam.patch
@@ -0,0 +1,223 @@
+HACK: This patch only allows compilation of jai-core
+See real proper fix at http://lists.debian.org/debian-java/2011/09/msg00054.html
+Index: jai-core-1.1/src/share/classes/com/sun/media/jai/tilecodec/JPEGTileDecoder.java
+===================================================================
+--- jai-core-1.1.orig/src/share/classes/com/sun/media/jai/tilecodec/JPEGTileDecoder.java 2011-09-12 10:26:41.000000000 +0200
++++ jai-core-1.1/src/share/classes/com/sun/media/jai/tilecodec/JPEGTileDecoder.java 2011-09-12 10:32:15.000000000 +0200
+@@ -30,7 +30,7 @@
+ import com.sun.image.codec.jpeg.JPEGImageDecoder;
+ import com.sun.image.codec.jpeg.JPEGCodec;
+ import com.sun.image.codec.jpeg.JPEGQTable;
+-import sun.awt.image.codec.JPEGParam;
++//import sun.awt.image.codec.JPEGParam;
+ import com.sun.media.jai.util.ImageUtil;
+ /**
+ * A concrete implementation of the <code>TileDecoderImpl</code> class
+@@ -136,23 +136,23 @@
+
+ // extract the horizontal subsampling rates
+ int[] horizontalSubsampling = new int[bandNum];
+- for (int i = 0; i < bandNum; i++)
+- horizontalSubsampling[i] = jdp.getHorizontalSubsampling(i);
++ //for (int i = 0; i < bandNum; i++)
++ // horizontalSubsampling[i] = jdp.getHorizontalSubsampling(i);
+ paramList.setParameter("horizontalSubsampling", horizontalSubsampling);
+
+ // extract the vertical subsampling rates
+ int[] verticalSubsampling = new int[bandNum];
+- for (int i = 0; i < bandNum; i++)
+- verticalSubsampling[i] = jdp.getVerticalSubsampling(i);
++ //for (int i = 0; i < bandNum; i++)
++ // verticalSubsampling[i] = jdp.getVerticalSubsampling(i);
+ paramList.setParameter("verticalSubsampling", verticalSubsampling);
+
+ // if the quality is not set, extract the quantization tables from
+ // the stream; otherwise, define them with the default values.
+ if (!paramList.getBooleanParameter("qualitySet"))
+ for (int i = 0; i < 4; i++) {
+- JPEGQTable table = jdp.getQTable(i);
+- paramList.setParameter("quantizationTable"+i,
+- (table == null) ? null : table.getTable());
++ //JPEGQTable table = jdp.getQTable(i);
++ //paramList.setParameter("quantizationTable"+i,
++ // (table == null) ? null : table.getTable());
+ }
+ else {
+ ParameterListDescriptor pld
+@@ -165,20 +165,20 @@
+
+ // extract the quantizationTableMapping
+ int[] quanTableMapping = new int[bandNum];
+- for (int i = 0; i < bandNum; i++)
+- quanTableMapping[i] = jdp.getQTableComponentMapping(i);
++ //for (int i = 0; i < bandNum; i++)
++ // quanTableMapping[i] = jdp.getQTableComponentMapping(i);
+ paramList.setParameter("quantizationTableMapping", quanTableMapping);
+
+ // extract the writeTableInfo and writeImageInfo
+- paramList.setParameter("writeTableInfo", jdp.isTableInfoValid());
+- paramList.setParameter("writeImageInfo", jdp.isImageInfoValid());
++ //paramList.setParameter("writeTableInfo", jdp.isTableInfoValid());
++ //paramList.setParameter("writeImageInfo", jdp.isImageInfoValid());
+
+ // extract the restart interval
+- paramList.setParameter("restartInterval", jdp.getRestartInterval());
++ //paramList.setParameter("restartInterval", jdp.getRestartInterval());
+
+ // define writeJFIFHeader by examing the APP0_MARKER is set or not
+- paramList.setParameter("writeJFIFHeader",
+- jdp.getMarker(JPEGDecodeParam.APP0_MARKER));
++ //paramList.setParameter("writeJFIFHeader",
++// jdp.getMarker(JPEGDecodeParam.APP0_MARKER));
+ }
+ }
+
+Index: jai-core-1.1/src/share/classes/com/sun/media/jai/tilecodec/JPEGTileEncoder.java
+===================================================================
+--- jai-core-1.1.orig/src/share/classes/com/sun/media/jai/tilecodec/JPEGTileEncoder.java 2011-09-12 10:27:28.000000000 +0200
++++ jai-core-1.1/src/share/classes/com/sun/media/jai/tilecodec/JPEGTileEncoder.java 2011-09-12 10:35:08.000000000 +0200
+@@ -29,7 +29,7 @@
+ import com.sun.image.codec.jpeg.JPEGImageEncoder ;
+ import com.sun.image.codec.jpeg.JPEGCodec ;
+ import com.sun.image.codec.jpeg.JPEGQTable ;
+-import sun.awt.image.codec.JPEGParam ;
++//import sun.awt.image.codec.JPEGParam ;
+
+ /**
+ * A concrete implementation of the <code>TileEncoderImpl</code> class
+@@ -84,8 +84,8 @@
+ SampleModel sm = ras.getSampleModel() ;
+
+ JPEGEncodeParam j2dEP = convertToJ2DJPEGEncodeParam(paramList, sm) ;
+- ((JPEGParam)j2dEP).setWidth(ras.getWidth()) ;
+- ((JPEGParam)j2dEP).setHeight(ras.getHeight()) ;
++ //((JPEGParam)j2dEP).setWidth(ras.getWidth()) ;
++ //((JPEGParam)j2dEP).setHeight(ras.getHeight()) ;
+
+ JPEGImageEncoder encoder = JPEGCodec.createJPEGEncoder(baos, j2dEP) ;
+ encoder.encode(ras) ;
+@@ -112,7 +112,7 @@
+
+ int nbands = sm.getNumBands() ;
+
+- JPEGParam j2dJP = createDefaultJ2DJPEGEncodeParam(nbands) ;
++ //JPEGParam j2dJP = createDefaultJ2DJPEGEncodeParam(nbands) ;
+
+ int[] hSubSamp
+ = (int[])paramList.getObjectParameter("horizontalSubsampling") ;
+@@ -122,37 +122,38 @@
+ = (int[])paramList.getObjectParameter("quantizationTableMapping") ;
+
+ for(int i=0; i<nbands; i++) {
+- j2dJP.setHorizontalSubsampling(i, hSubSamp[i]) ;
+- j2dJP.setVerticalSubsampling(i, vSubSamp[i]) ;
++ //j2dJP.setHorizontalSubsampling(i, hSubSamp[i]) ;
++ //j2dJP.setVerticalSubsampling(i, vSubSamp[i]) ;
+
+ int[] qTab
+ = (int[]) paramList.getObjectParameter("quantizationTable"+i) ;
+ if(qTab != null &&
+ qTab.equals(ParameterListDescriptor.NO_PARAMETER_DEFAULT)){
+- j2dJP.setQTableComponentMapping(i, qTabSlot[i]) ;
+- j2dJP.setQTable(qTabSlot[i], new JPEGQTable(qTab)) ;
++ //j2dJP.setQTableComponentMapping(i, qTabSlot[i]) ;
++ //j2dJP.setQTable(qTabSlot[i], new JPEGQTable(qTab)) ;
+ }
+ }
+
+ if(paramList.getBooleanParameter("qualitySet")) {
+ float quality = paramList.getFloatParameter("quality") ;
+- j2dJP.setQuality(quality, true) ;
++ //j2dJP.setQuality(quality, true) ;
+ }
+
+ int rInt = paramList.getIntParameter("restartInterval") ;
+- j2dJP.setRestartInterval(rInt) ;
++ //j2dJP.setRestartInterval(rInt) ;
+
+- j2dJP.setImageInfoValid(paramList.getBooleanParameter("writeImageInfo")) ;
+- j2dJP.setTableInfoValid(paramList.getBooleanParameter("writeTableInfo")) ;
++ //j2dJP.setImageInfoValid(paramList.getBooleanParameter("writeImageInfo")) ;
++ //j2dJP.setTableInfoValid(paramList.getBooleanParameter("writeTableInfo")) ;
+
+ if(paramList.getBooleanParameter("writeJFIFHeader")) {
+- j2dJP.setMarkerData(JPEGEncodeParam.APP0_MARKER, null) ;
++ //j2dJP.setMarkerData(JPEGEncodeParam.APP0_MARKER, null) ;
+ }
+
+- return (JPEGEncodeParam)j2dJP ;
++ //return (JPEGEncodeParam)j2dJP ;
++ return null;
+ }
+
+- private JPEGParam createDefaultJ2DJPEGEncodeParam(int nbands){
++/* private JPEGParam createDefaultJ2DJPEGEncodeParam(int nbands){
+ if(nbands == 1)
+ return new JPEGParam(JPEGEncodeParam.COLOR_ID_GRAY, 1) ;
+ if(nbands == 3)
+@@ -160,5 +161,5 @@
+ if(nbands == 4)
+ return new JPEGParam(JPEGEncodeParam.COLOR_ID_CMYK, 4) ;
+ return null ;
+- }
++ }*/
+ }
+Index: jai-core-1.1/src/share/classes/com/sun/media/jai/codecimpl/JPEGImageEncoder.java
+===================================================================
+--- jai-core-1.1.orig/src/share/classes/com/sun/media/jai/codecimpl/JPEGImageEncoder.java 2011-09-12 10:28:57.000000000 +0200
++++ jai-core-1.1/src/share/classes/com/sun/media/jai/codecimpl/JPEGImageEncoder.java 2011-09-12 10:47:55.000000000 +0200
+@@ -75,10 +75,10 @@
+ // If subsampling factors were set, apply them
+ //
+ val = jaiEP.getHorizontalSubsampling(i);
+- j2dEP.setHorizontalSubsampling(i, val);
++ //j2dEP.setHorizontalSubsampling(i, val);
+
+ val = jaiEP.getVerticalSubsampling(i);
+- j2dEP.setVerticalSubsampling(i, val);
++ //j2dEP.setVerticalSubsampling(i, val);
+
+ //
+ // If new Q factors were supplied, apply them
+@@ -86,8 +86,8 @@
+ if (jaiEP.isQTableSet(i)) {
+ qTab = jaiEP.getQTable(i);
+ val = jaiEP.getQTableSlot(i);
+- j2dEP.setQTableComponentMapping(i, val);
+- j2dEP.setQTable(val, new JPEGQTable(qTab));
++ //j2dEP.setQTableComponentMapping(i, val);
++ //j2dEP.setQTable(val, new JPEGQTable(qTab));
+ }
+ }
+
+@@ -115,8 +115,8 @@
+
+ // Write the JFIF (APP0) marker
+ if (jaiEP.getWriteJFIFHeader() == false) {
+- j2dEP.setMarkerData(
+- com.sun.image.codec.jpeg.JPEGDecodeParam.APP0_MARKER, null);
++ //j2dEP.setMarkerData(
++ // com.sun.image.codec.jpeg.JPEGDecodeParam.APP0_MARKER, null);
+ }
+
+ }
+@@ -272,15 +272,15 @@
+ encoder = com.sun.image.codec.jpeg.JPEGCodec.createJPEGEncoder(
+ output, j2dEP);
+
+- try {
++ //try {
+ // Write the image data.
+ encoder.encode(bi);
+- } catch(IOException e) {
++ /*} catch(IOException e) {
+ String message = JaiI18N.getString("JPEGImageEncoder2");
+ ImagingListenerProxy.errorOccurred(message, new ImagingException(message, e),
+ this, false);
+-// throw new RuntimeException(e.getMessage());
+- }
++ throw new RuntimeException(e.getMessage());
++ }*/
+
+ }
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..0f9eafb
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+remove_jpegparam.patch
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..16e92c8
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,12 @@
+#!/usr/bin/make -f
+
+JAVA_HOME=/usr/lib/jvm/default-java
+
+%:
+ dh $@ --with javahelper
+
+override_dh_auto_build:
+ ant -DBUILD_TYPE=fcs -f build.xml all
+
+get-orig-source:
+ ./debian/get-orig-source
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/visad.git
More information about the debian-med-commit
mailing list