Author: twerner
Date: 2007-11-25 19:28:50 +0000 (Sun, 25 Nov 2007)
New Revision: 4840
Added:
trunk/libxmlpull-api-java/debian/patches/
trunk/libxmlpull-api-java/debian/patches/build.diff
trunk/libxmlpull-api-java/debian/patches/series
Removed:
trunk/libxmlpull-api-java/debian/ant.properties
trunk/libxmlpull-api-java/debian/build.xml
Modified:
trunk/libxmlpull-api-java/debian/
trunk/libxmlpull-api-java/debian/control
trunk/libxmlpull-api-java/debian/rules
Log:
the package builds now
Property changes on: trunk/libxmlpull-api-java/debian
___________________________________________________________________
Name: mergeWithUpstream
+ 1
Deleted: trunk/libxmlpull-api-java/debian/ant.properties
===================================================================
--- trunk/libxmlpull-api-java/debian/ant.properties 2007-11-25 19:14:22 UTC
(rev 4839)
+++ trunk/libxmlpull-api-java/debian/ant.properties 2007-11-25 19:28:50 UTC
(rev 4840)
@@ -1,4 +0,0 @@
-project.name=xmlpull-api
-class.dir=build
-source.dir=.
-jar=xmlpull.jar
Deleted: trunk/libxmlpull-api-java/debian/build.xml
===================================================================
--- trunk/libxmlpull-api-java/debian/build.xml 2007-11-25 19:14:22 UTC (rev
4839)
+++ trunk/libxmlpull-api-java/debian/build.xml 2007-11-25 19:28:50 UTC (rev
4840)
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project default="jar" name="${project.name}" basedir="..">
-
- <target name="clean">
- <delete dir="${class.dir}" quiet="true"/>
- </target>
-
- <target name="compile" description="o Compile the source files">
- <mkdir dir="${class.dir}"/>
- <javac srcdir="${source.dir}" destdir="${class.dir}"
- debug="true" source="1.5"/>
- </target>
-
- <target name="jar" description="o Create the jar" depends="compile">
- <jar jarfile="${jar}">
- <fileset dir="${class.dir}">
- <include name="**"/>
- </fileset>
- </jar>
- </target>
-
-</project>
Modified: trunk/libxmlpull-api-java/debian/control
===================================================================
--- trunk/libxmlpull-api-java/debian/control 2007-11-25 19:14:22 UTC (rev
4839)
+++ trunk/libxmlpull-api-java/debian/control 2007-11-25 19:28:50 UTC (rev
4840)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Java Maintainers <[EMAIL PROTECTED]>
Uploaders: Torsten Werner <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 5), cdbs
+Build-Depends: debhelper (>= 5), cdbs, quilt
Build-Depends-Indep: ant, java-gcj-compat-dev
Standards-Version: 3.7.2
Homepage: http://www.xmlpull.org
Added: trunk/libxmlpull-api-java/debian/patches/build.diff
===================================================================
--- trunk/libxmlpull-api-java/debian/patches/build.diff
(rev 0)
+++ trunk/libxmlpull-api-java/debian/patches/build.diff 2007-11-25 19:28:50 UTC
(rev 4840)
@@ -0,0 +1,84 @@
+Index: libxmlpull-api-java-1.1.3.4c/build.xml
+===================================================================
+--- libxmlpull-api-java-1.1.3.4c.orig/build.xml 2007-11-25
20:21:48.000000000 +0100
++++ libxmlpull-api-java-1.1.3.4c/build.xml 2007-11-25 20:22:20.000000000
+0100
+@@ -142,7 +142,7 @@
+ <!-- =================================================================== -->
+
+ <target name="api" depends="prepare">
+- <javac debug="${debug}" deprecation="${deprecation}" source="1.2"
target="1.1"
++ <javac debug="${debug}" deprecation="${deprecation}" source="1.3"
target="1.3"
+ srcdir="${src_api}" destdir="${build_classes}"
classpath="${build_classes}"/>
+ </target>
+
+@@ -157,7 +157,7 @@
+
+ <target name="samples" depends="xmlpull">
+ <mkdir dir="${build_samples}"/>
+- <javac debug="${debug}" deprecation="${deprecation}" source="1.2"
target="1.1"
++ <javac debug="${debug}" deprecation="${deprecation}" source="1.3"
target="1.3"
+ srcdir="${src_samples}" destdir="${build_samples}"
+ classpath="${build_classes}"/>
+ </target>
+@@ -174,7 +174,7 @@
+
+ <target name="dom2_builder" depends="api">
+ <mkdir dir="${build_dom2_builder}"/>
+- <javac debug="${debug}" deprecation="${deprecation}" source="1.2"
target="1.1"
++ <javac debug="${debug}" deprecation="${deprecation}" source="1.3"
target="1.3"
+ srcdir="${src_dom2_builder}" destdir="${build_dom2_builder}"
+ classpath="${build_classes}"/>
+ <jar jarfile="${jar_dom2_builder}">
+@@ -184,7 +184,7 @@
+
+ <target name="parser_pool" depends="api">
+ <mkdir dir="${build_parser_pool}"/>
+- <javac debug="${debug}" deprecation="${deprecation}" source="1.2"
target="1.1"
++ <javac debug="${debug}" deprecation="${deprecation}" source="1.3"
target="1.3"
+ srcdir="${src_parser_pool}" destdir="${build_parser_pool}"
+ classpath="${build_classes}"/>
+ <jar jarfile="${jar_parser_pool}">
+@@ -194,7 +194,7 @@
+
+ <target name="sax2" depends="api">
+ <mkdir dir="${build_sax2}"/>
+- <javac debug="${debug}" deprecation="${deprecation}" source="1.2"
target="1.1"
++ <javac debug="${debug}" deprecation="${deprecation}" source="1.3"
target="1.3"
+ srcdir="${src_sax2}" destdir="${build_sax2}">
+ <classpath>
+ <pathelement location="${build_classes}" />
+@@ -210,7 +210,7 @@
+
+ <target name="util" depends="api">
+ <mkdir dir="${build_util}"/>
+- <javac debug="${debug}" deprecation="${deprecation}" source="1.2"
target="1.1"
++ <javac debug="${debug}" deprecation="${deprecation}" source="1.3"
target="1.3"
+ srcdir="${src_util}" destdir="${build_util}"
classpath="${build_classes}"/>
+ <jar jarfile="${jar_util}">
+ <fileset dir="${build_util}"/>
+@@ -219,7 +219,7 @@
+
+ <target name="wrapper" depends="require_junit,util">
+ <mkdir dir="${build_wrapper}"/>
+- <javac debug="${debug}" deprecation="${deprecation}" source="1.2"
target="1.1"
++ <javac debug="${debug}" deprecation="${deprecation}" source="1.3"
target="1.3"
+ srcdir="${src_wrapper}" destdir="${build_wrapper}"
classpath="${build_classes}:${build_util}"/>
+ <jar jarfile="${jar_wrapper}">
+ <fileset dir="${build_wrapper}"/>
+@@ -228,14 +228,14 @@
+
+ <target name="wrapper_tests" depends="require_junit,wrapper">
+ <mkdir dir="${build_addons_tests}"/>
+- <javac debug="${debug}" deprecation="${deprecation}" source="1.2"
target="1.1"
++ <javac debug="${debug}" deprecation="${deprecation}" source="1.3"
target="1.3"
+ srcdir="${src_wrapper_tests}" destdir="${build_wrapper}"
+ classpath="${build_classes}:${build_util}:${build_wrapper}"/>
+ </target>
+
+ <target name="xmlrpc" depends="api">
+ <mkdir dir="${build_xmlrpc}"/>
+- <javac debug="${debug}" deprecation="${deprecation}" source="1.2"
target="1.1"
++ <javac debug="${debug}" deprecation="${deprecation}" source="1.3"
target="1.3"
+ srcdir="${src_xmlrpc}" destdir="${build_xmlrpc}"
classpath="${build_classes}"/>
+ <jar jarfile="${jar_xmlrpc}">
+ <fileset dir="${build_xmlrpc}"/>
Added: trunk/libxmlpull-api-java/debian/patches/series
===================================================================
--- trunk/libxmlpull-api-java/debian/patches/series
(rev 0)
+++ trunk/libxmlpull-api-java/debian/patches/series 2007-11-25 19:28:50 UTC
(rev 4840)
@@ -0,0 +1 @@
+build.diff
Modified: trunk/libxmlpull-api-java/debian/rules
===================================================================
--- trunk/libxmlpull-api-java/debian/rules 2007-11-25 19:14:22 UTC (rev
4839)
+++ trunk/libxmlpull-api-java/debian/rules 2007-11-25 19:28:50 UTC (rev
4840)
@@ -1,14 +1,16 @@
#!/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-gcj
+DEB_ANT_BUILD_TARGET := jar
-install/libxmlpull-api-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/libxmlpull-api-java::
+ install -m644 -D build/lib/xmlpull_*.jar
$(DEB_DESTDIR)/usr/share/java/xmlpull-$(DEB_UPSTREAM_VERSION).jar
+ dh_link -plibxmlpull-api-java
/usr/share/java/xmlpull-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/xmlpull.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
