[pkg-java] r4842 - in trunk/libxstream-java/debian: . patches
twerner at alioth.debian.org
twerner at alioth.debian.org
Sun Nov 25 20:39:00 UTC 2007
Author: twerner
Date: 2007-11-25 20:39:00 +0000 (Sun, 25 Nov 2007)
New Revision: 4842
Added:
trunk/libxstream-java/debian/patches/
trunk/libxstream-java/debian/patches/encoding.diff
trunk/libxstream-java/debian/patches/series
Modified:
trunk/libxstream-java/debian/
trunk/libxstream-java/debian/control
trunk/libxstream-java/debian/rules
Log:
the package builds now
Property changes on: trunk/libxstream-java/debian
___________________________________________________________________
Name: mergeWithUpstream
+ 1
Modified: trunk/libxstream-java/debian/control
===================================================================
--- trunk/libxstream-java/debian/control 2007-11-25 20:00:25 UTC (rev 4841)
+++ trunk/libxstream-java/debian/control 2007-11-25 20:39:00 UTC (rev 4842)
@@ -1,10 +1,12 @@
Source: libxstream-java
-Section: libs
+Section: contrib/libs
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Torsten Werner <twerner at debian.org>
-Build-Depends: debhelper (>= 5), cdbs
-Build-Depends-Indep: ant, java-gcj-compat-dev
+Build-Depends: debhelper (>= 5), cdbs, quilt
+Build-Depends-Indep: ant, sun-java6-jdk, libxom-java, libjoda-time-java,
+ libjettison-java, libcglib2.1-java, libdom4j-java, libxpp3-java,
+ libjdom1-java
Standards-Version: 3.7.2
Homepage: http://xstream.codehaus.org
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libxstream-java
@@ -12,6 +14,5 @@
Package: libxstream-java
Architecture: all
-Section: libs
Depends: java-gcj-compat | java1-runtime | java2-runtime
Description: FIXME
Added: trunk/libxstream-java/debian/patches/encoding.diff
===================================================================
--- trunk/libxstream-java/debian/patches/encoding.diff (rev 0)
+++ trunk/libxstream-java/debian/patches/encoding.diff 2007-11-25 20:39:00 UTC (rev 4842)
@@ -0,0 +1,38 @@
+Index: libxstream-java-1.2.2/xstream/build.xml
+===================================================================
+--- libxstream-java-1.2.2.orig/xstream/build.xml 2007-11-25 21:23:38.000000000 +0100
++++ libxstream-java-1.2.2/xstream/build.xml 2007-11-25 21:24:03.000000000 +0100
+@@ -43,14 +43,14 @@
+ </target>
+
+ <target name="compile:java5" depends="compile:init" if="jdk1.5.available" description="Compile all minimum Java 5 specific">
+- <javac srcdir="${java.src.dir}" destdir="${java.build.dir}" debug="${java.compile.debug}" source="1.5" target="1.5">
++ <javac encoding="iso8859-1" srcdir="${java.src.dir}" destdir="${java.build.dir}" debug="${java.compile.debug}" source="1.5" target="1.5">
+ <includesfile name="jdk-1.5-minimum.txt" />
+ <classpath refid="classpath"/>
+ </javac>
+ </target>
+
+ <target name="compile:java3" depends="compile:init" description="Compile all minimum Java 1.3 specific">
+- <javac srcdir="${java.src.dir}" destdir="${java.build.dir}" debug="${java.compile.debug}" source="1.3" target="1.3">
++ <javac encoding="iso8859-1" srcdir="${java.src.dir}" destdir="${java.build.dir}" debug="${java.compile.debug}" source="1.3" target="1.3">
+ <excludesfile name="jdk-1.5-minimum.txt" />
+ <excludesfile name="jdk-1.5-specific.txt" unless="jdk1.5.available" />
+ <excludesfile name="jdk-1.4-specific.txt" unless="jdk1.4.available" />
+@@ -62,14 +62,14 @@
+
+ <target name="benchmark:compile" depends="compile">
+ <mkdir dir="${benchmark.build.dir}"/>
+- <javac srcdir="${benchmark.java.dir}" destdir="${benchmark.build.dir}">
++ <javac encoding="iso8859-1" srcdir="${benchmark.java.dir}" destdir="${benchmark.build.dir}">
+ <classpath refid="classpath"/>
+ </javac>
+ </target>
+
+ <target name="test:compile" depends="compile, benchmark:compile">
+ <mkdir dir="${test.build.dir}"/>
+- <javac srcdir="${test.src.dir}" destdir="${test.build.dir}">
++ <javac encoding="iso8859-1" srcdir="${test.src.dir}" destdir="${test.build.dir}">
+ <excludesfile name="jdk-1.5-minimum.txt" unless="jdk1.5.available" />
+ <excludesfile name="jdk-1.5-specific.txt" unless="jdk1.5.available" />
+ <excludesfile name="jdk-1.4-specific.txt" unless="jdk1.4.available" />
Added: trunk/libxstream-java/debian/patches/series
===================================================================
--- trunk/libxstream-java/debian/patches/series (rev 0)
+++ trunk/libxstream-java/debian/patches/series 2007-11-25 20:39:00 UTC (rev 4842)
@@ -0,0 +1 @@
+encoding.diff
Modified: trunk/libxstream-java/debian/rules
===================================================================
--- trunk/libxstream-java/debian/rules 2007-11-25 20:00:25 UTC (rev 4841)
+++ trunk/libxstream-java/debian/rules 2007-11-25 20:39:00 UTC (rev 4842)
@@ -1,14 +1,19 @@
#!/usr/bin/make -f
+include /usr/share/cdbs/1/class/ant.mk
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-JAVA_HOME := /usr/lib/jvm/java-gcj
-DEB_ANT_BUILDFILE := debian/build.xml
+JAVA_HOME := /usr/lib/jvm/java-6-sun
+DEB_ANT_BUILDFILE := xstream/build.xml
+DEB_ANT_BUILD_TARGET := benchmark:compile jar
+DEB_JARS := xom joda-time jettison cglib dom4j xpp3 jdom1
-install/libjettison-java::
- install -m644 -D jettison.jar $(DEB_DESTDIR)/usr/share/java/jettison-$(DEB_UPSTREAM_VERSION).jar
- dh_link -plibjettison-java /usr/share/java/jettison-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/jettison.jar
+install/libxstream-java::
+ install -m644 -D xstream/target/xstream-SNAPSHOT.jar $(DEB_DESTDIR)/usr/share/java/xstream-$(DEB_UPSTREAM_VERSION).jar
+ dh_link -plibxstream-java /usr/share/java/xstream-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/xstream.jar
+ install -m644 -D xstream/target/xstream-benchmark-SNAPSHOT.jar $(DEB_DESTDIR)/usr/share/java/xstream-benchmark-$(DEB_UPSTREAM_VERSION).jar
+ dh_link -plibxstream-java /usr/share/java/xstream-benchmark-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/xstream-benchmark.jar
get-orig-source:
-uscan --upstream-version 0 --rename
More information about the pkg-java-commits
mailing list