Author: varun
Date: 2008-01-09 15:08:18 +0000 (Wed, 09 Jan 2008)
New Revision: 5348
Added:
trunk/libcobra-java/debian/patches/
trunk/libcobra-java/debian/patches/disable_proxy.diff
trunk/libcobra-java/debian/patches/series
Modified:
trunk/libcobra-java/debian/build.xml
trunk/libcobra-java/debian/changelog
trunk/libcobra-java/debian/control
trunk/libcobra-java/debian/rules
Log:
* Add patches/disable_proxy.diff patch as a temporary fix to build test/*
files using java-gcj
* debian/control: Bump up Standards-Version to 3.7.3
Modified: trunk/libcobra-java/debian/build.xml
===================================================================
--- trunk/libcobra-java/debian/build.xml 2008-01-09 12:53:21 UTC (rev
5347)
+++ trunk/libcobra-java/debian/build.xml 2008-01-09 15:08:18 UTC (rev
5348)
@@ -11,8 +11,7 @@
<target name="compile" description="Compile the sources">
<mkdir dir="${class.dir}"/>
<javac srcdir="${source.dir}" destdir="${class.dir}"
- excludes="**/test/**" deprecation="true" debug="true"
- optimize="false"/>
+ deprecation="true" debug="true" optimize="false"/>
</target>
<target name="javadoc" description="Creates Javadoc documentation">
Modified: trunk/libcobra-java/debian/changelog
===================================================================
--- trunk/libcobra-java/debian/changelog 2008-01-09 12:53:21 UTC (rev
5347)
+++ trunk/libcobra-java/debian/changelog 2008-01-09 15:08:18 UTC (rev
5348)
@@ -1,3 +1,11 @@
+libcobra-java (0.97.4-2) UNRELEASED; urgency=low
+
+ * Add patches/disable_proxy.diff patch as a temporary fix to build test/*
+ files using java-gcj
+ * debian/control: Bump up Standards-Version to 3.7.3
+
+ -- Varun Hiremath <[EMAIL PROTECTED]> Wed, 09 Jan 2008 20:46:58 +0530
+
libcobra-java (0.97.4-1) unstable; urgency=low
* New upstream release
Modified: trunk/libcobra-java/debian/control
===================================================================
--- trunk/libcobra-java/debian/control 2008-01-09 12:53:21 UTC (rev 5347)
+++ trunk/libcobra-java/debian/control 2008-01-09 15:08:18 UTC (rev 5348)
@@ -2,10 +2,10 @@
Section: utils
Priority: optional
Maintainer: Debian Java Maintainers <[EMAIL PROTECTED]>
-Uploaders: Varun Hiremath <[EMAIL PROTECTED]>, Torsten Werner <[EMAIL
PROTECTED]>
-Build-Depends: cdbs, debhelper (>= 5)
+Uploaders: Varun Hiremath <[EMAIL PROTECTED]>, Torsten Werner <[EMAIL
PROTECTED]>
+Build-Depends: cdbs, debhelper (>= 5), quilt
Build-Depends-Indep: ant, rhino, libxalan2-java, java-gcj-compat-dev
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
Homepage: http://html.xamjwg.org/cobra.jsp
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcobra-java
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcobra-java
Added: trunk/libcobra-java/debian/patches/disable_proxy.diff
===================================================================
--- trunk/libcobra-java/debian/patches/disable_proxy.diff
(rev 0)
+++ trunk/libcobra-java/debian/patches/disable_proxy.diff 2008-01-09
15:08:18 UTC (rev 5348)
@@ -0,0 +1,32 @@
+Index:
libcobra-java-0.97.4/src/org/lobobrowser/html/test/SimpleHtmlRendererContext.java
+===================================================================
+---
libcobra-java-0.97.4.orig/src/org/lobobrowser/html/test/SimpleHtmlRendererContext.java
2008-01-09 20:41:25.000000000 +0530
++++
libcobra-java-0.97.4/src/org/lobobrowser/html/test/SimpleHtmlRendererContext.java
2008-01-09 20:41:28.000000000 +0530
+@@ -242,8 +242,9 @@
+ logger.info("process(): Loading URI=["
+ uri + "].");
+ long time0 = System.currentTimeMillis();
+ // Using potentially different URL for
loading.
+- Proxy proxy =
SimpleHtmlRendererContext.this.getProxy();
+- URLConnection connection = proxy ==
null || proxy == Proxy.NO_PROXY ? finalURLForLoading.openConnection() :
finalURLForLoading.openConnection(proxy);
++ // Proxy proxy =
SimpleHtmlRendererContext.this.getProxy();
++ // URLConnection connection = proxy ==
null || proxy == Proxy.NO_PROXY ? finalURLForLoading.openConnection() :
finalURLForLoading.openConnection(proxy);
++ URLConnection connection =
finalURLForLoading.openConnection();
+
connection.setRequestProperty("User-Agent",
getUserAgentContext().getUserAgent());
+ connection.setRequestProperty("Cookie",
"");
+ if (connection instanceof
HttpURLConnection) {
+Index:
libcobra-java-0.97.4/src/org/lobobrowser/html/test/SimpleHttpRequest.java
+===================================================================
+---
libcobra-java-0.97.4.orig/src/org/lobobrowser/html/test/SimpleHttpRequest.java
2008-01-09 20:41:36.000000000 +0530
++++ libcobra-java-0.97.4/src/org/lobobrowser/html/test/SimpleHttpRequest.java
2008-01-09 20:42:29.000000000 +0530
+@@ -249,8 +249,9 @@
+ String userName, String password) {
+ try {
+ this.abort();
+- Proxy proxy = this.proxy;
+- URLConnection c = proxy == null || proxy ==
Proxy.NO_PROXY ? url.openConnection() : url.openConnection(proxy);
++ URLConnection c = url.openConnection();
++ // Proxy proxy = this.proxy;
++ // URLConnection c = proxy == null || proxy ==
Proxy.NO_PROXY ? url.openConnection() : url.openConnection(proxy);
+ synchronized(this) {
+ this.connection = c;
+ }
Added: trunk/libcobra-java/debian/patches/series
===================================================================
--- trunk/libcobra-java/debian/patches/series (rev 0)
+++ trunk/libcobra-java/debian/patches/series 2008-01-09 15:08:18 UTC (rev
5348)
@@ -0,0 +1 @@
+disable_proxy.diff
Modified: trunk/libcobra-java/debian/rules
===================================================================
--- trunk/libcobra-java/debian/rules 2008-01-09 12:53:21 UTC (rev 5347)
+++ trunk/libcobra-java/debian/rules 2008-01-09 15:08:18 UTC (rev 5348)
@@ -2,6 +2,7 @@
include /usr/share/cdbs/1/class/ant.mk
include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
JAVA_HOME := /usr/lib/jvm/java-gcj
DEB_ANT_BUILDFILE := debian/build.xml
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
