Author: twerner Date: 2007-10-14 13:37:26 +0000 (Sun, 14 Oct 2007) New Revision: 4395
Added: trunk/libhibernate3-java/debian/patches/ trunk/libhibernate3-java/debian/patches/build.diff trunk/libhibernate3-java/debian/patches/series Modified: trunk/libhibernate3-java/debian/ trunk/libhibernate3-java/debian/control trunk/libhibernate3-java/debian/rules Log: the build process starts now (but generates errors) Property changes on: trunk/libhibernate3-java/debian ___________________________________________________________________ Name: mergeWithUpstream + 1 Modified: trunk/libhibernate3-java/debian/control =================================================================== --- trunk/libhibernate3-java/debian/control 2007-10-14 13:18:07 UTC (rev 4394) +++ trunk/libhibernate3-java/debian/control 2007-10-14 13:37:26 UTC (rev 4395) @@ -4,7 +4,7 @@ Maintainer: Debian Java Maintainers <[EMAIL PROTECTED]> Uploaders: Torsten Werner <[EMAIL PROTECTED]> Build-Depends: debhelper (>= 5), cdbs -Build-Depends-Indep: java-gcj-compat-dev (>= 1.0.69-2), ant +Build-Depends-Indep: ant, ant-optional, antlr, java-gcj-compat-dev (>= 1.0.69-2), junit, quilt Standards-Version: 3.7.2 XS-Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-java/trunk/libhibernate3-java XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libhibernate3-java Added: trunk/libhibernate3-java/debian/patches/build.diff =================================================================== --- trunk/libhibernate3-java/debian/patches/build.diff (rev 0) +++ trunk/libhibernate3-java/debian/patches/build.diff 2007-10-14 13:37:26 UTC (rev 4395) @@ -0,0 +1,31 @@ +Index: libhibernate3-java-3.2.5/build.xml +=================================================================== +--- libhibernate3-java-3.2.5.orig/build.xml 2007-07-31 20:02:26.000000000 +0200 ++++ libhibernate3-java-3.2.5/build.xml 2007-10-14 15:37:01.000000000 +0200 +@@ -107,10 +107,6 @@ + <!-- ############################# Tasks ############################## --> + <!-- ################################################################## --> + +- <taskdef name="splash" classname="org.apache.tools.ant.taskdefs.optional.splash.SplashTask"> +- <classpath refid="path.lib"/> +- </taskdef> +- + <taskdef name="junit" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"> + <classpath refid="path.lib"/> + </taskdef> +@@ -119,7 +115,6 @@ + <classpath refid="path.lib"/> + </taskdef> + +- <taskdef resource="clovertasks"/> + + + <!-- ################################################################## --> +@@ -130,7 +125,6 @@ + + <target name="splash" unless="nosplash" description="Display the logo"> + <property name="splash.dir" location="."/> +- <splash imageurl="file:${splash.dir}/hibernate_logo.gif" showduration="0"/> + </target> + + <target name="init" depends="splash" description="Initialize the build"> Added: trunk/libhibernate3-java/debian/patches/series =================================================================== --- trunk/libhibernate3-java/debian/patches/series (rev 0) +++ trunk/libhibernate3-java/debian/patches/series 2007-10-14 13:37:26 UTC (rev 4395) @@ -0,0 +1 @@ +build.diff Modified: trunk/libhibernate3-java/debian/rules =================================================================== --- trunk/libhibernate3-java/debian/rules 2007-10-14 13:18:07 UTC (rev 4394) +++ trunk/libhibernate3-java/debian/rules 2007-10-14 13:37:26 UTC (rev 4395) @@ -1,22 +1,17 @@ #!/usr/bin/make -f -# debian/rules file for c3p0 (uses cdbs) include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/ant.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk -# the upstream version without the .dfsg* suffix: -VERSION := `expr match $(DEB_UPSTREAM_VERSION) '\(.*\)\.dfsg.*'` - JAVA_HOME := /usr/lib/jvm/java-gcj/ -DEB_JARS := asm-attrs asm asm-util junit aspectwerkz aspectwerkz-core -DEB_ANT_BUILD_TARGET := jardep javadoc -DEB_ANT_ARGS += -Dcomponent.version=$(VERSION) +DEB_JARS := ant-antlr ant-junit antlr junit +DEB_ANT_BUILD_TARGET := jar javadoc JAR_DIR := /usr/share/java -install/libcglib2.1-java:: - dh_link -plibcglib2.1-java $(JAR_DIR)/cglib-$(VERSION).jar \ - $(JAR_DIR)/cglib.jar +#install/libcglib2.1-java:: +# dh_link -plibcglib2.1-java $(JAR_DIR)/cglib-$(VERSION).jar \ +# $(JAR_DIR)/cglib.jar get-orig-source: uscan --upstream-version 0 --rename _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
