[SCM] netbeans packaging branch, master, updated. debian/7.0.1+dfsg1-1-3-gbeacec8

[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  beacec81eac51f5c82b80d0a32ac2c5bb0f0c655 (commit)
      from  5b8b9779169e0ad69e447e2568f8e428368934ce (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 beacec81eac51f5c82b80d0a32ac2c5bb0f0c655
Author: Andrew Ross <ubuntu at rossfamily.co.uk>
Date:   Wed Sep 21 23:23:41 2011 +0100

    Update latest changes.

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

Summary of changes:
 debian/changelog                                   |   11 ++---------
 debian/control                                     |    7 +++----
 debian/libnb-java4-java.lintian-overrides          |    2 --
 debian/libnb-platform-devel-java.lintian-overrides |    3 ---
 debian/libnb-platform13-java.lintian-overrides     |    4 ----
 5 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 79535e6..1ffd709 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,16 +1,9 @@
 netbeans (7.0.1+dfsg1-2) unstable; urgency=low
 
   * Handle rename of libcommons-net-java to libcommons-net1-java.
-  * Platform should depend on a JRE.
-  * Java IDE should depend on a JDK.
+  * Netbeans should depend on a JDK.
       (Closes: #499870)
-  * Provide netbeans-ide and netbeans-platform and close fixed bugs
-      in those packages.
-      (Closes: #493152)
-      (Closes: #474465)
-      (Closes: #483757)
-      (Closes: #518941)
-      (Closes: #478762)
+  * Provide netbeans-ide and netbeans-platform.
 
  -- Andrew Ross <ubuntu at rossfamily.co.uk>  Sun, 11 Sep 2011 22:45:45 +0100
 
diff --git a/debian/control b/debian/control
index 083ea4c..7ea97d5 100644
--- a/debian/control
+++ b/debian/control
@@ -30,7 +30,6 @@ Vcs-Git: git://git.debian.org/git/pkg-java/netbeans.git
 Package: libnb-platform13-java
 Architecture: all
 Depends: ${misc:Depends}, ${java:Depends}, javahelp2, 
- default-jre | java6-runtime,
  libswing-layout-java (>= 1.0.3), libjna-java(>= 3.2.7-2~), junit4 (>= 4.6),
  libfelix-framework-java, libfelix-main-java, libequinox-osgi-java,
  libnb-org-openide-util-java, libnb-org-openide-util-lookup-java, 
@@ -50,8 +49,7 @@ Description: NetBeans Platform for building rich desktop applications in Java
 Package: libnb-platform-devel-java
 Architecture: all
 Depends: ${misc:Depends}, ${java:Depends}, libnb-platform13-java,
- default-jdk | java6-sdk, ant,
- libjemmy2-java, javahelp2, libbindex-java,
+ ant, libjemmy2-java, javahelp2, libbindex-java,
 Replaces: libnb-platform8-devel-java, libnb-platform7-devel-java
 Conflicts: libnb-platform8-devel-java, libnb-platform7-devel-java
 Description: Build harness for NetBeans Platform
@@ -108,6 +106,7 @@ Description: Utility classes for modules from the NetBeans Platform
 Package: netbeans
 Architecture: all
 Depends: ${java:Depends}, ${misc:Depends}, libnb-platform13-java (>= 7.0),
+ openjdk-6-jdk | java6-sdk | java7-sdk,
  libnb-ide13-java (= ${binary:Version}), 
  libnb-java4-java (= ${binary:Version}),
  libnb-apisupport2-java (= ${binary:Version})
@@ -140,7 +139,7 @@ Description: Common Integrated Development Environment Libraries for NetBeans
 
 Package: libnb-java4-java
 Architecture: all
-Depends: ${java:Depends}, ${misc:Depends}, default-jdk | java6-sdk,
+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.1~), ant (>= 1.7.0), ant-optional (>= 1.7.0)
diff --git a/debian/libnb-java4-java.lintian-overrides b/debian/libnb-java4-java.lintian-overrides
index ebefaea..6cb405e 100644
--- a/debian/libnb-java4-java.lintian-overrides
+++ b/debian/libnb-java4-java.lintian-overrides
@@ -9,5 +9,3 @@ libnb-java4-java: javalib-but-no-public-jars
 # changes.
 libnb-java4-java: package-contains-empty-directory
 
-# We do actually need a jre (actually we need a jdk).
-libnb-java4-java: needless-dependency-on-jre
diff --git a/debian/libnb-platform-devel-java.lintian-overrides b/debian/libnb-platform-devel-java.lintian-overrides
index 042dc5e..c371f7c 100644
--- a/debian/libnb-platform-devel-java.lintian-overrides
+++ b/debian/libnb-platform-devel-java.lintian-overrides
@@ -6,6 +6,3 @@ libnb-platform-devel-java: codeless-jar
 # specific to the NetBeans platform and need to live in a "cluster"
 libnb-platform-devel-java: javalib-but-no-public-jars
 
-# It's not needless, as we need a jre (and in fact jdk) to build a Netbeans 
-# Platform based application.
-libnb-platform-devel-java: needless-dependency-on-jre
diff --git a/debian/libnb-platform13-java.lintian-overrides b/debian/libnb-platform13-java.lintian-overrides
index 99b6a0d..cffaca7 100644
--- a/debian/libnb-platform13-java.lintian-overrides
+++ b/debian/libnb-platform13-java.lintian-overrides
@@ -5,7 +5,3 @@ libnb-platform13-java: codeless-jar
 # application. But the jar files don't live in /usr/share/java since they are 
 # specific to the NetBeans platform and need to live in a "cluster"
 libnb-platform13-java: javalib-but-no-public-jars
-
-# It's not actually needless in this case - we need a jre to run a Netbeans 
-# based application.
-libnb-platform13-java: needless-dependency-on-jre


hooks/post-receive
-- 
netbeans packaging