[pkg-java] r12609 - in trunk/ow-util-ant-tasks/debian: . patches
Onkar Shinde
onkarshinde-guest at alioth.debian.org
Mon Jun 21 15:17:56 UTC 2010
Author: onkarshinde-guest
Date: 2010-06-21 15:17:56 +0000 (Mon, 21 Jun 2010)
New Revision: 12609
Added:
trunk/ow-util-ant-tasks/debian/libow-util-ant-tasks-java-doc.doc-base
trunk/ow-util-ant-tasks/debian/patches/06_fix_build_with_asm3.diff
trunk/ow-util-ant-tasks/debian/patches/07_fix_classpath.diff
Removed:
trunk/ow-util-ant-tasks/debian/libow-util-ant-tasks-java.dirs
trunk/ow-util-ant-tasks/debian/libow-util-ant-tasks-java.doc-base
Modified:
trunk/ow-util-ant-tasks/debian/changelog
trunk/ow-util-ant-tasks/debian/control
trunk/ow-util-ant-tasks/debian/patches/series
trunk/ow-util-ant-tasks/debian/rules
Log:
ow-util-ant-tasks 1.3.2-4
Modified: trunk/ow-util-ant-tasks/debian/changelog
===================================================================
--- trunk/ow-util-ant-tasks/debian/changelog 2010-06-20 22:04:22 UTC (rev 12608)
+++ trunk/ow-util-ant-tasks/debian/changelog 2010-06-21 15:17:56 UTC (rev 12609)
@@ -1,3 +1,19 @@
+ow-util-ant-tasks (1.3.2-4) unstable; urgency=low
+
+ * Team upload.
+ * Use cdbs for building. Makes rules file compact.
+ * asm2 -> asm3 transition. Patch 06_fix_build_with_asm3.diff added to fix
+ compilation issues.
+ * Add libasm3-java and libxalan2-java as dependencies.
+ * Patch 07_fix_classpath.diff added to add appropriate classpath in manifest
+ file.
+ * Move API documentation to a separate package.
+ * debian/libow-util-ant-tasks-java.dirs - Remove, not needed.
+ * debian/libow-util-ant-tasks-java.doc-base
+ - Rename to debian/libow-util-ant-tasks-java-doc.doc-base
+
+ -- Onkar Shinde <onkarshinde at ubuntu.com> Mon, 21 Jun 2010 18:19:38 +0530
+
ow-util-ant-tasks (1.3.2-3) unstable; urgency=low
* Team upload.
Modified: trunk/ow-util-ant-tasks/debian/control
===================================================================
--- trunk/ow-util-ant-tasks/debian/control 2010-06-20 22:04:22 UTC (rev 12608)
+++ trunk/ow-util-ant-tasks/debian/control 2010-06-21 15:17:56 UTC (rev 12609)
@@ -3,8 +3,8 @@
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Michael Koch <konqueror at gmx.de>
-Build-Depends: debhelper (>= 7)
-Build-Depends-Indep: default-jdk, ant (>= 1.7), junit, libxalan2-java, libasm2-java
+Build-Depends: debhelper (>= 7), cdbs
+Build-Depends-Indep: default-jdk, ant (>= 1.7), junit, libxalan2-java, libasm3-java
Standards-Version: 3.8.4
Homepage: http://forge.ow2.org/projects/monolog/
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/ow-util-ant-tasks
@@ -13,9 +13,24 @@
Package: libow-util-ant-tasks-java
Architecture: all
Depends: ant (>= 1.7), default-jre-headless | java2-runtime-headless,
- ${misc:Depends}
+ ${misc:Depends}, libasm3-java, libxalan2-java
Description: ObjectWeb utility Ant tasks library
This library is used in the build process of several key frameworks
developed by ObjectWeb, among them the ObjectWeb ASM bytecode manipulation
framework, which is a dependency for several key packages within the
Debian Java Packaging project.
+ .
+ This package contains the library.
+
+Package: libow-util-ant-tasks-java-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Replaces: libow-util-ant-tasks-java (<< 1.3.2-4)
+Description: ObjectWeb utility Ant tasks library (API docs)
+ This library is used in the build process of several key frameworks
+ developed by ObjectWeb, among them the ObjectWeb ASM bytecode manipulation
+ framework, which is a dependency for several key packages within the
+ Debian Java Packaging project.
+ .
+ This package contains API documentation.
Copied: trunk/ow-util-ant-tasks/debian/libow-util-ant-tasks-java-doc.doc-base (from rev 12608, trunk/ow-util-ant-tasks/debian/libow-util-ant-tasks-java.doc-base)
===================================================================
--- trunk/ow-util-ant-tasks/debian/libow-util-ant-tasks-java-doc.doc-base (rev 0)
+++ trunk/ow-util-ant-tasks/debian/libow-util-ant-tasks-java-doc.doc-base 2010-06-21 15:17:56 UTC (rev 12609)
@@ -0,0 +1,10 @@
+Document: libow-util-ant-tasks-java
+Title: API Javadoc for ObjectWeb Utility Ant Tasks Library
+Author: ObjectWeb Monolog Project Team
+Abstract: This is the API Javadoc for the ObjectWeb utility
+ Ant tasks library.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libow-util-ant-tasks-java/api/index.html
+Files: /usr/share/doc/libow-util-ant-tasks-java/api/*.html
Deleted: trunk/ow-util-ant-tasks/debian/libow-util-ant-tasks-java.dirs
===================================================================
--- trunk/ow-util-ant-tasks/debian/libow-util-ant-tasks-java.dirs 2010-06-20 22:04:22 UTC (rev 12608)
+++ trunk/ow-util-ant-tasks/debian/libow-util-ant-tasks-java.dirs 2010-06-21 15:17:56 UTC (rev 12609)
@@ -1,2 +0,0 @@
-usr/share/java
-usr/share/doc/libow-util-ant-tasks-java
Deleted: trunk/ow-util-ant-tasks/debian/libow-util-ant-tasks-java.doc-base
===================================================================
--- trunk/ow-util-ant-tasks/debian/libow-util-ant-tasks-java.doc-base 2010-06-20 22:04:22 UTC (rev 12608)
+++ trunk/ow-util-ant-tasks/debian/libow-util-ant-tasks-java.doc-base 2010-06-21 15:17:56 UTC (rev 12609)
@@ -1,10 +0,0 @@
-Document: libow-util-ant-tasks-java
-Title: API Javadoc for ObjectWeb Utility Ant Tasks Library
-Author: ObjectWeb Monolog Project Team
-Abstract: This is the API Javadoc for the ObjectWeb utility
- Ant tasks library.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libow-util-ant-tasks-java/api/index.html
-Files: /usr/share/doc/libow-util-ant-tasks-java/api/*.html
Added: trunk/ow-util-ant-tasks/debian/patches/06_fix_build_with_asm3.diff
===================================================================
--- trunk/ow-util-ant-tasks/debian/patches/06_fix_build_with_asm3.diff (rev 0)
+++ trunk/ow-util-ant-tasks/debian/patches/06_fix_build_with_asm3.diff 2010-06-21 15:17:56 UTC (rev 12609)
@@ -0,0 +1,24 @@
+Description: compatibility fixes for ASM 3.x
+Author: Onkar Shinde <onkarshinde at ubuntu.com>
+--- a/src/org/objectweb/util/ant/DependencyAnalyzer.java 2010-06-21 19:22:12.000000000 +0530
++++ b/src/org/objectweb/util/ant/DependencyAnalyzer.java 2010-06-21 19:37:35.000000000 +0530
+@@ -354,7 +354,7 @@
+ log("Visit the class: " + fn, Project.MSG_DEBUG);
+ try {
+ File f = new File(group.groupDir, fn);
+- new ClassReader(new FileInputStream(f)).accept(dv, false);
++ new ClassReader(new FileInputStream(f)).accept(dv, 0);
+ } catch (FileNotFoundException e) {
+ log(e.getMessage(), Project.MSG_ERR);
+ } catch (IOException e) {
+@@ -718,6 +718,10 @@
+ if (signature != null)
+ new SignatureReader(signature).acceptType(this);
+ }
++
++ // Placeholder method to fix compilation problem.
++ public void visitFrame (int i, int j, Object[] x, int k, Object[] y) {
++ }
+ }
+
+ }
Added: trunk/ow-util-ant-tasks/debian/patches/07_fix_classpath.diff
===================================================================
--- trunk/ow-util-ant-tasks/debian/patches/07_fix_classpath.diff (rev 0)
+++ trunk/ow-util-ant-tasks/debian/patches/07_fix_classpath.diff 2010-06-21 15:17:56 UTC (rev 12609)
@@ -0,0 +1,12 @@
+Description: Add classpath in manifest file
+Author: Onkar Shinde <onkarshinde at ubuntu.com>
+--- a/build.xml 2010-06-21 19:59:54.000000000 +0530
++++ b/build.xml 2010-06-21 20:00:39.000000000 +0530
+@@ -32,6 +32,7 @@
+ <attribute name="product-version" value="ObjectwebAntTasks ${version}"/>
+ <attribute name="product-vendor" value="Objectweb"/>
+ <attribute name="product-description" value="This library contains Ant tasks that improve upon several of the base Ant tasks"/>
++ <attribute name="Class-Path" value="xalan2.jar asm3.jar"/>
+ </manifest>
+ </jar>
+ </target>
Modified: trunk/ow-util-ant-tasks/debian/patches/series
===================================================================
--- trunk/ow-util-ant-tasks/debian/patches/series 2010-06-20 22:04:22 UTC (rev 12608)
+++ trunk/ow-util-ant-tasks/debian/patches/series 2010-06-21 15:17:56 UTC (rev 12609)
@@ -1,3 +1,5 @@
01_upstream_enhance_compile_target.dpatch
02_upstream_correct_manifest_description.dpatch
05_MultipleCopy.dpatch
+06_fix_build_with_asm3.diff
+07_fix_classpath.diff
Modified: trunk/ow-util-ant-tasks/debian/rules
===================================================================
--- trunk/ow-util-ant-tasks/debian/rules 2010-06-20 22:04:22 UTC (rev 12608)
+++ trunk/ow-util-ant-tasks/debian/rules 2010-06-21 15:17:56 UTC (rev 12609)
@@ -1,86 +1,23 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-# debian/rules for ow-util-ant-tasks
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# 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
TEMPDIR=debian/libow-util-ant-tasks-java
+TEMPDIR_DOC=debian/libow-util-ant-tasks-java-doc
-# Set JAVA_HOME to be used for Java commands
-JAVA_HOME=/usr/lib/jvm/default-java
+JAVA_HOME := /usr/lib/jvm/default-java
+DEB_JARS := gnujaxp ant-junit junit xalan2 asm3
+DEB_ANT_BUILD_TARGET := jar jdoc
-# Set the invocation of the java command;
-JAVACMD=$(JAVA_HOME)/bin/java
-
-# Class path: Ant requires and JAXP-compatible XML parser
-# You need to set CLASSPATH here (even if your build.xml assembles its own
-# class path) to ensure the same build results in all cases
-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_LIB)/asm2.jar:$(JAVA_HOME)/lib/tools.jar
-
-# Set path to Ant properties file
-ANT_PROPS=debian/ant.properties
-
-# 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 -verbose -propertyfile $(ANT_PROPS)
-
-build: build-stamp
-
-build-stamp:
- dh_testdir
- $(ANT) jar
- $(ANT) jdoc
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
- $(ANT) clean
- rm -rf output
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
+install/libow-util-ant-tasks-java::
mkdir -p $(TEMPDIR)/usr/share/java
- mkdir -p $(TEMPDIR)/usr/share/doc/libow-util-ant-tasks-java
-
install -m 644 output/lib/ow_util_ant_tasks.jar \
$(TEMPDIR)/usr/share/java
- mv output/jdoc $(TEMPDIR)/usr/share/doc/libow-util-ant-tasks-java/api
-
-# Build architecture-independent files here.
-binary-indep: build install
- dh_testdir -i
- dh_testroot -i
- dh_installchangelogs -i
- dh_installdocs -i
- dh_installexamples -i
- dh_installman -i
- dh_link -i
- dh_strip -i
- dh_compress -i
- dh_fixperms -i
- dh_installdeb -i
- dh_shlibdeps -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
-
-# Build architecture-dependent files here.
-binary-arch: build install
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+install/libow-util-ant-tasks-java-doc::
+ mkdir -p $(TEMPDIR_DOC)/usr/share/doc/libow-util-ant-tasks-java
+ mv output/jdoc $(TEMPDIR_DOC)/usr/share/doc/libow-util-ant-tasks-java/api
More information about the pkg-java-commits
mailing list