[pkg-java] r8824 - in trunk/asm3/debian: . poms
Ludovic Claude
ludovicc-guest at alioth.debian.org
Thu Jul 2 23:56:58 UTC 2009
Author: ludovicc-guest
Date: 2009-07-02 23:56:57 +0000 (Thu, 02 Jul 2009)
New Revision: 8824
Added:
trunk/asm3/debian/libasm3-java.poms
trunk/asm3/debian/maven.rules
trunk/asm3/debian/poms/
trunk/asm3/debian/poms/asm-analysis.pom
trunk/asm3/debian/poms/asm-commons.pom
trunk/asm3/debian/poms/asm-parent.pom
trunk/asm3/debian/poms/asm-tree.pom
trunk/asm3/debian/poms/asm-util.pom
trunk/asm3/debian/poms/asm-xml.pom
trunk/asm3/debian/poms/asm.pom
Removed:
trunk/asm3/debian/libasm3-java.links
Modified:
trunk/asm3/debian/
trunk/asm3/debian/ant.properties
trunk/asm3/debian/changelog
trunk/asm3/debian/control
trunk/asm3/debian/rules
Log:
* New version
Property changes on: trunk/asm3/debian
___________________________________________________________________
Added: mergeWithUpstream
+ 1
Modified: trunk/asm3/debian/ant.properties
===================================================================
--- trunk/asm3/debian/ant.properties 2009-07-02 23:52:11 UTC (rev 8823)
+++ trunk/asm3/debian/ant.properties 2009-07-02 23:56:57 UTC (rev 8824)
@@ -1,6 +1,5 @@
# Properties that are set within asm's default build.properties
product.name=asm
-product.version=3.1
# Build class path (classes needed to build the project)
# Class path for the ObjectWeb utility Ant tasks (version 1.2 or higher)
Modified: trunk/asm3/debian/changelog
===================================================================
--- trunk/asm3/debian/changelog 2009-07-02 23:52:11 UTC (rev 8823)
+++ trunk/asm3/debian/changelog 2009-07-02 23:56:57 UTC (rev 8824)
@@ -1,8 +1,21 @@
-asm3 (3.1-3) UNRELEASED; urgency=low
+asm3 (3.2-1) unstable; urgency=low
+ [Ludovic Claude]
+ * New upstream version, add myself to Uploaders
+ * Change section to java, bump up Standards-Version to 3.8.1
+ * Use cdbs for the build
+ * Add the Maven POM to the package,
+ * Add a Build-Depends-Indep dependency on maven-repo-helper
+ * Use mh_installpom and mh_installjar to install the POM and the jar to the
+ Maven repository
+ * Add ${misc:Depends} to Depends to clear Lintian warnings
+ * Change the dependency on java-gcj to default-jdk
+ * Remove Depends on Java runtimes as it is a library
+
+ [Damien Raude-Morvan]
* Removed Marcus Crafter from Uploaders (Closes: #521480)
- -- Damien Raude-Morvan <drazzib at drazzib.com> Fri, 12 Jun 2009 22:57:21 +0200
+ -- Ludovic Claude <ludovic.claude at laposte.net> Fri, 15 May 2009 19:59:46 +0100
asm3 (3.1-2) unstable; urgency=low
Modified: trunk/asm3/debian/control
===================================================================
--- trunk/asm3/debian/control 2009-07-02 23:52:11 UTC (rev 8823)
+++ trunk/asm3/debian/control 2009-07-02 23:56:57 UTC (rev 8824)
@@ -1,19 +1,19 @@
Source: asm3
-Section: devel
+Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Barry Hawkins <barry at alltc.com>, Michael Koch <konqueror at gmx.de>
-Build-Depends: debhelper (>= 5)
-Build-Depends-Indep: ant (>= 1.6.5), java-gcj-compat-dev, libow-util-ant-tasks-java (>= 1.3-2)
-Standards-Version: 3.7.3
+Uploaders: Barry Hawkins <barry at alltc.com>, Michael Koch <konqueror at gmx.de>,
+ Ludovic Claude <ludovic.claude at laposte.net>
+Build-Depends: debhelper (>= 5), cdbs, default-jdk
+Build-Depends-Indep: maven-repo-helper, ant (>= 1.6.5), libow-util-ant-tasks-java (>= 1.3-2)
+Standards-Version: 3.8.1
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/asm3
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/asm3
Homepage: http://asm.objectweb.org/
Package: libasm3-java
Architecture: all
-Section: devel
-Depends: java-gcj-compat | java1-runtime | java2-runtime
+Depends: ${misc:Depends}
Description: Java bytecode manipulation framework
It can be used to dynamically generate stub classes or other proxy classes,
directly in binary form, or to dynamically modify classes at load time, i.e.,
@@ -29,6 +29,7 @@
Package: libasm3-java-doc
Architecture: all
Section: doc
+Depends: ${misc:Depends}
Suggests: libasm3-java
Description: Documentation for ASM, the Java(TM) bytecode manipulation framework
It can be used to dynamically generate stub classes or other proxy classes,
Deleted: trunk/asm3/debian/libasm3-java.links
===================================================================
--- trunk/asm3/debian/libasm3-java.links 2009-07-02 23:52:11 UTC (rev 8823)
+++ trunk/asm3/debian/libasm3-java.links 2009-07-02 23:56:57 UTC (rev 8824)
@@ -1,6 +0,0 @@
-/usr/share/java/asm3-3.1.jar /usr/share/java/asm3.jar
-/usr/share/java/asm3-analysis-3.1.jar /usr/share/java/asm3-analysis.jar
-/usr/share/java/asm3-commons-3.1.jar /usr/share/java/asm3-commons.jar
-/usr/share/java/asm3-tree-3.1.jar /usr/share/java/asm3-tree.jar
-/usr/share/java/asm3-util-3.1.jar /usr/share/java/asm3-util.jar
-/usr/share/java/asm3-xml-3.1.jar /usr/share/java/asm3-xml.jar
Added: trunk/asm3/debian/libasm3-java.poms
===================================================================
--- trunk/asm3/debian/libasm3-java.poms (rev 0)
+++ trunk/asm3/debian/libasm3-java.poms 2009-07-02 23:56:57 UTC (rev 8824)
@@ -0,0 +1,8 @@
+debian/poms/asm-parent.pom --no-parent
+debian/poms/asm-analysis.pom
+debian/poms/asm-commons.pom
+debian/poms/asm-tree.pom
+debian/poms/asm-util.pom
+debian/poms/asm-xml.pom
+debian/poms/asm.pom
+
Added: trunk/asm3/debian/maven.rules
===================================================================
--- trunk/asm3/debian/maven.rules (rev 0)
+++ trunk/asm3/debian/maven.rules 2009-07-02 23:56:57 UTC (rev 8824)
@@ -0,0 +1 @@
+asm * * s/3\..*/3.x/
Added: trunk/asm3/debian/poms/asm-analysis.pom
===================================================================
--- trunk/asm3/debian/poms/asm-analysis.pom (rev 0)
+++ trunk/asm3/debian/poms/asm-analysis.pom 2009-07-02 23:56:57 UTC (rev 8824)
@@ -0,0 +1,21 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <artifactId>asm-parent</artifactId>
+ <groupId>asm</groupId>
+ <version>3.2</version>
+ </parent>
+
+ <name>ASM Analysis</name>
+ <artifactId>asm-analysis</artifactId>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <artifactId>asm-tree</artifactId>
+ <groupId>asm</groupId>
+ </dependency>
+ </dependencies>
+
+</project>
Added: trunk/asm3/debian/poms/asm-commons.pom
===================================================================
--- trunk/asm3/debian/poms/asm-commons.pom (rev 0)
+++ trunk/asm3/debian/poms/asm-commons.pom 2009-07-02 23:56:57 UTC (rev 8824)
@@ -0,0 +1,21 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <artifactId>asm-parent</artifactId>
+ <groupId>asm</groupId>
+ <version>3.2</version>
+ </parent>
+
+ <name>ASM Commons</name>
+ <artifactId>asm-commons</artifactId>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <artifactId>asm-tree</artifactId>
+ <groupId>asm</groupId>
+ </dependency>
+ </dependencies>
+
+</project>
Added: trunk/asm3/debian/poms/asm-parent.pom
===================================================================
--- trunk/asm3/debian/poms/asm-parent.pom (rev 0)
+++ trunk/asm3/debian/poms/asm-parent.pom 2009-07-02 23:56:57 UTC (rev 8824)
@@ -0,0 +1,129 @@
+<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>
+
+ <artifactId>asm-parent</artifactId>
+ <groupId>asm</groupId>
+ <version>3.2</version>
+ <packaging>pom</packaging>
+
+ <name>ASM</name>
+ <description>A very small and fast Java bytecode manipulation framework</description>
+ <url>http://asm.objectweb.org/</url>
+
+ <organization>
+ <name>ObjectWeb</name>
+ <url>http://www.objectweb.org/</url>
+ </organization>
+ <inceptionYear>2000</inceptionYear>
+
+ <developers>
+ <developer>
+ <name>Eric Bruneton</name>
+ <id>ebruneton</id>
+ <email>Eric.Bruneton at rd.francetelecom.com</email>
+ <roles>
+ <role>Creator</role>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Eugene Kuleshov</name>
+ <id>eu</id>
+ <email>eu at javatx.org</email>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ </developers>
+
+ <scm>
+ <connection>scm:cvs:pserver:anonymous at cvs.forge.objectweb.org:/cvsroot/asm:asm</connection>
+ <developerConnection>scm:cvs:ext:${maven.username}@cvs.forge.objectweb.org:/cvsroot/asm:asm</developerConnection>
+ <url>http://cvs.forge.objectweb.org/cgi-bin/viewcvs.cgi/asm/asm/</url>
+ </scm>
+
+ <issueManagement>
+ <url>http://forge.objectweb.org/tracker/?group_id=23</url>
+ </issueManagement>
+
+ <dependencyManagement>
+ <dependencies>
+
+ <dependency>
+ <artifactId>asm</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <artifactId>asm-tree</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <artifactId>asm-analysis</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <artifactId>asm-commons</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <artifactId>asm-util</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <artifactId>asm-xml</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <version>${project.version}</version>
+ </dependency>
+
+ </dependencies>
+ </dependencyManagement>
+
+ <mailingLists>
+ <mailingList>
+ <name>ASM Users List</name>
+ <subscribe>sympa at ow2.org?subject=subscribe%20asm</subscribe>
+ <unsubscribe>sympa at ow2.org?subject=unsubscribe%20asm</unsubscribe>
+ <post>asm at ow2.org</post>
+ <archive>http://www.ow2.org/wws/arc/asm</archive>
+ </mailingList>
+ <mailingList>
+ <name>ASM Team List</name>
+ <subscribe>sympa at ow2.org?subject=subscribe%20asm-team</subscribe>
+ <unsubscribe>sympa at ow2.org?subject=unsubscribe%20asm-team</unsubscribe>
+ <post>asm-team at ow2.org</post>
+ <archive>http://www.ow2.org/wws/arc/asm-team</archive>
+ </mailingList>
+ </mailingLists>
+
+ <distributionManagement>
+ <downloadUrl>http://mojo.codehaus.org/my-project</downloadUrl>
+ <repository>
+ <id>objectweb</id>
+ <uniqueVersion>false</uniqueVersion>
+ <name>ObjectWeb Maven 2.0 Repository</name>
+ <url>dav:https://maven.forge.objectweb.org:8002/maven2/</url>
+ <layout>default</layout>
+ </repository>
+ <snapshotRepository>
+ <id>objectweb.snapshots</id>
+ <uniqueVersion>false</uniqueVersion>
+ <name>ObjectWeb Maven 2.0 Snapshot Repository</name>
+ <url>dav:https://maven.forge.objectweb.org:8002/maven2-snapshot/</url>
+ <layout>default</layout>
+ </snapshotRepository>
+ </distributionManagement>
+
+</project>
Added: trunk/asm3/debian/poms/asm-tree.pom
===================================================================
--- trunk/asm3/debian/poms/asm-tree.pom (rev 0)
+++ trunk/asm3/debian/poms/asm-tree.pom 2009-07-02 23:56:57 UTC (rev 8824)
@@ -0,0 +1,21 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <artifactId>asm-parent</artifactId>
+ <groupId>asm</groupId>
+ <version>3.2</version>
+ </parent>
+
+ <name>ASM Tree</name>
+ <artifactId>asm-tree</artifactId>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <artifactId>asm</artifactId>
+ <groupId>asm</groupId>
+ </dependency>
+ </dependencies>
+
+</project>
Added: trunk/asm3/debian/poms/asm-util.pom
===================================================================
--- trunk/asm3/debian/poms/asm-util.pom (rev 0)
+++ trunk/asm3/debian/poms/asm-util.pom 2009-07-02 23:56:57 UTC (rev 8824)
@@ -0,0 +1,21 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <artifactId>asm-parent</artifactId>
+ <groupId>asm</groupId>
+ <version>3.2</version>
+ </parent>
+
+ <name>ASM Util</name>
+ <artifactId>asm-util</artifactId>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <artifactId>asm-tree</artifactId>
+ <groupId>asm</groupId>
+ </dependency>
+ </dependencies>
+
+</project>
Added: trunk/asm3/debian/poms/asm-xml.pom
===================================================================
--- trunk/asm3/debian/poms/asm-xml.pom (rev 0)
+++ trunk/asm3/debian/poms/asm-xml.pom 2009-07-02 23:56:57 UTC (rev 8824)
@@ -0,0 +1,21 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <artifactId>asm-parent</artifactId>
+ <groupId>asm</groupId>
+ <version>3.2</version>
+ </parent>
+
+ <name>ASM XML</name>
+ <artifactId>asm-xml</artifactId>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <artifactId>asm-util</artifactId>
+ <groupId>asm</groupId>
+ </dependency>
+ </dependencies>
+
+</project>
Added: trunk/asm3/debian/poms/asm.pom
===================================================================
--- trunk/asm3/debian/poms/asm.pom (rev 0)
+++ trunk/asm3/debian/poms/asm.pom 2009-07-02 23:56:57 UTC (rev 8824)
@@ -0,0 +1,14 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <artifactId>asm-parent</artifactId>
+ <groupId>asm</groupId>
+ <version>3.2</version>
+ </parent>
+
+ <name>ASM Core</name>
+ <artifactId>asm</artifactId>
+ <packaging>jar</packaging>
+
+</project>
Modified: trunk/asm3/debian/rules
===================================================================
--- trunk/asm3/debian/rules 2009-07-02 23:52:11 UTC (rev 8823)
+++ trunk/asm3/debian/rules 2009-07-02 23:56:57 UTC (rev 8824)
@@ -1,83 +1,44 @@
#!/usr/bin/make -f
-# Set a locale; currently using default
-export LANG=C
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/ant.mk
-VERSION=3.1
+PACKAGE := $(DEB_SOURCE_PACKAGE)
+VERSION := $(DEB_UPSTREAM_VERSION)
+POM_VERSION := 3.1
+JAVA_HOME := /usr/lib/jvm/default-java
+DEB_JARS := gnujaxp ant ant-junit junit xalan2 $(JAVA_HOME)/lib/tools.jar
+DEB_ANT_BUILD_TARGET := dist
+DEB_ANT_BUILDFILE := build.xml
+DEB_ANT_ARGS := -propertyfile debian/ant.properties -Dproduct.version=$(VERSION)
+MAVEN_REPO := http://repository.sonatype.org/service/local/repositories/central/content
-# Set JAVA_HOME to be used for Java commands
-JAVA_HOME=/usr/lib/jvm/java-gcj
+get-orig-pom:
+ wget -O debian/poms/asm-parent.pom $(MAVEN_REPO)/asm/asm-parent/$(POM_VERSION)/asm-parent-$(POM_VERSION).pom
+ wget -O debian/poms/asm.pom $(MAVEN_REPO)/asm/asm/$(POM_VERSION)/asm-$(POM_VERSION).pom
+ wget -O debian/poms/asm-analysis.pom $(MAVEN_REPO)/asm/asm-analysis/$(POM_VERSION)/asm-analysis-$(POM_VERSION).pom
+ wget -O debian/poms/asm-commons.pom $(MAVEN_REPO)/asm/asm-commons/$(POM_VERSION)/asm-commons-$(POM_VERSION).pom
+ wget -O debian/poms/asm-tree.pom $(MAVEN_REPO)/asm/asm-tree/$(POM_VERSION)/asm-tree-$(POM_VERSION).pom
+ wget -O debian/poms/asm-util.pom $(MAVEN_REPO)/asm/asm-util/$(POM_VERSION)/asm-util-$(POM_VERSION).pom
+ wget -O debian/poms/asm-xml.pom $(MAVEN_REPO)/asm/asm-xml/$(POM_VERSION)/asm-xml-$(POM_VERSION).pom
+ perl -p -i -e 's/<version>$(POM_VERSION)/<version>$(VERSION)/' debian/poms/*.pom
-# Set the invocation of the java command
-JAVACMD=${JAVA_HOME}/bin/java
+get-orig-source:
+ -uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
-JAVA_LIB=/usr/share/java
-ANT_HOME=/usr/share/ant
-ANT_CLASSPATH=$(JAVA_LIB)/gnujaxp.jar:$(ANT_HOME)/lib/ant.jar:$(ANT_HOME)/lib/ant-launcher.jar:$(ANT_HOME)/lib/ant-junit.jar:$(JAVA_LIB)/junit.jar:$(JAVA_LIB)/xalan2.jar:$(JAVA_HOME)/lib/tools.jar
+binary-post-install/lib$(PACKAGE)-java::
+ mh_installpoms -plib$(PACKAGE)-java
+ mh_installjar -plib$(PACKAGE)-java -l --usj-name=asm3 debian/poms/asm.pom output/dist/lib/asm-$(VERSION).jar
+ mh_installjar -plib$(PACKAGE)-java -l --usj-name=asm3-analysis debian/poms/asm-analysis.pom output/dist/lib/asm-analysis-$(VERSION).jar
+ mh_installjar -plib$(PACKAGE)-java -l --usj-name=asm3-commons debian/poms/asm-commons.pom output/dist/lib/asm-commons-$(VERSION).jar
+ mh_installjar -plib$(PACKAGE)-java -l --usj-name=asm3-tree debian/poms/asm-tree.pom output/dist/lib/asm-tree-$(VERSION).jar
+ mh_installjar -plib$(PACKAGE)-java -l --usj-name=asm3-util debian/poms/asm-util.pom output/dist/lib/asm-util-$(VERSION).jar
+ mh_installjar -plib$(PACKAGE)-java -l --usj-name=asm3-xml debian/poms/asm-xml.pom output/dist/lib/asm-xml-$(VERSION).jar
-# Set path to Ant properties file
-ANT_PROPS=debian/ant.properties
+binary-post-install/lib$(PACKAGE)-java-doc::
+ dh_install -plib$(PACKAGE)-java-doc output/dist/doc/javadoc/user/* usr/share/doc/libasm3-java-doc/api
+ dh_install -plib$(PACKAGE)-java-doc output/dist/examples usr/share/doc/libasm3-java-doc
-# Universal Ant invocation for reliable builds;
-# place '-verbose' before -propertyfile to
-# obtain detailed build output.
-ANT=$(JAVACMD) -classpath $(ANT_CLASSPATH) \
- org.apache.tools.ant.Main -propertyfile $(ANT_PROPS)
+clean::
+ -rm -rf debian/tmp
-build: build-stamp
-
-build-stamp:
- dh_testdir
- $(ANT) dist
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
- $(ANT) clean
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- # install the libasm-java jar files
- mv output/dist/lib/asm-$(VERSION).jar $(CURDIR)/debian/libasm3-java/usr/share/java/asm3-$(VERSION).jar
- mv output/dist/lib/asm-analysis-$(VERSION).jar $(CURDIR)/debian/libasm3-java/usr/share/java/asm3-analysis-$(VERSION).jar
- mv output/dist/lib/asm-commons-$(VERSION).jar $(CURDIR)/debian/libasm3-java/usr/share/java/asm3-commons-$(VERSION).jar
- mv output/dist/lib/asm-tree-$(VERSION).jar $(CURDIR)/debian/libasm3-java/usr/share/java/asm3-tree-$(VERSION).jar
- mv output/dist/lib/asm-util-$(VERSION).jar $(CURDIR)/debian/libasm3-java/usr/share/java/asm3-util-$(VERSION).jar
- mv output/dist/lib/asm-xml-$(VERSION).jar $(CURDIR)/debian/libasm3-java/usr/share/java/asm3-xml-$(VERSION).jar
- # install the javadocs and examples
- mkdir $(CURDIR)/debian/libasm3-java-doc/usr/share/doc/libasm3-java-doc/api
- mv output/dist/doc/javadoc/user/* $(CURDIR)/debian/libasm3-java-doc/usr/share/doc/libasm3-java-doc/api
- mv output/dist/examples $(CURDIR)/debian/libasm3-java-doc/usr/share/doc/libasm3-java-doc
-
-# Build architecture-independent files here.
-binary-indep: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs
- dh_installexamples
- dh_installman
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-# Build architecture-dependent files here.
-binary-arch: build install
-# We have nothing to do by default.
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
More information about the pkg-java-commits
mailing list