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

[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  5b8b9779169e0ad69e447e2568f8e428368934ce (commit)
      from  04a113f4a4133113503c90af35aec4dcf01a6faa (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 5b8b9779169e0ad69e447e2568f8e428368934ce
Author: Andrew Ross <ubuntu at rossfamily.co.uk>
Date:   Mon Sep 19 20:22:19 2011 +0100

    Provide netbeans-ide and netbeans-platform, and depend on a jre/jdk.

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

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

diff --git a/debian/changelog b/debian/changelog
index 0cd163e..79535e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,16 @@
 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.
+      (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)
 
  -- Andrew Ross <ubuntu at rossfamily.co.uk>  Sun, 11 Sep 2011 22:45:45 +0100
 
diff --git a/debian/control b/debian/control
index f0f0435..083ea4c 100644
--- a/debian/control
+++ b/debian/control
@@ -29,12 +29,16 @@ Vcs-Git: git://git.debian.org/git/pkg-java/netbeans.git
 
 Package: libnb-platform13-java
 Architecture: all
-Depends: ${misc:Depends}, ${java:Depends}, javahelp2,
+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, 
  libnb-org-openide-modules-java
 Suggests: libnb-platform13-java-doc
+Provides: netbeans-platform
+Replaces: netbeans-platform
+Conflicts: netbeans-platform
 Description: NetBeans Platform for building rich desktop applications in Java
  The NetBeans Platform is a framework for building rich desktop applications
  in Java. It provides the code that is required to connect actions to menu 
@@ -46,6 +50,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,
 Replaces: libnb-platform8-devel-java, libnb-platform7-devel-java
 Conflicts: libnb-platform8-devel-java, libnb-platform7-devel-java
@@ -108,6 +113,7 @@ Depends: ${java:Depends}, ${misc:Depends}, libnb-platform13-java (>= 7.0),
  libnb-apisupport2-java (= ${binary:Version})
 Conflicts: netbeans5.5, netbeans-ide
 Replaces: netbeans5.5, netbeans-ide
+Provides: netbeans-ide
 Description: Extensible Java IDE
  Integrated Development Environment for software developers. It supports 
  development of desktop, enterprise, web, and mobile applications. Package
@@ -134,7 +140,7 @@ Description: Common Integrated Development Environment Libraries for NetBeans
 
 Package: libnb-java4-java
 Architecture: all
-Depends: ${java:Depends}, ${misc:Depends},
+Depends: ${java:Depends}, ${misc:Depends}, default-jdk | java6-sdk,
  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 f68e80d..ebefaea 100644
--- a/debian/libnb-java4-java.lintian-overrides
+++ b/debian/libnb-java4-java.lintian-overrides
@@ -8,3 +8,6 @@ libnb-java4-java: javalib-but-no-public-jars
 # Netbeans creates this empty directory, and we include it to avoid unneeded
 # 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 798666c..042dc5e 100644
--- a/debian/libnb-platform-devel-java.lintian-overrides
+++ b/debian/libnb-platform-devel-java.lintian-overrides
@@ -5,3 +5,7 @@ libnb-platform-devel-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-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 cffaca7..99b6a0d 100644
--- a/debian/libnb-platform13-java.lintian-overrides
+++ b/debian/libnb-platform13-java.lintian-overrides
@@ -5,3 +5,7 @@ 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