[xml-commons-external] 10/23: * d/control: Add myself as Uploaders. * d/rules: Build xml-apis-ext.jar and xml-apis.jar (JAXP 1.4).

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository xml-commons-external.

commit 91907fe5ee1d0de6b3b256a14406bd1ed414cc93
Author: Damien Raude-Morvan <drazzib at debian.org>
Date:   Fri Aug 26 22:05:13 2011 +0000

    * d/control: Add myself as Uploaders.
    * d/rules: Build xml-apis-ext.jar and xml-apis.jar (JAXP 1.4).
---
 debian/changelog                     |  7 +++++++
 debian/control                       |  3 ++-
 debian/rules                         | 32 ++++++++++++++++++++++----------
 debian/{pom.xml => xml-apis-ext.xml} |  2 +-
 debian/{pom.xml => xml-apis.xml}     |  6 +++---
 5 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 560e7e2..d420eb0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xml-commons-external (1.4.01-2) unstable; urgency=low
+
+  * d/control: Add myself as Uploaders.
+  * d/rules: Build xml-apis-ext.jar and xml-apis.jar (JAXP 1.4).
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sat, 27 Aug 2011 00:04:58 +0200
+
 xml-commons-external (1.4.01-1) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 6a856e6..2ebf6d2 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,8 @@ Source: xml-commons-external
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Vincent Fourmond <fourmond at debian.org>, Onkar Shinde <onkarshinde at ubuntu.com>
+Uploaders: Vincent Fourmond <fourmond at debian.org>, Onkar Shinde <onkarshinde at ubuntu.com>,
+ Damien Raude-Morvan <drazzib at debian.org>
 Standards-Version: 3.9.2
 Build-Depends: debhelper (>= 7), cdbs, maven-repo-helper
 Build-Depends-Indep: default-jdk
diff --git a/debian/rules b/debian/rules
index 6586dd8..2fd7e6d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,25 +8,37 @@ VERSION := ${DEB_UPSTREAM_VERSION}
 JAVA_HOME := /usr/lib/jvm/default-java
 
 clean::
-	rm -rf classes external.jar docs
+	rm -rf classes xml-apis-ext.jar xml-apis.jar docs
 
 build-indep:
-	# Build library jar
+	# Build all classes
 	mkdir classes
-	javac -source 1.4 -d classes org/apache/xmlcommons/*.java org/w3c/css/sac/*.java org/w3c/css/sac/helpers/*.java
-	javac -source 1.4 -d classes org/w3c/dom/*.java org/w3c/dom/bootstrap/*.java org/w3c/dom/css/*.java org/w3c/dom/events/*.java org/w3c/dom/html/*.java org/w3c/dom/ls/*.java org/w3c/dom/ranges/*.java org/w3c/dom/smil/*.java org/w3c/dom/stylesheets/*.java org/w3c/dom/svg/*.java org/w3c/dom/traversal/*.java org/w3c/dom/views/*.java org/w3c/dom/xpath/*.java
-	jar -cvfm external.jar manifest.commons -C classes/  org/
+	javac -source 1.4 -d classes `find org/ javax/ -name '*.java'`
+
+	# Build xml-apis-ext and xml-apis jar
+	(cd classes/; jar -cvfm ../xml-apis-ext.jar ../manifest.commons \
+	  `find -type d -name "sac" -o -name "smil" -o -name "svg"`)
+	(cd classes/; jar -cvfm ../xml-apis.jar ../manifest.commons \
+	  `find -type f ! \( -wholename "*/sac/*" -o -wholename "*/smil/*" -o -wholename "*/svg/*" \)`)
 
 	#Build api documentation
 	mkdir api
 	javadoc -d api javax.xml org.apache.xmlcommons org.w3c.css.sac org.w3c.dom
 
 install/libxml-commons-external-java::
-	# Install pom and jar
-	mh_installpom -v -plibxml-commons-external-java debian/pom.xml
-	mh_installjar -plibxml-commons-external-java -l debian/pom.xml \
-		-nxml-commons-external -i${VERSION} external.jar
-	ln -s xml-commons-external-${VERSION}.jar debian/libxml-commons-external-java/usr/share/java/xml-apis-ext.jar
+	# Install xml-apis-ext
+	mh_installpom -v -plibxml-commons-external-java debian/xml-apis-ext.xml
+	mh_installjar -plibxml-commons-external-java -l debian/xml-apis-ext.xml \
+		-s -nxml-apis-ext -i${VERSION} xml-apis-ext.jar
+	dh_link -plibxml-commons-external-java /usr/share/java/xml-apis-ext-${VERSION}.jar /usr/share/java/xml-commons-external-${VERSION}.jar
+	dh_link -plibxml-commons-external-java /usr/share/java/xml-apis-ext-${VERSION}.jar /usr/share/java/xml-commons-external.jar
+	dh_link -plibxml-commons-external-java /usr/share/java/xml-apis-ext-${VERSION}.jar /usr/share/java/xml-apis-ext.jar
+
+	# Install xml-apis
+	mh_installpom -v -plibxml-commons-external-java debian/xml-apis.xml
+	mh_installjar -plibxml-commons-external-java -l debian/xml-apis.xml \
+		-s -nxml-apis -i${VERSION} xml-apis.jar
+	dh_link -plibxml-commons-external-java /usr/share/java/xml-apis-${VERSION}.jar /usr/share/java/jaxp-1.4.jar
 
 install/libxml-commons-external-java-doc::
 	# Install the documentation into the libxml-commons-java-doc package
diff --git a/debian/pom.xml b/debian/xml-apis-ext.xml
similarity index 98%
copy from debian/pom.xml
copy to debian/xml-apis-ext.xml
index 42b01f5..79ecb35 100644
--- a/debian/pom.xml
+++ b/debian/xml-apis-ext.xml
@@ -3,7 +3,7 @@
   <groupId>xml-apis</groupId>
   <artifactId>xml-apis-ext</artifactId>
   <name>XML Commons External Components XML APIs Extensions</name>
-  <version>1.3.05</version>
+  <version>1.4.01</version>
   <description>xml-commons provides an Apache-hosted set of DOM, SAX, and 
     JAXP interfaces for use in other xml-based projects. Our hope is that we 
     can standardize on both a common version and packaging scheme for these 
diff --git a/debian/pom.xml b/debian/xml-apis.xml
similarity index 92%
rename from debian/pom.xml
rename to debian/xml-apis.xml
index 42b01f5..14b07c8 100644
--- a/debian/pom.xml
+++ b/debian/xml-apis.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?><project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>xml-apis</groupId>
-  <artifactId>xml-apis-ext</artifactId>
-  <name>XML Commons External Components XML APIs Extensions</name>
-  <version>1.3.05</version>
+  <artifactId>xml-apis-1.4</artifactId>
+  <name>XML Commons External Components XML APIs</name>
+  <version>1.4.01</version>
   <description>xml-commons provides an Apache-hosted set of DOM, SAX, and 
     JAXP interfaces for use in other xml-based projects. Our hope is that we 
     can standardize on both a common version and packaging scheme for these 

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