[pkg-java] r8224 - in trunk/xom/debian: . patches

Varun Hiremath varun at alioth.debian.org
Wed May 6 01:30:08 UTC 2009 

Author: varun
Date: 2009-05-06 01:30:08 +0000 (Wed, 06 May 2009)
New Revision: 8224

Added:
   trunk/xom/debian/patches/series
Modified:
   trunk/xom/debian/changelog
   trunk/xom/debian/control
   trunk/xom/debian/patches/01xom-remove-jaxen.patch
   trunk/xom/debian/patches/02xom-clean-dist.patch
   trunk/xom/debian/patches/03_compile15.patch
   trunk/xom/debian/patches/04_remove_sun_import.patch
   trunk/xom/debian/patches/05_build.patch
   trunk/xom/debian/rules
Log:
* New upstream release
* Convert to default-jdk/jre, thanks to Chris Cheney for the patch
  (Closes: #508979)
* Bump Standards-Version to 3.8.1
* Switch to quilt for managing patches

Modified: trunk/xom/debian/changelog
===================================================================
--- trunk/xom/debian/changelog	2009-05-06 00:57:37 UTC (rev 8223)
+++ trunk/xom/debian/changelog	2009-05-06 01:30:08 UTC (rev 8224)
@@ -1,3 +1,13 @@
+xom (1.2.1-1) unstable; urgency=low
+
+  * New upstream release
+  * Convert to default-jdk/jre, thanks to Chris Cheney for the patch
+    (Closes: #508979)
+  * Bump Standards-Version to 3.8.1
+  * Switch to quilt for managing patches
+
+ -- Varun Hiremath <varun at debian.org>  Tue, 05 May 2009 21:10:47 -0400
+
 xom (1.1-3) unstable; urgency=low
 
   * debian/control:

Modified: trunk/xom/debian/control
===================================================================
--- trunk/xom/debian/control	2009-05-06 00:57:37 UTC (rev 8223)
+++ trunk/xom/debian/control	2009-05-06 01:30:08 UTC (rev 8224)
@@ -1,21 +1,20 @@
 Source: xom
-Section: libs
+Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Stephan Michels <stephan at apache.org>, Varun Hiremath <varun at debian.org>, Kumar Appaiah <akumar at debian.org>
-Build-Depends: debhelper (>= 5), cdbs
-Build-Depends-Indep: ant, java-gcj-compat-dev, junit (>= 3.8.1),
+Build-Depends: debhelper (>= 5), cdbs, quilt
+Build-Depends-Indep: ant, default-jdk-builddep, junit (>= 3.8.1),
  libxerces2-java, libxalan2-java, libjaxen-java (>= 1.1)
-Standards-Version: 3.7.3
+Standards-Version: 3.8.1
 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:  java-gcj-compat | java1-runtime | java2-runtime, libjaxen-java (>= 1.1~beta8)
+Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless, 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, 
@@ -37,6 +36,7 @@
 Package: libxom-java-doc
 Architecture: all
 Section: doc
+Depends: ${misc:Depends}
 Suggests: libxom-java
 Description: Documentation for the libxom-java package
  XOM(tm) is a new XML object model. It is an open source (LGPL),
@@ -56,4 +56,4 @@
  your XML so you don't have to. With XOM, you can focus on the unique
  value of your application, and trust XOM to get the XML right.
  .
- This package includes the api documentation for libxom-java package.
+ This package includes the API documentation for libxom-java package.

Modified: trunk/xom/debian/patches/01xom-remove-jaxen.patch
===================================================================
--- trunk/xom/debian/patches/01xom-remove-jaxen.patch	2009-05-06 00:57:37 UTC (rev 8223)
+++ trunk/xom/debian/patches/01xom-remove-jaxen.patch	2009-05-06 01:30:08 UTC (rev 8224)
@@ -1,5 +1,9 @@
---- build.xml.orig	2006-02-11 12:19:49.000000000 +0100
-+++ build.xml	2006-02-11 12:21:51.000000000 +0100
+Author: Varun Hiremath
+Description: Remove jaxen from build.
+Index: xom-1.2.1/build.xml
+===================================================================
+--- xom-1.2.1.orig/build.xml	2009-05-05 21:08:52.000000000 -0400
++++ xom-1.2.1/build.xml	2009-05-05 21:08:57.000000000 -0400
 @@ -56,7 +56,6 @@
      <property name="dist.dir"        value="./dist"/>    
      <property name="clover.dir"      value="./clover"/>
@@ -7,7 +11,7 @@
 -    <property name="jaxen.dir"       value="${build.dir}/jaxen-classes"/>
  
      <property name="xml-apis.jar"   value="${lib.dir}/xml-apis.jar"/>
-     <property name="parser.jar"     value="${lib.dir}/xercesImpl.jar"/>
+     <property name="parser.jar"     value="${lib.dir}/dtd-xercesImpl.jar"/>
 @@ -93,7 +92,6 @@
        <pathelement location="${xml-apis.jar}"/>
        <pathelement location="${parser.jar}"/>
@@ -38,11 +42,11 @@
  
  
 -  <target name="compile-core" depends="prepare, compile-jaxen" 
-+  <target name="compile-core" depends="prepare" 
++  <target name="compile-core" depends="prepare"
            description="Compile the source code">
      <javac srcdir="${build.src}"
             destdir="${build.dest}"
-@@ -301,10 +296,6 @@
+@@ -302,10 +297,6 @@
           includes="nu/xom/* nu/xom/xslt/* nu/xom/xinclude/* nu/xom/converters/* nu/xom/canonical/* nu/xom/tests/XOMTestCase.class"
           excludes="nu/xom/samples/* nu/xom/benchmarks/* nu/xom/pantry/* nu/xom/tools/*">
  
@@ -53,25 +57,25 @@
        <manifest>
          <attribute name="Built-By" value="${user.name}"/>
          <attribute name="Specification-Title"    value="XOM"/>
-@@ -321,12 +312,6 @@
-         <attribute name="Implementation-Version" value="${version}"/>
-         <attribute name="Implementation-Vendor"  value="Elliotte Rusty Harold"/>          
+@@ -322,12 +313,6 @@
+         <attribute name="Implementation-Version"  value="${version}"/>
+         <attribute name="Implementation-Vendor"   value="Elliotte Rusty Harold"/>          
         </section>
 -        <section name="org/jaxen/">
--          <attribute name="Specification-Title"   value="Jaxen XPath engine"/>
--          <attribute name="Implementation-Title"  value="org.jaxen"/>
--          <attribute name="Implementation-Version" value="1.1d4"/>
+-          <attribute name="Specification-Title"    value="Jaxen XPath engine"/>
+-          <attribute name="Implementation-Title"   value="org.jaxen"/>
+-          <attribute name="Implementation-Version" value="1.1.2"/>
 -          <attribute name="Implementation-Vendor"  value="CodeHaus"/>
 -        </section>
          <section name="nu/xom/xslt/">
            <attribute name="Sealed" value="true"/>
            <attribute name="Specification-Title"   value="XOM XSLT interface"/>
-@@ -698,42 +683,6 @@
+@@ -699,39 +684,6 @@
      </jar>
    </target>
  
 -  <target name="compile-jaxen" description="Compile Jaxen" depends="get-jaxen">
--    <javac srcdir="${build.dir}/jaxen/src/java/main"
+-    <javac srcdir="${build.dir}/jaxen-1.1.2/src/java/main"
 -           destdir="${build.dir}/jaxen-classes"
 -           debug="${debug}"
 -           optimize="${optimize}"
@@ -100,10 +104,7 @@
 -  </target>
 -  
 -  <target name="get-jaxen" description="Download Jaxen source code" depends="prepare">
--      <cvs cvsRoot=":pserver:anonymous at cvs.jaxen.codehaus.org:/home/projects/jaxen/scm"
--       package="jaxen"
--       dest="${build.dir}"
--  />
+-      <unzip src="jaxen-1.1.2-src.zip" dest="${build.dir}" />
 -  </target>
 -
    <target name="debug" depends="init" description="Print various Ant properties">

Modified: trunk/xom/debian/patches/02xom-clean-dist.patch
===================================================================
--- trunk/xom/debian/patches/02xom-clean-dist.patch	2009-05-06 00:57:37 UTC (rev 8223)
+++ trunk/xom/debian/patches/02xom-clean-dist.patch	2009-05-06 01:30:08 UTC (rev 8224)
@@ -1,6 +1,10 @@
---- build.xml.orig	2006-02-18 15:11:08.000000000 +0100
-+++ build.xml	2006-02-18 15:11:58.000000000 +0100
-@@ -590,6 +590,7 @@
+Author: Varun Hiremath
+Description: Remove a directory during cleaning.
+Index: xom-1.2.1/build.xml
+===================================================================
+--- xom-1.2.1.orig/build.xml	2009-05-05 21:08:57.000000000 -0400
++++ xom-1.2.1/build.xml	2009-05-05 21:09:24.000000000 -0400
+@@ -576,6 +576,7 @@
      <delete>
        <fileset dir="." includes="junit*properties"/>
      </delete>

Modified: trunk/xom/debian/patches/03_compile15.patch
===================================================================
--- trunk/xom/debian/patches/03_compile15.patch	2009-05-06 00:57:37 UTC (rev 8223)
+++ trunk/xom/debian/patches/03_compile15.patch	2009-05-06 01:30:08 UTC (rev 8224)
@@ -1,12 +1,15 @@
-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
+Author: Varun Hiremath
+Description: Add compile15 to compile-core depends.
+Index: xom-1.2.1/build.xml
+===================================================================
+--- xom-1.2.1.orig/build.xml	2009-05-05 21:05:40.000000000 -0400
++++ xom-1.2.1/build.xml	2009-05-05 21:06:49.000000000 -0400
 @@ -188,7 +188,7 @@
    </target>
  
  
--  <target name="compile-core" depends="prepare" 
-+  <target name="compile-core" depends="prepare, compile15" 
+-  <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}"

Modified: trunk/xom/debian/patches/04_remove_sun_import.patch
===================================================================
--- trunk/xom/debian/patches/04_remove_sun_import.patch	2009-05-06 00:57:37 UTC (rev 8223)
+++ trunk/xom/debian/patches/04_remove_sun_import.patch	2009-05-06 01:30:08 UTC (rev 8224)
@@ -1,3 +1,5 @@
+Author: Varun Hiremath
+Description: Remove sun imports.
 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

Modified: trunk/xom/debian/patches/05_build.patch
===================================================================
--- trunk/xom/debian/patches/05_build.patch	2009-05-06 00:57:37 UTC (rev 8223)
+++ trunk/xom/debian/patches/05_build.patch	2009-05-06 01:30:08 UTC (rev 8224)
@@ -1,7 +1,10 @@
-diff -Nur xom-1.1/build.xml xom-1.1.new/build.xml
---- xom-1.1/build.xml	2007-11-24 03:23:54.000000000 +0530
-+++ xom-1.1.new/build.xml	2007-11-24 03:24:12.000000000 +0530
-@@ -377,7 +377,6 @@
+Author: Varun Hiremath
+Description: Remove external links
+Index: xom-1.2.1/build.xml
+===================================================================
+--- xom-1.2.1.orig/build.xml	2009-05-05 21:04:27.000000000 -0400
++++ xom-1.2.1/build.xml	2009-05-05 21:04:27.000000000 -0400
+@@ -378,7 +378,6 @@
               windowtitle="${Name} ${version}  API"
               docencoding="UTF-8"
               charset="UTF-8"

Added: trunk/xom/debian/patches/series
===================================================================
--- trunk/xom/debian/patches/series	                        (rev 0)
+++ trunk/xom/debian/patches/series	2009-05-06 01:30:08 UTC (rev 8224)
@@ -0,0 +1,6 @@
+01xom-remove-jaxen.patch 
+02xom-clean-dist.patch 
+03_compile15.patch
+04_remove_sun_import.patch
+05_build.patch
+

Modified: trunk/xom/debian/rules
===================================================================
--- trunk/xom/debian/rules	2009-05-06 00:57:37 UTC (rev 8223)
+++ trunk/xom/debian/rules	2009-05-06 01:30:08 UTC (rev 8224)
@@ -2,7 +2,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 JAVA_HOME		:= /usr/lib/jvm/java-gcj
 DEB_JARS		:= xercesImpl xalan xml-apis jaxen saxpath junit

More information about the pkg-java-commits mailing list