The following commit has been merged in the master branch:
commit e746516aa3c617f2becaf3b9b0359e2c0e32d751
Author: Andrew Ross <ubu...@rossfamily.co.uk>
Date:   Fri Dec 2 00:05:26 2011 +0000

    Updated for 7.0.1+dfsg1-4

diff --git a/debian/changelog b/debian/changelog
index 1d7f046..62e7c1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+netbeans (7.0.1+dfsg1-4) unstable; urgency=low
+
+  * Patch core.osgi to use osgi-core 4.3. (Closes: #649750)
+  * Correct binary package names and install locations.
+      (Closes: #646856)
+  * Install AbsoluteLayout.jar in a separate package.
+      (Closes: #646857)
+
+ -- Andrew Ross <ubu...@rossfamily.co.uk>  Thu, 01 Dec 2011 21:59:37 +0000
+
 netbeans (7.0.1+dfsg1-3) unstable; urgency=low
 
   * Use libosgi-core-java and libosgi-compendium-java for osgi.
diff --git a/debian/control b/debian/control
index a3dd3ea..cd35522 100644
--- a/debian/control
+++ b/debian/control
@@ -104,13 +104,22 @@ Description: Utility classes for modules from the 
NetBeans Platform
  APIs and working together or in a standalone mode. This package provides
  some utility functions for managing NetBeans modules.
 
+Package: libnb-absolutelayout-java
+Architecture: all
+Depends: ${misc:Depends}, ${java:Depends}
+Description: Java LayoutManager to allow placement in absolute positions
+ This library is part of the Netbeans platform and provides an 
+ implementation of the java.awt.LayoutManager interface. This 
+ implementation allows you to position components by their 
+ absolute position.
+
 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})
+ libnb-ide14-java (= ${binary:Version}), 
+ libnb-java5-java (= ${binary:Version}),
+ libnb-apisupport3-java (= ${binary:Version})
 Conflicts: netbeans5.5, netbeans-ide
 Replaces: netbeans5.5, netbeans-ide
 Provides: netbeans-ide
@@ -120,7 +129,7 @@ Description: Extensible Java IDE
  includes the Base IDE, Java Development Tools and Plug-in Development Tools. 
  Support for PHP, Ruby, C/C++, Java EE and others can be added.
 
-Package: libnb-ide13-java
+Package: libnb-ide14-java
 Architecture: all
 Depends: ${java:Depends}, ${misc:Depends}, libnb-platform13-java (>= 7.0),
  antlr3 (>= 3.2), libcommons-codec-java, libbytelist-java,
@@ -138,10 +147,11 @@ Description: Common Integrated Development Environment 
Libraries for NetBeans
  APIs and working together or in a standalone mode. This package contains 
  independent libraries for use in the NetBeans IDE.
 
-Package: libnb-java4-java
+Package: libnb-java5-java
 Architecture: all
 Depends: ${java:Depends}, ${misc:Depends},
- libnb-platform13-java (>= 7.0), libnb-ide13-java (= ${binary:Version}),
+ libnb-platform13-java (>= 7.0), libnb-ide14-java (= ${binary:Version}),
+ libnb-absolutelayout-java,
  libbetter-appframework-java,  libbeansbinding-java, libcglib-java,
  libnb-javaparser-java (>= 7.0.1~), ant (>= 1.7.0), ant-optional (>= 1.7.0)
 Description: Common Java Related Libraries for NetBeans
@@ -149,11 +159,11 @@ Description: Common Java Related Libraries for NetBeans
  APIs and working together or in a standalone mode. This package contains 
  common libraries for the NetBeans Java IDE.
 
-Package: libnb-apisupport2-java
+Package: libnb-apisupport3-java
 Architecture: all
 Depends: ${java:Depends}, ${misc:Depends}, libnb-platform13-java (>= 7.0),
- libnb-platform-devel-java (>= 7.0), libnb-ide13-java (= ${binary:Version}),
- libnb-java4-java (= ${binary:Version})
+ libnb-platform-devel-java (>= 7.0), libnb-ide14-java (= ${binary:Version}),
+ libnb-java5-java (= ${binary:Version})
 Description: Common NetBeans Platform Development 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/libnb-apisupport2-java.lintian-overrides 
b/debian/libnb-apisupport2-java.lintian-overrides
deleted file mode 100644
index 914fe9a..0000000
--- a/debian/libnb-apisupport2-java.lintian-overrides
+++ /dev/null
@@ -1,10 +0,0 @@
-# Netbeans builds lots of codeless jars on purpose, so don't warn us about them
-libnb-apisupport2-java: codeless-jar
-
-# Netbeans has it's own way to set the classpath, and it breaks things if we 
-# set it separately.
-libnb-apisupport2-java: missing-classpath
-
-# It is a library of sorts, although it installs as a netbeans cluster rather
-# than in /usr/share/java
-libnb-apisupport2-java: javalib-but-no-public-jars
diff --git a/debian/libnb-apisupport3-java.lintian-overrides 
b/debian/libnb-apisupport3-java.lintian-overrides
new file mode 100644
index 0000000..853fcef
--- /dev/null
+++ b/debian/libnb-apisupport3-java.lintian-overrides
@@ -0,0 +1,10 @@
+# Netbeans builds lots of codeless jars on purpose, so don't warn us about them
+libnb-apisupport3-java: codeless-jar
+
+# Netbeans has it's own way to set the classpath, and it breaks things if we 
+# set it separately.
+libnb-apisupport3-java: missing-classpath
+
+# It is a library of sorts, although it installs as a netbeans cluster rather
+# than in /usr/share/java
+libnb-apisupport3-java: javalib-but-no-public-jars
diff --git a/debian/libnb-ide13-java.lintian-overrides 
b/debian/libnb-ide13-java.lintian-overrides
deleted file mode 100644
index 8f182c1..0000000
--- a/debian/libnb-ide13-java.lintian-overrides
+++ /dev/null
@@ -1,6 +0,0 @@
-# Netbeans builds lots of codeless jars on purpose, so don't warn us about them
-libnb-ide13-java: codeless-jar
-
-# It is a library of sorts, although it installs as a netbeans cluster rather
-# than in /usr/share/java
-libnb-ide13-java: javalib-but-no-public-jars
diff --git a/debian/libnb-ide14-java.lintian-overrides 
b/debian/libnb-ide14-java.lintian-overrides
new file mode 100644
index 0000000..30df0d3
--- /dev/null
+++ b/debian/libnb-ide14-java.lintian-overrides
@@ -0,0 +1,6 @@
+# Netbeans builds lots of codeless jars on purpose, so don't warn us about them
+libnb-ide14-java: codeless-jar
+
+# It is a library of sorts, although it installs as a netbeans cluster rather
+# than in /usr/share/java
+libnb-ide14-java: javalib-but-no-public-jars
diff --git a/debian/libnb-java4-java.lintian-overrides 
b/debian/libnb-java4-java.lintian-overrides
deleted file mode 100644
index 6cb405e..0000000
--- a/debian/libnb-java4-java.lintian-overrides
+++ /dev/null
@@ -1,11 +0,0 @@
-# Netbeans builds lots of codeless jars on purpose, so don't warn us about them
-libnb-java4-java: codeless-jar
-
-# It is a library of sorts, although it installs as a netbeans cluster rather
-# than in /usr/share/java
-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
-
diff --git a/debian/libnb-java5-java.lintian-overrides 
b/debian/libnb-java5-java.lintian-overrides
new file mode 100644
index 0000000..c3bbbd7
--- /dev/null
+++ b/debian/libnb-java5-java.lintian-overrides
@@ -0,0 +1,11 @@
+# Netbeans builds lots of codeless jars on purpose, so don't warn us about them
+libnb-java5-java: codeless-jar
+
+# It is a library of sorts, although it installs as a netbeans cluster rather
+# than in /usr/share/java
+libnb-java5-java: javalib-but-no-public-jars
+
+# Netbeans creates this empty directory, and we include it to avoid unneeded
+# changes.
+libnb-java5-java: package-contains-empty-directory
+
diff --git a/debian/pom/AbsoluteLayout.xml b/debian/pom/AbsoluteLayout.xml
new file mode 100644
index 0000000..d366858
--- /dev/null
+++ b/debian/pom/AbsoluteLayout.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd"; 
xmlns="http://maven.apache.org/POM/4.0.0";
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.netbeans.external</groupId>
+  <artifactId>AbsoluteLayout</artifactId>
+  <version>7.0</version>
+  <name>Maven definition for AbsoluteLayout.jar - external part of NetBeans 
module.</name>
+  <description>POM and identification for artifact that was not possible to 
uniquely identify as a maven dependency.</description>
+</project>
diff --git a/debian/rules b/debian/rules
index 0fe5929..c1871af 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,11 +9,11 @@ libnb-platform-java           := $(pkg-lib-platform)-java
 libnb-platform-java-doc        := $(pkg-lib-platform)-java-doc
 libnb-platform-devel-java      := libnb-platform-devel-java
 
-# TODO - update to latest versions
+# Included clusters
 pkg-nb                         := netbeans
-base-apisupport                := apisupport2
-base-ide                       := ide13
-base-java                      := java4
+base-apisupport                := apisupport3
+base-ide                       := ide14
+base-java                      := java5
 base-nb                        := nb
 base-platform                  := platform13
 
@@ -116,6 +116,9 @@ override_dh_auto_install:
        mh_installjar -plibnb-org-openide-modules-java -l 
debian/pom/openide-modules.xml \
                nbbuild/netbeans/platform/lib/org-openide-modules.jar
        mh_installpom -plibnb-org-openide-modules-java 
debian/pom/openide-modules.xml
+       mh_installjar -plibnb-absolutelayout-java -l 
debian/pom/AbsoluteLayout.xml \
+               nbbuild/netbeans/java/modules/ext/AbsoluteLayout.jar
+       mh_installpom -plibnb-absolutelayout-java debian/pom/AbsoluteLayout.xml
        #
        # Install Platform
        echo > nbbuild/netbeans/platform/.noautoupdate
@@ -160,10 +163,13 @@ override_dh_auto_install:
        $(INSTALL)$(pkg-java) nbbuild/netbeans/java/.noautoupdate 
$(NB_INSTALL_DIR)/$(base-java)
        $(INSTALL)$(pkg-java) nbbuild/netbeans/java/.lastModified 
$(NB_INSTALL_DIR)/$(base-java)
        # Link in Ant libraries and binaries
-       -rmdir debian/libnb-java4-java/$(NB_INSTALL_DIR)/$(base-java)/ant/lib
+       -rmdir debian/$(pkg-java)/$(NB_INSTALL_DIR)/$(base-java)/ant/lib
        $(LINK)$(pkg-java)    usr/share/ant/bin         
$(NB_INSTALL_DIR)/$(base-java)/ant/bin
        $(LINK)$(pkg-java)    usr/share/ant/etc         
$(NB_INSTALL_DIR)/$(base-java)/ant/etc
        $(LINK)$(pkg-java)    usr/share/ant/lib         
$(NB_INSTALL_DIR)/$(base-java)/ant/lib
+       # Link in AbsoluteLayout jar
+       -rm 
debian/$(pkg-java)/$(NB_INSTALL_DIR)/$(base-java)/modules/ext/AbsoluteLayout.jar
+       $(LINK)$(pkg-java)    usr/share/java/AbsoluteLayout.jar  
$(NB_INSTALL_DIR)/$(base-java)/modules/ext/AbsoluteLayout.jar
 #
        # Install API support package files
        echo > nbbuild/netbeans/apisupport/.noautoupdate

-- 
netbeans packaging

_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Reply via email to