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

[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  be0f1707ccb6f0a9fb100d6f0677a70422142ef1 (commit)
      from  157c549a23b856864248b8e7c9025d02597d9def (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 be0f1707ccb6f0a9fb100d6f0677a70422142ef1
Author: Andrew Ross <ubuntu at rossfamily.co.uk>
Date:   Tue Aug 23 23:01:22 2011 +0100

    Update packaging.

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

Summary of changes:
 debian/control                                 |    4 +-
 debian/patches/netbeans~debugger.jpda.ui.patch |   27 ++++++++++++++++++++++++
 debian/patches/series                          |    5 ++-
 3 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index 4d39fa3..701034d 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ Build-Depends: debhelper (>= 7.0.50~), javahelper, ant (>= 1.7.0),
  libsvnkit-java, libswingx-java (>=0.9.5), libtrilead-ssh2-java,
  libsimple-validation-java, libxerces2-java,
  libbetter-appframework-java,  libbeansbinding-java, libcglib-java,
- libnb-javaparser-java (>= 7.0~)
+ libnb-javaparser-java (>= 7.0.1~)
 Standards-Version: 3.9.2
 Homepage: http://netbeans.org/
 Vcs-Browser: http://git.debian.org/?p=pkg-java/netbeans.git
@@ -134,7 +134,7 @@ Architecture: all
 Depends: ${java:Depends}, ${misc:Depends},
  libnb-platform13-java (>= 7.0), libnb-ide13-java (= ${binary:Version}),
  libbetter-appframework-java,  libbeansbinding-java, libcglib-java,
- libnb-javaparser-java (>= 7.0~), ant (>= 1.7.0), ant-optional (>= 1.7.0)
+ libnb-javaparser-java (>= 7.0.1~), ant (>= 1.7.0), ant-optional (>= 1.7.0)
 Description: Common Java Related Libraries for NetBeans
  The NetBeans Platform is a set of modules, each providing their own 
  APIs and working together or in a standalone mode. This package contains 
diff --git a/debian/patches/netbeans~debugger.jpda.ui.patch b/debian/patches/netbeans~debugger.jpda.ui.patch
new file mode 100644
index 0000000..a1037ff
--- /dev/null
+++ b/debian/patches/netbeans~debugger.jpda.ui.patch
@@ -0,0 +1,27 @@
+Use the latest api for com.sun.source.util.Trees. Reported upstream at:
+http://netbeans.org/bugzilla/show_bug.cgi?id=201267
+
+Index: netbeans/debugger.jpda.ui/src/org/netbeans/modules/debugger/jpda/ui/WatchPanel.java
+===================================================================
+--- netbeans.orig/debugger.jpda.ui/src/org/netbeans/modules/debugger/jpda/ui/WatchPanel.java	2011-08-23 21:25:07.276130076 +0100
++++ netbeans/debugger.jpda.ui/src/org/netbeans/modules/debugger/jpda/ui/WatchPanel.java	2011-08-23 21:25:42.546130576 +0100
+@@ -43,6 +43,7 @@
+  */
+ package org.netbeans.modules.debugger.jpda.ui;
+ 
++import com.sun.source.tree.CatchTree;
+ import com.sun.source.tree.ClassTree;
+ import com.sun.source.tree.CompilationUnitTree;
+ import com.sun.source.tree.IdentifierTree;
+@@ -716,6 +717,11 @@
+             return trees.getDocComment(path);
+         }
+ 
++        @Override
++        public TypeMirror getLub(CatchTree tree) {
++            return trees.getLub(tree);
++        }
++
+     }
+ 
+     public static final class DelegatingBorder implements Border {
diff --git a/debian/patches/series b/debian/patches/series
index 4f9ce90..80907e5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,5 +15,6 @@ netbeans~updatecenters.patch
 netbeans~build.patch
 netbeans~cluster-properties.patch
 netbeans~small-ide.patch
-netbeans~old-java.source-module.patch
-netbeans~old-java-modules.patch
+#netbeans~old-java.source-module.patch
+#netbeans~old-java-modules.patch
+netbeans~debugger.jpda.ui.patch


hooks/post-receive
-- 
netbeans packaging