[pkg-java] r13523 - in trunk/libitext5-java/debian: . patches
Andrew Ross
rockclimb-guest at alioth.debian.org
Tue Apr 12 23:03:41 UTC 2011
Author: rockclimb-guest
Date: 2011-04-12 23:03:36 +0000 (Tue, 12 Apr 2011)
New Revision: 13523
Added:
trunk/libitext5-java/debian/docs
trunk/libitext5-java/debian/javabuild
trunk/libitext5-java/debian/libitext5-java-doc.javadoc
trunk/libitext5-java/debian/libitext5-java.jlibs
Removed:
trunk/libitext5-java/debian/patches/01_allow_standard_input.diff
trunk/libitext5-java/debian/patches/debian-specifics.diff
Modified:
trunk/libitext5-java/debian/changelog
trunk/libitext5-java/debian/control
trunk/libitext5-java/debian/copyright
trunk/libitext5-java/debian/patches/series
trunk/libitext5-java/debian/rules
trunk/libitext5-java/debian/watch
Log:
Updated to new iText repository layout.
Modified: trunk/libitext5-java/debian/changelog
===================================================================
--- trunk/libitext5-java/debian/changelog 2011-04-10 21:45:24 UTC (rev 13522)
+++ trunk/libitext5-java/debian/changelog 2011-04-12 23:03:36 UTC (rev 13523)
@@ -1,3 +1,14 @@
+libitext5-java (5.0.6+svn4804-1) unstable; urgency=low
+
+ * New upstream release from SVN, with updated AGPL additional license term.
+ * Upstream is now just the core itext library (rups is not included).
+ * Moved to using the basic javahelper builder
+ * Updated copyright file to cover afm font files and cmap files.
+ * Removed debian patches which are no longer required.
+ * Dropped binary package libitext5-rups-java from debian/control.
+
+ -- Andrew Ross <ubuntu at rossfamily.co.uk> Tue, 12 Apr 2011 21:37:55 +0100
+
libitext5-java (5.0.5-1) unstable; urgency=low
* New upstream release. (Closes: #609840)
Modified: trunk/libitext5-java/debian/control
===================================================================
--- trunk/libitext5-java/debian/control 2011-04-10 21:45:24 UTC (rev 13522)
+++ trunk/libitext5-java/debian/control 2011-04-12 23:03:36 UTC (rev 13523)
@@ -3,9 +3,9 @@
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Andrew Ross <ubuntu at rossfamily.co.uk>
-Build-Depends: debhelper (>= 7), javahelper (>=0.32~), cdbs, default-jdk-builddep,
- ant, libbcprov-java, libbcmail-java, libbctsp-java, libdom4j-java, libpdfrenderer-java,
- libbcprov-java-doc, libbcmail-java-doc, libbctsp-java-doc, libdom4j-java-doc
+Build-Depends: debhelper (>= 7.0.50~), javahelper (>=0.32~), cdbs,
+ libbcprov-java, libbcmail-java, libbctsp-java, libbcprov-java-doc,
+ libbcmail-java-doc, libbctsp-java-doc
Build-Depends-Indep: default-jdk, default-jdk-doc
Standards-Version: 3.9.1
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libitext5-java
@@ -24,14 +24,6 @@
technology-based Servlets: The look and feel of HTML is browser dependent;
with iText and PDF you can control exactly how your servlet's output will look.
-Package: libitext5-rups-java
-Architecture: all
-Depends: ${java:Depends}, libitext5-java (= ${binary:Version}), ${misc:Depends}
-Recommends: ${java:Recommends}
-Description: graphical tool for Reading and Updating PDF Syntax (RUPS)
- iText RUPS provides a GUI for visualizing PDF files and investigating their
- internal structure.
-
Package: libitext5-java-doc
Section: doc
Architecture: all
Modified: trunk/libitext5-java/debian/copyright
===================================================================
--- trunk/libitext5-java/debian/copyright 2011-04-10 21:45:24 UTC (rev 13522)
+++ trunk/libitext5-java/debian/copyright 2011-04-12 23:03:36 UTC (rev 13523)
@@ -4,49 +4,46 @@
It was downloaded from http://itextpdf.com/download.php
-Copyright (c) 1998-2009 1T3XT BVBA
-Authors: Bruno Lowagie, Paulo Soares, et al.
+ * Copyright (c) 1998-2011 1T3XT BVBA
+ * Authors: Bruno Lowagie, Paulo Soares, et al.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License version 3
+ * as published by the Free Software Foundation with the addition of the
+ * following permission added to Section 15 as permitted in Section 7(a):
+ * FOR ANY PART OF THE COVERED WORK IN WHICH THE COPYRIGHT IS OWNED BY 1T3XT,
+ * 1T3XT DISCLAIMS THE WARRANTY OF NON INFRINGEMENT OF THIRD PARTY RIGHTS.
+ *
+ * This program 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 Affero General Public License for more details.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program; if not, see http://www.gnu.org/licenses or write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA, 02110-1301 USA, or download the license from the following URL:
+ * http://itextpdf.com/terms-of-use/
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU Affero General Public License.
+ *
+ * In accordance with Section 7(b) of the GNU Affero General Public License,
+ * a covered work must retain the producer line in every PDF that is created
+ * or manipulated using iText.
+ *
+ * You can be released from the requirements of the license by purchasing
+ * a commercial license. Buying such a license is mandatory as soon as you
+ * develop commercial activities involving the iText software without
+ * disclosing the source code of your own applications.
+ * These activities include: offering paid services to customers as an ASP,
+ * serving PDFs on the fly in a web application, shipping iText with a closed
+ * source product.
+ *
+ * For more information, please contact iText Software Corp. at this
+ * address: sales at itextpdf.com
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License version 3
-as published by the Free Software Foundation with the addition of the
-following permission added to Section 15 as permitted in Section 7(a):
-FOR ANY PART OF THE COVERED WORK IN WHICH THE COPYRIGHT IS OWNED BY
-1T3XT, 1T3XT DISCLAIMS THE WARRANTY OF NON INFRINGEMENT OF THIRD PARTY
-RIGHTS.
-This program 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
-Affero General Public License for more details. You should have
-received a copy of the GNU Affero General Public License along with
-this program; if not, see http://www.gnu.org/licenses or write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA, 02110-1301 USA, or download the license from the following
-URL:
-
-http://itextpdf.com/terms-of-use/
-
-The interactive user interfaces in modified source and object code
-versions of this program must display Appropriate Legal Notices, as
-required under Section 5 of the GNU Affero General Public License.
-
-In accordance with Section 7(b) of the GNU Affero General Public
-License, you must retain the producer line in every PDF that is
-created or manipulated using iText.
-
-You can be released from the requirements of the license by purchasing
-a commercial license. Buying such a license is mandatory as soon as
-you develop commercial activities involving the iText software without
-disclosing the source code of your own applications. These activities
-include: offering paid services to customers as an ASP, serving PDFs
-on the fly in a web application, shipping iText with a closed source
-product.
-
-For more information, please contact iText Software Corp. at this
-address: sales at itextpdf.com
-
-----------------------------------------------------------------------
The following are under different licenses:
@@ -59,6 +56,7 @@
"This material from The Java(tm) Specialists' Newsletter by Maximum Solutions
(South Africa). Please contact Maximum Solutions for more information.
+
(2)
SimpleXMLParser:
@@ -69,17 +67,41 @@
We ask that you reference the author as the creator and JavaWorld as the original publisher
of the code." Steven Brandt also agreed with the use of this class.
+ * The code to recognize the encoding in this class and in the convenience
+ * class IanaEncodings was taken from Apache Xerces published under the
+ * following license:
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+
+On Debian systems, the complete text of the Apache License can be found
+in `/usr/share/common-licenses/Apache-2.0'.
+
+
(3)
The following files contain material that was copyrighted by SUN:
-com/itextpdf/text/pdf/LZWDecoder.java (first appearance in iText: 2002-02-08)
-com/itextpdf/text/pdf/codec/BmpImage.java (first appearance in iText: 2003-06-20)
-com/itextpdf/text/pdf/codec/PngImage.java (first appearance in iText: 2003-04-25)
-com/itextpdf/text/pdf/codec/TIFFDirectory.java (first appearance in iText: 2003-04-09)
-com/itextpdf/text/pdf/codec/TIFFFaxDecoder.java (first appearance in iText: 2003-04-09)
-com/itextpdf/text/pdf/codec/TIFFField.java (first appearance in iText: 2003-04-09)
-com/itextpdf/text/pdf/codec/TIFFLZWDecoder.java (first appearance in iText: 2003-04-09)
+com/itextpdf/text/pdf/LZWDecoder.java
+com/itextpdf/text/pdf/codec/LZWStringTable.java
+com/itextpdf/text/pdf/codec/TIFFFaxDecompressor.java
+com/itextpdf/text/pdf/codec/LZWCompressor.java
+com/itextpdf/text/pdf/codec/TIFFField.java
+com/itextpdf/text/pdf/codec/TIFFLZWDecoder.java
+com/itextpdf/text/pdf/codec/BitFile.java
+com/itextpdf/text/pdf/codec/TIFFDirectory.java
+com/itextpdf/text/pdf/codec/TIFFFaxDecoder.java
The original code was released under the BSD license, and contained the following
extra restriction: "You acknowledge that Software is not designed, licensed or intended
@@ -149,6 +171,7 @@
to support formats handled by JAI but not included in Java SE
as well as some new things like JPEG2000."
+
(4) the file com/itextpdf/text/pdf/codec/TIFFConstants
and some other TIFF related code is derived from LIBTIFF:
@@ -174,6 +197,7 @@
LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
OF THIS SOFTWARE.
+
(5)
BidiOrder:
@@ -228,9 +252,23 @@
be used in advertising or otherwise to promote the sale, use or other dealings
in these Data Files or Software without prior written authorization of the
copyright holder.
-
+
+
(6)
-Some files use code from different Apache projects.
+Some files use code from different Apache projects:
+com/itextpdf/text/pdf/IntHashtable.java
+com/itextpdf/text/pdf/qrcode/*
+com/itextpdf/text/pdf/hyphenation/HyphenationException.java
+com/itextpdf/text/pdf/hyphenation/PatternConsumer.java
+com/itextpdf/text/pdf/hyphenation/Hyphenator.java
+com/itextpdf/text/pdf/hyphenation/Hyphen.java
+com/itextpdf/text/pdf/hyphenation/CharVector.java
+com/itextpdf/text/pdf/hyphenation/TernaryTree.java
+com/itextpdf/text/pdf/hyphenation/Hyphenation.java
+com/itextpdf/text/pdf/hyphenation/HyphenationTree.java
+com/itextpdf/text/pdf/hyphenation/ByteVector.java
+com/itextpdf/text/xml/XmlDomWriter.java
+
The source code of these files contains the appropriate copyright notices
as described in the Appendix of http://www.apache.org/licenses/LICENSE-2.0
@@ -255,48 +293,214 @@
On Debian systems, the complete text of the Apache License can be found
in `/usr/share/common-licenses/Apache-2.0'.
+
(7)
-Source files in src/rups are
+Files:
+com/itextpdf/text/pdf/fonts/cmaps/
- Copyright 2007 Bruno Lowagie.
+ * Copyright (c) 2005, www.fontbox.org
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, 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. Neither the name of fontbox; nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS 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 REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, 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.
+ *
+ * http://www.fontbox.org
-and licensed as follows:
-This library 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.1 of the License, or (at your option) any later version.
+(8)
+src/main/resources/com/itextpdf/text/pdf/fonts/*.afm
+src/main/resources/com/itextpdf/text/pdf/fonts/mustRead.html
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 2.1, February 1999
+Are subjec to the following, where "This file" refers to the html
+file:
-The full text of the license can be found at
-'/usr/share/common-licenses/LGPL-2.1'.
+This file and the 14 PostScript(R) AFM files it accompanies may be
+used, copied, and distributed for any purpose and without charge, with
+or without modification, provided that all copyright notices are
+retained; that the AFM files are not distributed without this file;
+that all modifications to this file or any of the AFM files are
+prominently noted in the modified file(s); and that this paragraph is
+not modified. Adobe Systems has no responsibility or obligation to
+support the use of the AFM files.
-(8)
-The icons in rups/com/itextpdf/rups/view/icons/ are licensed as
-follows:
-Silk icon set 1.3
+(9)
+src/main/resources/com/itextpdf/text/pdf/fonts/*.cmap
+src/main/resources/com/itextpdf/text/pdf/fonts/*.properties
+src/main/resources/com/itextpdf/text/pdf/fonts/cmaps/*
-_________________________________________
-Mark James
-http://www.famfamfam.com/lab/icons/silk/
-_________________________________________
+The *.cmap and *.properties files in this jar are necessary
+to produce PDF files with iText that use CJK fonts.
-This work is licensed under a
-Creative Commons Attribution 2.5 License.
-[ http://creativecommons.org/licenses/by/2.5/ ]
+Note that whatever value you pass for the 'embedded' parameter
+with the method BaseFont.createFont, the font WILL NOT BE embedded.
+To understand why, please read the following information.
-This means you may use it for any purpose,
-and make any changes you like.
-All I ask is that you include a link back
-to this page in your credits.
+The fonts that are used in Acrobat Reader when viewing a PDF file
+that uses CJK fonts will be downloaded in one or more font packs.
+You can download these fontpacks yourself from this URL:
+http://www.adobe.com/products/acrobat/acrrasianfontpack.html
-Are you using this icon set? Send me an email
-(including a link or picture if available) to
-mjames at gmail dot com
+On this page, you can find the following information:
+"If the author of an Adobe (R) Portable Document Format (PDF) file
+embeds CJK and Central European (CE) fonts in a PDF document, then
+any language version of Adobe Reader (R) software will be able to
+display the CJK and CE text on any system without additional software.
-Any other questions about this icon set please
-contact mjames at gmail dot com
+If the author of the PDF document uses CJK or CE fonts but does not
+embed them in the document, then the correct fonts will need to be
+installed in order to view the Adobe PDF file on non-native systems."
+When you download one of the font packs, for instance the font
+pack for "Chinese Simplified", you will see that the fonts are
+licensed for use in Adobe Reader only:
+
+"Note: The font software contained in this package is being licensed
+to you solely for use with Adobe (R) Acrobat (R) Reader (R) software
+("Acrobat Reader") and is subject to the terms and conditions of
+the electronic End-User License Agreement accompanying Acrobat Reader."
+
+This explains why iText doesn't ever embed a CJK font in the PDF file.
+These fonts have to be downloaded and used in the context of Adobe
+Reader; you can not use them with iText to produce a PDF document
+that has these fonts embedded (as you would do with other fonts) so
+that they can be viewed in other readers; unless you have a license
+from Adobe to use these fonts.
+
+The *.cmap and *.properties files in this jar, do not contain
+any font program. They contain information (mappings, metrics,...)
+that is based on font information distributed on Adobe's site:
+http://partners.adobe.com/public/developer/acrobat/index_advanced.html#pci
+
+The original copyright notice of the mappings is as follows:
+"Copyright 1990-2000 Adobe Systems Incorporated.
+ All Rights Reserved.
+
+ Patents Pending
+
+ NOTICE: All information contained herein is the property
+ of Adobe Systems Incorporated.
+
+ Permission is granted for redistribution of this file
+ provided this copyright notice is maintained intact and
+ that the contents of this file are not altered in any
+ way from its original form.
+
+ PostScript and Display PostScript are trademarks of
+ Adobe Systems Incorporated which may be registered in
+ certain jurisdictions."
+
+The original files with the mappings are plain text files,
+and therefore not optimized for being read by a computer
+software program. That's why they were pre-processed to map
+directly the Unicode value with the CID value using a 64k
+char array. No data was changed in this process.
+
+Additionally, the iTextAsian.jar contains some properties files
+with font metrics. These are included for the same reason AFM
+files are needed (see also the file mustRead.html shipped with
+the iText.jar). As defined in the PDF reference: "The width
+information for each glyph is stored both in the font dictionary
+and in the font program itself. (The two sets of widths must be
+identical; storing this information in the font dictionary, although
+redundant, enables a consumer application to determine glyph
+positioning without having to look inside the font program.)"
+See PDF Reference sixth edition section 5.1.3 (p393-394).
+
+Whereas in the case of CJK fonts, the font program is subject
+to the Adobe Reader EULA, the font metrics aren't. Page 396:
+"Glyph metric information is also available separately in the
+form of Adobe font metrics (AFM) and Adobe composite font metrics
+(ACFM) files. These files are for use by application programs
+that generate PDF page descriptions and must make formatting
+decisions based on the widths and other metrics of glyphs. (...)
+Specifications for the AFM and ACFM file formats are available
+in Adobe Technical Note #5004, Adobe Font Metrics File Format
+Specification; the files can be obtained from the Adobe Solutions
+Network Web site."
+
+Unfortuntately the URL of these files has changed over time, and
+some metrics files seem to have been removed. However, you'll
+find sufficient information in the Technical Notes to build your
+own AFM and/or ACFM files if you ever need font metrics in the
+Adobe Font Metrics format.
+
+Note that the properties files in the iTextAsian.jar contain
+font metrics, but they are not stored in the AFM or ACFM format.
+For reasons of performance, the font metrics were stored as
+key-value pairs. Compare the keys in the properties files with
+the keys mentioned in Table 5.19 on p456 of the PDF Reference.
+This way, the necessary key-value pairs can be imported directly
+into a Font Dictionary that is part of a PDF file created by iText.
+
+These specific metrics files were created by Paulo Soares and
+may be used, copied, and distributed for any purpose and without
+charge, with or without modification.
+
+
+(10)
+src/main/resources/com/itextpdf/text/pdf/fonts/glyphlist.txt
+
+The information used to create this file is Adobe documentation
+covered by the following license:
+
+# ###################################################################################
+# Copyright (c) 1997,1998,2002,2007 Adobe Systems Incorporated
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this documentation file to use, copy, publish, distribute,
+# sublicense, and/or sell copies of the documentation, and to permit
+# others to do the same, provided that:
+# - No modification, editing or other alteration of this document is
+# allowed; and
+# - The above copyright notice and this permission notice shall be
+# included in all copies of the documentation.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this documentation file, to create their own derivative works
+# from the content of this document to use, copy, publish, distribute,
+# sublicense, and/or sell the derivative works, and to permit others to do
+# the same, provided that the derived work is not represented as being a
+# copy or version of this document.
+#
+# Adobe shall not be liable to any party for any loss of revenue or profit
+# or for indirect, incidental, special, consequential, or other similar
+# damages, whether based on tort (including without limitation negligence
+# or strict liability), contract or other legal or equitable grounds even
+# if Adobe has been advised or had reason to know of the possibility of
+# such damages.Ê The Adobe materials are provided on an "AS IS" basis.Ê
+# Adobe specifically disclaims all express, statutory, or implied
+# warranties relating to the Adobe materials, including but not limited to
+# those concerning merchantability or fitness for a particular purpose or
+# non-infringement of any third party rights regarding the Adobe
+# materials.
+# ###################################################################################
+# Name: Adobe Glyph List
+# Table version: 2.0
+# Date: September 20, 2002
+#
+# See http://partners.adobe.com/asn/developer/typeforum/unicodegn.html
+#
+# Format: Semicolon-delimited fields:
+# (1) glyph name
+# (2) Unicode scalar value
Added: trunk/libitext5-java/debian/docs
===================================================================
--- trunk/libitext5-java/debian/docs (rev 0)
+++ trunk/libitext5-java/debian/docs 2011-04-12 23:03:36 UTC (rev 13523)
@@ -0,0 +1 @@
+src/main/resources/com/itextpdf/text/AGPL.txt
Added: trunk/libitext5-java/debian/javabuild
===================================================================
--- trunk/libitext5-java/debian/javabuild (rev 0)
+++ trunk/libitext5-java/debian/javabuild 2011-04-12 23:03:36 UTC (rev 13523)
@@ -0,0 +1 @@
+itext5.jar src/main/java
Added: trunk/libitext5-java/debian/libitext5-java-doc.javadoc
===================================================================
--- trunk/libitext5-java/debian/libitext5-java-doc.javadoc (rev 0)
+++ trunk/libitext5-java/debian/libitext5-java-doc.javadoc 2011-04-12 23:03:36 UTC (rev 13523)
@@ -0,0 +1 @@
+internal /usr/share/doc/libitext5-java/api
Added: trunk/libitext5-java/debian/libitext5-java.jlibs
===================================================================
--- trunk/libitext5-java/debian/libitext5-java.jlibs (rev 0)
+++ trunk/libitext5-java/debian/libitext5-java.jlibs 2011-04-12 23:03:36 UTC (rev 13523)
@@ -0,0 +1 @@
+itext5.jar
Deleted: trunk/libitext5-java/debian/patches/01_allow_standard_input.diff
===================================================================
--- trunk/libitext5-java/debian/patches/01_allow_standard_input.diff 2011-04-10 21:45:24 UTC (rev 13522)
+++ trunk/libitext5-java/debian/patches/01_allow_standard_input.diff 2011-04-12 23:03:36 UTC (rev 13523)
@@ -1,26 +0,0 @@
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- libitext-java-2.1.7.orig/core/com/lowagie/text/pdf/RandomAccessFileOrArray.java
-+++ libitext-java-2.1.7/core/com/lowagie/text/pdf/RandomAccessFileOrArray.java
-@@ -99,7 +99,11 @@ public class RandomAccessFileOrArray imp
- }
- }
- else {
-- InputStream is = BaseFont.getResourceStream(filename);
-+ InputStream is;
-+ if( filename.equals("-"))
-+ is = System.in;
-+ else
-+ is = BaseFont.getResourceStream(filename);
- if (is == null)
- throw new IOException(filename + " not found as file or resource.");
- try {
Deleted: trunk/libitext5-java/debian/patches/debian-specifics.diff
===================================================================
--- trunk/libitext5-java/debian/patches/debian-specifics.diff 2011-04-10 21:45:24 UTC (rev 13522)
+++ trunk/libitext5-java/debian/patches/debian-specifics.diff 2011-04-12 23:03:36 UTC (rev 13523)
@@ -1,42 +0,0 @@
-Description: Build the rups jar and link to debian path for javadoc.
---- libitext5-java-5.0.5.orig/build.xml
-+++ libitext5-java-5.0.5/build.xml
-@@ -15,6 +15,10 @@
- <ant antfile="ant/compile.xml" inheritAll="false" target="jar" />
- </target>
-
-+ <target name="jar.rups">
-+ <ant antfile="ant/compile.xml" inheritAll="false" target="jar.rups" />
-+ </target>
-+
- <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
- <!-- Make a new release after exporting the modules src/www from CVS -->
- <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
---- libitext5-java-5.0.5.orig/ant/.ant.properties
-+++ libitext5-java-5.0.5/ant/.ant.properties
-@@ -18,7 +18,7 @@ lib.bctsp=bctsp-${bc.jdk}-1${bc.version}
- lib.dom4j=dom4j-1.6.1.jar
-
- itext.bin=${itext.build}/bin
--itext.docs=${itext.build}/docs
-+itext.docs=${itext.build}/api
- itext.release=${itext.build}/release
- itext.downloads=${itext.build}/downloads
- itext.dist=${itext.release}/dist
---- libitext5-java-5.0.5.orig/ant/release.xml
-+++ libitext5-java-5.0.5/ant/release.xml
-@@ -58,9 +58,11 @@
- <packageset dir="${itext.src}/rups" defaultexcludes="yes">
- <include name="com/itextpdf/**" />
- </packageset>
-- <classpath refid="itext.classpath"/>
-- <link href="http://java.sun.com/j2se/1.5.0/docs/api/" />
-- <link href="http://www.bouncycastle.org/docs/docs1.5/" />
-+<!-- <classpath refid="itext.classpath"/>-->
-+ <link href="/usr/share/doc/default-jdk-doc/api" />
-+ <link href="/usr/share/doc/libbcprov-java-doc/api" />
-+ <link href="/usr/share/doc/libbcmail-java-doc/api" />
-+ <link href="/usr/share/doc/libbctsp-java-doc/api" />
- <header><a href="http://itextpdf.com/book/" target="_blank"><img src="http://itextpdf.com/img/book/iia2.jpg" border="0" /></a></header>
- <footer>Hosted by <a href="http://www.openminds.be/">openminds</a></footer>
- </javadoc>
Modified: trunk/libitext5-java/debian/patches/series
===================================================================
--- trunk/libitext5-java/debian/patches/series 2011-04-10 21:45:24 UTC (rev 13522)
+++ trunk/libitext5-java/debian/patches/series 2011-04-12 23:03:36 UTC (rev 13523)
@@ -1,2 +0,0 @@
-#01_allow_standard_input.diff
-debian-specifics.diff
Modified: trunk/libitext5-java/debian/rules
===================================================================
--- trunk/libitext5-java/debian/rules 2011-04-10 21:45:24 UTC (rev 13522)
+++ trunk/libitext5-java/debian/rules 2011-04-12 23:03:36 UTC (rev 13523)
@@ -1,41 +1,36 @@
#!/usr/bin/make -f
+# -*- makefile -*-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/javahelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+# Get definition of $(DEB_SRCDIR)
+include /usr/share/cdbs/1/rules/buildvars.mk
-JAVA_HOME := /usr/lib/jvm/default-java
-ANT_HOME := /usr/share/ant
-DEB_ANT_BUILD_TARGET := jar jar.rups javadoc
-DEB_ANT_CLEAN_TARGET := clean
-DEB_ANT_BUILDFILE := src/build.xml
-DEB_JARS := bcprov bcmail bctsp dom4j pdfrenderer
+JAVA_HOME := /usr/lib/jvm/default-java
-LIBRARY_PACKAGE := itext5
+export CLASSPATH=/usr/share/java/bcprov.jar:/usr/share/java/bcmail.jar:/usr/share/java/bctsp.jar
-makebuilddir/lib$(LIBRARY_PACKAGE)-java:: debian/stamp-makebuilddir
-debian/stamp-makebuilddir:
- ln -s . src
- mkdir lib
- touch $@
+# Include the resource files in the jar:
+#export JH_JAR_EXTRA=$(shell find src/main/resources -type f)
-install/lib$(LIBRARY_PACKAGE)-java::
- dh_installdirs -plib$(LIBRARY_PACKAGE)-java usr/share/java
- install -m 644 lib/iText.jar debian/lib$(LIBRARY_PACKAGE)-java/usr/share/java/$(LIBRARY_PACKAGE)-$(DEB_UPSTREAM_VERSION).jar
- dh_link -plib$(LIBRARY_PACKAGE)-java usr/share/java/$(LIBRARY_PACKAGE)-$(DEB_UPSTREAM_VERSION).jar usr/share/java/$(LIBRARY_PACKAGE).jar
- dh_installdocs -plib$(LIBRARY_PACKAGE)-java core/com/itextpdf/text/AGPL.txt
+%:
+ dh $@ --with javahelper
-install/lib$(LIBRARY_PACKAGE)-rups-java::
- dh_installdirs -plib$(LIBRARY_PACKAGE)-rups-java usr/share/java
- install -m 644 lib/iText-rups.jar debian/lib$(LIBRARY_PACKAGE)-rups-java/usr/share/java/$(LIBRARY_PACKAGE)-rups-$(DEB_UPSTREAM_VERSION).jar
- dh_link -plib$(LIBRARY_PACKAGE)-rups-java usr/share/java/$(LIBRARY_PACKAGE)-rups-$(DEB_UPSTREAM_VERSION).jar usr/share/java/$(LIBRARY_PACKAGE)-rups.jar
- dh_installdocs -plib$(LIBRARY_PACKAGE)-rups-java core/com/itextpdf/text/AGPL.txt
+# Link src/main/resources/. Using JH_JAR_EXTRA above instead results in the
+# files being in the wrong place in the resulting jar.
+override_jh_build:
+ ln -s $(DEB_SRCDIR)/src/main/resources/com $(DEB_SRCDIR)/com
+ JH_JAR_EXTRA=`find com/ -type f` jh_build
-install/lib$(LIBRARY_PACKAGE)-java-doc::
- jh_installjavadoc -plib$(LIBRARY_PACKAGE)-java-doc build/api
- dh_installdocs -plib$(LIBRARY_PACKAGE)-java-doc core/com/itextpdf/text/AGPL.txt
-clean::
- dh_testdir
- dh_testroot
- -rm -rf build src lib debian/stamp-*
+# Clean up our symlink
+override_dh_clean:
+ rm -f $(DEB_SRCDIR)/com
+ dh_clean
+
+get-orig-source:
+ svn export -r 4804 https://itext.svn.sourceforge.net/svnroot/itext/trunk/itext
+ find itext/src/test -name "*.pdf" -exec rm \{\} \;
+ tar -cvzf ../libitext5-java_5.0.6+svn4804.orig.tar.gz itext
+ rm -rf itext
+ # replace with this once we're not using an svn release
+ # uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
+
Modified: trunk/libitext5-java/debian/watch
===================================================================
--- trunk/libitext5-java/debian/watch 2011-04-10 21:45:24 UTC (rev 13522)
+++ trunk/libitext5-java/debian/watch 2011-04-12 23:03:36 UTC (rev 13523)
@@ -1,2 +1,3 @@
version=3
+opts=dversionmangle=s/\+svn.*$// \
http://sf.net/itext/iText-src-([0-9\.]*)\.tar\.gz
More information about the pkg-java-commits
mailing list