[pkg-java] r13579 - in trunk/xom/debian: . poms

Damien Raude-Morvan drazzib at alioth.debian.org
Mon Apr 25 12:11:09 UTC 2011 

Author: drazzib
Date: 2011-04-25 12:11:03 +0000 (Mon, 25 Apr 2011)
New Revision: 13579

Added:
   trunk/xom/debian/README.source
   trunk/xom/debian/libxom-java.poms
   trunk/xom/debian/poms/
   trunk/xom/debian/poms/xom.pom
Removed:
   trunk/xom/debian/README.Debian-source
Modified:
   trunk/xom/debian/changelog
   trunk/xom/debian/control
   trunk/xom/debian/rules
Log:
* Team upload.
* Apply patch from James Pages <james.page at canonical.com>. Thanks :
* Enabled maven artifact deployment (LP: #715684) (Closes: #612592).
  - debian/control: Build-Depends added maven-repo-helper
  - debian/rules: install maven artifacts and new target to retrieve
    original POM file.
  - debian/poms/xom.pom: localised pom for maven
  - debian/libxom-java.poms: pom reference locations
* Update Standards-Version: 3.9.2:
  - Rename debian/README.Debian-source to debian/README.source.
* Drop Depends on JRE since it's a library (as per Debian Java Policy).

Deleted: trunk/xom/debian/README.Debian-source
===================================================================
--- trunk/xom/debian/README.Debian-source	2011-04-25 11:51:26 UTC (rev 13578)
+++ trunk/xom/debian/README.Debian-source	2011-04-25 12:11:03 UTC (rev 13579)
@@ -1,13 +0,0 @@
-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

Copied: trunk/xom/debian/README.source (from rev 13573, trunk/xom/debian/README.Debian-source)
===================================================================
--- trunk/xom/debian/README.source	                        (rev 0)
+++ trunk/xom/debian/README.source	2011-04-25 12:11:03 UTC (rev 13579)
@@ -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	2011-04-25 11:51:26 UTC (rev 13578)
+++ trunk/xom/debian/changelog	2011-04-25 12:11:03 UTC (rev 13579)
@@ -1,10 +1,24 @@
 xom (1.2.1-3) unstable; urgency=low
 
-  UNRELEASED
+  * Team upload.
+
+  [ Torsten Werner ]
   * Remove new patch from last version because gcj was broken.
 
- -- Torsten Werner <twerner at debian.org>  Thu, 25 Feb 2010 20:48:41 +0100
+  [ Damien Raude-Morvan ]
+  * Apply patch from James Pages <james.page at canonical.com>. Thanks :
+  * Enabled maven artifact deployment (LP: #715684) (Closes: #612592).
+    - debian/control: Build-Depends added maven-repo-helper
+    - debian/rules: install maven artifacts and new target to retrieve
+      original POM file.
+    - debian/poms/xom.pom: localised pom for maven
+    - debian/libxom-java.poms: pom reference locations
+  * Update Standards-Version: 3.9.2:
+    - Rename debian/README.Debian-source to debian/README.source.
+  * Drop Depends on JRE since it's a library (as per Debian Java Policy).
 
+ -- Damien Raude-Morvan <drazzib at debian.org>  Mon, 25 Apr 2011 14:10:19 +0200
+
 xom (1.2.1-2) unstable; urgency=low
 
   * Convert patches to dep3 format.

Modified: trunk/xom/debian/control
===================================================================
--- trunk/xom/debian/control	2011-04-25 11:51:26 UTC (rev 13578)
+++ trunk/xom/debian/control	2011-04-25 12:11:03 UTC (rev 13579)
@@ -3,10 +3,10 @@
 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: debhelper (>= 5), cdbs, maven-repo-helper
 Build-Depends-Indep: ant, default-jdk, junit (>= 3.8.1),
  libxerces2-java, libxalan2-java, libjaxen-java (>= 1.1)
-Standards-Version: 3.8.4
+Standards-Version: 3.9.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
@@ -14,7 +14,7 @@
 Package: libxom-java
 Architecture: all
 Suggests: libxom-java-doc
-Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless, libjaxen-java (>= 1.1~beta8)
+Depends: ${misc:Depends}, 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, 

Added: trunk/xom/debian/libxom-java.poms
===================================================================
--- trunk/xom/debian/libxom-java.poms	                        (rev 0)
+++ trunk/xom/debian/libxom-java.poms	2011-04-25 12:11:03 UTC (rev 13579)
@@ -0,0 +1 @@
+debian/poms/xom.pom

Added: trunk/xom/debian/poms/xom.pom
===================================================================
--- trunk/xom/debian/poms/xom.pom	                        (rev 0)
+++ trunk/xom/debian/poms/xom.pom	2011-04-25 12:11:03 UTC (rev 13579)
@@ -0,0 +1,70 @@
+<?xml version="1.0"?>
+<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/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <packaging>jar</packaging>
+  <name>XOM</name>
+  <version>1.2.1</version>
+  <description>The XOM Dual Streaming/Tree API for Processing XML</description>
+  <url>http://xom.nu</url>
+  <licenses>
+    <license>
+      <name>The GNU Lesser General Public License, Version 2.1</name>
+      <url>http://www.gnu.org/licenses/lgpl-2.1.html</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+  <scm>
+    <url>https://xom.dev.java.net/source/browse/xom/</url>
+  </scm>
+  
+  <artifactId>xom</artifactId>
+  <!--  previously used group ID -->
+  <groupId>xom</groupId>
+
+  <inceptionYear>2002</inceptionYear>
+
+  <mailingLists>
+    <mailingList>
+      <name>XOM Interest Mailing List</name>
+      <archive>http://lists.ibiblio.org/pipermail/xom-interest/</archive>
+    </mailingList>
+  </mailingLists>
+
+  <developers>
+    <developer>
+      <name>Elliotte Rusty Harold</name>
+      <id>elharo</id>
+      <email>elharo at ibiblio.org</email>
+      <organization>Cafe au Lait</organization>
+    </developer>
+  </developers>
+
+  <dependencies>
+    <dependency>
+        <groupId>xml-apis</groupId>
+        <artifactId>xml-apis</artifactId>
+        <version>1.3.03</version>
+        <type>jar</type>
+    </dependency>  
+    <dependency>
+        <groupId>xerces</groupId>
+        <artifactId>xercesImpl</artifactId>
+        <version>2.8.0</version>
+        <type>jar</type>
+    </dependency>  
+    <dependency>
+        <groupId>xalan</groupId>
+        <artifactId>xalan</artifactId>
+        <version>2.7.0</version>
+        <type>jar</type>
+    </dependency>
+  </dependencies>
+  
+  <build>
+    <sourceDirectory>src</sourceDirectory>
+  </build>  
+  
+</project>  

Modified: trunk/xom/debian/rules
===================================================================
--- trunk/xom/debian/rules	2011-04-25 11:51:26 UTC (rev 13578)
+++ trunk/xom/debian/rules	2011-04-25 12:11:03 UTC (rev 13579)
@@ -6,16 +6,20 @@
 JAVA_HOME		:= /usr/lib/jvm/default-java
 DEB_JARS		:= xercesImpl xalan xml-apis jaxen saxpath junit
 DEB_ANT_BUILD_TARGET	:= jar samples javadoc
+PACKAGE                 := xom
+MAVEN_REPO              := http://repo1.maven.org/maven2
 
 clean::
 	-find -name '*.class' | xargs $(RM)
+	-rm build/xom-samples-$(DEB_UPSTREAM_VERSION).jar
+	mh_clean
 
 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
+	cp build/xom-samples.jar build/xom-samples-$(DEB_UPSTREAM_VERSION).jar
+	dh_install -plibxom-java build/xom-samples-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/
+	dh_link -plibxom-java /usr/share/java/xom-samples-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/xom-samples.jar
+	mh_installpoms -plib$(PACKAGE)-java
+	mh_installjar -plib$(PACKAGE)-java -l debian/poms/$(PACKAGE).pom build/$(PACKAGE)-$(DEB_UPSTREAM_VERSION).jar 
 
 install/libxom-java-doc::
 	dh_installdocs -plibxom-java-doc build/apidocs
@@ -23,4 +27,11 @@
 get-orig-source:
 	-uscan --upstream-version 0 --rename	
 
-DEB_PHONY_RULES += get-orig-source
+get-orig-pom:
+	mkdir -p debian/poms
+	wget  -U NoSuchBrowser/1.0 -O debian/poms/$(PACKAGE).pom \
+		$(MAVEN_REPO)/xom/$(PACKAGE)/$(DEB_UPSTREAM_VERSION)/$(PACKAGE)-$(DEB_UPSTREAM_VERSION).pom
+
+
+
+DEB_PHONY_RULES += get-orig-source get-orig-pom

More information about the pkg-java-commits mailing list