The following commit has been merged in the master branch:
commit 38089ffdc750b3f83ccfb60f9d1fdaf1037004d2
Author: gregor herrmann <[email protected]>
Date: Sun Jun 23 18:26:46 2013 +0200
Refresh patches.
diff --git a/debian/patches/01_extensions.patch
b/debian/patches/01_extensions.patch
index 16384b0..81abbfe 100644
--- a/debian/patches/01_extensions.patch
+++ b/debian/patches/01_extensions.patch
@@ -3,44 +3,43 @@ Description: Use "compile" instead of "compileall" in order
to avoid building
Origin: vendor
Forwarded: no
Author: <[email protected]>
-Last-Update: 2012-04-17
+Last-Update: 2013-06-23
--- a/build.xml
+++ b/build.xml
-@@ -131,6 +131,8 @@
- <javadoc
- destdir="${docs.dir}/api" author="true" use="true"
windowtitle="Glazed Lists" source="${java.target.version}">
- <packageset dir="source"><exclude
name="**/impl/**"/><exclude name="**/migrationkit/**"/></packageset>
+@@ -165,6 +165,8 @@
+ <javadoc
+ destdir="${docs.dir}/api" author="true" use="true"
windowtitle="Glazed Lists" source="${java.target.version}">
+ <packageset dir="source"><exclude
name="**/impl/**"/><exclude name="**/migrationkit/**"/></packageset>
+ <!--
+ we don't build docs for the extensions because they are
not built
- <packageset
dir="extensions/calculation/source"><exclude name="**/impl/**"/></packageset>
- <packageset dir="extensions/swt/source"><exclude
name="**/impl/**"/><exclude name="**/migrationkit/**"/></packageset>
- <packageset dir="extensions/ktable/source"><exclude
name="**/impl/**"/></packageset>
-@@ -148,6 +150,7 @@
- <link href="http://www.jfree.org/jfreechart/api/javadoc/"/>
- <link
href="http://download.java.net/javadesktop/swinglabs/releases/0.8/docs/api/"/>
- <link href="http://www.hibernate.org/hib_docs/v3/api/"/>
+ <packageset
dir="extensions/calculation/source"><exclude name="**/impl/**"/></packageset>
+ <packageset dir="extensions/swt/source"><exclude
name="**/impl/**"/><exclude name="**/migrationkit/**"/></packageset>
+ <packageset dir="extensions/ktable/source"><exclude
name="**/impl/**"/></packageset>
+@@ -182,6 +184,7 @@
+ <link href="http://www.jfree.org/jfreechart/api/javadoc/"/>
+ <link
href="http://download.java.net/javadesktop/swinglabs/releases/0.8/docs/api/"/>
+ <link
href="http://docs.jboss.org/hibernate/core/3.6/javadocs/"/>
+ -->
- <doctitle><![CDATA[<h1>${doctitle}</h1>]]></doctitle>
- <bottom><![CDATA[<a
href="http://publicobject.com/glazedlists/"; target="_top">Glazed Lists</a>,
Copyright © 2003 publicobject.com, O'Dell Engineering.<br>Documentation
build by ${user.name} at ${datestamp.dateAndTime}]]></bottom>
- </javadoc>
-@@ -159,7 +162,11 @@
- Construct the .jar file for use in a library.
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -->
-
-- <target name="jar" depends="compileall"
+ <doctitle><![CDATA[<h1>${doctitle}</h1>]]></doctitle>
+ <bottom><![CDATA[<a href="http://www.glazedlists.com";
target="_top">Glazed Lists</a>, Copyright © 2003 publicobject.com, O'Dell
Engineering.<br>Documentation build by ${user.name} at
${datestamp.dateAndTime}]]></bottom>
+ </javadoc>
+@@ -226,7 +229,11 @@
+ <property name="bundle.version" value="${implementation.version}"/>
+ </target>
+
+ <!--
-+ <target name="jar" depends="compileall"
+ we just depend on "compile" in order to leave out the extensions
-+ -->
-+ <target name="jar" depends="compile"
- description="Creates glazedlists jar file (which is also a valid OSGi
bundle) containing all UI libraries.">
-
- <mkdir dir="tools"/>
-@@ -1032,4 +1039,4 @@
- </delete>
- </target>
-
+ <target name="jar" depends="compileall,update-version-properties"
++ -->
++ <target name="jar" depends="compile,update-version-properties"
+ description="Creates glazedlists jar file (which is also a valid OSGi
bundle) containing all UI libraries.">
+
+ <mkdir dir="tools"/>
+@@ -980,4 +987,4 @@
+ </delete>
+ </target>
+
-</project>
\ No newline at end of file
+</project>
diff --git a/debian/patches/02_javadoc_encoding.patch
b/debian/patches/02_javadoc_encoding.patch
index b8c1e1a..37b8fe2 100644
--- a/debian/patches/02_javadoc_encoding.patch
+++ b/debian/patches/02_javadoc_encoding.patch
@@ -3,16 +3,16 @@ Description: define source encoding for javadocs
Origin: vendor
Forwarded: no
Author: gregor herrmann <[email protected]>
-Last-Update: 2012-04-17
+Last-Update: 2013-06-23
--- a/build.xml
+++ b/build.xml
-@@ -129,7 +129,7 @@
- <!-- document all the source -->
- <mkdir dir="${docs.dir}"/>
- <javadoc
-- destdir="${docs.dir}/api" author="true" use="true"
windowtitle="Glazed Lists" source="${java.target.version}">
-+ destdir="${docs.dir}/api" author="true" use="true"
windowtitle="Glazed Lists" source="${java.target.version}"
encoding="iso-8859-1">
- <packageset dir="source"><exclude
name="**/impl/**"/><exclude name="**/migrationkit/**"/></packageset>
+@@ -163,7 +163,7 @@
+ <!-- document all the source -->
+ <mkdir dir="${docs.dir}"/>
+ <javadoc
+- destdir="${docs.dir}/api" author="true" use="true"
windowtitle="Glazed Lists" source="${java.target.version}">
++ destdir="${docs.dir}/api" author="true" use="true"
windowtitle="Glazed Lists" source="${java.target.version}"
encoding="iso-8859-1">
+ <packageset dir="source"><exclude
name="**/impl/**"/><exclude name="**/migrationkit/**"/></packageset>
<!--
we don't build docs for the extensions because they are
not built
diff --git a/debian/patches/03_no_internet.patch
b/debian/patches/03_no_internet.patch
index cd30069..775c6ea 100644
--- a/debian/patches/03_no_internet.patch
+++ b/debian/patches/03_no_internet.patch
@@ -2,43 +2,43 @@ Description: don't do internet stuff
Forwarded: no
Origin: Vendor
Author: gregor herrmann <[email protected]>
-Last-Update: 2012-04-17
+Last-Update: 2013-06-23
Bug-Debian: http://bugs.debian.org/536988
--- a/build.xml
+++ b/build.xml
-@@ -171,14 +171,16 @@
-
- <mkdir dir="tools"/>
- <!--download the BND library for creating entries in the manifest.mf
file which make it a compliant OSGi bundle. See http://www.osgi.org/ -->
-+ <!--
- <java classname="ca.odell.glazedlists.impl.HttpClient">
- <classpath path="${classes.dir}"/>
- <arg
value="https://glazedlists.dev.java.net/files/documents/1073/110958/bnd.jar"/>
- <arg value="tools/bnd.jar"/>
- </java>
-+ -->
-
- <!-- prepare the bnd task which generates OSGi bundle JARs -->
-- <taskdef resource="aQute/bnd/ant/taskdef.properties"
classpath="tools/bnd.jar"/>
-+ <!-- <taskdef resource="aQute/bnd/ant/taskdef.properties"
classpath="tools/bnd.jar"/> -->
-
- <!-- create a normal jar file -->
- <jar destfile="${target.dir}/${jar.file}" update="true" index="true">
-@@ -191,13 +193,13 @@
- </jar>
-
- <!-- use the BND tool to generate an OSGi jar from scratch, using the
original JAR file as input -->
-- <bnd classpath="${target.dir}/${jar.file}"
output="${target.dir}/${jar.file}.osgi" exceptions="true"
files="glazedlists.bnd"/>
-+ <!-- <bnd classpath="${target.dir}/${jar.file}"
output="${target.dir}/${jar.file}.osgi" exceptions="true"
files="glazedlists.bnd"/> -->
-
- <!-- delete the original jar file -->
-- <delete file="${target.dir}/${jar.file}"/>
-+ <!-- <delete file="${target.dir}/${jar.file}"/> -->
-
- <!-- rename the OSGi Bundle to the orignal jar file's name -->
-- <move file="${target.dir}/${jar.file}.osgi"
toFile="${target.dir}/${jar.file}"/>
-+ <!-- <move file="${target.dir}/${jar.file}.osgi"
toFile="${target.dir}/${jar.file}"/> -->
- </target>
-
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
+@@ -238,14 +238,16 @@
+
+ <mkdir dir="tools"/>
+ <!--download the BND library for creating entries in the manifest.mf
file which make it a compliant OSGi bundle. See http://www.osgi.org/ -->
++ <!--
+ <java classname="ca.odell.glazedlists.impl.HttpClient">
+ <classpath path="${classes.dir}"/>
+ <arg value="${download.tools.url}/bnd/bnd.jar"/>
+ <arg value="tools/bnd.jar"/>
+ </java>
++ -->
+
+ <!-- prepare the bnd task which generates OSGi bundle JARs -->
+- <taskdef resource="aQute/bnd/ant/taskdef.properties"
classpath="tools/bnd.jar"/>
++ <!-- <taskdef resource="aQute/bnd/ant/taskdef.properties"
classpath="tools/bnd.jar"/> -->
+
+ <!-- create a normal jar file -->
+ <jar destfile="${target.dir}/${jar.file}" update="true" index="true">
+@@ -259,13 +261,13 @@
+ </jar>
+
+ <!-- use the BND tool to generate an OSGi jar from scratch, using the
original JAR file as input -->
+- <bnd classpath="${target.dir}/${jar.file}"
output="${target.dir}/${jar.file}.osgi" exceptions="true"
files="glazedlists.bnd"/>
++ <!-- <bnd classpath="${target.dir}/${jar.file}"
output="${target.dir}/${jar.file}.osgi" exceptions="true"
files="glazedlists.bnd"/> -->
+
+ <!-- delete the original jar file -->
+- <delete file="${target.dir}/${jar.file}"/>
++ <!-- <delete file="${target.dir}/${jar.file}"/> -->
+
+ <!-- rename the OSGi Bundle to the orignal jar file's name -->
+- <move file="${target.dir}/${jar.file}.osgi"
toFile="${target.dir}/${jar.file}"/>
++ <!-- <move file="${target.dir}/${jar.file}.osgi"
toFile="${target.dir}/${jar.file}"/> -->
+ </target>
+
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
--
libglazedlists-java packaging
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
