[jaxb] 01/01: initial packaging

Timo Aaltonen tjaalton-guest at moszumanska.debian.org
Sat Jan 18 09:33:00 UTC 2014


This is an automated email from the git hooks/post-receive script.

tjaalton-guest pushed a commit to branch master
in repository jaxb.

commit 08b3abb5af80db5d9ba30a1575ffd23257c8abc6
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Sat Jan 18 11:19:19 2014 +0200

    initial packaging
---
 debian/build-javadoc.xml                           |  17 +++
 debian/changelog                                   |   5 +
 debian/compat                                      |   1 +
 debian/control                                     |  57 +++++++++++
 debian/copyright                                   |  19 ++++
 debian/libjaxb-java-doc.doc-base.javadoc           |   9 ++
 debian/libjaxb-java-doc.javadoc                    |   1 +
 debian/libjaxb-java.jlibs                          |   4 +
 debian/libjaxb-java.poms                           |   2 +
 debian/orig-tar.sh                                 |  31 ++++++
 debian/patches/add-dependencies.patch              | 114 +++++++++++++++++++++
 debian/patches/dont-build-examples.patch           |  37 +++++++
 debian/patches/dont-bundle-other-jars.patch        |  44 ++++++++
 debian/patches/dont-generate-1.0-runtime.patch     |  60 +++++++++++
 debian/patches/dont-generate-jing-rnc-driver.patch |  31 ++++++
 debian/patches/dont-use-internal-resolver.patch    |  27 +++++
 debian/patches/dont-use-prebuilt-javadocs.patch    |  26 +++++
 .../patches/remove-classpath-from-manifests.patch  |  34 ++++++
 debian/patches/series                              |   8 ++
 debian/rules                                       |  72 +++++++++++++
 debian/source/format                               |   1 +
 debian/watch                                       |   4 +
 22 files changed, 604 insertions(+)

diff --git a/debian/build-javadoc.xml b/debian/build-javadoc.xml
new file mode 100644
index 0000000..6411abb
--- /dev/null
+++ b/debian/build-javadoc.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+
+<project name="javadoc" default="build">
+
+  <target name="build">
+    <mkdir dir="apidocs" />
+    <javadoc destdir="apidocs">
+      <fileset dir="runtime/src" includes="**/*.java"/>
+      <fileset dir="xjc/src" includes="**/*.java"/>
+    </javadoc>
+    <copy todir="apidocs">
+      <fileset dir="runtime/src" includes="**/doc-files/**/*"/>
+      <fileset dir="xjc/src" includes="**/doc-files/**/*"/>
+    </copy>
+  </target>
+
+</project>
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..2a98df0
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+jaxb (2.2.5-1) UNRELEASED; urgency=low
+
+  * Initial release. (Closes: #734727)
+
+ -- Ade Lee <alee at redhat.com>  Wed, 04 Dec 2013 23:03:50 -0500
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..9b77959
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,57 @@
+Source: jaxb
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Timo Aaltonen <tjaalton at ubuntu.com>
+Build-Depends: debhelper (>= 9), default-jdk, javahelper (>= 0.43), ant, maven-repo-helper,
+ libargs4j-java,
+ libcodemodel-java (>= 2.6),
+ libdom4j-java,
+ libisorelax-java,
+ libistack-commons-java,
+ libdtd-parser-java,
+ libfastinfoset-java,
+ libjaxb-api-java,
+ libjing-java,
+ libmsv-java,
+ librelaxngcc-java,
+ librngom-java,
+ libtxw2-java (>= 0.1+20110809),
+ libxml-commons-resolver1.1-java,
+Standards-Version: 3.9.5
+Vcs-Git: git://anonscm.debian.org/pkg-java/jaxb.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/jaxb.git
+Homepage: https://jaxb.java.net
+
+Package: libjaxb-java
+Architecture: all
+Depends: ${java:Depends}, ${misc:Depends},
+ libargs4j-java,
+ libcodemodel-java (>= 2.6),
+ libdom4j-java,
+ libdtd-parser-java,
+ libfastinfoset-java,
+ libisorelax-java,
+ libistack-commons-java,
+ libjaxb-api-java,
+ libjing-java,
+ libmsv-java,
+ librelaxngcc-java,
+ librngom-java,
+ libtxw2-java (>= 0.1+20110809),
+ libxml-commons-resolver1.1-java,
+Recommends: ${java:Recommends}
+Description: JAXB Reference Implementation
+ GlassFish Java Architecture for XML Binding (JAXB) Reference
+ Implementation.
+
+Package: libjaxb-java-doc
+Architecture: all
+Section: doc
+Depends: ${java:Depends}, ${misc:Depends}
+Recommends: ${java:Recommends}
+Description: JAXB Reference Implementation -- documentation
+ GlassFish Java Architecture for XML Binding (JAXB) Reference
+ Implementation.
+ .
+ This package contains the Javadoc API.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..d079d78
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,19 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Scannotation
+Source: http://www.attainware.com/
+
+Files: *
+Copyright: 1997-2013, Oracle
+License: CDDL or GPL-2 with classpath exception
+
+License: GPL-2
+ On Debian systems, the full text of the Apache-2.0 license
+ can be found in the file '/usr/share/common-licenses/GPL-2'
+
+Files: debian/*
+Copyright: 2013, Ade Lee <alee at redhat.com>
+License: Apache-2.0
+
+License: Apache-2.0
+ On Debian systems, the full text of the Apache-2.0 license
+ can be found in the file '/usr/share/common-licenses/Apache-2.0'
diff --git a/debian/libjaxb-java-doc.doc-base.javadoc b/debian/libjaxb-java-doc.doc-base.javadoc
new file mode 100644
index 0000000..91ed1ac
--- /dev/null
+++ b/debian/libjaxb-java-doc.doc-base.javadoc
@@ -0,0 +1,9 @@
+Document: libjaxb-java-doc
+Title: API JavaDoc for libjaxb-java-doc
+Author: The authors of libjaxb-java-doc
+Abstract: This is the API JavaDoc for libjaxb-java-doc
+Section: Programming/Java
+
+Format: HTML
+Index: /usr/share/doc/libjaxb-java-doc/api
+Files: /usr/share/doc/libjaxb-java-doc/api/*.html
diff --git a/debian/libjaxb-java-doc.javadoc b/debian/libjaxb-java-doc.javadoc
new file mode 100644
index 0000000..c6556b5
--- /dev/null
+++ b/debian/libjaxb-java-doc.javadoc
@@ -0,0 +1 @@
+apidocs
diff --git a/debian/libjaxb-java.jlibs b/debian/libjaxb-java.jlibs
new file mode 100644
index 0000000..022e128
--- /dev/null
+++ b/debian/libjaxb-java.jlibs
@@ -0,0 +1,4 @@
+dist/lib/jaxb-impl.jar
+dist/lib/jaxb-xjc.jar
+tools/lib/util/pretty-printer.jar
+tools/xmllint/build/xmllint.jar
diff --git a/debian/libjaxb-java.poms b/debian/libjaxb-java.poms
new file mode 100644
index 0000000..70cf004
--- /dev/null
+++ b/debian/libjaxb-java.poms
@@ -0,0 +1,2 @@
+jaxb-impl.pom
+jaxb-xjc.pom
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
new file mode 100755
index 0000000..8d7bd6d
--- /dev/null
+++ b/debian/orig-tar.sh
@@ -0,0 +1,31 @@
+#!/bin/sh -e
+
+VERSION=$2
+UVERSION=`echo $VERSION | sed 's/\./_/g'`
+TAR=../jaxb_$VERSION.orig.tar.xz
+DIR=jaxb-$VERSION
+TAG=$(echo "jaxb-$UVERSION" | sed -re's/~(alpha|beta)/-\1-/')
+
+svn export https://svn.java.net/svn/jaxb~version2/tags/$TAG $DIR
+wget http://repo1.maven.org/maven2/com/sun/xml/bind/jaxb-impl/$VERSION/jaxb-impl-$VERSION.pom
+wget http://repo1.maven.org/maven2/com/sun/xml/bind/jaxb-xjc/$VERSION/jaxb-xjc-$VERSION.pom
+mv jaxb-impl-$VERSION.pom $DIR/jaxb-impl.pom
+mv jaxb-xjc-$VERSION.pom $DIR/jaxb-xjc.pom
+XZ_OPT=--best tar -c -J -f $TAR \
+    --exclude '*.jar' \
+    --exclude '*.class' \
+    --exclude '*.ipr' \
+    --exclude '*.iml' \
+    --exclude '.settings' \
+    --exclude '.project' \
+    --exclude '.classpath' \
+    --exclude '*.dll' \
+    --exclude '*.zip' \
+    $DIR
+rm -rf $DIR ../$TAG
+
+# move to directory 'tarballs'
+if [ -r .svn/deb-layout ]; then
+  . .svn/deb-layout
+  mv $TAR $origDir && echo "moved $TAR to $origDir"
+fi
diff --git a/debian/patches/add-dependencies.patch b/debian/patches/add-dependencies.patch
new file mode 100644
index 0000000..ccb2a68
--- /dev/null
+++ b/debian/patches/add-dependencies.patch
@@ -0,0 +1,114 @@
+--- a/jaxb-impl.pom
++++ b/jaxb-impl.pom
+@@ -43,12 +43,6 @@
+ 
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ 
+-    <parent>
+-        <groupId>net.java</groupId>
+-        <artifactId>jvnet-parent</artifactId>
+-        <version>1</version>
+-    </parent>
+-    
+     <modelVersion>4.0.0</modelVersion>
+     <groupId>com.sun.xml.bind</groupId>
+     <artifactId>jaxb-impl</artifactId>
+@@ -91,6 +85,37 @@
+         <url>http://java.net/projects/jaxb/sources/version2/show/branches/jaxb-2_2-branch/jaxb-ri</url>
+     </scm>
+ 
++    <dependencies>
++        <dependency>
++            <groupId>isorelax</groupId>
++            <artifactId>isorelax</artifactId>
++            <scope>system</scope>
++            <systemPath>/usr/share/java/isorelax.jar</systemPath>
++        </dependency>
++        <dependency>
++            <groupId>net.java.dev.msv</groupId>
++            <artifactId>msv</artifactId>
++            <scope>system</scope>
++            <systemPath>/usr/share/java/msv-core.jar</systemPath>
++        </dependency>
++        <dependency>
++            <groupId>relaxngDatatype</groupId>
++            <artifactId>relaxngDatatype</artifactId>
++            <scope>system</scope>
++            <systemPath>/usr/share/java/relaxngDatatype.jar</systemPath>
++        </dependency>
++        <dependency>
++            <groupId>com.sun.istack</groupId>
++            <artifactId>istack-commons-runtime</artifactId>
++            <version>2.6.1</version>
++        </dependency>
++        <dependency>
++            <groupId>com.sun.xml.txw2</groupId>
++            <artifactId>txw2</artifactId>
++            <version>20110809</version>
++        </dependency>
++    </dependencies>
++
+     <dependencyManagement>        
+         <dependencies>
+             <dependency>
+--- a/jaxb-xjc.pom
++++ b/jaxb-xjc.pom
+@@ -43,12 +43,6 @@
+ 
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ 
+-    <parent>
+-        <groupId>net.java</groupId>
+-        <artifactId>jvnet-parent</artifactId>
+-        <version>1</version>
+-    </parent>
+-    
+     <modelVersion>4.0.0</modelVersion>
+     <groupId>com.sun.xml.bind</groupId>
+     <artifactId>jaxb-xjc</artifactId>
+@@ -91,6 +85,45 @@
+         <url>http://java.net/projects/jaxb/sources/version2/show/branches/jaxb-2_2-branch/jaxb-ri</url>
+     </scm>
+ 
++    <dependencies>
++      <dependency>
++        <groupId>com.sun.codemodel</groupId>
++        <artifactId>codemodel</artifactId>
++        <version>2.6</version>
++      </dependency>
++      <dependency>
++        <groupId>com.sun.xml.dtd-parser</groupId>
++        <artifactId>dtd-parser</artifactId>
++        <version>1.2-SNAPSHOT</version>
++      </dependency>
++      <dependency>
++        <groupId>com.sun.istack</groupId>
++        <artifactId>istack-commons-tools</artifactId>
++        <version>2.6.1</version>
++      </dependency>
++      <dependency>
++        <groupId>relaxngDatatype</groupId>
++        <artifactId>relaxngDatatype</artifactId>
++        <scope>system</scope>
++        <systemPath>/usr/share/java/relaxngDatatype.jar</systemPath>
++      </dependency>
++      <dependency>
++        <groupId>xml-resolver</groupId>
++        <artifactId>xml-resolver</artifactId>
++        <version>1.2</version>
++      </dependency>
++      <dependency>
++        <groupId>org.kohsuke.rngom</groupId>
++        <artifactId>rngom</artifactId>
++        <version>201103-SNAPSHOT</version>
++      </dependency>
++      <dependency>
++        <groupId>com.sun.xsom</groupId>
++        <artifactId>xsom</artifactId>
++        <version>20110809</version>
++      </dependency>
++    </dependencies>
++
+     <dependencyManagement>
+         <dependencies>
+             <dependency>
diff --git a/debian/patches/dont-build-examples.patch b/debian/patches/dont-build-examples.patch
new file mode 100644
index 0000000..0c34924
--- /dev/null
+++ b/debian/patches/dont-build-examples.patch
@@ -0,0 +1,37 @@
+From bc4b149aa582d1663db86141533477a3a7ca937e Mon Sep 17 00:00:00 2001
+From: Juan Hernandez <juan.hernandez at redhat.com>
+Date: Sat, 10 Mar 2012 18:04:52 +0100
+Subject: [PATCH 7/7] Don't build examples
+
+---
+ build.xml |   14 --------------
+ 1 files changed, 0 insertions(+), 14 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index 7b18a8e..4da31cb 100644
+--- a/build.xml
++++ b/build.xml
+@@ -880,20 +880,6 @@
+ 
+         </parallel>
+ 
+-        <antcall target="process-sample.notinwspack"/>
+-        <!-- copy samples -->
+-        <mkdir dir="${jaxb.dist}/samples"/>
+-        <copy todir="${jaxb.dist}/samples">
+-          <fileset dir="${jaxb.root}/samples/work" defaultexcludes="yes">
+-            <exclude name="CHANGELOG.txt"/>
+-            <exclude name="**/build.golden.regexp"/>
+-            <exclude name="**/.cvsignore"/>
+-            <exclude name="**/sample.meta"/>
+-            <exclude name="**/gen-src/**/*"/>
+-            <exclude name="**/classes/**/*"/>
+-          </fileset>
+-        </copy>
+-
+     </target>
+ 
+     <target name="push-snapshot-to-maven">
+-- 
+1.7.9
+
diff --git a/debian/patches/dont-bundle-other-jars.patch b/debian/patches/dont-bundle-other-jars.patch
new file mode 100644
index 0000000..3a862f7
--- /dev/null
+++ b/debian/patches/dont-bundle-other-jars.patch
@@ -0,0 +1,44 @@
+From a954f6d671b5c3f334a80e803db77362500c1e48 Mon Sep 17 00:00:00 2001
+From: Juan Hernandez <juan.hernandez at redhat.com>
+Date: Sat, 10 Mar 2012 17:20:13 +0100
+Subject: [PATCH 4/5] Don't bundle other jars
+
+---
+ build.xml |    7 -------
+ 1 files changed, 0 insertions(+), 7 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index 12631a1..4dda9ef 100644
+--- a/build.xml
++++ b/build.xml
+@@ -830,7 +830,6 @@
+                       <fileset dir="${runtime-fi.classes}"/>
+                       <fileset dir="${runtime-staxex.classes}"/>
+                       <fileset dir="${runtime.src}" includes="META-INF/**/*" />
+-                      <zipgroupfileset dir="${jaxb.libs.runtime2}" includes="*.jar" />
+                   </jar>
+               </sequential>
+ 
+@@ -854,19 +853,13 @@ Class-Path: ${manifest.classpath}
+                     <mapper type="glob" from="*.java" to="*.java_" />
+                   </copy>
+ 
+-                  <mkdir dir="${jaxb.root}/build/jaxb-xjc-rejar"/>
+-                  <unzip dest="${jaxb.root}/build/jaxb-xjc-rejar">
+-                    <fileset dir="${jaxb.libs.compiler}" includes="*.jar" />
+-                  </unzip>
+                   <jar jarfile="${jaxb.dist}/lib/jaxb-xjc.jar"
+                        manifest="${xjc.root}/manifest.xjc"
+                        duplicate="fail">
+                       <!-- can't use zipgroupfileset because of the duplicate LICENSE.txt -->
+-                      <fileset dir="${jaxb.root}/build/jaxb-xjc-rejar"/>
+                       <fileset dir="${xjc.classes}"/>
+                       <metainf dir="${xjc.src}/META-INF" />
+                   </jar>
+-                  <delete dir="${jaxb.root}/build/jaxb-xjc-rejar"/>
+               </sequential>
+ 
+               <!-- copy bin scripts -->
+-- 
+1.7.9
+
diff --git a/debian/patches/dont-generate-1.0-runtime.patch b/debian/patches/dont-generate-1.0-runtime.patch
new file mode 100644
index 0000000..81504cf
--- /dev/null
+++ b/debian/patches/dont-generate-1.0-runtime.patch
@@ -0,0 +1,60 @@
+From 2dd0e1c44601db267fab47fa903c3f478d624d53 Mon Sep 17 00:00:00 2001
+From: Juan Hernandez <juan.hernandez at redhat.com>
+Date: Sat, 10 Mar 2012 17:11:14 +0100
+Subject: [PATCH 2/5] Don't generate 1.0 runtime
+
+---
+ build.xml |   23 +----------------------
+ 1 files changed, 1 insertions(+), 22 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index 7e95870..12631a1 100644
+--- a/build.xml
++++ b/build.xml
+@@ -798,7 +798,7 @@
+        
+     <!-- generate a distribution -->
+     <target name="dist"
+-            depends="compile, integrate-1.0-compiler"
++            depends="compile"
+             description="create a distribution in jaxb-ri/dist">
+         <mkdir dir="${jaxb.dist}" />
+         <mkdir dir="${jaxb.dist}/bin" />
+@@ -834,25 +834,6 @@
+                   </jar>
+               </sequential>
+ 
+-              <!-- JAXB 1.0 runtime jar -->
+-              <!-- generate jaxb1-impl.jar for 1.0 runtime -->
+-              <!-- include the contents of the old jaxb-libs.jar -->
+-              <sequential>
+-                  <createManifest file="${runtime.root}/build/manifest.rt1" extensionName="com.sun.xml.bind" />
+-                  <mkdir dir="${jaxb.root}/build/jaxb-1-impl-rejar"/>
+-                  <unzip dest="${jaxb.root}/build/jaxb-1-impl-rejar">
+-                    <fileset dir="${jaxb.libs.runtime}" includes="*.jar" />
+-                  </unzip>
+-                  <jar jarfile="${jaxb.dist}/lib/jaxb1-impl.jar"
+-                       manifest="${runtime.root}/build/manifest.rt1">
+-                      <!-- can't use zipgroupfileset because of the duplicate version.properties -->
+-                      <fileset dir="${jaxb.root}/build/jaxb-1-impl-rejar"/>
+-                      <fileset dir="${runtime-deprecated.classes}"/>
+-                  </jar>
+-                  <delete dir="${jaxb.root}/build/jaxb-1-impl-rejar"/>
+-              </sequential>
+-
+-
+               <!-- generate jaxb-xjc.jar: xjc, and schemagen subprojects -->
+               <sequential>
+                   <createManifest file="${xjc.root}/manifest.xjc" extensionName="com.sun.tools.xjc" />
+@@ -884,8 +865,6 @@ Class-Path: ${manifest.classpath}
+                       <fileset dir="${jaxb.root}/build/jaxb-xjc-rejar"/>
+                       <fileset dir="${xjc.classes}"/>
+                       <metainf dir="${xjc.src}/META-INF" />
+-                      <!-- bundle the 1.0 compiler in the side directory -->
+-                      <zipfileset dir="${xjc10.classes}/.." />
+                   </jar>
+                   <delete dir="${jaxb.root}/build/jaxb-xjc-rejar"/>
+               </sequential>
+-- 
+1.7.9
+
diff --git a/debian/patches/dont-generate-jing-rnc-driver.patch b/debian/patches/dont-generate-jing-rnc-driver.patch
new file mode 100644
index 0000000..17b709a
--- /dev/null
+++ b/debian/patches/dont-generate-jing-rnc-driver.patch
@@ -0,0 +1,31 @@
+From 2fad64699dd922ae6c78575b4b32f621461544a5 Mon Sep 17 00:00:00 2001
+From: Juan Hernandez <juan.hernandez at redhat.com>
+Date: Sat, 10 Mar 2012 17:16:56 +0100
+Subject: [PATCH 3/5] Don't generate Jing RNC driver
+
+---
+ tools/build.xml |    2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+diff --git a/tools/build.xml b/tools/build.xml
+index d304db4..0723987 100644
+--- a/tools/build.xml
++++ b/tools/build.xml
+@@ -53,14 +53,12 @@
+     <target name="compile" depends="compile-for-source"
+             description="build tools and deploy them into necessary locations">
+         <ant dir="${jaxb.root}/tools/pretty-printer" />
+-        <ant dir="${jaxb.root}/tools/jing-rnc-driver"/>
+     </target>
+     
+     <target name="clean">
+         <ant dir="${jaxb.root}/tools/source-tidy"          target="clean"/>
+         <ant dir="${jaxb.root}/tools/webapp-commons"       target="clean"/>
+         <ant dir="${jaxb.root}/tools/pretty-printer"       target="clean"/>
+-        <ant dir="${jaxb.root}/tools/jing-rnc-driver"      target="clean"/>
+         <ant dir="${jaxb.root}/tools/xmllint"              target="clean"/>
+     </target>
+ </project>
+-- 
+1.7.9
+
diff --git a/debian/patches/dont-use-internal-resolver.patch b/debian/patches/dont-use-internal-resolver.patch
new file mode 100644
index 0000000..240e5c0
--- /dev/null
+++ b/debian/patches/dont-use-internal-resolver.patch
@@ -0,0 +1,27 @@
+From 5f4055b0b8792440e3f004ff189e08e05c5a1d44 Mon Sep 17 00:00:00 2001
+From: Juan Hernandez <juan.hernandez at redhat.com>
+Date: Sat, 10 Mar 2012 17:08:06 +0100
+Subject: [PATCH 1/5] Don't use internal resolver
+
+---
+ xjc/src/com/sun/tools/xjc/Options.java |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/xjc/src/com/sun/tools/xjc/Options.java b/xjc/src/com/sun/tools/xjc/Options.java
+index 78c9cf4..d8247de 100644
+--- a/xjc/src/com/sun/tools/xjc/Options.java
++++ b/xjc/src/com/sun/tools/xjc/Options.java
+@@ -67,8 +67,8 @@ import com.sun.codemodel.CodeWriter;
+ import com.sun.codemodel.JPackage;
+ import com.sun.codemodel.writer.FileCodeWriter;
+ import com.sun.codemodel.writer.PrologCodeWriter;
+-import com.sun.org.apache.xml.internal.resolver.CatalogManager;
+-import com.sun.org.apache.xml.internal.resolver.tools.CatalogResolver;
++import org.apache.xml.resolver.CatalogManager;
++import org.apache.xml.resolver.tools.CatalogResolver;
+ import com.sun.tools.xjc.api.ClassNameAllocator;
+ import com.sun.tools.xjc.api.SpecVersion;
+ import com.sun.tools.xjc.generator.bean.field.FieldRendererFactory;
+-- 
+1.7.9
+
diff --git a/debian/patches/dont-use-prebuilt-javadocs.patch b/debian/patches/dont-use-prebuilt-javadocs.patch
new file mode 100644
index 0000000..f905447
--- /dev/null
+++ b/debian/patches/dont-use-prebuilt-javadocs.patch
@@ -0,0 +1,26 @@
+From 463def43292b22ba9137b79fe98a96fe545725ed Mon Sep 17 00:00:00 2001
+From: Juan Hernandez <juan.hernandez at redhat.com>
+Date: Sat, 10 Mar 2012 18:04:19 +0100
+Subject: [PATCH 6/7] Don't use prebuilt javadocs
+
+---
+ build.xml |    3 ---
+ 1 files changed, 0 insertions(+), 3 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index a0759eb..7b18a8e 100644
+--- a/build.xml
++++ b/build.xml
+@@ -880,9 +880,6 @@
+ 
+         </parallel>
+ 
+-        <unzip src="${jaxb.libs.redist}/jaxb-api-doc.zip" dest="${jaxb.dist}/docs/api"/>
+-        <antcall target="docs" />
+-
+         <antcall target="process-sample.notinwspack"/>
+         <!-- copy samples -->
+         <mkdir dir="${jaxb.dist}/samples"/>
+-- 
+1.7.9
+
diff --git a/debian/patches/remove-classpath-from-manifests.patch b/debian/patches/remove-classpath-from-manifests.patch
new file mode 100644
index 0000000..8933dfc
--- /dev/null
+++ b/debian/patches/remove-classpath-from-manifests.patch
@@ -0,0 +1,34 @@
+From 1bcc5546d6100f1cc41f6e1cb9be113ce967d737 Mon Sep 17 00:00:00 2001
+From: Juan Hernandez <juan.hernandez at redhat.com>
+Date: Sat, 10 Mar 2012 17:24:00 +0100
+Subject: [PATCH 5/5] Remove classpath from manifests
+
+---
+ build.xml |    4 ----
+ 1 files changed, 0 insertions(+), 4 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index 4dda9ef..a0759eb 100644
+--- a/build.xml
++++ b/build.xml
+@@ -820,9 +820,6 @@
+               <!-- generate jaxb-impl.jar for 2.0 runtime -->
+               <sequential>
+                   <createManifest file="${runtime.root}/build/manifest.rt" extensionName="com.sun.xml.bind" />
+-                  <manifest mode="update" file="${runtime.root}/build/manifest.rt">
+-                    <attribute name="Class-Path" value="jaxb-api.jar activation.jar jsr173_1.0_api.jar jaxb1-impl.jar" /> <!-- added for JES4 script compatibility -->
+-                  </manifest>
+                   <jar jarfile="${jaxb.dist}/lib/jaxb-impl.jar"
+                        manifest="${runtime.root}/build/manifest.rt"
+                        duplicate="fail">
+@@ -845,7 +842,6 @@
+                   <property name="manifest.classpath" value="jaxb-api.jar jaxb-impl.jar jsr173_1.0_api.jar activation.jar" />
+                   <echo file="${xjc.root}/manifest.xjc" append="true"
+ >Main-Class: com.sun.tools.xjc.XJCFacade
+-Class-Path: ${manifest.classpath}
+ 
+ </echo>
+                   <copy todir="${xjc.classes}">
+-- 
+1.7.9
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..5b4d1e0
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,8 @@
+dont-use-internal-resolver.patch
+dont-generate-1.0-runtime.patch
+dont-generate-jing-rnc-driver.patch
+dont-bundle-other-jars.patch
+remove-classpath-from-manifests.patch
+add-dependencies.patch
+dont-use-prebuilt-javadocs.patch
+dont-build-examples.patch
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..46056b9
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,72 @@
+#!/usr/bin/make -f
+
+export JAVA_HOME=/usr/lib/jvm/default-java
+
+# Put depended upon jars in here
+# export CLASSPATH=
+
+VERSION = $(shell dpkg-parsechangelog |grep Version| sed 's/.*: //;s/-.*//')
+
+%:
+	dh $@ --with javahelper
+
+override_dh_auto_build:
+	ln -s /usr/share/java/codemodel.jar tools/lib/rebundle/compiler/codemodel.jar
+	ln -s /usr/share/java/dtd-parser.jar tools/lib/rebundle/compiler/dtd-parser.jar
+	ln -s /usr/share/java/istack-commons-tools.jar tools/lib/rebundle/compiler/istack-commons-tools.jar
+	ln -s /usr/share/java/relaxngDatatype.jar tools/lib/rebundle/compiler/relaxngDatatype.jar
+	ln -s /usr/share/java/xml-resolver.jar tools/lib/rebundle/compiler/resolver.jar
+	ln -s /usr/share/java/rngom.jar tools/lib/rebundle/compiler/rngom.jar
+	ln -s /usr/share/java/xsom.jar tools/lib/rebundle/compiler/xsom.jar
+	ln -s /usr/share/java/isorelax.jar tools/lib/rebundle/runtime/isorelax.jar
+	ln -s /usr/share/java/msv-core.jar tools/lib/rebundle/runtime/msv.jar
+	ln -s /usr/share/java/relaxngDatatype.jar tools/lib/rebundle/runtime/relaxngDatatype.jar
+	ln -s /usr/share/java/istack-commons-runtime.jar tools/lib/rebundle/runtime2/istack-commons-runtime.jar
+	ln -s /usr/share/java/txw2.jar tools/lib/rebundle/runtime2/txw2.jar
+	ln -s /usr/share/java/jaxb-api.jar tools/lib/redist/jaxb-api.jar
+	ln -s /usr/share/java/FastInfoset.jar tools/lib/util/FastInfoset.jar
+	ln -s /usr/share/java/args4j.jar tools/lib/util/args4j.jar
+	ln -s /usr/share/java/codemodel-annotation-compiler.jar tools/lib/util/codemodel-annotation-compiler.jar
+	ln -s /usr/share/java/dom4j.jar tools/lib/util/dom4j.jar
+	ln -s /usr/share/java/jing.jar tools/lib/util/jing.jar
+	ln -s /usr/share/java/relaxngcc.jar tools/lib/util/relaxngcc.jar
+	ln -s /usr/share/java/stax-ex.jar tools/lib/util/stax-ex.jar
+	ln -s /usr/share/java/txwc2.jar tools/lib/util/txwc2.jar
+	ln -s debian/build-javadoc.xml .
+
+	ant -Dbuild.sysclasspath=last -Dbuild.number=1 dist
+	ant -Dbuild.sysclasspath=last -f build-javadoc.xml
+
+override_dh_clean:
+	dh_clean
+	-rm -rf apidocs
+	-rm -rf `find . -name "*.jar"`
+	-rm -rf `find . -name "*.class"`
+	-rm -rf `find . -name "*.zip"`
+	-rm -rf ./xjc/build
+	-rm -rf ./runtime/build
+	-rm -rf ./runtime-deprecated/build
+	-rm -rf ./dist
+	-rm -f xjc/manifest.xjc
+
+clean::
+	dh_clean
+	-rm -rf apidocs
+	-rm -rf `find . -name "*.jar"`
+	-rm -rf `find . -name "*.class"`
+	-rm -rf `find . -name "*.zip"`
+	-rm -rf ./xjc/build
+	-rm -rf ./runtime/build
+	-rm -rf ./runtime-deprecated/build
+	-rm -rf ./dist
+	-rm -f xjc/manifest.xjc
+
+override_dh_install:
+	dh_install
+	mh_installpoms
+	mh_installjar -plibjaxb-java -l jaxb-impl.pom dist/lib/jaxb-impl.jar
+	mh_installjar -plibjaxb-java -l jaxb-xjc.pom dist/lib/jaxb-xjc.jar
+
+get-orig-source:
+	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
+
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..d1f0fc9
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,4 @@
+version=3
+opts="uversionmangle=s/-(alpha|beta)-/~$1/;s/_/\./g" \
+  https://svn.java.net/svn/jaxb~version2/tags/ \
+  jaxb-(\d.*)/ debian debian/orig-tar.sh

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jaxb.git



More information about the pkg-java-commits mailing list