Package: batik Severity: wishlist Tags: patch Hello,
I am packaging a software which needs the version 1.7 of batik. I made the patch to update to the new upstream version and made some small changes to make lintian happier. Thx, Sylvestre PS: Is it possible to rejoin the pkg-java-maintainers team and had the flag DM-Upload-Allowed: yes to this package ?
diff -ur --new-file batik-1.6/debian/changelog batik-1.7/debian/changelog --- batik-1.6/debian/changelog 2008-07-12 16:22:42.000000000 +0200 +++ batik-1.7/debian/changelog 2008-07-12 18:16:38.000000000 +0200 @@ -1,3 +1,19 @@ +batik (1.7-0.1) unstable; urgency=low + + * Non-maintainer upload. + * New upstream version + * orig-tar.sh added to repack the zip + * watch file updated to handle orig-tar.sh + * dpkg-source warning removed + * Updated Standards-Version to 3.8.0.1 + * Update of debian/rules to match changes of batik 1.7 + * Patch 02_fix_jar_target.patch removed + * Lintian warning removed (refers to the file + /usr/share/common-licenses/Apache-2.0) + + + -- Sylvestre Ledru <[EMAIL PROTECTED]> Sat, 12 Jul 2008 16:38:29 +0200 + batik (1.6-4) unstable; urgency=low [ Mark Howard ] diff -ur --new-file batik-1.6/debian/control batik-1.7/debian/control --- batik-1.6/debian/control 2008-07-12 16:22:42.000000000 +0200 +++ batik-1.7/debian/control 2008-07-12 18:16:38.000000000 +0200 @@ -4,7 +4,7 @@ Maintainer: Debian Java Maintainers <[EMAIL PROTECTED]> Uploaders: Arnaud Vandyck <[EMAIL PROTECTED]>, Wolfgang Baer <[EMAIL PROTECTED]>, Michael Koch <[EMAIL PROTECTED]>, Vincent Fourmond <[EMAIL PROTECTED]> -Standards-Version: 3.7.3 +Standards-Version: 3.8.0.1 Build-Depends: debhelper (>= 4.2.30), cdbs Build-Depends-Indep: sun-j2sdk1.4 | java2-compiler, ant, libbsf-java, libxalan2-java, rhino, libavalon-framework-java (>= 4.2.0-1), libcommons-io-java, libcommons-logging-java diff -ur --new-file batik-1.6/debian/copyright batik-1.7/debian/copyright --- batik-1.6/debian/copyright 2008-07-12 16:22:42.000000000 +0200 +++ batik-1.7/debian/copyright 2008-07-12 18:16:38.000000000 +0200 @@ -3,178 +3,9 @@ It was downloaded from <http://xml.apache.org/batik>. +Copyright: (c) 2000-008 The Apache Software Foundation. - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ +License: + Apache 2 - 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. +The full text of the Apache 2 license can be found in `/usr/share/common-licenses/Apache-2.0` diff -ur --new-file batik-1.6/debian/libbatik-java.install batik-1.7/debian/libbatik-java.install --- batik-1.6/debian/libbatik-java.install 2008-07-12 16:22:42.000000000 +0200 +++ batik-1.7/debian/libbatik-java.install 2008-07-12 18:16:38.000000000 +0200 @@ -1 +1 @@ -debian/wrappers.sh usr/lib/java/ \ Pas de fin de ligne à la fin du fichier. +debian/wrappers.sh usr/lib/java/ diff -ur --new-file batik-1.6/debian/orig-tar.sh batik-1.7/debian/orig-tar.sh --- batik-1.6/debian/orig-tar.sh 1970-01-01 01:00:00.000000000 +0100 +++ batik-1.7/debian/orig-tar.sh 2008-07-12 18:16:38.000000000 +0200 @@ -0,0 +1,20 @@ +#!/bin/sh -e + +# called by uscan with '--upstream-version' <version> <file> +DIR=batik-$2 +TAR=../batik_$2.orig.tar.gz + +# clean up the upstream tarball +unzip $3 +rm -rf $DIR/lib/ +tar -c -z -f $TAR $DIR/ +rm -rf $DIR $3 + +# move to directory 'tarballs' +if [ -r .svn/deb-layout ]; then + . .svn/deb-layout + mv $TAR $origDir + echo "moved $TAR to $origDir" +fi + +exit 0 diff -ur --new-file batik-1.6/debian/patches/02_fix_jar_target.patch batik-1.7/debian/patches/02_fix_jar_target.patch --- batik-1.6/debian/patches/02_fix_jar_target.patch 2008-07-12 16:22:42.000000000 +0200 +++ batik-1.7/debian/patches/02_fix_jar_target.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,17 +0,0 @@ ---- build.xml.orig 2005-10-16 14:52:19.000000000 +0200 -+++ build.xml 2005-10-20 17:23:27.000000000 +0200 -@@ -488,10 +488,10 @@ - <jar jarfile="${build}/lib/${project}-libs.jar"> - <fileset dir="${dest}" excludes="**/CVS"> - <include name="org/apache/batik/**"/> -- <include name="org/w3c/css/sac/**"/> -- <include name="org/w3c/dom/smil/**"/> -- <include name="org/w3c/dom/svg/**"/> -- <include name="org/w3c/dom/svg12/**"/> -+ <exclude name="org/w3c/css/sac/**"/> -+ <exclude name="org/w3c/dom/smil/**"/> -+ <exclude name="org/w3c/dom/svg/**"/> -+ <exclude name="org/w3c/dom/svg12/**"/> - </fileset> - <fileset dir="${resources}" excludes="${resources}/**/CVS"> - <include name="**"/> diff -ur --new-file batik-1.6/debian/rules batik-1.7/debian/rules --- batik-1.6/debian/rules 2008-07-12 16:22:42.000000000 +0200 +++ batik-1.7/debian/rules 2008-07-12 18:16:38.000000000 +0200 @@ -12,31 +12,35 @@ include /usr/share/cdbs/1/class/ant.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -JAVA_HOME_DIRS := /usr/lib/j2sdk1.4-sun /usr/lib/j2sdk1.4-ibm /usr/lib/j2sdk1.4-blackdown /usr/local/IBMJava2-ppc-142 /usr/lib/jvm/java-6-sun/ + +JAVA_HOME_DIRS := /usr/lib/j2sdk1.4-sun /usr/lib/j2sdk1.4-ibm /usr/lib/j2sdk1.4-blackdown /usr/local/IBMJava2-ppc-142 /usr/lib/jvm/java-1.5.0-sun/ /usr/lib/jvm/java-6-sun/ 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 transcoder +DEB_ANT_BUILD_TARGET := all-jar libs-jar ext-jar transcoder-jar DEB_BUILDDIR := . DEB_ANT_BUILDFILE := build.xml DEB_ANT_CLEAN_TARGET := clean LIBRARY=batik -VERSION=1.6 +VERSION=1.7 + 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 + install -m 644 batik-$(VERSION)/lib/batik-libs.jar debian/libbatik-java/usr/share/java/batik-libs-$(VERSION).jar + install -m 644 batik-$(VERSION)/lib/batik-ext.jar debian/libbatik-java/usr/share/java/batik-ext-$(VERSION).jar + install -m 644 batik-$(VERSION)/lib/batik-all.jar debian/libbatik-java/usr/share/java/batik-all-$(VERSION).jar + install -m 644 batik-$(VERSION)/lib/batik-transcoder.jar debian/libbatik-java/usr/share/java/batik-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 batik-transcoder-$(VERSION).jar debian/libbatik-java/usr/share/java/fop-transcoder-$(VERSION).jar ln -s fop-transcoder-$(VERSION).jar debian/libbatik-java/usr/share/java/fop-transcoder.jar # Install wrapper scripts @@ -44,3 +48,6 @@ for prog in rasterizer.sh squiggle.sh svgpp.sh ttf2svg.sh ; do \ install debian/$$prog debian/libbatik-java/usr/bin/`echo $$prog | sed s/.sh//`; \ done + +get-orig-source: + -uscan --upstream-version 0 --rename diff -ur --new-file batik-1.6/debian/watch batik-1.7/debian/watch --- batik-1.6/debian/watch 2008-07-12 16:22:42.000000000 +0200 +++ batik-1.7/debian/watch 2008-07-12 18:16:38.000000000 +0200 @@ -1,2 +1,2 @@ version=3 -http://archive.apache.org/dist/xmlgraphics/batik/ batik-([0123456789.]*).zip +http://archive.apache.org/dist/xmlgraphics/batik/ batik-src-([\d.]*).zip debian debian/orig-tar.sh diff -ur --new-file batik-1.6/debian/wrappers.sh batik-1.7/debian/wrappers.sh --- batik-1.6/debian/wrappers.sh 2008-07-12 16:22:42.000000000 +0200 +++ batik-1.7/debian/wrappers.sh 2008-07-12 18:16:38.000000000 +0200 @@ -103,4 +103,4 @@ fi java_show_debug "Runnning $JAVACMD $JAVA_ARGS $cp $@" exec $JAVACMD $JAVA_ARGS $cp "$@" -} \ Pas de fin de ligne à la fin du fichier. +}
