[pkg-java] r9448 - trunk/ivy/debian

Ludovic Claude ludovicc-guest at alioth.debian.org
Sun Aug 2 00:50:54 UTC 2009


Author: ludovicc-guest
Date: 2009-08-02 00:50:45 +0000 (Sun, 02 Aug 2009)
New Revision: 9448

Added:
   trunk/ivy/debian/ivy-doc.doc-base.api
   trunk/ivy/debian/ivy.poms
   trunk/ivy/debian/maven.rules
   trunk/ivy/debian/pom.xml
Removed:
   trunk/ivy/debian/ivy-doc.doc-base
   trunk/ivy/debian/ivy-doc.docs
Modified:
   trunk/ivy/debian/changelog
   trunk/ivy/debian/control
   trunk/ivy/debian/rules
   trunk/ivy/debian/watch
Log:
* New upstream version
* Add myself to Uploaders
* Bump Standards-Version to 3.8.2
* Change section to java
* Add the Maven POM to the package
* Add a Build-Depends-Indep dependency on maven-repo-helper
* Depend on the headless Java runtimes as Ivy does not use any GUI
  or graphics most of the time
* move default-jre | java2-runtime to Suggests for the rare case
  when Swing is used (to ask the user for credentials when they
  are missing)
* Move api documentation to /usr/share/doc/ivy/api

Modified: trunk/ivy/debian/changelog
===================================================================
--- trunk/ivy/debian/changelog	2009-08-02 00:02:26 UTC (rev 9447)
+++ trunk/ivy/debian/changelog	2009-08-02 00:50:45 UTC (rev 9448)
@@ -1,3 +1,20 @@
+ivy (2.1.0~rc2-1) experimental; urgency=low
+
+  * New upstream version
+  * Add myself to Uploaders
+  * Bump Standards-Version to 3.8.2
+  * Change section to java
+  * Add the Maven POM to the package
+  * Add a Build-Depends-Indep dependency on maven-repo-helper
+  * Depend on the headless Java runtimes as Ivy does not use any GUI
+    or graphics most of the time
+  * move default-jre | java2-runtime to Suggests for the rare case
+    when Swing is used (to ask the user for credentials when they
+    are missing)
+  * Move api documentation to /usr/share/doc/ivy/api
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Sun, 26 Jul 2009 16:59:47 +0100
+
 ivy (2.1.0~rc1-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/ivy/debian/control
===================================================================
--- trunk/ivy/debian/control	2009-08-02 00:02:26 UTC (rev 9447)
+++ trunk/ivy/debian/control	2009-08-02 00:50:45 UTC (rev 9448)
@@ -1,22 +1,23 @@
 Source: ivy
-Section: libs
+Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Varun Hiremath <varun at debian.org>, Torsten Werner <twerner at debian.org>
+Uploaders: Varun Hiremath <varun at debian.org>, Torsten Werner <twerner at debian.org>,
+ Ludovic Claude <ludovic.claude at laposte.net>
 Build-Depends: cdbs, debhelper (>= 6)
-Build-Depends-Indep: ant, openjdk-6-jdk, libcommons-httpclient-java,
+Build-Depends-Indep: maven-repo-helper, ant, openjdk-6-jdk, libcommons-httpclient-java,
  libcommons-lang-java, libcommons-cli-java, liboro-java,
  libcommons-collections-java, libcommons-vfs-java, junit,
- libjsch-java
-Standards-Version: 3.8.1
+ libjsch-java, openjdk-6-doc
+Standards-Version: 3.8.2
 Homepage: http://ant.apache.org/ivy/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/ivy
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/ivy
 
 Package: ivy
 Architecture: all
-Depends: ${misc:Depends}, default-jre | java2-runtime
-Suggests: libjsch-java, ivy-doc
+Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless
+Suggests: libjsch-java, ivy-doc, default-jre | java2-runtime
 Description: The agile dependency manager
  Ivy is a very powerful dependency manager oriented toward Java
  dependency management, even though it could be used to manage
@@ -25,7 +26,7 @@
 Package: ivy-doc
 Section: doc
 Architecture: all
-Depends: ${misc:Depends}, default-jre | java2-runtime
+Depends: ${misc:Depends}, openjdk-6-doc | classpath-doc
 Description: The agile dependency manager (documentation)
  Ivy is a very powerful dependency manager oriented toward Java
  dependency management, even though it could be used to manage

Deleted: trunk/ivy/debian/ivy-doc.doc-base
===================================================================
--- trunk/ivy/debian/ivy-doc.doc-base	2009-08-02 00:02:26 UTC (rev 9447)
+++ trunk/ivy/debian/ivy-doc.doc-base	2009-08-02 00:50:45 UTC (rev 9448)
@@ -1,9 +0,0 @@
-Document: ivy
-Title: API for ivy
-Author: The Apache Software Foundation
-Abstract: The agile dependency manager
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/ivy-doc/api/index.html
-Files: /usr/share/doc/ivy-doc/api/*.html

Added: trunk/ivy/debian/ivy-doc.doc-base.api
===================================================================
--- trunk/ivy/debian/ivy-doc.doc-base.api	                        (rev 0)
+++ trunk/ivy/debian/ivy-doc.doc-base.api	2009-08-02 00:50:45 UTC (rev 9448)
@@ -0,0 +1,9 @@
+Document: ivy
+Title: API for ivy
+Author: The Apache Software Foundation
+Abstract: The agile dependency manager
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/ivy/api/index.html
+Files: /usr/share/doc/ivy/api/*.html

Deleted: trunk/ivy/debian/ivy-doc.docs
===================================================================
--- trunk/ivy/debian/ivy-doc.docs	2009-08-02 00:02:26 UTC (rev 9447)
+++ trunk/ivy/debian/ivy-doc.docs	2009-08-02 00:50:45 UTC (rev 9448)
@@ -1 +0,0 @@
-api

Added: trunk/ivy/debian/ivy.poms
===================================================================
--- trunk/ivy/debian/ivy.poms	                        (rev 0)
+++ trunk/ivy/debian/ivy.poms	2009-08-02 00:50:45 UTC (rev 9448)
@@ -0,0 +1 @@
+debian/pom.xml --no-parent

Added: trunk/ivy/debian/maven.rules
===================================================================
--- trunk/ivy/debian/maven.rules	                        (rev 0)
+++ trunk/ivy/debian/maven.rules	2009-08-02 00:50:45 UTC (rev 9448)
@@ -0,0 +1 @@
+s/ant/org.apache.ant/ * * s/.*/debian/

Added: trunk/ivy/debian/pom.xml
===================================================================
--- trunk/ivy/debian/pom.xml	                        (rev 0)
+++ trunk/ivy/debian/pom.xml	2009-08-02 00:50:45 UTC (rev 9448)
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.    
+-->
+<!--
+   Apache Maven 2 POM generated by Apache Ivy
+   http://ant.apache.org/ivy/
+   Apache Ivy version: non official version 
+-->
+<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">
+
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.ivy</groupId>
+  <artifactId>ivy</artifactId>
+  <packaging>jar</packaging>
+  <version>2.1.0-rc1</version>
+  <url>http://ant.apache.org/ivy/</url>
+  <dependencies>
+    <dependency>
+      <groupId>ant</groupId>
+      <artifactId>ant</artifactId>
+      <version>1.6.2</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>ant</groupId>
+      <artifactId>ant-nodeps</artifactId>
+      <version>1.6.2</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>ant</groupId>
+      <artifactId>ant-trax</artifactId>
+      <version>1.6.2</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>commons-httpclient</groupId>
+      <artifactId>commons-httpclient</artifactId>
+      <version>3.0</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>oro</groupId>
+      <artifactId>oro</artifactId>
+      <version>2.0.8</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>commons-vfs</groupId>
+      <artifactId>commons-vfs</artifactId>
+      <version>1.0</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>com.jcraft</groupId>
+      <artifactId>jsch</artifactId>
+      <version>0.1.31</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <version>2.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.ant</groupId>
+      <artifactId>ant-testutil</artifactId>
+      <version>1.7.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>ant</groupId>
+      <artifactId>ant-launcher</artifactId>
+      <version>1.6.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl</artifactId>
+      <version>2.6.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xmlParserAPIs</artifactId>
+      <version>2.6.2</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>

Modified: trunk/ivy/debian/rules
===================================================================
--- trunk/ivy/debian/rules	2009-08-02 00:02:26 UTC (rev 9447)
+++ trunk/ivy/debian/rules	2009-08-02 00:50:45 UTC (rev 9448)
@@ -3,15 +3,29 @@
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
-JAVA_HOME 		:= /usr/lib/jvm/java-6-openjdk
-DEB_ANT_BUILD_TARGET	:= jar javadoc
-DEB_ANT_BUILDFILE	:= debian/build.xml
-DEB_JARS		:= commons-httpclient commons-lang commons-cli commons-collections\
-			commons-vfs junit jsch oro
+PACKAGE              := $(DEB_SOURCE_PACKAGE)
+VERSION              := $(DEB_UPSTREAM_VERSION)
+MVN_VERSION          := $(shell echo $(VERSION) | sed 's/~/-/')
+JAVA_HOME            := /usr/lib/jvm/java-6-openjdk
+DEB_ANT_BUILD_TARGET := jar javadoc
+DEB_ANT_BUILDFILE    := debian/build.xml
+DEB_JARS             := commons-httpclient commons-lang commons-cli commons-collections \
+                        commons-vfs junit jsch oro
+API_DOCS             := api
 
-install/ivy::
-	install -m 644 -D ivy.jar debian/ivy/usr/share/java/ivy-$(DEB_UPSTREAM_VERSION).jar
-	dh_link /usr/share/java/ivy-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/ivy.jar
+binary-post-install/$(PACKAGE)::
+	mh_installpoms -p$(PACKAGE)
+	mh_installjar -p$(PACKAGE) -l debian/pom.xml ivy.jar
 
+binary-post-install/$(PACKAGE)-doc::
+	dh_install -p$(PACKAGE)-doc $(API_DOCS) usr/share/doc/$(PACKAGE)
+
+clean::
+	-rm -rf debian/tmp
+
 get-orig-source:
-	-uscan --force-download --rename
+	-uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
+
+get-orig-pom:
+	wget -O debian/pom.xml http://repository.sonatype.org/service/local/repositories/central/content/org/apache/ivy/ivy/$(MVN_VERSION)/ivy-$(MVN_VERSION).pom
+

Modified: trunk/ivy/debian/watch
===================================================================
--- trunk/ivy/debian/watch	2009-08-02 00:02:26 UTC (rev 9447)
+++ trunk/ivy/debian/watch	2009-08-02 00:50:45 UTC (rev 9448)
@@ -1,3 +1,3 @@
 version=3
 opts="uversionmangle=s/-rc/~rc/" \
-http://www.apache.org/dist/ant/ivy/([\d].*)/apache-ivy-([\d].*)-src.tar.gz debian debian/orig-tar.sh
+ http://www.apache.org/dist/ant/ivy/([\d].*)/apache-ivy-([\d].*)-src.tar.gz debian debian/orig-tar.sh




More information about the pkg-java-commits mailing list