diff -Nru tvbrowser-2.7.5+dfsg/debian/changelog tvbrowser-2.7.5+dfsg/debian/changelog
--- tvbrowser-2.7.5+dfsg/debian/changelog	2010-01-21 10:44:07.000000000 +0000
+++ tvbrowser-2.7.5+dfsg/debian/changelog	2010-02-17 13:33:21.000000000 +0000
@@ -1,6 +1,7 @@
-tvbrowser (2.7.5+dfsg-0~px4) unstable; urgency=low
+tvbrowser (2.7.5+dfsg-0~px5) unstable; urgency=low
 
   * New upstream release: 2.7.5
+  * Bumped Standards-Version to 3.8.4
   * Switched to dpkg-source 3.0 (quilt) format
   * Switched patch system from dpatch to quilt
   * Added patch to be able to update commons-compress.jar to version 1.0
@@ -12,8 +13,10 @@
   * Removed unused jar-files from upstream tarball
   * Wrote a script for "debian/rules get-orig-source" to automatically create
     a modified source tarball
+  * Added a patch which adds java.net.preferIPv4Stack=true option
+    to avoid net.ipv6.bindv6only=1 problems.
 
- -- Per Wawra <debian.perfide@safersignup.com>  Thu, 21 Jan 2010 00:00:00 +0100
+ -- Per Wawra <debian.perfide@safersignup.com>  Wed, 17 Feb 2010 00:00:00 +0100
 
 tvbrowser (2.7.4-0px1) unstable; urgency=low
 
diff -Nru tvbrowser-2.7.5+dfsg/debian/control tvbrowser-2.7.5+dfsg/debian/control
--- tvbrowser-2.7.5+dfsg/debian/control	2010-01-21 03:05:57.000000000 +0000
+++ tvbrowser-2.7.5+dfsg/debian/control	2010-02-17 13:33:34.000000000 +0000
@@ -7,7 +7,7 @@
  libcommons-compress-java, libcommons-lang-java, libcommons-net-java,
  libgdata-java, libjgoodies-forms-java, libjgoodies-looks-java, liblucene2-java,
  liboro-java, libskinlf-java, libstax-java, libtvanytimeapi-java
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Homepage: http://www.tvbrowser.org/
 
 Package: tvbrowser
diff -Nru tvbrowser-2.7.5+dfsg/debian/patches/43_native_jar_paths.diff tvbrowser-2.7.5+dfsg/debian/patches/43_native_jar_paths.diff
--- tvbrowser-2.7.5+dfsg/debian/patches/43_native_jar_paths.diff	2010-01-20 21:59:17.000000000 +0000
+++ tvbrowser-2.7.5+dfsg/debian/patches/43_native_jar_paths.diff	2010-02-17 15:32:01.000000000 +0000
@@ -16,8 +16,12 @@
    <property name="txt.dir" value="txt"/>
    <property name="src.dir" value="src"/>
    <property name="test.src.dir" value="test/src"/>
-@@ -87,8 +88,32 @@
-   <path id="classpath">
+@@ -84,11 +85,35 @@
+     <pathelement location="${src.dir}"/>
+   </path>
+ 
+-  <path id="classpath">
++  <path id="classpath"> <!-- not yet part of Debian -->
      <pathelement location="${classes.dir}"/>
      <fileset dir="${lib.dir}">
 -      <include name="*.jar"/>
@@ -29,25 +33,25 @@
 +    </fileset>
 +  </path>
 +
-+  <path id="nclasspath">
++  <path id="nclasspath"> <!-- part of Debian -->
 +    <pathelement location="${classes.dir}"/>
 +    <fileset dir="${nlib.dir}">
-+      <include name="bsh-2.0b4.jar"/>
-+      <include name="commons-codec-1.4.jar"/>
-+      <include name="commons-compress-1.0.jar"/>
-+      <include name="commons-lang-2.4.jar"/>
-+      <include name="commons-net-1.4.1.jar"/>
-+      <include name="forms-1.2.0.jar"/>
-+      <include name="gdata-calendar-2.0.jar"/>
-+      <include name="gdata-client-1.0.jar"/>
-+      <include name="gdata-core-1.0.jar"/>
-+      <include name="looks.jar"/>
-+      <include name="lucene-core-2.9.1.jar"/>
-+      <include name="oro-2.0.8.jar"/>
-+      <include name="skinlf-6.7.jar"/>
-+      <include name="stax-1.2.0.jar"/>
-+      <include name="stax-api-1.0.1.jar"/>
-+      <include name="tvanytimeapi-1.3.jar"/>
++      <include name="bsh.jar"/> <!-- bsh-2.0b4.jar -->
++      <include name="commons-codec.jar"/> <!-- commons-codec-1.4.jar -->
++      <include name="commons-compress.jar"/> <!-- commons-compress-1.0.jar -->
++      <include name="commons-lang.jar"/> <!-- commons-lang-2.4.jar -->
++      <include name="commons-net.jar"/> <!-- commons-net-1.4.1.jar -->
++      <include name="forms.jar"/> <!-- forms-1.2.0.jar -->
++      <include name="gdata-calendar.jar"/> <!-- gdata-calendar-2.0.jar -->
++      <include name="gdata-client.jar"/> <!-- gdata-client-1.0.jar -->
++      <include name="gdata-core.jar"/> <!-- gdata-core-1.0.jar -->
++      <include name="looks.jar"/> <!-- 2.3.1-1 -->
++      <include name="lucene-core.jar"/> <!-- lucene-core-2.9.1.jar -->
++      <include name="oro.jar"/> <!-- oro-2.0.8.jar -->
++      <include name="skinlf.jar"/> <!-- skinlf-6.7.jar -->
++      <include name="stax.jar"/> <!-- stax-1.2.0.jar -->
++      <include name="stax-api.jar"/> <!-- stax-api-1.0.1.jar -->
++      <include name="tvanytimeapi.jar"/> <!-- tvanytimeapi-1.3.jar -->
      </fileset>
    </path>
  
@@ -59,7 +63,7 @@
          <path refid="classpath"/>
        </classpath>
        <exclude name="**/macosx/*"/>
-@@ -320,22 +346,24 @@
+@@ -320,23 +346,25 @@
  
      <!-- Extract the libraries for the tvbrowser.jar into the temp.dir -->
      <mkdir dir="${unpacked.dir}/skinlf.jar"/>
@@ -67,11 +71,12 @@
 -    <unjar src="${lib.dir}/bsh-2.0b4.jar" dest="${unpacked.dir}/bsh-2.0b4.jar"/>
 -    <unjar src="${lib.dir}/forms-1.2.0.jar" dest="${unpacked.dir}/forms-1.2.0.jar"/>
 -    <unjar src="${lib.dir}/looks-2.1.4.jar" dest="${unpacked.dir}/looks-2.1.4.jar"/>
-+    <unjar src="${nlib.dir}/skinlf-6.7.jar" dest="${unpacked.dir}/skinlf-6.7.jar"/>
-+    <unjar src="${nlib.dir}/bsh-2.0b4.jar" dest="${unpacked.dir}/bsh-2.0b4.jar"/>
-+    <unjar src="${nlib.dir}/forms-1.2.0.jar" dest="${unpacked.dir}/forms-1.2.0.jar"/>
-+    <unjar src="${nlib.dir}/looks.jar" dest="${unpacked.dir}/looks.jar"/>
-     <unjar src="${lib.dir}/l2fprod-common-tasks.jar" dest="${unpacked.dir}/l2fprod-common-tasks.jar"/>
+-    <unjar src="${lib.dir}/l2fprod-common-tasks.jar" dest="${unpacked.dir}/l2fprod-common-tasks.jar"/>
++    <unjar src="${nlib.dir}/skinlf.jar" dest="${unpacked.dir}/skinlf.jar"/> <!-- skinlf-6.7.jar -->
++    <unjar src="${nlib.dir}/bsh.jar" dest="${unpacked.dir}/bsh.jar"/> <!-- bsh-2.0b4.jar -->
++    <unjar src="${nlib.dir}/forms.jar" dest="${unpacked.dir}/forms.jar"/> <!-- forms-1.2.0.jar -->
++    <unjar src="${nlib.dir}/looks.jar" dest="${unpacked.dir}/looks.jar"/> <!-- 2.3.1 -->
++    <unjar src="${lib.dir}/l2fprod-common-tasks.jar" dest="${unpacked.dir}/l2fprod-common-tasks.jar"/> <!-- not yet part of Debian -->
 +    <!--
      <unjar src="${lib.dir}/jRegistryKey.jar" dest="${unpacked.dir}/jRegistryKey.jar" /> 	 
 -    <unjar src="${lib.dir}/TVAnytimeAPI.jar" dest="${unpacked.dir}/TVAnytimeAPI.jar" /> 	 
@@ -81,101 +86,184 @@
 -    <unjar src="${lib.dir}/gdata-calendar-1.0.jar" dest="${unpacked.dir}/gdata-calendar-1.0.jar" />
 -    <unjar src="${lib.dir}/gdata-client-1.0.jar" dest="${unpacked.dir}/gdata-client-1.0.jar" /> 	   	
 -    <unjar src="${lib.dir}/gdata-core-1.0.jar" dest="${unpacked.dir}/gdata-core-1.0.jar" />
-+    -->
-+    <unjar src="${nlib.dir}/tvanytimeapi-1.3.jar" dest="${unpacked.dir}/tvanytimeapi-1.3.jar" /> 	 
-+    <unjar src="${nlib.dir}/commons-compress-1.0.jar" dest="${unpacked.dir}/commons-compress-1.0.jar" />
-+    <unjar src="${nlib.dir}/commons-codec-1.4.jar" dest="${unpacked.dir}/commons-codec-1.4.jar" />
-+    <unjar src="${nlib.dir}/commons-lang-2.4.jar" dest="${unpacked.dir}/commons-lang-2.4.jar" />
-+    <unjar src="${nlib.dir}/gdata-calendar-2.0.jar" dest="${unpacked.dir}/gdata-calendar-2.0.jar" />
-+    <unjar src="${nlib.dir}/gdata-client-1.0.jar" dest="${unpacked.dir}/gdata-client-1.0.jar" /> 	   	
-+    <unjar src="${nlib.dir}/gdata-core-1.0.jar" dest="${unpacked.dir}/gdata-core-1.0.jar" />
-     <unjar src="${lib.dir}/jcom.jar" dest="${unpacked.dir}/jcom.jar" />
+-    <unjar src="${lib.dir}/jcom.jar" dest="${unpacked.dir}/jcom.jar" />
 -    <unjar src="${lib.dir}/lucene-core-2.3.1.jar" dest="${unpacked.dir}/lucene-core-2.3.1.jar"/>
 -    <unjar src="${lib.dir}/jakarta-oro-2.0.8.jar" dest="${unpacked.dir}/jakarta-oro-2.0.8.jar" /> 
-+    <unjar src="${nlib.dir}/lucene-core-2.9.1.jar" dest="${unpacked.dir}/lucene-core-2.9.1.jar"/>
-+    <unjar src="${nlib.dir}/oro-2.0.8.jar" dest="${unpacked.dir}/oro-2.0.8.jar" /> 
-     <unjar src="${lib.dir}/opencsv-1.8.jar" dest="${unpacked.dir}/opencsv-1.8.jar" />
+-    <unjar src="${lib.dir}/opencsv-1.8.jar" dest="${unpacked.dir}/opencsv-1.8.jar" />
++    -->
++    <unjar src="${nlib.dir}/tvanytimeapi.jar" dest="${unpacked.dir}/tvanytimeapi.jar" /> <!-- tvanytimeapi-1.3.jar -->
++    <unjar src="${nlib.dir}/commons-compress.jar" dest="${unpacked.dir}/commons-compress.jar" /> <!-- commons-compress-1.0.jar -->
++    <unjar src="${nlib.dir}/commons-codec.jar" dest="${unpacked.dir}/commons-codec.jar" /> <!-- commons-codec-1.4.jar -->
++    <unjar src="${nlib.dir}/commons-lang.jar" dest="${unpacked.dir}/commons-lang.jar" /> <!-- commons-lang-2.4.jar -->
++    <unjar src="${nlib.dir}/gdata-calendar.jar" dest="${unpacked.dir}/gdata-calendar.jar" /> <!-- gdata-calendar-2.0.jar -->
++    <unjar src="${nlib.dir}/gdata-client.jar" dest="${unpacked.dir}/gdata-client.jar" /> <!-- gdata-client-1.0.jar -->
++    <unjar src="${nlib.dir}/gdata-core.jar" dest="${unpacked.dir}/gdata-core.jar" /> <!-- gdata-core-1.0.jar -->
++    <unjar src="${lib.dir}/jcom.jar" dest="${unpacked.dir}/jcom.jar" /> <!-- not yet part of Debian -->
++    <unjar src="${nlib.dir}/lucene-core.jar" dest="${unpacked.dir}/lucene-core.jar"/> <!-- lucene-core-2.9.1.jar -->
++    <unjar src="${nlib.dir}/oro.jar" dest="${unpacked.dir}/oro.jar" /> <!-- oro-2.0.8.jar -->
++    <unjar src="${lib.dir}/opencsv-1.8.jar" dest="${unpacked.dir}/opencsv-1.8.jar" /> <!-- not yet part of Debian -->
  
      <!-- Pack the tvbrowser.jar -->
-@@ -354,10 +382,12 @@
-    	  <fileset dir="${unpacked.dir}/skinlf.jar" includes="org/**"/>
-       <fileset dir="${unpacked.dir}/bsh-2.0b4.jar" includes="bsh/**"/>
-       <fileset dir="${unpacked.dir}/forms-1.2.0.jar" includes="com/**"/>
+     <jar jarfile="${tvbrowser-default.runtime.dir}/tvbrowser.jar"
+@@ -350,16 +378,18 @@
+       <fileset dir="${classes.dir}" includes="tvdataservice/**"/>
+       <fileset dir="${classes.dir}" includes="util/**"/>
+       <fileset dir="${classes.dir}" includes="com/**"/>
+-      <fileset dir="${unpacked.dir}/skinlf.jar" includes="com/**"/>
+-   	  <fileset dir="${unpacked.dir}/skinlf.jar" includes="org/**"/>
+-      <fileset dir="${unpacked.dir}/bsh-2.0b4.jar" includes="bsh/**"/>
+-      <fileset dir="${unpacked.dir}/forms-1.2.0.jar" includes="com/**"/>
 -      <fileset dir="${unpacked.dir}/looks-2.1.4.jar" includes="com/**"/>
-+      <fileset dir="${unpacked.dir}/looks.jar" includes="com/**"/>
-       <fileset dir="${unpacked.dir}/l2fprod-common-tasks.jar" includes="com/**"/>
+-      <fileset dir="${unpacked.dir}/l2fprod-common-tasks.jar" includes="com/**"/>
++      <fileset dir="${unpacked.dir}/skinlf.jar" includes="com/**"/> <!-- 6.7 -->
++   	  <fileset dir="${unpacked.dir}/skinlf.jar" includes="org/**"/> <!-- path does not exist -->
++      <fileset dir="${unpacked.dir}/bsh.jar" includes="bsh/**"/> <!-- bsh-2.0b4.jar -->
++      <fileset dir="${unpacked.dir}/forms.jar" includes="com/**"/> <!-- forms-1.2.0.jar -->
++      <fileset dir="${unpacked.dir}/looks.jar" includes="com/**"/> <!-- 2.3.1 -->
++      <fileset dir="${unpacked.dir}/l2fprod-common-tasks.jar" includes="com/**"/> <!-- not yet part of Debian -->
 +      <!--
        <fileset dir="${unpacked.dir}/jRegistryKey.jar" includes="ca/**" />
 -      <fileset dir="${unpacked.dir}/commons-codec-1.3.jar" includes="org/**" />
+-      <fileset dir="${unpacked.dir}/commons-lang-2.4.jar" includes="org/**" />
+-      <fileset dir="${unpacked.dir}/opencsv-1.8.jar" includes="au/**"/>
 +      -->
-+      <fileset dir="${unpacked.dir}/commons-codec-1.4.jar" includes="org/**" />
-       <fileset dir="${unpacked.dir}/commons-lang-2.4.jar" includes="org/**" />
-       <fileset dir="${unpacked.dir}/opencsv-1.8.jar" includes="au/**"/>
++      <fileset dir="${unpacked.dir}/commons-codec.jar" includes="org/**" /> <!-- commons-codec-1.4.jar -->
++      <fileset dir="${unpacked.dir}/commons-lang.jar" includes="org/**" /> <!-- commons-lang-2.4.jar -->
++      <fileset dir="${unpacked.dir}/opencsv-1.8.jar" includes="au/**"/> <!-- not yet part of Debian -->
      </jar>
-@@ -372,7 +402,7 @@
+ 
+     <!-- Pack the plugin jars -->
+@@ -372,10 +402,10 @@
      <jar jarfile="${tvbrowser-default.runtime.dir}/plugins/CalendarExportPlugin.jar"
           compress="false">
          <fileset dir="${classes.dir}" includes="calendarexportplugin/**"/>
 -        <fileset dir="${unpacked.dir}/gdata-calendar-1.0.jar" includes="**" /> 	 
-+        <fileset dir="${unpacked.dir}/gdata-calendar-2.0.jar" includes="**" /> 	 
-         <fileset dir="${unpacked.dir}/gdata-client-1.0.jar" includes="**" /> 	 
-         <fileset dir="${unpacked.dir}/gdata-core-1.0.jar" includes="**" /> 	 
-         <fileset dir="${unpacked.dir}/jcom.jar" includes="**" />
+-        <fileset dir="${unpacked.dir}/gdata-client-1.0.jar" includes="**" /> 	 
+-        <fileset dir="${unpacked.dir}/gdata-core-1.0.jar" includes="**" /> 	 
+-        <fileset dir="${unpacked.dir}/jcom.jar" includes="**" />
++        <fileset dir="${unpacked.dir}/gdata-calendar.jar" includes="**" /> <!-- gdata-calendar-2.0.jar -->
++        <fileset dir="${unpacked.dir}/gdata-client.jar" includes="**" /> <!-- gdata-client-1.0.jar -->
++        <fileset dir="${unpacked.dir}/gdata-core.jar" includes="**" /> <!-- gdata-core-1.0.jar -->
++        <fileset dir="${unpacked.dir}/jcom.jar" includes="**" /> <!-- not yet part of Debian -->
+     </jar>
+ 
+   	<jar jarfile="${tvbrowser-default.runtime.dir}/plugins/CapturePlugin.jar"
 @@ -457,8 +487,8 @@
      <!-- Pack BBC data service --> 	 
      <jar jarfile="${tvbrowser-default.runtime.dir}/plugins/BbcBackstageDataService.jar" compress="false">
              <fileset dir="${classes.dir}" includes="bbcbackstagedataservice/**" /> 	 
 -            <fileset dir="${unpacked.dir}/TVAnytimeAPI.jar" includes="bbc/**" /> 	 
 -            <fileset dir="${unpacked.dir}/commons-compress-20050911.jar" includes="**" /> 	 
-+            <fileset dir="${unpacked.dir}/tvanytimeapi-1.3.jar" includes="bbc/**" /> 	 
-+            <fileset dir="${unpacked.dir}/commons-compress-1.0.jar" includes="**" /> 	 
++            <fileset dir="${unpacked.dir}/tvanytimeapi.jar" includes="bbc/**" /> <!-- tvanytimeapi-1.3.jar -->
++            <fileset dir="${unpacked.dir}/commons-compress.jar" includes="**" /> <!-- commons-compress-1.0.jar -->
      </jar> 	 
      <!-- Pack RadioTimes data service -->
      <jar jarfile="${tvbrowser-default.runtime.dir}/plugins/RadioTimesDataService.jar" compress="false"> 	 
-@@ -470,8 +500,8 @@
+@@ -470,15 +500,15 @@
        </jar>
  
  
 -    <unjar src="${lib.dir}/stax-1.2.0.jar" dest="${unpacked.dir}/stax-1.2.0.jar" />
 -    <unjar src="${lib.dir}/stax-api-1.0.1.jar" dest="${unpacked.dir}/stax-api-1.0.1.jar" />
-+    <unjar src="${nlib.dir}/stax-1.2.0.jar" dest="${unpacked.dir}/stax-1.2.0.jar" />
-+    <unjar src="${nlib.dir}/stax-api-1.0.1.jar" dest="${unpacked.dir}/stax-api-1.0.1.jar" />
-     <unjar src="${lib.dir}/xtvd-lib-2.0.jar" dest="${unpacked.dir}/xtvd-lib-2.0.jar" />
+-    <unjar src="${lib.dir}/xtvd-lib-2.0.jar" dest="${unpacked.dir}/xtvd-lib-2.0.jar" />
++    <unjar src="${nlib.dir}/stax.jar" dest="${unpacked.dir}/stax.jar" /> <!-- stax-1.2.0.jar -->
++    <unjar src="${nlib.dir}/stax-api.jar" dest="${unpacked.dir}/stax-api.jar" /> <!-- stax-api-1.0.1.jar -->
++    <unjar src="${lib.dir}/xtvd-lib-2.0.jar" dest="${unpacked.dir}/xtvd-lib-2.0.jar" /> <!-- not yet part of Debian -->
      <!-- Pack Dreambox data service -->
      <jar jarfile="${tvbrowser-default.runtime.dir}/plugins/SchedulesDirectDataService.jar" compress="false">
-@@ -521,7 +551,7 @@
+         <fileset dir="${classes.dir}" includes="schedulesdirectdataservice/**" />
+-        <fileset dir="${unpacked.dir}/stax-1.2.0.jar" includes="com/**"/>
+-        <fileset dir="${unpacked.dir}/stax-api-1.0.1.jar" includes="javax/**"/>
+-        <fileset dir="${unpacked.dir}/xtvd-lib-2.0.jar" includes="net/**"/>
++        <fileset dir="${unpacked.dir}/stax.jar" includes="com/**"/> <!-- stax-1.2.0.jar -->
++        <fileset dir="${unpacked.dir}/stax-api.jar" includes="javax/**"/> <!-- stax-api-1.0.1.jar -->
++        <fileset dir="${unpacked.dir}/xtvd-lib-2.0.jar" includes="net/**"/> <!-- not yet part of Debian -->
+     </jar>
+ 
+ 
+@@ -520,8 +550,8 @@
+     </copy>
  
      <!-- Extract the libraries for the tvbrowser.jar into the temp.dir -->
-     <mkdir dir="${unpacked.dir}/commons-net-1.4.1.jar"/>
+-    <mkdir dir="${unpacked.dir}/commons-net-1.4.1.jar"/>
 -    <unjar src="${lib.dir}/commons-net-1.4.1.jar" dest="${unpacked.dir}/commons-net-1.4.1.jar"/>
-+    <unjar src="${nlib.dir}/commons-net-1.4.1.jar" dest="${unpacked.dir}/commons-net-1.4.1.jar"/>
++    <mkdir dir="${unpacked.dir}/commons-net.jar"/> <!-- commons-net-1.4.1.jar -->
++    <unjar src="${nlib.dir}/commons-net.jar" dest="${unpacked.dir}/commons-net.jar"/> <!-- commons-net-1.4.1.jar -->
  
    </target>
  
-@@ -687,13 +717,13 @@
+@@ -542,7 +572,7 @@
+ 
+     <jar jarfile="${tvbrowser-optional.runtime.dir}/plugins/ImdbPlugin.jar"
+          compress="false">
+-      <fileset dir="${unpacked.dir}/lucene-core-2.3.1.jar" includes="**/*"/>
++      <fileset dir="${unpacked.dir}/lucene-core.jar" includes="**/*"/> <!-- lucene-core-2.3.1.jar -->
+       <fileset dir="${classes.dir}" includes="imdbplugin/**"/>
+     </jar>
+ 
+@@ -686,15 +716,15 @@
+     <mkdir dir="${tvdatatools.runtime.dir}/prepared"/>
  
      <!-- Extract the libraries for the jars into the temp.dir -->
-     <mkdir dir="${unpacked.dir}/commons-net-1.4.1.jar"/>
+-    <mkdir dir="${unpacked.dir}/commons-net-1.4.1.jar"/>
 -    <unjar src="${lib.dir}/commons-net-1.4.1.jar" dest="${unpacked.dir}/commons-net-1.4.1.jar"/>
-+    <unjar src="${nlib.dir}/commons-net-1.4.1.jar" dest="${unpacked.dir}/commons-net-1.4.1.jar"/>
++    <mkdir dir="${unpacked.dir}/commons-net.jar"/> <!-- commons-net-1.4.1.jar -->
++    <unjar src="${nlib.dir}/commons-net.jar" dest="${unpacked.dir}/commons-net.jar"/> <!-- commons-net-1.4.1.jar -->
  
-     <mkdir dir="${unpacked.dir}/commons-lang-2.4.jar"/>
+-    <mkdir dir="${unpacked.dir}/commons-lang-2.4.jar"/>
 -    <unjar src="${lib.dir}/commons-lang-2.4.jar" dest="${unpacked.dir}/commons-net-1.4.1.jar"/>
-+    <unjar src="${nlib.dir}/commons-lang-2.4.jar" dest="${unpacked.dir}/commons-net-1.4.1.jar"/>
++    <mkdir dir="${unpacked.dir}/commons-lang.jar"/> <!-- commons-lang-2.4.jar -->
++    <unjar src="${nlib.dir}/commons-lang" dest="${unpacked.dir}/commons-lang.jar"/> <!-- commons-lang-2.4.jar -->
  
 -    <unjar src="${lib.dir}/looks-2.1.4.jar" dest="${unpacked.dir}/looks-2.1.4.jar"/>
 -    <unjar src="${lib.dir}/jakarta-oro-2.0.8.jar" dest="${unpacked.dir}/jakarta-oro-2.0.8.jar"/>
-+    <unjar src="${nlib.dir}/looks-2.1.4.jar" dest="${unpacked.dir}/looks-2.1.4.jar"/>
-+    <unjar src="${nlib.dir}/oro-2.0.8.jar" dest="${unpacked.dir}/oro-2.0.8.jar"/>
- 	  <unjar src="${lib.dir}/opencsv-1.8.jar" dest="${unpacked.dir}/opencsv-1.8.jar" />
+-	  <unjar src="${lib.dir}/opencsv-1.8.jar" dest="${unpacked.dir}/opencsv-1.8.jar" />
++    <unjar src="${nlib.dir}/looks.jar" dest="${unpacked.dir}/looks.jar"/> <!-- looks-2.1.4.jar -->
++    <unjar src="${nlib.dir}/oro.jar" dest="${unpacked.dir}/oro.jar"/> <!-- oro-2.0.8.jar -->
++	  <unjar src="${lib.dir}/opencsv-1.8.jar" dest="${unpacked.dir}/opencsv-1.8.jar" /> <!-- not yet part of Debian -->
  
      <!-- Pack the MirrorUpdater.jar -->
-@@ -717,7 +747,7 @@
-       <fileset dir="${unpacked.dir}/commons-net-1.4.1.jar" includes="org/**"/>
-       <fileset dir="${unpacked.dir}/commons-lang-2.4.jar" includes="org/**"/>
-       <fileset dir="${unpacked.dir}/looks-2.1.4.jar" includes="com/**"/>
+     <jar jarfile="${tvdatatools.runtime.dir}/MirrorUpdater.jar"
+@@ -714,11 +744,11 @@
+       <fileset dir="${classes.dir}" includes="tvbrowser/core/Settings*"/>
+       <fileset dir="${classes.dir}" includes="tvbrowser/core/plugin/DefaultSettings*"/>-->
+       <fileset dir="${classes.dir}" includes="tvbrowser/**"/>
+-      <fileset dir="${unpacked.dir}/commons-net-1.4.1.jar" includes="org/**"/>
+-      <fileset dir="${unpacked.dir}/commons-lang-2.4.jar" includes="org/**"/>
+-      <fileset dir="${unpacked.dir}/looks-2.1.4.jar" includes="com/**"/>
 -      <fileset dir="${unpacked.dir}/jakarta-oro-2.0.8.jar" includes="org/**"/>
-+      <fileset dir="${unpacked.dir}/oro-2.0.8.jar" includes="org/**"/>
-       <fileset dir="${unpacked.dir}/opencsv-1.8.jar" includes="au/**"/>
+-      <fileset dir="${unpacked.dir}/opencsv-1.8.jar" includes="au/**"/>
++      <fileset dir="${unpacked.dir}/commons-net.jar" includes="org/**"/> <!-- commons-net-1.4.1.jar -->
++      <fileset dir="${unpacked.dir}/commons-lang.jar" includes="org/**"/> <!-- commons-lang-2.4.jar -->
++      <fileset dir="${unpacked.dir}/looks.jar" includes="com/**"/> <!-- looks-2.1.4.jar -->
++      <fileset dir="${unpacked.dir}/oro.jar" includes="org/**"/> <!-- oro-2.0.8.jar -->
++      <fileset dir="${unpacked.dir}/opencsv-1.8.jar" includes="au/**"/> <!-- not yet part of Debian -->
+     </jar>
+ 
+     <!-- Pack the PrimaryDataManager.jar -->
+@@ -736,9 +766,9 @@
+       <fileset dir="${classes.dir}" includes="devplugin/**"/>
+       <fileset dir="${classes.dir}" includes="util/**"/>
+       <fileset dir="${classes.dir}" includes="tvbrowser/**"/>
+-      <fileset dir="${unpacked.dir}/looks-2.1.4.jar" includes="com/**"/>
+-      <fileset dir="${unpacked.dir}/opencsv-1.8.jar" includes="au/**"/>
+-      <fileset dir="${unpacked.dir}/commons-lang-2.4.jar" includes="org/**"/>
++      <fileset dir="${unpacked.dir}/looks.jar" includes="com/**"/> <!-- looks-2.1.4.jar -->
++      <fileset dir="${unpacked.dir}/opencsv-1.8.jar" includes="au/**"/> <!-- not yet part of Debian -->
++      <fileset dir="${unpacked.dir}/commons-lang.jar" includes="org/**"/> <!-- commons-lang-2.4.jar -->
+     </jar>
+ 
+     <!-- Pack the PDSRunner.jar -->
+@@ -756,9 +786,9 @@
+       <fileset dir="${classes.dir}" includes="devplugin/**"/>
+       <fileset dir="${classes.dir}" includes="util/**"/>
+       <fileset dir="${classes.dir}" includes="tvbrowser/**"/>
+-      <fileset dir="${unpacked.dir}/looks-2.1.4.jar" includes="com/**"/>
+-      <fileset dir="${unpacked.dir}/opencsv-1.8.jar" includes="au/**"/>
+-      <fileset dir="${unpacked.dir}/commons-lang-2.4.jar" includes="org/**"/>
++      <fileset dir="${unpacked.dir}/looks.jar" includes="com/**"/> <!-- looks-2.1.4.jar -->
++      <fileset dir="${unpacked.dir}/opencsv-1.8.jar" includes="au/**"/> <!-- not yet part of Debian -->
++      <fileset dir="${unpacked.dir}/commons-lang.jar" includes="org/**"/> <!-- commons-lang-2.4.jar -->
      </jar>
  
+     <!-- Copy the file(s) -->
diff -Nru tvbrowser-2.7.5+dfsg/debian/patches/50_avoid_bindv6only_problems.diff tvbrowser-2.7.5+dfsg/debian/patches/50_avoid_bindv6only_problems.diff
--- tvbrowser-2.7.5+dfsg/debian/patches/50_avoid_bindv6only_problems.diff	1970-01-01 01:00:00.000000000 +0100
+++ tvbrowser-2.7.5+dfsg/debian/patches/50_avoid_bindv6only_problems.diff	2010-02-17 15:40:36.000000000 +0000
@@ -0,0 +1,21 @@
+Description: This fixes problems TVB has with net.ipv6.bindv6only=1
+Origin: other, -
+Bug: -
+Bug-Debian: -
+Forwarded: -
+Author: Per Wawra <debian.perfide@safersignup.com>
+Last-Update: 2010-02-17
+
+--- a/deployment/linux/tvbrowser.sh
++++ b/deployment/linux/tvbrowser.sh
+@@ -105,8 +105,8 @@
+ 
+ cd ${PROGRAM_DIR}
+ 
+-echo "${JAVA_PROGRAM_DIR}java -Xms16m -Xmx256m  -Djava.library.path=\"${PROGRAM_DIR}\" -Dpropertiesfile=linux.properties -jar tvbrowser.jar '$@'"
+-${JAVA_PROGRAM_DIR}java -Xms16m -Xmx128m -Djava.library.path="${PROGRAM_DIR}" -Dpropertiesfile=linux.properties -jar tvbrowser.jar "$@"
++echo "${JAVA_PROGRAM_DIR}java -Xms16m -Xmx256m -Djava.net.preferIPv4Stack=true -Djava.library.path=\"${PROGRAM_DIR}\" -Dpropertiesfile=linux.properties -jar tvbrowser.jar \"$@\""
++${JAVA_PROGRAM_DIR}java -Xms16m -Xmx256m -Djava.net.preferIPv4Stack=true -Djava.library.path="${PROGRAM_DIR}" -Dpropertiesfile=linux.properties -jar tvbrowser.jar "$@"
+ 
+ echo "TV-Browser TERMINATED."
+ 
diff -Nru tvbrowser-2.7.5+dfsg/debian/patches/series tvbrowser-2.7.5+dfsg/debian/patches/series
--- tvbrowser-2.7.5+dfsg/debian/patches/series	2010-01-20 21:52:28.000000000 +0000
+++ tvbrowser-2.7.5+dfsg/debian/patches/series	2010-02-17 13:19:06.000000000 +0000
@@ -5,3 +5,4 @@
 41_remove_unused_taskdefs.diff
 42_no_deprecation_warnings.diff
 43_native_jar_paths.diff
+50_avoid_bindv6only_problems.diff