[pkg-java] r4923 - trunk/libquartz-java/debian
twerner at alioth.debian.org
twerner at alioth.debian.org
Fri Nov 30 13:08:32 UTC 2007
Author: twerner
Date: 2007-11-30 13:08:32 +0000 (Fri, 30 Nov 2007)
New Revision: 4923
Added:
trunk/libquartz-java/debian/install
Removed:
trunk/libquartz-java/debian/ant.properties
trunk/libquartz-java/debian/build.xml
Modified:
trunk/libquartz-java/debian/changelog
trunk/libquartz-java/debian/control
trunk/libquartz-java/debian/rules
Log:
* Move package to contrib because of Build-Depends: glassfish-javaee.
* Use upstream provided build.xml.
Deleted: trunk/libquartz-java/debian/ant.properties
===================================================================
--- trunk/libquartz-java/debian/ant.properties 2007-11-30 10:48:06 UTC (rev 4922)
+++ trunk/libquartz-java/debian/ant.properties 2007-11-30 13:08:32 UTC (rev 4923)
@@ -1,15 +0,0 @@
-project.name=quartz
-class.dir=classes
-source.dir=src
-
-java.dir=java
-jboss.dir=jboss
-oracle.dir=oracle
-test.dir=test
-weblogic.dir=weblogic
-
-java.jar=quartz.jar
-jboss.jar=quartz-jboss.jar
-oracle.jar=quartz-oracle.jar
-test.jar=quartz-test.jar
-weblogic.jar=quartz-weblogic.jar
Deleted: trunk/libquartz-java/debian/build.xml
===================================================================
--- trunk/libquartz-java/debian/build.xml 2007-11-30 10:48:06 UTC (rev 4922)
+++ trunk/libquartz-java/debian/build.xml 2007-11-30 13:08:32 UTC (rev 4923)
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project default="jar" name="${project.name}" basedir="..">
-
- <target name="clean">
- <delete dir="${java.dir}/${class.dir}" quiet="true"/>
- <delete dir="${jboss.dir}/${class.dir}" quiet="true"/>
- <delete dir="${oracle.dir}/${class.dir}" quiet="true"/>
- <delete dir="${test.dir}/${class.dir}" quiet="true"/>
- <delete dir="${weblogic.dir}/${class.dir}" quiet="true"/>
- <delete file="${java.jar}" quiet="true"/>
- <delete file="${jboss.jar}" quiet="true"/>
- <delete file="${oracle.jar}" quiet="true"/>
- <delete file="${test.jar}" quiet="true"/>
- <delete file="${weblogic.jar}" quiet="true"/>
- </target>
-
- <target name="jar">
- <mkdir dir="${source.dir}/${java.dir}/${class.dir}"/>
- <javac srcdir="${source.dir}/${java.dir}" destdir="${source.dir}/${java.dir}/${class.dir}"
- debug="true"/>
-
- <jar jarfile="${java.jar}">
- <fileset dir="${source.dir}/${java.dir}/${class.dir}">
- <include name="**"/>
- </fileset>
- </jar>
-
- <mkdir dir="${source.dir}/${jboss.dir}/${class.dir}"/>
- <javac srcdir="${source.dir}/${jboss.dir}" destdir="${source.dir}/${jboss.dir}/${class.dir}"
- debug="true" source="1.5" classpath="quartz.jar"/>
-
- <jar jarfile="${jboss.jar}">
- <fileset dir="${source.dir}/${jboss.dir}/${class.dir}">
- <include name="**"/>
- </fileset>
- </jar>
-
- <mkdir dir="${source.dir}/${test.dir}/${class.dir}"/>
- <javac srcdir="${source.dir}/${test.dir}" destdir="${source.dir}/${test.dir}/${class.dir}"
- debug="true" classpath="quartz.jar"/>
-
- <jar jarfile="${test.jar}">
- <fileset dir="${source.dir}/${test.dir}/${class.dir}">
- <include name="**"/>
- </fileset>
- </jar>
-
-<!-- <mkdir dir="${source.dir}/${oracle.dir}/${class.dir}"/> -->
-<!-- <javac srcdir="${source.dir}/${oracle.dir}" destdir="${source.dir}/${oracle.dir}/${class.dir}" -->
-<!-- debug="true" classpath="quartz.jar"/> -->
-
-<!-- <jar jarfile="${oracle.jar}"> -->
-<!-- <fileset dir="${source.dir}/${oracle.dir}/${class.dir}"> -->
-<!-- <include name="**"/> -->
-<!-- </fileset> -->
-<!-- </jar> -->
-
-<!-- <mkdir dir="${source.dir}/${weblogic.dir}/${class.dir}"/> -->
-<!-- <javac srcdir="${source.dir}/${weblogic.dir}" destdir="${source.dir}/${weblogic.dir}/${class.dir}" -->
-<!-- debug="true" classpath="quartz.jar"/> -->
-
-<!-- <jar jarfile="${weblogic.jar}"> -->
-<!-- <fileset dir="${source.dir}/${weblogic.dir}/${class.dir}"> -->
-<!-- <include name="**"/> -->
-<!-- </fileset> -->
-<!-- </jar> -->
-
- </target>
-
-</project>
Modified: trunk/libquartz-java/debian/changelog
===================================================================
--- trunk/libquartz-java/debian/changelog 2007-11-30 10:48:06 UTC (rev 4922)
+++ trunk/libquartz-java/debian/changelog 2007-11-30 13:08:32 UTC (rev 4923)
@@ -1,3 +1,10 @@
+libquartz-java (1.6.0-2) unstable; urgency=low
+
+ * Move package to contrib because of Build-Depends: glassfish-javaee.
+ * Use upstream provided build.xml.
+
+ -- Torsten Werner <twerner at debian.org> Fri, 30 Nov 2007 14:10:48 +0100
+
libquartz-java (1.6.0-1) unstable; urgency=low
* Initial release (Closes: #450612)
Modified: trunk/libquartz-java/debian/control
===================================================================
--- trunk/libquartz-java/debian/control 2007-11-30 10:48:06 UTC (rev 4922)
+++ trunk/libquartz-java/debian/control 2007-11-30 13:08:32 UTC (rev 4923)
@@ -1,5 +1,5 @@
Source: libquartz-java
-Section: libs
+Section: contrib/libs
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Varun Hiremath <varunhiremath at gmail.com>, Torsten Werner <twerner at debian.org>
Added: trunk/libquartz-java/debian/install
===================================================================
--- trunk/libquartz-java/debian/install (rev 0)
+++ trunk/libquartz-java/debian/install 2007-11-30 13:08:32 UTC (rev 4923)
@@ -0,0 +1 @@
+build/*.jar /usr/share/java/
Modified: trunk/libquartz-java/debian/rules
===================================================================
--- trunk/libquartz-java/debian/rules 2007-11-30 10:48:06 UTC (rev 4922)
+++ trunk/libquartz-java/debian/rules 2007-11-30 13:08:32 UTC (rev 4923)
@@ -5,20 +5,19 @@
JAVA_HOME := /usr/lib/jvm/java-gcj
DEB_ANT_BUILD_TARGET := jar
-DEB_ANT_BUILDFILE := debian/build.xml
+#tests fail because clover is missing:
+#DEB_ANT_CHECK_TARGET := test
DEB_JARS := commons-logging commons-modeler servlet-api glassfish-ejb-api glassfish-javaee \
commons-dbcp commons-beanutils commons-digester commons-collections3 jnpserver\
jboss-system jboss-common jboss-jmx junit
-ALL_JARS = $(wildcard *.jar)
-DEST_DIR = $(DEB_DESTDIR)/usr/share/java
+ALL_JARS = $(wildcard build/*.jar)
common-install-prehook-indep::
- for jar in $(ALL_JARS); do \
- BASENAME=`basename $$jar .jar`; \
- FULLNAME=$$BASENAME-$(DEB_UPSTREAM_VERSION).jar; \
- install -m 644 -D $$jar $(DEST_DIR)/$$FULLNAME; \
- ln -s $$FULLNAME $(DEST_DIR)/$$BASENAME.jar; \
+ for jar in $(ALL_JARS); do \
+ FILENAME=`basename $$jar`; \
+ LINKBASE=`basename $$jar -$(DEB_UPSTREAM_VERSION).jar`; \
+ dh_link /usr/share/java/$$FILENAME /usr/share/java/$$LINKBASE.jar; \
done
get-orig-source:
More information about the pkg-java-commits
mailing list