This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository netbeans.
commit f0f5696a02ae49dcb02a5048eae52f6bff8e1691 Author: Markus Koschany <[email protected]> Date: Sun Jun 14 15:56:00 2015 +0200 Do not build the platform packages anymore. Instead depend on libnb-platform18-java. --- debian/control | 97 ++-------------------- ...ibnb-org-openide-modules-java.lintian-overrides | 3 - .../libnb-org-openide-util-java.lintian-overrides | 3 - debian/libnb-platform-devel-java.lintian-overrides | 8 -- debian/libnb-platform13-java-doc.javadoc | 1 - debian/libnb-platform13-java.lintian-overrides | 7 -- debian/rules | 53 +----------- 7 files changed, 7 insertions(+), 165 deletions(-) diff --git a/debian/control b/debian/control index 410fb1c..9bccd1d 100644 --- a/debian/control +++ b/debian/control @@ -90,8 +90,8 @@ Architecture: all Depends: libnb-ide14-java (= ${binary:Version}), libnb-java5-java (= ${binary:Version}), - libnb-platform-devel-java (>= 7.0), - libnb-platform13-java (>= 7.0), + libnb-platform-devel-java, + libnb-platform18-java, ${java:Depends}, ${misc:Depends} Description: Common NetBeans Platform Development Related Libraries for NetBeans @@ -118,7 +118,7 @@ Depends: libjzlib-java (>= 1.0.7), liblucene3-java, libmysql-java, - libnb-platform13-java (>= 7.0), + libnb-platform18-java, libpostgresql-jdbc-java, libservlet2.5-java, libsimple-validation-java, @@ -153,7 +153,7 @@ Depends: libnb-absolutelayout-java, libnb-ide14-java (= ${binary:Version}), libnb-javaparser-java (>= 7.0.1~), - libnb-platform13-java (>= 7.0), + libnb-platform18-java, ${java:Depends}, ${misc:Depends} Description: Common Java Related Libraries for NetBeans @@ -161,93 +161,6 @@ 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-org-openide-modules-java -Architecture: all -Depends: - libnb-org-openide-util-java, - libnb-org-openide-util-lookup-java, - ${java:Depends}, - ${misc:Depends} -Description: Utility classes for modules from the NetBeans Platform - The NetBeans Platform is a set of modules, each providing their own - APIs and working together or in a standalone mode. This package provides - some utility functions for managing NetBeans modules. - -Package: libnb-org-openide-util-java -Architecture: all -Depends: - libnb-org-openide-util-lookup-java, - ${java:Depends}, - ${misc:Depends} -Provides: - libopenide-util-java -Replaces: - libopenide-util-java -Conflicts: - libopenide-util-java -Description: Utility classes from the NetBeans Platform - The NetBeans Platform is a set of modules, each providing their own - APIs and working together or in a standalone mode. This package provides - some utility functions used by the modules that make up the platform. - -Package: libnb-org-openide-util-lookup-java -Architecture: all -Depends: - ${java:Depends}, - ${misc:Depends} -Description: Utility lookup classes from the NetBeans Platform - The NetBeans Platform is a set of modules, each providing their own - APIs and working together or in a standalone mode. This package provides - some utility functions for lookups and is used by the modules that make - up the platform. - -Package: libnb-platform-devel-java -Architecture: all -Depends: - ant, - javahelp2, - libbindex-java, - libjemmy2-java, - libjnlp-servlet-java, - libnb-platform13-java, - ${java:Depends}, - ${misc:Depends} -Description: Build harness for NetBeans Platform - 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 - items, toolbar items, keyboard shortcuts and more. It is the core of the - NetBeans IDE. - . - This package contains the NetBeans Platform Harness containing the build - scripts and ant tasks required to build an application on top of NetBeans - Platform. - -Package: libnb-platform13-java -Architecture: all -Depends: - antlr3 (>= 3.2), - javahelp2, - junit4 (>= 4.6), - libfelix-framework-java, - libfelix-main-java, - libjna-java (>= 3.2.7-2~), - libjna-platform-java, - libnb-org-openide-modules-java, - libnb-org-openide-util-java, - libnb-org-openide-util-lookup-java, - libosgi-compendium-java, - libosgi-core-java, - libswing-layout-java (>= 1.0.3), - ${java:Depends}, - ${misc:Depends} -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 - items, toolbar items, keyboard shortcuts and more. It is the core of the - NetBeans IDE. - . - This package provides the platform itself. - Package: netbeans Architecture: all Depends: @@ -256,7 +169,7 @@ Depends: libnb-apisupport3-java (= ${binary:Version}), libnb-ide14-java (= ${binary:Version}), libnb-java5-java (= ${binary:Version}), - libnb-platform13-java (>= 7.0), + libnb-platform18-java, ${java:Depends}, ${misc:Depends} Description: Extensible Java IDE diff --git a/debian/libnb-org-openide-modules-java.lintian-overrides b/debian/libnb-org-openide-modules-java.lintian-overrides deleted file mode 100644 index e648f48..0000000 --- a/debian/libnb-org-openide-modules-java.lintian-overrides +++ /dev/null @@ -1,3 +0,0 @@ -# Netbeans has it's own way to set the classpath, and it breaks things if we -# set it separately. -libnb-org-openide-modules-java: missing-classpath diff --git a/debian/libnb-org-openide-util-java.lintian-overrides b/debian/libnb-org-openide-util-java.lintian-overrides deleted file mode 100644 index 6e5d028..0000000 --- a/debian/libnb-org-openide-util-java.lintian-overrides +++ /dev/null @@ -1,3 +0,0 @@ -# Netbeans has it's own way to set the classpath, and it breaks things if we -# set it separately. -libnb-org-openide-util-java: missing-classpath diff --git a/debian/libnb-platform-devel-java.lintian-overrides b/debian/libnb-platform-devel-java.lintian-overrides deleted file mode 100644 index c371f7c..0000000 --- a/debian/libnb-platform-devel-java.lintian-overrides +++ /dev/null @@ -1,8 +0,0 @@ -# Netbeans builds lots of codeless jars on purpose, so don't warn us about them -libnb-platform-devel-java: codeless-jar - -# This is a library package in the sense that it doesn't by itself provide an -# 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 - diff --git a/debian/libnb-platform13-java-doc.javadoc b/debian/libnb-platform13-java-doc.javadoc deleted file mode 100644 index f1a758c..0000000 --- a/debian/libnb-platform13-java-doc.javadoc +++ /dev/null @@ -1 +0,0 @@ -nbbuild/build/javadoc /usr/share/doc/libnb-platform13-java-doc/api diff --git a/debian/libnb-platform13-java.lintian-overrides b/debian/libnb-platform13-java.lintian-overrides deleted file mode 100644 index cffaca7..0000000 --- a/debian/libnb-platform13-java.lintian-overrides +++ /dev/null @@ -1,7 +0,0 @@ -# Netbeans builds lots of codeless jars on purpose, so don't warn us about them -libnb-platform13-java: codeless-jar - -# This is a library package in the sense that it doesn't by itself provide an -# 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 diff --git a/debian/rules b/debian/rules index 5c2e8bc..92214c9 100755 --- a/debian/rules +++ b/debian/rules @@ -2,19 +2,13 @@ export JAVA_HOME=/usr/lib/jvm/default-java -#package names -pkg-platform := platform13 -pkg-lib-platform := libnb-$(pkg-platform) -libnb-platform-java := $(pkg-lib-platform)-java -libnb-platform-devel-java := libnb-platform-devel-java - # Included clusters pkg-nb := netbeans base-apisupport := apisupport3 base-ide := ide14 base-java := java5 base-nb := nb -base-platform := platform13 +base-platform := platform18 pkg-apisupport := libnb-$(base-apisupport)-java pkg-ide := libnb-$(base-ide)-java @@ -31,14 +25,10 @@ NB_JSEARCH_JAR := jsearch-2.0_05.jar NB_INSTALL_DIR := usr/share/netbeans -EXT_JAR_LINK_DIR := $(NB_INSTALL_DIR)/$(pkg-platform)/modules/ext/ -LIB_DIR := $(NB_INSTALL_DIR)/$(pkg-platform)/lib/ INSTALL := dh_install -p LINK := dh_link -p -NB_PLATFORM_BUILD_DIR := $(shell pwd)/nbbuild/netbeans/platform - DEB_UPSTREAM_VERSION = $(shell dpkg-parsechangelog | \ grep -e '^Version' | \ perl -pi -e 's/^Version:\s+(.*)\+dfsg\d+-\d+.*$$/$$1/') @@ -61,13 +51,6 @@ override_dh_auto_build: # link Debian's system jars $(shell awk 'NF==4 {printf("ln -sf %s %s/%s;\n",$$1,$$2,$$4)}' debian/linked-jars) ################################################################ - # Build the Windows launcher - mkdir -p nbbuild/netbeans/platform/lib - cd o.n.bootstrap/launcher/windows && LDFLAGS="" CONF="nbexec" make -e - cd o.n.bootstrap/launcher/windows && LDFLAGS="" CONF="nbexec64" make -e - cd apisupport.harness/windows-launcher-src && LDFLAGS="" CONF="app.exe" make -e - cd apisupport.harness/windows-launcher-src && LDFLAGS="" CONF="app64.exe" make -e - ################################################################ # Build the IDE. DISPLAY must be unset to avoid build failures. unset DISPLAY; ant \ -Dpermit.jdk7.builds=true \ @@ -84,40 +67,10 @@ override_dh_auto_install: # recreate links $(shell awk 'NF==4 {printf("ln -sf %s nbbuild/netbeans/%s/%s;\n",$$1,$$3,$$4)}' debian/linked-jars) # Install libraries - mh_installjar -plibnb-org-openide-util-java -l debian/pom/openide-util.xml \ - nbbuild/netbeans/platform/lib/org-openide-util.jar - mh_installpom -plibnb-org-openide-util-java debian/pom/openide-util.xml - mh_installjar -plibnb-org-openide-util-lookup-java -l debian/pom/openide-util-lookup.xml \ - nbbuild/netbeans/platform/lib/org-openide-util-lookup.jar - mh_installpom -plibnb-org-openide-util-lookup-java debian/pom/openide-util-lookup.xml - 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 - echo > nbbuild/netbeans/platform/.lastModified - $(INSTALL)$(libnb-platform-java) nbbuild/netbeans/platform/* $(NB_INSTALL_DIR)/$(pkg-platform) - $(INSTALL)$(libnb-platform-java) nbbuild/netbeans/platform/.noautoupdate $(NB_INSTALL_DIR)/$(pkg-platform) - $(INSTALL)$(libnb-platform-java) nbbuild/netbeans/platform/.lastModified $(NB_INSTALL_DIR)/$(pkg-platform) - $(LINK)$(libnb-platform-java) $(JAVADIR)/org-openide-util.jar $(LIB_DIR)/org-openide-util.jar - $(LINK)$(libnb-platform-java) $(JAVADIR)/org-openide-util-lookup.jar $(LIB_DIR)/org-openide-util-lookup.jar - $(LINK)$(libnb-platform-java) $(JAVADIR)/org-openide-modules.jar $(LIB_DIR)/org-openide-modules.jar - # - # Install devel package - rm -f nbbuild/netbeans/harness/antlib/$(NB_JSEARCH_JAR) - echo > nbbuild/netbeans/harness/.noautoupdate - echo > nbbuild/netbeans/harness/.lastModified - $(INSTALL)$(libnb-platform-devel-java) nbbuild/netbeans/harness/* $(NB_INSTALL_DIR)/harness - $(INSTALL)$(libnb-platform-devel-java) nbbuild/netbeans/harness/.noautoupdate $(NB_INSTALL_DIR)/harness - $(INSTALL)$(libnb-platform-devel-java) nbbuild/netbeans/harness/.lastModified $(NB_INSTALL_DIR)/harness - # - #Fixing permissions - chmod 0755 debian/$(libnb-platform-devel-java)/$(NB_INSTALL_DIR)/harness/launchers/app.sh - # # Install IDE package files echo > nbbuild/netbeans/ide/.noautoupdate echo > nbbuild/netbeans/ide/.lastModified @@ -184,9 +137,7 @@ override_dh_auto_install: override_dh_auto_clean: - -rm -f *.cdbs-config_list - -rm -f stamp-build-$(libnb-platform-java) - -rm -f stamp-build-$(libnb-platform-devel-java) + dh_auto_clean $(call symlink, $(JAVADIR)/$(JH_JAR), javahelp/external/$(NB_JH_JAR)) $(call symlink, $(JAVADIR)/$(JSEARCH_JAR), apisupport.harness/external/$(NB_JSEARCH_JAR)) ant -Dpermit.jdk7.builds=true -f nbbuild/build.xml clean -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/netbeans.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
