[SCM] netbeans packaging branch, master, updated. upstream/7.0.1+dfsg1-20-g2205f88

[Andrew Ross]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "netbeans packaging".

The branch, master has been updated
       via  2205f8858eb60ca622817dcc98d165d6658070a2 (commit)
      from  b3abc5ba2d0ce48e62b023b40432c5976bd3d873 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2205f8858eb60ca622817dcc98d165d6658070a2
Author: Andrew Ross <ubuntu at rossfamily.co.uk>
Date:   Wed Sep 7 19:03:32 2011 +0100

    Don't insist on the windows launcher

-----------------------------------------------------------------------

Summary of changes:
 debian/patches/netbeans-platform~suitebuild.patch |   16 ++++++++++++++++
 debian/patches/series                             |    1 +
 2 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/debian/patches/netbeans-platform~suitebuild.patch b/debian/patches/netbeans-platform~suitebuild.patch
new file mode 100644
index 0000000..8bc7853
--- /dev/null
+++ b/debian/patches/netbeans-platform~suitebuild.patch
@@ -0,0 +1,16 @@
+Don't fail if we can't find the Windows exe launcher. This lets us build for older netbeans platforms where the
+package didn't contain Windows launchers.
+
+Index: netbeans/apisupport.harness/release/suite.xml
+===================================================================
+--- netbeans.orig/apisupport.harness/release/suite.xml	2011-09-07 19:01:15.758711116 +0100
++++ netbeans/apisupport.harness/release/suite.xml	2011-09-07 19:01:43.127877804 +0100
+@@ -322,7 +322,7 @@
+         <condition property="app.exe.prefix" value="" else="pre7_">
+             <isset property="nbexec.dll.found"/>
+         </condition>
+-        <copy file="${harness.dir}/launchers/${app.exe.prefix}app.exe" tofile="${build.launcher.dir}/bin/${app.name}.exe" overwrite="true"/>
++        <copy file="${harness.dir}/launchers/${app.exe.prefix}app.exe" tofile="${build.launcher.dir}/bin/${app.name}.exe" failonerror="false" overwrite="true"/>
+         <copy file="${harness.dir}/launchers/${app.exe.prefix}app_w.exe" tofile="${build.launcher.dir}/bin/${app.name}_w.exe" failonerror="false" overwrite="true"/>
+ 
+         <copy file="${harness.dir}/launchers/app.sh" tofile="${build.launcher.dir}/bin/${app.name}"/>
diff --git a/debian/patches/series b/debian/patches/series
index 91b3fa0..99ea0d8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,6 +5,7 @@ netbeans-platform~windowslauncher.patch
 netbeans-platform~include-extras.patch
 netbeans-platform~nbi.patch
 netbeans-platform~properties.patch
+netbeans-platform~suitebuild.patch
 netbeans~nocopy.patch
 netbeans~no-rhino.patch
 netbeans~svnclient.patch


hooks/post-receive
-- 
netbeans packaging