[pkg-java] r11273 - trunk/commons-javaflow/debian

Damien Raude-Morvan drazzib at alioth.debian.org
Sat Dec 12 21:26:23 UTC 2009 

Author: drazzib
Date: 2009-12-12 21:26:23 +0000 (Sat, 12 Dec 2009)
New Revision: 11273

Added:
   trunk/commons-javaflow/debian/libcommons-javaflow-java-doc.install
   trunk/commons-javaflow/debian/libcommons-javaflow-java.poms
   trunk/commons-javaflow/debian/maven.rules
   trunk/commons-javaflow/debian/pom.xml
Removed:
   trunk/commons-javaflow/debian/libcommons-javaflow-java-doc.docs
Modified:
   trunk/commons-javaflow/debian/changelog
   trunk/commons-javaflow/debian/compat
   trunk/commons-javaflow/debian/control
   trunk/commons-javaflow/debian/libcommons-javaflow-java-doc.doc-base
   trunk/commons-javaflow/debian/rules
Log:
* Maven POMs:
  - debian/control: add a Build-Depends-Indep dependency on maven-repo-helper
  - debian/rules: use mh_installpoms and mh_installjar
    to install the POM and the jar to the Maven repository
  - debian/pom.xml: Debian pom.xml file as upstream doesn't provide one
  - debian/rules: new get-orig-pom to update debian/pom.xml at new upstream
    release.
* Bump debhelper version to >= 7
* Bump Standards-Version 3.8.3 (no changes needed)
* Install Javadoc API documentation to /usr/share/doc/libcommons-javaflow-java/api/

Modified: trunk/commons-javaflow/debian/changelog
===================================================================
--- trunk/commons-javaflow/debian/changelog	2009-12-12 21:07:14 UTC (rev 11272)
+++ trunk/commons-javaflow/debian/changelog	2009-12-12 21:26:23 UTC (rev 11273)
@@ -1,8 +1,18 @@
-commons-javaflow (0.0~svn20060411-3) UNRELEASED; urgency=low
+commons-javaflow (0.0~svn20060411-3) unstable; urgency=low
 
   * Update my email address
+  * Maven POMs:
+    - debian/control: add a Build-Depends-Indep dependency on maven-repo-helper
+    - debian/rules: use mh_installpoms and mh_installjar
+      to install the POM and the jar to the Maven repository
+    - debian/pom.xml: Debian pom.xml file as upstream doesn't provide one
+    - debian/rules: new get-orig-pom to update debian/pom.xml at new upstream
+      release.
+  * Bump debhelper version to >= 7
+  * Bump Standards-Version 3.8.3 (no changes needed)
+  * Install Javadoc API documentation to /usr/share/doc/libcommons-javaflow-java/api/
 
- -- Damien Raude-Morvan <drazzib at debian.org>  Sat, 24 Oct 2009 21:05:31 +0200
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sat, 12 Dec 2009 22:23:58 +0100
 
 commons-javaflow (0.0~svn20060411-2) unstable; urgency=low
 

Modified: trunk/commons-javaflow/debian/compat
===================================================================
--- trunk/commons-javaflow/debian/compat	2009-12-12 21:07:14 UTC (rev 11272)
+++ trunk/commons-javaflow/debian/compat	2009-12-12 21:26:23 UTC (rev 11273)
@@ -1 +1 @@
-5
+7

Modified: trunk/commons-javaflow/debian/control
===================================================================
--- trunk/commons-javaflow/debian/control	2009-12-12 21:07:14 UTC (rev 11272)
+++ trunk/commons-javaflow/debian/control	2009-12-12 21:26:23 UTC (rev 11273)
@@ -1,11 +1,11 @@
 Source: commons-javaflow
+Section: java
+Priority: optional
 Maintainer: Debian Java maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Damien Raude-Morvan <drazzib at debian.org>, Torsten Werner <twerner at debian.org>
-Standards-Version: 3.8.2
-Section: java
-Priority: optional
-Build-Depends: default-jdk, ant, debhelper (>= 5), cdbs
-Build-Depends-Indep: libcommons-logging-java, libcommons-jci-java, libbcel-java
+Standards-Version: 3.8.3
+Build-Depends: default-jdk, ant, debhelper (>= 7), cdbs
+Build-Depends-Indep: libcommons-logging-java, libcommons-jci-java, libbcel-java, maven-repo-helper
 Homepage: http://commons.apache.org/sandbox/javaflow/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/commons-javaflow
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/commons-javaflow

Modified: trunk/commons-javaflow/debian/libcommons-javaflow-java-doc.doc-base
===================================================================
--- trunk/commons-javaflow/debian/libcommons-javaflow-java-doc.doc-base	2009-12-12 21:07:14 UTC (rev 11272)
+++ trunk/commons-javaflow/debian/libcommons-javaflow-java-doc.doc-base	2009-12-12 21:26:23 UTC (rev 11273)
@@ -5,5 +5,5 @@
 Section: Programming
 
 Format: HTML
-Index: /usr/share/doc/libcommons-javaflow-java-doc/api/index.html
-Files: /usr/share/doc/libcommons-javaflow-java-doc/api/*
+Index: /usr/share/doc/libcommons-javaflow-java/api/index.html
+Files: /usr/share/doc/libcommons-javaflow-java/api/*

Deleted: trunk/commons-javaflow/debian/libcommons-javaflow-java-doc.docs
===================================================================
--- trunk/commons-javaflow/debian/libcommons-javaflow-java-doc.docs	2009-12-12 21:07:14 UTC (rev 11272)
+++ trunk/commons-javaflow/debian/libcommons-javaflow-java-doc.docs	2009-12-12 21:26:23 UTC (rev 11273)
@@ -1,2 +0,0 @@
-docs/api
-

Copied: trunk/commons-javaflow/debian/libcommons-javaflow-java-doc.install (from rev 11270, trunk/commons-javaflow/debian/libcommons-javaflow-java-doc.docs)
===================================================================
--- trunk/commons-javaflow/debian/libcommons-javaflow-java-doc.install	                        (rev 0)
+++ trunk/commons-javaflow/debian/libcommons-javaflow-java-doc.install	2009-12-12 21:26:23 UTC (rev 11273)
@@ -0,0 +1,2 @@
+docs/api /usr/share/doc/libcommons-javaflow-java/
+

Added: trunk/commons-javaflow/debian/libcommons-javaflow-java.poms
===================================================================
--- trunk/commons-javaflow/debian/libcommons-javaflow-java.poms	                        (rev 0)
+++ trunk/commons-javaflow/debian/libcommons-javaflow-java.poms	2009-12-12 21:26:23 UTC (rev 11273)
@@ -0,0 +1 @@
+debian/pom.xml --no-parent

Added: trunk/commons-javaflow/debian/maven.rules
===================================================================
--- trunk/commons-javaflow/debian/maven.rules	                        (rev 0)
+++ trunk/commons-javaflow/debian/maven.rules	2009-12-12 21:26:23 UTC (rev 11273)
@@ -0,0 +1 @@
+asm * jar s/.*/3.x/

Added: trunk/commons-javaflow/debian/pom.xml
===================================================================
--- trunk/commons-javaflow/debian/pom.xml	                        (rev 0)
+++ trunk/commons-javaflow/debian/pom.xml	2009-12-12 21:26:23 UTC (rev 11273)
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+  <parent>
+    <groupId>org.apache.commons</groupId>
+    <artifactId>commons-sandbox-parent</artifactId>
+    <version>7</version>
+  </parent>
+  
+  <artifactId>javaflow</artifactId>
+  <version>0.0~svn20060411</version>
+  <name>Commons Javaflow (Sandbox)</name>
+  <url>http://commons.apache.org/sandbox/javaflow/</url>
+  <inceptionYear>2004</inceptionYear>
+
+  <developers>
+    <developer>
+      <id>tcurdt</id>
+      <name>Torsten Curdt</name>
+      <email>tcurdt at apache.org</email>
+    </developer>
+    <developer>
+      <id>kohsuke</id>
+      <name>Kohsuke Kawaguchi</name>
+      <email>kohsuke at apache.org</email>
+    </developer>
+  </developers>
+
+  <contributors>
+    <contributor>
+      <name>Eugene Kuleshov</name>
+      <email>eu at javatx.org</email>
+    </contributor>
+  </contributors>
+
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/commons/sandbox/javaflow/trunk/</connection>
+    <developerConnection>scn:svn:https://svn.apache.org/repos/asf/commons/sandbox/javaflow/trunk/</developerConnection>
+    <url>http://svn.apache.org/viewvc/commons/sandbox/javaflow/trunk/</url>
+  </scm>
+
+  <distributionManagement>
+    <snapshotRepository>
+      <id>apache-maven-snapshot</id>
+      <name>repository</name>
+      <url>scpexe://people.apache.org/www/people.apache.org/maven-snapshot-repository</url>
+    </snapshotRepository>
+    <site>
+      <id>website</id>
+      <url>scpexe://people.apache.org/www/commons.apache.org/sandbox/javaflow/</url>
+    </site>
+  </distributionManagement>
+
+  <dependencies>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.1.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.bcel</groupId>
+      <artifactId>bcel</artifactId>
+      <version>5.2</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-jci-core</artifactId>
+      <version>1.0</version>
+    </dependency>
+    <dependency>
+      <groupId>asm</groupId>
+      <artifactId>asm</artifactId>
+      <version>3.1</version>
+    </dependency>
+    <dependency>
+      <groupId>asm</groupId>
+      <artifactId>asm-analysis</artifactId>
+      <version>3.1</version>
+    </dependency>
+    <dependency>
+      <groupId>asm</groupId>
+      <artifactId>asm-commons</artifactId>
+      <version>3.1</version>
+    </dependency>
+    <dependency>
+      <groupId>asm</groupId>
+      <artifactId>asm-util</artifactId>
+      <version>3.1</version>
+    </dependency>
+    <dependency>
+      <groupId>asm</groupId>
+      <artifactId>asm-tree</artifactId>
+      <version>3.1</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>1.4</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.ant</groupId>
+      <artifactId>ant</artifactId>
+      <version>1.7.0</version>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit-addons</groupId>
+      <artifactId>junit-addons</artifactId>
+      <version>1.4</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <properties>
+    <commons.componentid>javaflow</commons.componentid>
+    <commons.jira.componentid>12311186</commons.jira.componentid>
+  </properties> 
+
+  <build>
+    <plugins>
+
+      <plugin>     
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <forkMode>never</forkMode>
+          <includes>
+            <include>**/*TestCase.java</include>
+          </includes>
+          <excludes>
+            <exclude>**/Abstract*</exclude>
+          </excludes>
+          <testFailureIgnore>true</testFailureIgnore>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+
+    </plugins>
+
+<!--
+    <extensions>
+      <extension>
+        <groupId>org.apache.maven.wagon</groupId>
+        <artifactId>wagon-ssh-external</artifactId>
+        <version>1.0-alpha-2</version>
+      </extension>
+    </extensions>
+-->
+  </build>
+
+</project>

Modified: trunk/commons-javaflow/debian/rules
===================================================================
--- trunk/commons-javaflow/debian/rules	2009-12-12 21:07:14 UTC (rev 11272)
+++ trunk/commons-javaflow/debian/rules	2009-12-12 21:26:23 UTC (rev 11273)
@@ -3,6 +3,9 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 
+POM_VERSION          := 1.0-SNAPSHOT
+POM_URL              := http://svn.apache.org/repos/asf/commons/sandbox/javaflow/trunk/pom.xml
+
 # Extract everything after "svn" in DEB_UPSTREAM_VERSION
 SVN_EXPORT_DATE      := $(shell echo $(DEB_UPSTREAM_VERSION) | sed 's/.*svn//')
 
@@ -17,8 +20,8 @@
 DEB_ANT_ARGS         := -Ddeb.package=$(DEB_SOURCE_PACKAGE) -Ddeb.version=$(DEB_UPSTREAM_VERSION)
 
 binary-post-install/libcommons-javaflow-java::
-	dh_install build/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).jar usr/share/java
-	dh_link usr/share/java/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).jar usr/share/java/$(DEB_SOURCE_PACKAGE).jar
+	mh_installpoms -plibcommons-javaflow-java
+	mh_installjar -plibcommons-javaflow-java -l debian/pom.xml build/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).jar
 
 # Export from SVN and remove externals JAR in lib/
 get-orig-source:
@@ -30,3 +33,8 @@
 	rm -rf commons-javaflow-$(DEB_UPSTREAM_VERSION)/lib && \
 	tar -czf ../../${DEB_SOURCE_PACKAGE}_$(DEB_UPSTREAM_VERSION).orig.tar.gz commons-javaflow-$(DEB_UPSTREAM_VERSION))
 	rm -rf orig_tmp
+
+get-orig-pom:
+	wget -O debian/pom.xml $(POM_URL)
+	perl -p -i -e 's/<version>$(POM_VERSION)/<version>$(DEB_UPSTREAM_VERSION)/' debian/pom.xml
+

More information about the pkg-java-commits mailing list