Merge lp:~ubuntu-branches/ubuntu/oneiric/sweethome3d/oneiric-201108050311 into lp:ubuntu/oneiric/sweethome3d

[Ubuntu Package Importer]

The package importer has detected a possible inconsistency between the package history in the archve and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/oneiric/sweethome3d reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/oneiric/sweethome3d/oneiric-201108050311. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

Unmerged revisions

10. By Luke Yelavich on 2011-08-05

releasing version 3.1+dfsg-1ubuntu1

9. By Luke Yelavich on 2011-08-05

Merge branch lp:~scarneiro/ubuntu/oneiric/sweethome3d/fix-for-755950

=== added file 'debian/patches/04use-icedtea-jnlp'
--- debian/patches/04use-icedtea-jnlp	1970-01-01 00:00:00 +0000
+++ debian/patches/04use-icedtea-jnlp	2011-08-17 12:52:36 +0000
@@ -0,0 +1,51 @@
+Index: sweethome3d/build.xml
+===================================================================
+--- sweethome3d.orig/build.xml	2011-07-31 12:05:37.132196888 -0300
++++ sweethome3d/build.xml	2011-07-31 12:06:37.492496196 -0300
+@@ -47,7 +47,7 @@
+       </extdirs>
+       <classpath>
+         <pathelement location="libtest/AppleJavaExtensions.jar"/>
+-        <pathelement location="libtest/jnlp.jar"/>
++        <pathelement location="/usr/share/icedtea-web/netx.jar"/>
+       </classpath>
+ 	<exclude name="com/eteks/sweethome3d/MacOSXConfiguration.java"/>
+ 	<exclude name="com/eteks/sweethome3d/swing/VideoPanel.java"/>
+@@ -255,7 +255,6 @@
+         <exclude name="vecmath.jar"/>
+       </fileset>
+     </copy>
+-    <copy todir="deploy/lib" file="libtest/jnlp.jar"/>
+ 
+     <!-- Clean build directory -->
+     <delete dir="build"/>
+@@ -386,9 +385,6 @@
+       <fileset dir="lib">
+         <include name="*.jar"/>
+       </fileset>
+-      <fileset dir="libtest">
+-        <include name="jnlp.jar"/>
+-      </fileset>
+       <fileset dir=".">
+         <include name="LICENSE.TXT"/>
+         <include name="COPYING.TXT"/>
+@@ -539,9 +535,8 @@
+         <exclude name="iText-2.1.7.jar"/>
+       </fileset>
+     </copy>
+-    <!-- Copy jnlp.jar, JMF and Mac OS X Java 3D 1.5 DLLs and JARs for Java 3D 
++    <!-- Copy JMF and Mac OS X Java 3D 1.5 DLLs and JARs for Java 3D
+          to install/macosx/SweetHome3D-version/Sweet Home 3D.app/Contents/Resources/Java/ext -->
+-    <copy file="libtest/jnlp.jar" todir="install/macosx/SweetHome3D-${version}/Sweet Home 3D.app/Contents/Resources/Java/ext"/>
+     <copy todir="install/macosx/SweetHome3D-${version}/Sweet Home 3D.app/Contents/Resources/Java/ext" >
+       <fileset dir="lib/macosx">
+         <include name="*.jar"/>
+@@ -816,7 +811,7 @@
+       <classpath>
+         <fileset dir="lib"/>
+         <pathelement location="libtest/AppleJavaExtensions.jar"/>
+-        <pathelement location="libtest/jnlp.jar"/>
++        <pathelement location="/usr/share/icedtea-web/netx"/>
+       </classpath>
+     </javadoc>
+ 

=== renamed file 'debian/patches/04use-icedtea-jnlp' => 'debian/patches/04use-icedtea-jnlp.moved'