[pkg-java] r7120 - trunk/fop/debian
sylvestre-guest at alioth.debian.org
sylvestre-guest at alioth.debian.org
Mon Oct 6 16:33:31 UTC 2008
Author: sylvestre-guest
Date: 2008-10-06 16:33:20 +0000 (Mon, 06 Oct 2008)
New Revision: 7120
Added:
trunk/fop/debian/orig-tar.sh
Modified:
trunk/fop/debian/README.Debian
trunk/fop/debian/changelog
trunk/fop/debian/control
trunk/fop/debian/copyright
trunk/fop/debian/rules
trunk/fop/debian/watch
Log:
+ * Switch to openJDK
+ * Script orig-tar.sh to repack the archive (rm -rf lib/*)
+ * Update of the copyright file (fop changed to Apache 2)
Modified: trunk/fop/debian/README.Debian
===================================================================
--- trunk/fop/debian/README.Debian 2008-10-05 12:19:16 UTC (rev 7119)
+++ trunk/fop/debian/README.Debian 2008-10-06 16:33:20 UTC (rev 7120)
@@ -68,15 +68,10 @@
Thanks for feedbacks.
-fop 0.94.dfsg
+fop 0.95.dfsg
-------------
I removed generated plan examples and all the jars in the lib directory
+This is managed by the script orig-tar.sh which is called by uscan.
-
-Why not in main?
-----------------
-
-fop needs libbatik-java which is in contrib.
-
-- Arnaud Vandyck <avdyk at debian.org>, Thu, 10 May 2007 12:46:33 +0200
Modified: trunk/fop/debian/changelog
===================================================================
--- trunk/fop/debian/changelog 2008-10-05 12:19:16 UTC (rev 7119)
+++ trunk/fop/debian/changelog 2008-10-06 16:33:20 UTC (rev 7120)
@@ -8,6 +8,9 @@
* Update of the JAVA_HOME in debian/ant.properties (Closes: #492322)
* Updated Standards-Version to 3.8.0
* Homepage, Vcs-Svn, Vcs-Browser & DM-Upload-Allowed added
+ * Switch to openJDK
+ * Script orig-tar.sh to repack the archive (rm -rf lib/*)
+ * Update of the copyright file (fop changed to Apache 2)
* Add myself as uploader.
[ Michael Koch ]
Modified: trunk/fop/debian/control
===================================================================
--- trunk/fop/debian/control 2008-10-05 12:19:16 UTC (rev 7119)
+++ trunk/fop/debian/control 2008-10-06 16:33:20 UTC (rev 7120)
@@ -4,7 +4,7 @@
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>, Sylvestre Ledru <sylvestre.ledru at inria.fr>
Build-Depends: debhelper (>= 5), cdbs (>= 0.4.27)
-Build-Depends-Indep: ant-optional, libbatik-java (>= 1.5.1-1), libavalon-framework-java (>=4.1.2-2), libxalan2-java, libxerces2-java, java-gcj-compat-dev, libcommons-io-java, libcommons-logging-java, junit, libxmlgraphics-commons-java (>= 1.2), libservlet2.4-java
+Build-Depends-Indep: ant-optional, libbatik-java (>= 1.7), libavalon-framework-java (>=4.1.2-2), libxalan2-java, libxerces2-java, openjdk-6-jdk, libcommons-io-java, libcommons-logging-java, junit, libxmlgraphics-commons-java (>= 1.2), libservlet2.4-java, libxml-commons-external-java
Standards-Version: 3.8.0
Homepage: http://xmlgraphics.apache.org/fop/
Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/fop
Modified: trunk/fop/debian/copyright
===================================================================
--- trunk/fop/debian/copyright 2008-10-05 12:19:16 UTC (rev 7119)
+++ trunk/fop/debian/copyright 2008-10-06 16:33:20 UTC (rev 7120)
@@ -10,51 +10,8 @@
James Tauber <jtauber at jtauber.com>
Copyright:
+(C) 2005-2007 The Apache Software Foundation
- ============================================================================
- The Apache Software License, Version 1.1
- ============================================================================
-
- Copyright (C) 1999 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 "FOP" 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 and was originally created by
- James Tauber <jtauber at jtauber.com>. For more information on the Apache
- Software Foundation, please see <http://www.apache.org/>.
-
+Both the original software and the Debian packaging are licensed under the
+Apache License, version 2.0. On Debian systems, the complete text of the Apache
+License, version 2.0, can be found in `/usr/share/common-licenses/Apache-2.0'.
Added: trunk/fop/debian/orig-tar.sh
===================================================================
--- trunk/fop/debian/orig-tar.sh (rev 0)
+++ trunk/fop/debian/orig-tar.sh 2008-10-06 16:33:20 UTC (rev 7120)
@@ -0,0 +1,20 @@
+#!/bin/sh -e
+
+# called by uscan with '--upstream-version' <version> <file>
+DIR=fop-$2
+TAR=../fop_$2.orig.tar.gz
+
+# clean up the upstream tarball
+tar -zxvf $3
+rm -rf $DIR/lib/*
+tar -czf $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
Property changes on: trunk/fop/debian/orig-tar.sh
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/fop/debian/rules
===================================================================
--- trunk/fop/debian/rules 2008-10-05 12:19:16 UTC (rev 7119)
+++ trunk/fop/debian/rules 2008-10-06 16:33:20 UTC (rev 7120)
@@ -5,8 +5,8 @@
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/class/ant.mk
-JAVA_HOME := /usr/lib/jvm/java-gcj
-DEB_JARS := $(ANT_HOME)/lib/ant-trax.jar batik avalon-framework xercesImpl xmlParserAPIs xalan2 junit commons-io commons-logging xmlgraphics-commons servlet-api-2.4
+JAVA_HOME := /usr/lib/jvm/java-6-openjdk
+DEB_JARS := $(ANT_HOME)/lib/ant-trax.jar batik-all xml-apis-ext batik-libs xml-apis avalon-framework xercesImpl xmlParserAPIs xalan2 junit commons-io commons-logging xmlgraphics-commons servlet-api-2.4
DEB_ANT_BUILD_TARGET := package javadocs #docs
DEB_ANT_CLEAN_TARGET := distclean
DEB_ANT_ARGS := -verbose
Modified: trunk/fop/debian/watch
===================================================================
--- trunk/fop/debian/watch 2008-10-05 12:19:16 UTC (rev 7119)
+++ trunk/fop/debian/watch 2008-10-06 16:33:20 UTC (rev 7120)
@@ -1,3 +1,4 @@
version=3
opts=dversionmangle=s/\.dfsg// \
- http://www.apache.org/dist/xmlgraphics/fop/source/fop-([\d\.]+)-src.tar.gz
+http://www.apache.org/dist/xmlgraphics/fop/source/fop-([\d\.]+)-src.tar.gz \
+debian debian/orig-tar.sh
\ No newline at end of file
More information about the pkg-java-commits
mailing list