[pkg-java] r4744 - in trunk/xom/debian: . patches
varun-guest at alioth.debian.org
varun-guest at alioth.debian.org
Tue Nov 13 10:19:49 UTC 2007
Author: varun-guest
Date: 2007-11-13 10:19:49 +0000 (Tue, 13 Nov 2007)
New Revision: 4744
Added:
trunk/xom/debian/README.Debian-source
trunk/xom/debian/orig-tar.sh
trunk/xom/debian/patches/03_compile15.patch
trunk/xom/debian/patches/04_remove_sun_import.patch
trunk/xom/debian/watch
Modified:
trunk/xom/debian/
trunk/xom/debian/changelog
trunk/xom/debian/compat
trunk/xom/debian/control
trunk/xom/debian/copyright
trunk/xom/debian/rules
Log:
* debian/control:
+ Add myself and Kumar to Uploaders
+ Switch to java-gcj from kaffe
+ Separate out Build-Depends and Indep.
+ Replace ecj-bootstrap with ecj
+ Add Vcs-{Svn, Browser} and Homepage headers.
* debian/rules:
+ Set JAVA_HOME to java-gcj instead of kaffe
+ Fix Ant build targets.
+ Use cdbs variables.
+ Add get-orig-source target.
* debian/patches:
+ Add 03_compile15.patch to compile JDK15XML1_0Parser.class
+ Add 04_remove_sun_import.patch to fix imports to use xercesImpl.jar
* debian/compat: switch to 5
* Add debian/orig-tar.sh to create orig.tar.gz
* Add debian/README.Debian-source.
* Add watch file.
Property changes on: trunk/xom/debian
___________________________________________________________________
Name: mergeWithUpstream
+ 1
Added: trunk/xom/debian/README.Debian-source
===================================================================
--- trunk/xom/debian/README.Debian-source (rev 0)
+++ trunk/xom/debian/README.Debian-source 2007-11-13 10:19:49 UTC (rev 4744)
@@ -0,0 +1,13 @@
+xom for Debian
+==============
+
+The upstream supplied source package contains binary jar files and
+classes. Currently no clean source distribution exists. Therefore, the
+upstream sources were modified to comply with the Debian Free Software
+Guidelines.
+
+Use the rules/get-orig-source target to create the orig.tar.gz.
+For more details on repackaging of upstream sources please see the
+debian/orig-tar.sh file.
+
+ -- Varun Hiremath <varunhiremath at gmail.com>, Tue, 13 Nov 2007 15:53:59 +0530
Modified: trunk/xom/debian/changelog
===================================================================
--- trunk/xom/debian/changelog 2007-11-13 08:42:27 UTC (rev 4743)
+++ trunk/xom/debian/changelog 2007-11-13 10:19:49 UTC (rev 4744)
@@ -1,6 +1,26 @@
xom (1.1-1) unstable; urgency=low
+ [ Stephan Michels ]
* Initial version. Closes: #330238
- -- Stephan Michels <stephan at apache.org> Mon, 9 Jan 2006 11:40:09 +0100
-
+ [ Varun Hiremath ]
+ * debian/control:
+ + Add myself and Kumar to Uploaders
+ + Switch to java-gcj from kaffe
+ + Separate out Build-Depends and Indep.
+ + Replace ecj-bootstrap with ecj
+ + Add Vcs-{Svn, Browser} and Homepage headers.
+ * debian/rules:
+ + Set JAVA_HOME to java-gcj instead of kaffe
+ + Fix Ant build targets.
+ + Use cdbs variables.
+ + Add get-orig-source target.
+ * debian/patches:
+ + Add 03_compile15.patch to compile JDK15XML1_0Parser.class
+ + Add 04_remove_sun_import.patch to fix imports to use xercesImpl.jar
+ * debian/compat: switch to 5
+ * Add debian/orig-tar.sh to create orig.tar.gz
+ * Add debian/README.Debian-source.
+ * Add watch file.
+
+ -- Varun Hiremath <varunhiremath at gmail.com> Tue, 13 Nov 2007 15:41:42 +0530
Modified: trunk/xom/debian/compat
===================================================================
--- trunk/xom/debian/compat 2007-11-13 08:42:27 UTC (rev 4743)
+++ trunk/xom/debian/compat 2007-11-13 10:19:49 UTC (rev 4744)
@@ -1 +1 @@
-4
+5
Modified: trunk/xom/debian/control
===================================================================
--- trunk/xom/debian/control 2007-11-13 08:42:27 UTC (rev 4743)
+++ trunk/xom/debian/control 2007-11-13 10:19:49 UTC (rev 4744)
@@ -2,16 +2,20 @@
Section: libs
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Stephan Michels <stephan at apache.org>
-Priority: optional
-Build-Depends-Indep: debhelper (>> 4.0.0), cdbs, kaffe (>= 2:1.1.5), ant, junit (>= 3.8.1), libxerces2-java, libxalan2-java, libjaxen-java (>=1.1.beta8), ecj-bootstrap
-Standards-Version: 3.6.1
+Uploaders: Stephan Michels <stephan at apache.org>, Varun Hiremath <varunhiremath at gmail.com>, Kumar Appaiah <akumar at ee.iitm.ac.in>
+Build-Depends: debhelper (>= 5), cdbs
+Build-Depends-Indep: ant, java-gcj-compat-dev, junit (>= 3.8.1),
+ libxerces2-java, libxalan2-java, libjaxen-java (>= 1.1), ecj
+Standards-Version: 3.7.2
+Homepage: http://www.xom.nu/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/xom
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/xom
Package: libxom-java
Architecture: all
Section: libs
Suggests: libxom-java-doc
-Depends: kaffe (>= 2:1.1.5) | java1-runtime | java2-runtime, libjaxen-java (>=1.1.beta8)
+Depends: java-gcj-compat | java1-runtime | java2-runtime, libjaxen-java (>=1.1.beta8)
Description: A new XML object model for Java
XOM(tm) is a new XML object model. It is an open source (LGPL),
tree-based API for processing XML with Java that strives for correctness,
Modified: trunk/xom/debian/copyright
===================================================================
--- trunk/xom/debian/copyright 2007-11-13 08:42:27 UTC (rev 4743)
+++ trunk/xom/debian/copyright 2007-11-13 10:19:49 UTC (rev 4744)
@@ -3,11 +3,12 @@
It was downloaded from http://www.xom.nu/
-Copyright:
+Upstream Author: Elliotte Rusty Harold <elharo at metalab.unc.edu>
-XOM is a dual streaming/tree-based API for processing XML with Java.
-Copyright 2004, 2005 Elliotte Rusty Harold
+Copyrights: (C) 2004, 2005 Elliotte Rusty Harold
+License:
+
This library is free software; you can redistribute it and/or modify
it under the terms of version 2.1 of the GNU Lesser General Public
License as published by the Free Software Foundation.
@@ -17,12 +18,9 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the
- Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- Boston, MA 02111-1307 USA
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-You can contact Elliotte Rusty Harold by sending e-mail to
-elharo at metalab.unc.edu. Please include the word "XOM" in the
-subject line. For more information see http://www.xom.nu/
-or ask a question on the xom-interest mailing list.
+On Debian systems, the complete text of the GNU Lesser General
+Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
Added: trunk/xom/debian/orig-tar.sh
===================================================================
--- trunk/xom/debian/orig-tar.sh (rev 0)
+++ trunk/xom/debian/orig-tar.sh 2007-11-13 10:19:49 UTC (rev 4744)
@@ -0,0 +1,19 @@
+#!/bin/sh -e
+
+# called by uscan with '--upstream-version' <version> <file>
+DIR=xom_$2.orig
+
+# clean up the upstream tarball
+tar zxf $3
+mv XOM $DIR
+GZIP=--best tar czf $3 --exclude '*.jar' --exclude '*.class' $DIR
+rm -rf $DIR
+
+# move to directory 'tarballs'
+if [ -r .svn/deb-layout ]; then
+ . .svn/deb-layout
+ mv $3 $origDir
+ echo "moved $3 to $origDir"
+fi
+
+exit 0
Property changes on: trunk/xom/debian/orig-tar.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/xom/debian/patches/03_compile15.patch
===================================================================
--- trunk/xom/debian/patches/03_compile15.patch (rev 0)
+++ trunk/xom/debian/patches/03_compile15.patch 2007-11-13 10:19:49 UTC (rev 4744)
@@ -0,0 +1,12 @@
+diff -Nur xom-1.1/build.xml xom-1.1.new/build.xml
+--- xom-1.1/build.xml 2007-11-13 15:11:51.000000000 +0530
++++ xom-1.1.new/build.xml 2007-11-13 15:12:15.000000000 +0530
+@@ -188,7 +188,7 @@
+ </target>
+
+
+- <target name="compile-core" depends="prepare"
++ <target name="compile-core" depends="prepare, compile15"
+ description="Compile the source code">
+ <javac srcdir="${build.src}"
+ destdir="${build.dest}"
Added: trunk/xom/debian/patches/04_remove_sun_import.patch
===================================================================
--- trunk/xom/debian/patches/04_remove_sun_import.patch (rev 0)
+++ trunk/xom/debian/patches/04_remove_sun_import.patch 2007-11-13 10:19:49 UTC (rev 4744)
@@ -0,0 +1,27 @@
+diff -Nur xom-1.1/src15/nu/xom/JDK15XML1_0Parser.java xom-1.1.new/src15/nu/xom/JDK15XML1_0Parser.java
+--- xom-1.1/src15/nu/xom/JDK15XML1_0Parser.java 2004-08-17 19:18:30.000000000 +0530
++++ xom-1.1.new/src15/nu/xom/JDK15XML1_0Parser.java 2007-11-13 15:25:08.000000000 +0530
+@@ -24,9 +24,9 @@
+
+ import org.xml.sax.SAXException;
+
+-import com.sun.org.apache.xerces.internal.parsers.SAXParser;
+-import com.sun.org.apache.xerces.internal.parsers.DTDConfiguration;
+-import com.sun.org.apache.xerces.internal.impl.Constants
++import org.apache.xerces.parsers.SAXParser;
++import org.apache.xerces.parsers.DTDConfiguration;
++import org.apache.xerces.impl.Constants
+ ;
+ /**
+ * <p>
+@@ -47,8 +47,8 @@
+
+ super(new DTDConfiguration());
+ // workaround for Java 1.5 beta 2 bugs
+- com.sun.org.apache.xerces.internal.util.SecurityManager manager
+- = new com.sun.org.apache.xerces.internal.util.SecurityManager();
++ org.apache.xerces.util.SecurityManager manager
++ = new org.apache.xerces.util.SecurityManager();
+ setProperty(Constants.XERCES_PROPERTY_PREFIX + Constants.SECURITY_MANAGER_PROPERTY, manager);
+
+ }
Modified: trunk/xom/debian/rules
===================================================================
--- trunk/xom/debian/rules 2007-11-13 08:42:27 UTC (rev 4743)
+++ trunk/xom/debian/rules 2007-11-13 10:19:49 UTC (rev 4744)
@@ -4,25 +4,28 @@
include /usr/share/cdbs/1/class/ant.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-JAVA_HOME := /usr/lib/kaffe
+JAVA_HOME := /usr/lib/jvm/java-gcj
ANT_HOME := /usr/share/ant
DEB_JARS := xercesImpl xalan xml-apis jaxen saxpath ant-optional junit ecj $(ANT_HOME)/lib/ant-launcher.jar
-DEB_ANT_BUILD_TARGET := javadoc dist
+DEB_ANT_BUILD_TARGET := javadoc jar samples
DEB_ANT_COMPILER := org.eclipse.jdt.core.JDTCompilerAdapter
-
-# Additional command-line arguments for Ant
-#ANT_ARGS := -verbose
-
ANT_ARGS := -Dbuild.sysclasspath=only
ANT_OPTS := -Xss3m
-LIBRARY_PACKAGE := xom
-API_VERSION := 1.1
+clean::
+ -find -name '*.class' | xargs $(RM)
-install/lib$(LIBRARY_PACKAGE)-java::
- dh_installdirs -plib$(LIBRARY_PACKAGE)-java usr/share/java
- dh_install -plib$(LIBRARY_PACKAGE)-java build/$(LIBRARY_PACKAGE)-$(API_VERSION).jar usr/share/java
- dh_link -plib$(LIBRARY_PACKAGE)-java usr/share/java/$(LIBRARY_PACKAGE)-$(API_VERSION).jar usr/share/java/$(LIBRARY_PACKAGE).jar
+install/libxom-java::
+ dh_installdirs -plibxom-java usr/share/java
+ dh_install -plibxom-java build/xom-$(DEB_UPSTREAM_VERSION).jar usr/share/java
+ dh_link -plibxom-java usr/share/java/xom-$(DEB_UPSTREAM_VERSION).jar usr/share/java/xom.jar
+ install -m644 build/xom-samples.jar debian/libxom-java/usr/share/java/xom-samples-$(DEB_UPSTREAM_VERSION).jar
+ dh_link -plibxom-java usr/share/java/xom-samples-$(DEB_UPSTREAM_VERSION).jar usr/share/java/xom-samples.jar
-install/lib$(LIBRARY_PACKAGE)-java-doc::
- dh_installdocs -plib$(LIBRARY_PACKAGE)-java-doc build/apidocs
+install/libxom-java-doc::
+ dh_installdocs -plibxom-java-doc build/apidocs
+
+get-orig-source:
+ -uscan --upstream-version 0 --rename
+
+DEB_PHONY_RULES += get-orig-source
Added: trunk/xom/debian/watch
===================================================================
--- trunk/xom/debian/watch (rev 0)
+++ trunk/xom/debian/watch 2007-11-13 10:19:49 UTC (rev 4744)
@@ -0,0 +1,2 @@
+version=3
+http://www.cafeconleche.org/XOM/ xom-(.*)-src\.tar\.gz debian debian/orig-tar.sh
More information about the pkg-java-commits
mailing list