Index: core/src/org/netbeans/core/modules/NbInstaller.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/modules/NbInstaller.java,v
--- core/src/org/netbeans/core/modules/NbInstaller.java	23 Oct 2002 16:22:30 -0000	1.53
+++ core/src/org/netbeans/core/modules/NbInstaller.java	24 Oct 2002 15:55:38 -0000
@@ -778,9 +778,41 @@ 
                 }
             }
             if (!alreadyHaveJH) {
-                Util.err.log("Adding automatic dependency on JavaHelp for module " + m.getCodeNameBase());
+                Util.err.log("Adding automatic dependency on org.netbeans.api.javahelp.Help for module " + m.getCodeNameBase());
                 dependencies.addAll(Dependency.create(Dependency.TYPE_REQUIRES,
                                                       "org.netbeans.api.javahelp.Help")); // NOI18N
+            }
+            // #27776: need to also handle package deps on javax.help,
+            // which should now be module deps on
+            // org.netbeans.modules.javahelp.
+            alreadyHaveJH = false;
+            it = dependencies.iterator();
+            while (it.hasNext()) {
+                Dependency d = (Dependency)it.next();
+                if (d.getType() == Dependency.TYPE_MODULE &&
+                        d.getName().startsWith("org.netbeans.modules.javahelp/")) { // NOI18N
+                    alreadyHaveJH = true;
+                    break;
+                }
+            }
+            if (!alreadyHaveJH) {
+                boolean needPackageJH = false;
+                it = dependencies.iterator();
+                String pkg = "javax.help"; // NOI18N
+                while (it.hasNext()) {
+                    Dependency d = (Dependency)it.next();
+                    String name = d.getName();
+                    if (d.getType() == Dependency.TYPE_PACKAGE &&
+                            (name.equals(pkg) || name.startsWith("[" + pkg + ".") || name.startsWith(pkg + "["))) { // NOI18N
+                        needPackageJH = true;
+                        break;
+                    }
+                }
+                if (needPackageJH) {
+                    Util.err.log("Adding automatic dependency on org.netbeans.modules.javahelp for module " + m.getCodeNameBase());
+                    dependencies.addAll(Dependency.create(Dependency.TYPE_MODULE,
+                                                          "org.netbeans.modules.javahelp/1 > 1.0")); // NOI18N
+                }
             }
         }
         // For pre-3.14, add automatic deps on org.openide.src and org.openide.deprecated.