This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository commons-beanutils.
commit aa6c91b09d5718ec6855f37c81c27518f423eda4 Author: Arnaud Vandyck <[email protected]> Date: Mon Sep 19 11:37:25 2005 +0000 commons-beanutils (1.6.1-5) unstable; urgency=low --- build.xml | 77 ++++++++++++++++++++++++++-- debian/changelog | 54 +++++++++++++++++++ debian/compat | 1 + debian/control | 21 ++++---- debian/libcommons-beanutils-java.links | 3 +- debian/rules | 94 +++++++--------------------------- 6 files changed, 159 insertions(+), 91 deletions(-) diff --git a/build.xml b/build.xml index 58417a9..05a0641 100644 --- a/build.xml +++ b/build.xml @@ -55,7 +55,7 @@ <property name="component.title" value="Bean Introspection Utilities"/> <!-- The current version number of this component --> - <property name="component.version" value="1.3"/> + <property name="component.version" value="1.6.1"/> <!-- The base directory for compilation targets --> <property name="build.home" value="target"/> @@ -80,7 +80,7 @@ <property name="compile.debug" value="true"/> <!-- Should Java compilations set the 'deprecation' compiler option? --> - <property name="compile.deprecation" value="true"/> + <property name="compile.deprecation" value="false"/> <!-- Should Java compilations set the 'optimize' compiler option? --> <property name="compile.optimize" value="true"/> @@ -158,6 +158,7 @@ <javac srcdir="${source.home}" destdir="${build.home}/classes" debug="${compile.debug}" + source="1.3" deprecation="${compile.deprecation}" optimize="${compile.optimize}"> <classpath refid="compile.classpath"/> @@ -208,7 +209,7 @@ overview="src/java/overview.html" doctitle="<h1>${component.title} (Version ${component.version})</h1>" windowtitle="${component.title} (Version ${component.version})" - bottom="Copyright (c) 2001-2002 - Apache Software Foundation"> + bottom="Copyright (c) 2001-2003 - Apache Software Foundation"> <classpath refid="compile.classpath"/> </javadoc> </target> @@ -217,8 +218,12 @@ <target name="dist" depends="compile,javadoc" description="Create binary distribution"> <mkdir dir="${dist.home}"/> +<!-- + <copy file="LICENSE.txt" + todir="${dist.home}"/> <copy file="RELEASE-NOTES.txt" todir="${dist.home}"/> +--> <antcall target="jar"/> </target> @@ -227,6 +232,8 @@ description="Create jar"> <mkdir dir="${dist.home}"/> <mkdir dir="${build.home}/classes/META-INF"/> + <copy file="LICENSE.txt" + tofile="${build.home}/classes/META-INF/LICENSE.txt"/> <jar jarfile="${dist.home}/commons-${component.name}.jar" basedir="${build.home}/classes" manifest="${build.home}/conf/MANIFEST.MF"/> @@ -254,7 +261,11 @@ test.dyna.bean, test.bean, test.convert, - test.method + test.method, + test.dyna.result, + test.dyna.row, + test.bean.comparator, + test.locale.converters " description="Run all unit test cases"> </target> @@ -380,5 +391,63 @@ </java> </target> + <target name="test.dyna.result" depends="compile.tests"> + <echo message="Running DynaBean ResultSet tests ..."/> + <java classname="${test.runner}" fork="yes" + failonerror="${test.failonerror}"> + <sysproperty key="org.apache.commons.logging.LogFactory" + value="${test.factory}"/> + <sysproperty key="org.apache.commons.logging.Log" + value="${test.log}"/> + <sysproperty key="org.apache.commons.logging.simplelog.defaultlog" + value="${test.level}"/> + <arg value="org.apache.commons.beanutils.DynaResultSetTestCase"/> + <classpath refid="test.classpath"/> + </java> + </target> + + <target name="test.dyna.row" depends="compile.tests"> + <echo message="Running DynaBean RowSet tests ..."/> + <java classname="${test.runner}" fork="yes" + failonerror="${test.failonerror}"> + <sysproperty key="org.apache.commons.logging.LogFactory" + value="${test.factory}"/> + <sysproperty key="org.apache.commons.logging.Log" + value="${test.log}"/> + <sysproperty key="org.apache.commons.logging.simplelog.defaultlog" + value="${test.level}"/> + <arg value="org.apache.commons.beanutils.DynaRowSetTestCase"/> + <classpath refid="test.classpath"/> + </java> + </target> + <target name="test.bean.comparator" depends="compile.tests"> + <echo message="Running BeanComparator tests ..."/> + <java classname="${test.runner}" fork="yes" + failonerror="${test.failonerror}"> + <sysproperty key="org.apache.commons.logging.LogFactory" + value="${test.factory}"/> + <sysproperty key="org.apache.commons.logging.Log" + value="${test.log}"/> + <sysproperty key="org.apache.commons.logging.simplelog.defaultlog" + value="${test.level}"/> + <arg value="org.apache.commons.beanutils.BeanComparatorTestCase"/> + <classpath refid="test.classpath"/> + </java> + </target> + + <target name="test.locale.converters" depends="compile.tests"> + <echo message="Running Locale converters tests ..."/> + <java classname="${test.runner}" fork="yes" + failonerror="${test.failonerror}"> + <sysproperty key="org.apache.commons.logging.LogFactory" + value="${test.factory}"/> + <sysproperty key="org.apache.commons.logging.Log" + value="${test.log}"/> + <sysproperty key="org.apache.commons.logging.simplelog.defaultlog" + value="${test.level}"/> + <arg value="org.apache.commons.beanutils.locale.converters.DateLocaleConverterTestCase"/> + <classpath refid="test.classpath"/> + </java> + </target> </project> diff --git a/debian/changelog b/debian/changelog index 467c287..ff1ba51 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,57 @@ +commons-beanutils (1.6.1-5) unstable; urgency=low + + * debian/control (Build-Depends-Indep): ant transition + * debian/control (Standards-Version): 3.6.2, nothing to change + * debian/control (Uploaders): added myself + * debian/rules: ant transition + + -- Arnaud Vandyck <[email protected]> Mon, 19 Sep 2005 13:14:23 +0200 + +commons-beanutils (1.6.1-4) unstable; urgency=low + + * rebuild by jikes with -source 1.3 option. + This keeps backward compatibility. + + -- Takashi Okamoto <[email protected]> Fri, 6 Aug 2004 23:58:14 +0900 + +commons-beanutils (1.6.1-3) unstable; urgency=low + + * fixed FTBFS (closes: #251017). + + -- Takashi Okamoto <[email protected]> Wed, 7 Jul 2004 23:46:46 +0900 + +commons-beanutils (1.6.1-2) unstable; urgency=low + + * Move to main. + * use cdbs to build package. + + -- Takashi Okamoto <[email protected]> Sat, 1 May 2004 20:49:12 +0900 + +commons-beanutils (1.6.1-1) unstable; urgency=low + + * New upstream release + * - + + -- Takashi Okamoto <[email protected]> Sat, 1 May 2004 20:49:09 +0900 + +commons-beanutils (1.6-2) unstable; urgency=low + + * change control file for java policy. + + -- Takashi Okamoto <[email protected]> Sat, 8 Feb 2003 10:32:07 +0900 + +commons-beanutils (1.6-1) unstable; urgency=low + + * New upstream release + + -- Takashi Okamoto <[email protected]> Sat, 8 Feb 2003 09:57:41 +0900 + +commons-beanutils (1.5-1) unstable; urgency=low + + * New upstream release + + -- Takashi Okamoto <[email protected]> Sun, 10 Nov 2002 15:49:54 +0900 + commons-beanutils (1.3-1) unstable; urgency=low * New upstream release diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..b8626c4 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +4 diff --git a/debian/control b/debian/control index 962a342..df4cd07 100644 --- a/debian/control +++ b/debian/control @@ -1,13 +1,14 @@ Source: commons-beanutils -Section: contrib/libs +Section: libs Priority: optional -Maintainer: Takashi Okamoto <[email protected]> -Build-Depends-Indep: debhelper (>> 3.0.0), ant, libcommons-collections-java, libcommons-logging-java -Standards-Version: 3.5.2 +Maintainer: Debian Java Maintainers <[email protected]> +Uploaders: Takashi Okamoto <[email protected]>, Arnaud Vandyck <[email protected]> +Build-Depends-Indep: kaffe (>= 2:1.1.4.PRE1.1.5-7), jikes, debhelper (>> 4.0.0), cdbs, ant, libcommons-collections-java, libcommons-logging-java +Standards-Version: 3.6.2 Package: libcommons-beanutils-java Architecture: all -Depends: java-common, libcommons-collections-java, libcommons-logging-java +Depends: kaffe (>= 1:1.1.3) | java2-runtime | java1-runtime, libcommons-collections-java, libcommons-logging-java Suggests: libcommons-beanutils-java-doc Description: utility for manipulating JavaBeans The BeanUtils Component contains a set of Java classes that provide @@ -15,8 +16,8 @@ Description: utility for manipulating JavaBeans to the JavaBeans Specification naming patterns for bean properties in a dynamic fashion. -Package: libcommons-beanutils-java-doc -Architecture: all -Description: Documentation for libcommons-collections-java - Documentation for libcommons-collections-java which is utility for - manipulating JavaBeans. +#Package: libcommons-beanutils-java-doc +#Architecture: all +#Description: Documentation for libcommons-collections-java +# Documentation for libcommons-collections-java which is utility for +# manipulating JavaBeans. diff --git a/debian/libcommons-beanutils-java.links b/debian/libcommons-beanutils-java.links index 5aa2e65..8f952c5 100644 --- a/debian/libcommons-beanutils-java.links +++ b/debian/libcommons-beanutils-java.links @@ -1 +1,2 @@ -/usr/share/java/commons-beanutils-1.3.jar /usr/share/java/commons-beanutils.jar +/usr/share/java/commons-beanutils-1.6.1.jar /usr/share/java/commons-beanutils.jar + diff --git a/debian/rules b/debian/rules index 6360577..9a9ebbc 100644 --- a/debian/rules +++ b/debian/rules @@ -1,86 +1,28 @@ #!/usr/bin/make -f -# Sample debian/rules that uses debhelper. -# GNU copyright 1997 to 1999 by Joey Hess. +# debian/rules file for libcommons-logging-java (uses cdbs) -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 -export LANG=C +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/ant.mk -# This is the debhelper compatability version to use. -export DH_COMPAT=3 +# These two must be specified +JAVA_HOME := /usr/lib/kaffe +ANT_HOME := /usr/share/ant -LIBRARY=commons-beanutils -VERSION=1.3 -BUILDFILE=build.xml +# Additional JARs to add to the class path, either full path or just the +# basename for JARs in /usr/share/java. The ".jar" suffix may also be ommitted +DEB_JARS := commons-logging commons-collections $(ANT_HOME)/lib/ant-launcher.jar -# Directories to look for JAVA_HOME (JDK 1.2+ rquired!) -JAVA_HOME=/usr/local/j2sdk1.4.0_01 +# Build compiler +DEB_ANT_COMPILER := jikes -export ANT=/usr/bin/ant -export CLASSPATH=/usr/share/java/commons-collections.jar:/usr/share/java/commons-logging.jar:${JAVA_HOME}/lib/tools.jar:. +# Defaults to debian/ant.properties +#DEB_ANT_PROPERTYFILE := build.properties -build: build-stamp -build-stamp: - dh_testdir +# Defaults to build.xml (Ant default) in $(DEB_BUILDDIR) +#DEB_ANT_BUILDFILE := build.xml - # Add here commands to compile the package. - ${ANT} -buildfile ${BUILDFILE} dist javadoc +DEB_ANT_BUILD_TARGET := jar javadoc - touch build-stamp +install/libcommons-beanutils-java:: + install -m 644 dist/commons-beanutils.jar debian/libcommons-beanutils-java/usr/share/java/commons-beanutils-1.6.1.jar -clean: - dh_testdir - dh_testroot - rm -f build-stamp - - # Add here commands to clean up after the build process. - ${ANT} -buildfile ${BUILDFILE} clean - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - install -m 644 dist/${LIBRARY}.jar $(CURDIR)/debian/lib${LIBRARY}-java/usr/share/java/${LIBRARY}-${VERSION}.jar - - dh_movefiles --sourcedir=debian/lib${LIBRARY}-java - -# Build architecture-independent files here. -binary-indep: build install - dh_testdir -i - dh_testroot -i -# dh_installdebconf -i - dh_installdocs -i - dh_installexamples -i - dh_installmenu -i -# dh_installlogrotate -i -# dh_installemacsen -i -# dh_installpam -i -# dh_installmime -i -# dh_installinit -i -# dh_installcron -i -# dh_installman -i -# dh_installinfo -i -# dh_undocumented -i - dh_installchangelogs -i - dh_link -i - dh_strip -i - dh_compress -i - dh_fixperms -i -# dh_makeshlibs -i - dh_installdeb -i -# dh_perl -i -# dh_shlibdeps -i - dh_gencontrol -i - dh_md5sums -i - dh_builddeb -i - -# 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 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/commons-beanutils.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
