Author: drazzib
Date: 2012-05-28 22:30:16 +0000 (Mon, 28 May 2012)
New Revision: 16071
Added:
tags/libxstream-java/1.4.2-1/
tags/libxstream-java/1.4.2-1/debian/build.properties
tags/libxstream-java/1.4.2-1/debian/build.xml
tags/libxstream-java/1.4.2-1/debian/changelog
tags/libxstream-java/1.4.2-1/debian/control
tags/libxstream-java/1.4.2-1/debian/libxstream-java.poms
tags/libxstream-java/1.4.2-1/debian/manifest
tags/libxstream-java/1.4.2-1/debian/maven.ignoreRules
tags/libxstream-java/1.4.2-1/debian/maven.rules
tags/libxstream-java/1.4.2-1/debian/patches/series
tags/libxstream-java/1.4.2-1/debian/rules
Removed:
tags/libxstream-java/1.4.2-1/debian/changelog
tags/libxstream-java/1.4.2-1/debian/control
tags/libxstream-java/1.4.2-1/debian/libxstream-java.poms
tags/libxstream-java/1.4.2-1/debian/maven.rules
tags/libxstream-java/1.4.2-1/debian/patches/01_fix_classpath.diff
tags/libxstream-java/1.4.2-1/debian/patches/series
tags/libxstream-java/1.4.2-1/debian/rules
Log:
[svn-buildpackage] Tagging libxstream-java 1.4.2-1
Copied: tags/libxstream-java/1.4.2-1/debian/build.properties (from rev 16070,
trunk/libxstream-java/debian/build.properties)
===================================================================
--- tags/libxstream-java/1.4.2-1/debian/build.properties
(rev 0)
+++ tags/libxstream-java/1.4.2-1/debian/build.properties 2012-05-28
22:30:16 UTC (rev 16071)
@@ -0,0 +1,7 @@
+ant.build.javac.source=1.5
+ant.build.javac.target=1.5
+
+javadoc.dir=target/api
+build.sourceDirectory=src/java
+classpath.compile=\
+ ${basedir}/xstream/build/xstream-${version}.jar
\ No newline at end of file
Copied: tags/libxstream-java/1.4.2-1/debian/build.xml (from rev 16070,
trunk/libxstream-java/debian/build.xml)
===================================================================
--- tags/libxstream-java/1.4.2-1/debian/build.xml
(rev 0)
+++ tags/libxstream-java/1.4.2-1/debian/build.xml 2012-05-28 22:30:16 UTC
(rev 16071)
@@ -0,0 +1,47 @@
+<?xml version="1.0"?>
+
+<project name="xstream" default="package" basedir="..">
+
+ <property file="debian/build.properties"/>
+ <property name="maven.build"
value="/usr/share/maven-ant-helper/maven-build.xml"/>
+ <property file="/usr/share/maven-ant-helper/maven-defaults.properties"/>
+
+ <macrodef name="cleanmodule">
+ <attribute name="dir"/>
+ <sequential>
+ <ant target="clean" antfile="${maven.build}" dir="@{dir}">
+ <property name="debian.dir" location="debian" />
+ <property name="project.dir" value="@{dir}" />
+ </ant>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="packagemodule">
+ <attribute name="dir"/>
+ <sequential>
+ <ant target="package" antfile="${maven.build}" dir="@{dir}">
+ <property name="debian.dir" location="debian" />
+ <property name="project.dir" value="@{dir}" />
+ </ant>
+ </sequential>
+ </macrodef>
+
+ <target name="clean">
+ <delete dir="build"/>
+ <cleanmodule dir="xstream/"/>
+ <cleanmodule dir="xstream-benchmark/"/>
+ </target>
+
+ <target name="package">
+ <packagemodule dir="xstream/"/>
+ <packagemodule dir="xstream-benchmark/"/>
+ </target>
+
+ <target name="javadoc">
+ <javadoc destdir="${javadoc.dir}">
+ <packageset dir="xstream/src/java/"/>
+ <packageset dir="xstream-benchmark/src/java/"/>
+ </javadoc>
+ </target>
+
+</project>
Deleted: tags/libxstream-java/1.4.2-1/debian/changelog
===================================================================
--- trunk/libxstream-java/debian/changelog 2012-05-27 14:45:43 UTC (rev
16069)
+++ tags/libxstream-java/1.4.2-1/debian/changelog 2012-05-28 22:30:16 UTC
(rev 16071)
@@ -1,109 +0,0 @@
-libxstream-java (1.3.1-8) UNRELEASED; urgency=low
-
- * Team upload.
- * Remove Michael Koch from Uploaders (Closes: #654106)
- * Update Standards-Version: 3.9.2.
-
- -- tony mancill <tmanc...@debian.org> Sat, 14 Jan 2012 10:26:44 -0800
-
-libxstream-java (1.3.1-7) unstable; urgency=low
-
- * Switch to source format 3.0.
- * Update Standards-Version: 3.9.1.
-
- -- Torsten Werner <twer...@debian.org> Thu, 18 Aug 2011 15:01:00 +0200
-
-libxstream-java (1.3.1-6) unstable; urgency=low
-
- [ Onkar Shinde ]
- * debian/control
- - Add quilt build dependency.
- * debian/rules
- - Include patchsys-quilt.mk rule.
- * debian/patches/01_fix_classpath.diff
- - Add appropriate jar files in classpath using manifest attribute.
- (LP: #457660)
- * debian/patches/series
- - Create new and include the new patch added.
- * debian/README.source
- - Add to comply with policy.
-
- [ Michael Koch ]
- * Added myself to Uploaders.
-
- -- Michael Koch <konque...@gmx.de> Wed, 04 Nov 2009 21:10:05 +0100
-
-libxstream-java (1.3.1-5) unstable; urgency=low
-
- * Switch to default-jdk
- * Build-Depends: replace cglib2.1 with cglib (Closes: #550613)
- * Bump Standards-Version to 3.8.3
- * Bump dh compat to 7
-
- -- Varun Hiremath <va...@debian.org> Thu, 15 Oct 2009 14:35:55 -0400
-
-libxstream-java (1.3.1-4) unstable; urgency=low
-
- * Add missing dependencies to Depends and Suggests
-
- -- Ludovic Claude <ludovic.cla...@laposte.net> Fri, 14 Aug 2009 23:30:34
+0100
-
-libxstream-java (1.3.1-3) unstable; urgency=low
-
- * Upload to unstable.
-
- -- Torsten Werner <twer...@debian.org> Sun, 09 Aug 2009 12:57:52 +0200
-
-libxstream-java (1.3.1-2) experimental; urgency=low
-
- * Change section to java
- * Bump up Standards-Version to 3.8.2
- * Add ${misc:Depends} to Depends to clear Lintian warnings
- * Remove Depends on Java runtimes as it is a library
- * Add the Maven POM to the package
- * Add a Build-Depends-Indep dependency on maven-repo-helper
-
- -- Ludovic Claude <ludovic.cla...@laposte.net> Tue, 28 Jul 2009 20:51:09
+0100
-
-libxstream-java (1.3.1-1) unstable; urgency=low
-
- * New upstream release
- * Minor cleanups
-
- -- Torsten Werner <twer...@debian.org> Thu, 01 Jan 2009 01:20:34 +0100
-
-libxstream-java (1.3-4) unstable; urgency=low
-
- * Fix java bytecode / java runtime version mismatch by setting -source
- and -target to 1.5 (Closes: #503789)
-
- -- Varun Hiremath <va...@debian.org> Sat, 01 Nov 2008 11:41:26 -0400
-
-libxstream-java (1.3-3) unstable; urgency=low
-
- * Really move package to main.
-
- -- Torsten Werner <twer...@debian.org> Mon, 11 Aug 2008 18:13:41 +0200
-
-libxstream-java (1.3-2) unstable; urgency=low
-
- * Build package with OpenJDK now.
- * Move package to main.
- * Bump Standards-Version: 3.8.0 (no changes needed).
-
- -- Torsten Werner <twer...@debian.org> Mon, 11 Aug 2008 17:50:31 +0200
-
-libxstream-java (1.3-1) unstable; urgency=low
-
- * New upstream release
- * Add myself to Uploaders
- * Bump Standards-Version to 3.7.3
- * Remove patches/encoding.diff - not required
-
- -- Varun Hiremath <va...@debian.org> Thu, 28 Feb 2008 15:30:34 +0530
-
-libxstream-java (1.2.2-1) unstable; urgency=low
-
- * initial version (Closes: #453149)
-
- -- Torsten Werner <twer...@debian.org> Sat, 24 Nov 2007 00:01:40 +0100
Copied: tags/libxstream-java/1.4.2-1/debian/changelog (from rev 16070,
trunk/libxstream-java/debian/changelog)
===================================================================
--- tags/libxstream-java/1.4.2-1/debian/changelog
(rev 0)
+++ tags/libxstream-java/1.4.2-1/debian/changelog 2012-05-28 22:30:16 UTC
(rev 16071)
@@ -0,0 +1,120 @@
+libxstream-java (1.4.2-1) unstable; urgency=low
+
+ [ tony mancill ]
+ * Remove Michael Koch from Uploaders (Closes: #654106)
+ * Update Standards-Version: 3.9.3.
+
+ [ Damien Raude-Morvan ]
+ * New upstream release:
+ - Add Build-Depends on libstax-java, libwoodstox-java, libstax2-api-java
+ and libkxml2-java (and Suggests).
+ * Use maven-ant-helper for build:
+ - Add Build-Depends on maven-ant-helper.
+ - New debian/build.xml.
+ - Drop patch on MANIFEST.MF update and use jh_manifest.
+ - Add Build-Depends on javahelper.
+ * Add myself as Uploader.
+
+ -- Damien Raude-Morvan <draz...@debian.org> Mon, 28 May 2012 23:14:16 +0200
+
+libxstream-java (1.3.1-7) unstable; urgency=low
+
+ * Switch to source format 3.0.
+ * Update Standards-Version: 3.9.1.
+
+ -- Torsten Werner <twer...@debian.org> Thu, 18 Aug 2011 15:01:00 +0200
+
+libxstream-java (1.3.1-6) unstable; urgency=low
+
+ [ Onkar Shinde ]
+ * debian/control
+ - Add quilt build dependency.
+ * debian/rules
+ - Include patchsys-quilt.mk rule.
+ * debian/patches/01_fix_classpath.diff
+ - Add appropriate jar files in classpath using manifest attribute.
+ (LP: #457660)
+ * debian/patches/series
+ - Create new and include the new patch added.
+ * debian/README.source
+ - Add to comply with policy.
+
+ [ Michael Koch ]
+ * Added myself to Uploaders.
+
+ -- Michael Koch <konque...@gmx.de> Wed, 04 Nov 2009 21:10:05 +0100
+
+libxstream-java (1.3.1-5) unstable; urgency=low
+
+ * Switch to default-jdk
+ * Build-Depends: replace cglib2.1 with cglib (Closes: #550613)
+ * Bump Standards-Version to 3.8.3
+ * Bump dh compat to 7
+
+ -- Varun Hiremath <va...@debian.org> Thu, 15 Oct 2009 14:35:55 -0400
+
+libxstream-java (1.3.1-4) unstable; urgency=low
+
+ * Add missing dependencies to Depends and Suggests
+
+ -- Ludovic Claude <ludovic.cla...@laposte.net> Fri, 14 Aug 2009 23:30:34
+0100
+
+libxstream-java (1.3.1-3) unstable; urgency=low
+
+ * Upload to unstable.
+
+ -- Torsten Werner <twer...@debian.org> Sun, 09 Aug 2009 12:57:52 +0200
+
+libxstream-java (1.3.1-2) experimental; urgency=low
+
+ * Change section to java
+ * Bump up Standards-Version to 3.8.2
+ * Add ${misc:Depends} to Depends to clear Lintian warnings
+ * Remove Depends on Java runtimes as it is a library
+ * Add the Maven POM to the package
+ * Add a Build-Depends-Indep dependency on maven-repo-helper
+
+ -- Ludovic Claude <ludovic.cla...@laposte.net> Tue, 28 Jul 2009 20:51:09
+0100
+
+libxstream-java (1.3.1-1) unstable; urgency=low
+
+ * New upstream release
+ * Minor cleanups
+
+ -- Torsten Werner <twer...@debian.org> Thu, 01 Jan 2009 01:20:34 +0100
+
+libxstream-java (1.3-4) unstable; urgency=low
+
+ * Fix java bytecode / java runtime version mismatch by setting -source
+ and -target to 1.5 (Closes: #503789)
+
+ -- Varun Hiremath <va...@debian.org> Sat, 01 Nov 2008 11:41:26 -0400
+
+libxstream-java (1.3-3) unstable; urgency=low
+
+ * Really move package to main.
+
+ -- Torsten Werner <twer...@debian.org> Mon, 11 Aug 2008 18:13:41 +0200
+
+libxstream-java (1.3-2) unstable; urgency=low
+
+ * Build package with OpenJDK now.
+ * Move package to main.
+ * Bump Standards-Version: 3.8.0 (no changes needed).
+
+ -- Torsten Werner <twer...@debian.org> Mon, 11 Aug 2008 17:50:31 +0200
+
+libxstream-java (1.3-1) unstable; urgency=low
+
+ * New upstream release
+ * Add myself to Uploaders
+ * Bump Standards-Version to 3.7.3
+ * Remove patches/encoding.diff - not required
+
+ -- Varun Hiremath <va...@debian.org> Thu, 28 Feb 2008 15:30:34 +0530
+
+libxstream-java (1.2.2-1) unstable; urgency=low
+
+ * initial version (Closes: #453149)
+
+ -- Torsten Werner <twer...@debian.org> Sat, 24 Nov 2007 00:01:40 +0100
Deleted: tags/libxstream-java/1.4.2-1/debian/control
===================================================================
--- trunk/libxstream-java/debian/control 2012-05-27 14:45:43 UTC (rev
16069)
+++ tags/libxstream-java/1.4.2-1/debian/control 2012-05-28 22:30:16 UTC (rev
16071)
@@ -1,48 +0,0 @@
-Source: libxstream-java
-Section: java
-Priority: optional
-Maintainer: Debian Java Maintainers
<pkg-java-maintainers@lists.alioth.debian.org>
-Uploaders: Torsten Werner <twer...@debian.org>, Varun Hiremath
<va...@debian.org>
-Build-Depends: debhelper (>= 7), cdbs
-Build-Depends-Indep: ant, default-jdk, libxom-java, libjoda-time-java,
- libjettison-java, libcglib-java, libdom4j-java, libxpp3-java,
- libjdom1-java, maven-repo-helper
-Standards-Version: 3.9.2
-Homepage: http://xstream.codehaus.org
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libxstream-java
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libxstream-java
-
-Package: libxstream-java
-Architecture: all
-Depends: ${misc:Depends}, libxpp3-java
-Suggests: libdom4j-java, libjdom1-java, libjoda-time-java, libstax-java,
- libxom-java, libcglib2.1-java, libjettison-java
-Description: Java library to serialize objects to XML and back again
- The features of the XStream library are:
- .
- - Ease of use. A high level facade is supplied that simplifies common
- use cases.
- - No mappings required. Most objects can be serialized without need
- for specifying mappings.
- - Performance. Speed and low memory footprint are a crucial part of
- the design, making it suitable for large object graphs or systems
- with high message throughput.
- - Clean XML. No information is duplicated that can be obtained via
- reflection. This results in XML that is easier to read for humans
- and more compact than native Java serialization.
- - Requires no modifications to objects. Serializes internal fields,
- including private and final. Supports non-public and inner classes.
- Classes are not required to have default constructor.
- - Full object graph support. Duplicate references encountered in the
- object-model will be maintained. Supports circular references.
- - Integrates with other XML APIs. By implementing an interface,
- XStream can serialize directly to/from any tree structure (not just
- XML).
- - Customizable conversion strategies. Strategies can be registered
- allowing customization of how particular types are represented as
- XML.
- - Error messages. When an exception occurs due to malformed XML,
- detailed diagnostics are provided to help isolate and fix the
- problem.
- - Alternative output format. The modular design allows other output
- formats. XStream ships currently with JSON support and morphing.
Copied: tags/libxstream-java/1.4.2-1/debian/control (from rev 16070,
trunk/libxstream-java/debian/control)
===================================================================
--- tags/libxstream-java/1.4.2-1/debian/control (rev 0)
+++ tags/libxstream-java/1.4.2-1/debian/control 2012-05-28 22:30:16 UTC (rev
16071)
@@ -0,0 +1,72 @@
+Source: libxstream-java
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers
<pkg-java-maintainers@lists.alioth.debian.org>
+Uploaders: Torsten Werner <twer...@debian.org>,
+ Varun Hiremath <va...@debian.org>,
+ Damien Raude-Morvan <draz...@debian.org>
+Build-Depends: ant,
+ cdbs,
+ debhelper (>= 7),
+ default-jdk,
+ javahelper,
+ libcglib-java,
+ libdom4j-java,
+ libjdom1-java,
+ libjettison-java,
+ libjoda-time-java,
+ libkxml2-java,
+ libstax-java,
+ libstax2-api-java,
+ libwoodstox-java,
+ libxom-java,
+ libxpp3-java,
+ maven-ant-helper,
+ maven-repo-helper
+Standards-Version: 3.9.3
+Homepage: http://xstream.codehaus.org
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libxstream-java
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libxstream-java
+
+Package: libxstream-java
+Architecture: all
+Depends: libxpp3-java, ${misc:Depends}
+Suggests: libcglib-java,
+ libdom4j-java,
+ libjdom1-java,
+ libjettison-java,
+ libjoda-time-java,
+ libkxml2-java,
+ libstax-java,
+ libstax2-api-java,
+ libwoodstox-java,
+ libxom-java
+Description: Java library to serialize objects to XML and back again
+ The features of the XStream library are:
+ .
+ - Ease of use. A high level facade is supplied that simplifies common
+ use cases.
+ - No mappings required. Most objects can be serialized without need
+ for specifying mappings.
+ - Performance. Speed and low memory footprint are a crucial part of
+ the design, making it suitable for large object graphs or systems
+ with high message throughput.
+ - Clean XML. No information is duplicated that can be obtained via
+ reflection. This results in XML that is easier to read for humans
+ and more compact than native Java serialization.
+ - Requires no modifications to objects. Serializes internal fields,
+ including private and final. Supports non-public and inner classes.
+ Classes are not required to have default constructor.
+ - Full object graph support. Duplicate references encountered in the
+ object-model will be maintained. Supports circular references.
+ - Integrates with other XML APIs. By implementing an interface,
+ XStream can serialize directly to/from any tree structure (not just
+ XML).
+ - Customizable conversion strategies. Strategies can be registered
+ allowing customization of how particular types are represented as
+ XML.
+ - Error messages. When an exception occurs due to malformed XML,
+ detailed diagnostics are provided to help isolate and fix the
+ problem.
+ - Alternative output format. The modular design allows other output
+ formats. XStream ships currently with JSON support and morphing.
Deleted: tags/libxstream-java/1.4.2-1/debian/libxstream-java.poms
===================================================================
--- trunk/libxstream-java/debian/libxstream-java.poms 2012-05-27 14:45:43 UTC
(rev 16069)
+++ tags/libxstream-java/1.4.2-1/debian/libxstream-java.poms 2012-05-28
22:30:16 UTC (rev 16071)
@@ -1,4 +0,0 @@
-pom.xml --no-parent
-xstream/pom.xml
-xstream-benchmark/pom.xml
-
Copied: tags/libxstream-java/1.4.2-1/debian/libxstream-java.poms (from rev
16070, trunk/libxstream-java/debian/libxstream-java.poms)
===================================================================
--- tags/libxstream-java/1.4.2-1/debian/libxstream-java.poms
(rev 0)
+++ tags/libxstream-java/1.4.2-1/debian/libxstream-java.poms 2012-05-28
22:30:16 UTC (rev 16071)
@@ -0,0 +1,3 @@
+pom.xml --no-parent
+xstream/pom.xml --java-lib
+xstream-benchmark/pom.xml --java-lib
Copied: tags/libxstream-java/1.4.2-1/debian/manifest (from rev 16070,
trunk/libxstream-java/debian/manifest)
===================================================================
--- tags/libxstream-java/1.4.2-1/debian/manifest
(rev 0)
+++ tags/libxstream-java/1.4.2-1/debian/manifest 2012-05-28 22:30:16 UTC
(rev 16071)
@@ -0,0 +1,2 @@
+usr/share/java/xstream.jar:
+ Class-Path: cglib.jar dom4j.jar jdom1.jar jettison.jar joda-time.jar xom.jar
xpp3.jar xpp3-xpath.jar
\ No newline at end of file
Copied: tags/libxstream-java/1.4.2-1/debian/maven.ignoreRules (from rev 16070,
trunk/libxstream-java/debian/maven.ignoreRules)
===================================================================
--- tags/libxstream-java/1.4.2-1/debian/maven.ignoreRules
(rev 0)
+++ tags/libxstream-java/1.4.2-1/debian/maven.ignoreRules 2012-05-28
22:30:16 UTC (rev 16071)
@@ -0,0 +1,36 @@
+# Maven ignore rules - ignore some Maven dependencies and plugins
+# Format of this file is:
+# [group] [artifact] [type] [version] [classifier] [scope]
+# where each element can be either
+# - the exact string, for example org.apache for the group, or 3.1
+# for the version. In this case, the element is simply matched
+# and left as it is
+# - * (the star character, alone). In this case, anything will
+# match and be left as it is. For example, using * on the
+# position of the artifact field will match any artifact id
+# All elements much match before a rule can be applied
+# Example rule: match jar with groupid= junit, artifactid= junit
+# and version starting with 3., this dependency is then removed
+# from the POM
+# junit junit jar s/3\..*/3.x/
+
+com.megginson.sax xml-writer * * * *
+commons-cli commons-cli * * * *
+commons-io commons-io * * * *
+commons-lang commons-lang * * * *
+jmock jmock * * * *
+org.apache.maven.plugins maven-assembly-plugin * * * *
+org.apache.maven.plugins maven-eclipse-plugin * * * *
+org.apache.maven.plugins maven-enforcer-plugin * * * *
+org.apache.maven.plugins maven-javadoc-plugin * * * *
+org.apache.maven.plugins maven-release-plugin * * * *
+org.apache.maven.plugins maven-source-plugin * * * *
+org.apache.maven.plugins maven-surefire-plugin * * * *
+org.apache.maven.plugins maven-surefire-report-plugin * * * *
+org.apache.maven.wagon wagon-webdav * * * *
+org.codehaus.mojo cobertura-maven-plugin * * * *
+org.codehaus.mojo jxr-maven-plugin * * * *
+org.codehaus.woodstox wstx-asl * * * *
+org.json json * * * *
+oro oro * * * *
+xmlpull xmlpull * * * *
Deleted: tags/libxstream-java/1.4.2-1/debian/maven.rules
===================================================================
--- trunk/libxstream-java/debian/maven.rules 2012-05-27 14:45:43 UTC (rev
16069)
+++ tags/libxstream-java/1.4.2-1/debian/maven.rules 2012-05-28 22:30:16 UTC
(rev 16071)
@@ -1 +0,0 @@
-junit junit jar s/3\..*/3.x/
Copied: tags/libxstream-java/1.4.2-1/debian/maven.rules (from rev 16070,
trunk/libxstream-java/debian/maven.rules)
===================================================================
--- tags/libxstream-java/1.4.2-1/debian/maven.rules
(rev 0)
+++ tags/libxstream-java/1.4.2-1/debian/maven.rules 2012-05-28 22:30:16 UTC
(rev 16071)
@@ -0,0 +1,31 @@
+# Maven rules - transform Maven dependencies and plugins
+# Format of this file is:
+# [group] [artifact] [type] [version] [classifier] [scope]
+# where each element can be either
+# - the exact string, for example org.apache for the group, or 3.1
+# for the version. In this case, the element is simply matched
+# and left as it is
+# - * (the star character, alone). In this case, anything will
+# match and be left as it is. For example, using * on the
+# position of the artifact field will match any artifact id
+# - a regular expression of the form s/match/replace/
+# in this case, elements that match are transformed using
+# the regex rule.
+# All elements much match before a rule can be applied
+# Example rule: match jar with groupid= junit, artifactid= junit
+# and version starting with 3., replacing the version with 3.x
+# junit junit jar s/3\..*/3.x/
+
+com.thoughtworks.xstream xstream-benchmark jar s/.*/debian/ * *
+com.thoughtworks.xstream xstream-distribution pom s/.*/debian/ * *
+com.thoughtworks.xstream xstream-hibernate jar s/.*/debian/ * *
+com.thoughtworks.xstream xstream-parent pom s/.*/debian/ * *
+com.thoughtworks.xstream xstream jar s/.*/debian/ * *
+s/jdom/org.jdom/ jdom jar s/1\..*/debian/ * *
+s/net.sf.kxml/kxml2/ kxml2-min jar s/.*/debian/ * *
+s/net.sf.kxml/kxml2/ kxml2 jar s/.*/debian/ * *
+joda-time joda-time jar s/.*/debian/ * *
+junit junit jar s/3\..*/3.x/ * *
+org.codehaus.jettison jettison s/bundle/jar/ s/.*/debian/ * *
+s/hsqldb/org.hsqldb/ hsqldb * s/.*/debian/ * *
+s/jboss/javassist/ javassist * s/.*/debian/ * *
Deleted: tags/libxstream-java/1.4.2-1/debian/patches/01_fix_classpath.diff
===================================================================
--- trunk/libxstream-java/debian/patches/01_fix_classpath.diff 2012-05-27
14:45:43 UTC (rev 16069)
+++ tags/libxstream-java/1.4.2-1/debian/patches/01_fix_classpath.diff
2012-05-28 22:30:16 UTC (rev 16071)
@@ -1,28 +0,0 @@
-Index: libxstream-java-1.3.1/xstream/build.xml
-===================================================================
---- libxstream-java-1.3.1.orig/xstream/build.xml 2009-11-04
21:39:34.000000000 +0530
-+++ libxstream-java-1.3.1/xstream/build.xml 2009-11-04 21:41:56.000000000
+0530
-@@ -25,6 +25,7 @@
- <property name="test.src.includes" value="**/*Test.java"/>
- <property name="test.src.excludes" value="**/Abstract*"/>
- <property name="junit.haltonfailure" value="false"/>
-+ <property name="manifest.classpath" value="cglib.jar dom4j.jar jdom1.jar
jettison.jar joda-time.jar xom.jar xpp3.jar xpp3-xpath.jar"/>
-
- <available property="jdk1.4.available"
classname="java.lang.StackTraceElement"/>
- <available property="jdk1.5.available" classname="java.lang.Enum"/>
-@@ -144,9 +145,15 @@
-
- <target name="jar" depends="compile">
- <jar jarfile="${build.dir}/xstream-${version}.jar">
-+ <manifest>
-+ <attribute name="Class-Path" value="${manifest.classpath}"/>
-+ </manifest>
- <fileset dir="${java.build.dir}"/>
- </jar>
- <jar jarfile="${build.dir}/xstream-benchmark-${version}.jar">
-+ <manifest>
-+ <attribute name="Class-Path" value="${manifest.classpath}"/>
-+ </manifest>
- <fileset dir="${benchmark.build.dir}"/>
- </jar>
- <antcall target="jdk-check"/>
Deleted: tags/libxstream-java/1.4.2-1/debian/patches/series
===================================================================
--- trunk/libxstream-java/debian/patches/series 2012-05-27 14:45:43 UTC (rev
16069)
+++ tags/libxstream-java/1.4.2-1/debian/patches/series 2012-05-28 22:30:16 UTC
(rev 16071)
@@ -1 +0,0 @@
-01_fix_classpath.diff
Copied: tags/libxstream-java/1.4.2-1/debian/patches/series (from rev 16070,
trunk/libxstream-java/debian/patches/series)
===================================================================
Deleted: tags/libxstream-java/1.4.2-1/debian/rules
===================================================================
--- trunk/libxstream-java/debian/rules 2012-05-27 14:45:43 UTC (rev 16069)
+++ tags/libxstream-java/1.4.2-1/debian/rules 2012-05-28 22:30:16 UTC (rev
16071)
@@ -1,23 +0,0 @@
-#!/usr/bin/make -f
-
-include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-
-PACKAGE := $(DEB_SOURCE_PACKAGE)
-VERSION := $(DEB_UPSTREAM_VERSION)
-JAVA_HOME := /usr/lib/jvm/default-java
-DEB_ANT_BUILDFILE := xstream/build.xml
-DEB_ANT_BUILD_TARGET := benchmark:compile jar
-DEB_JARS := ant-nodeps xom joda-time jettison cglib dom4j xpp3
jdom1
-ANT_OPTS := -Dant.build.javac.source=1.5
-Dant.build.javac.target=1.5
-
-binary-post-install/$(PACKAGE)::
- mh_installpoms -p$(PACKAGE)
- mh_installjar -p$(PACKAGE) -l xstream/pom.xml
xstream/target/xstream-SNAPSHOT.jar
- mh_installjar -p$(PACKAGE) -l xstream-benchmark/pom.xml
xstream/target/xstream-benchmark-SNAPSHOT.jar
-
-clean::
- -rm -rf debian/tmp
-
-get-orig-source:
- uscan --force-download --rename
Copied: tags/libxstream-java/1.4.2-1/debian/rules (from rev 16070,
trunk/libxstream-java/debian/rules)
===================================================================
--- tags/libxstream-java/1.4.2-1/debian/rules (rev 0)
+++ tags/libxstream-java/1.4.2-1/debian/rules 2012-05-28 22:30:16 UTC (rev
16071)
@@ -0,0 +1,27 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/ant.mk
+
+PACKAGE := $(DEB_SOURCE_PACKAGE)
+VERSION := $(DEB_UPSTREAM_VERSION)
+JAVA_HOME := /usr/lib/jvm/default-java
+DEB_JARS := ant-nodeps xom joda-time jettison cglib dom4j xpp3
jdom1 stax woodstox-core-lgpl kxml2 stax2-api
+DEB_ANT_BUILD_TARGET := package javadoc
+DEB_ANT_BUILDFILE := debian/build.xml
+DEB_ANT_ARGS := -Dbasedir=$(realpath .) -Dpackage=xstream
-Dversion=$(VERSION)
+
+pre-build::
+ -rm
xstream/src/java/com/thoughtworks/xstream/converters/reflection/HarmonyReflectionProvider.java
+
+binary-post-install/$(PACKAGE)::
+ mh_installpoms -p$(PACKAGE)
+ mh_installjar -p$(PACKAGE) -l xstream/pom.xml
xstream/build/xstream-$(VERSION).jar
+ mh_installjar -p$(PACKAGE) -l xstream-benchmark/pom.xml
xstream-benchmark/build/xstream-benchmark-$(VERSION).jar
+ jh_manifest
+
+clean::
+ mh_clean
+
+get-orig-source:
+ uscan --force-download --rename
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
