diff -u libnb-platform7-java-6.0.1/debian/rules libnb-platform7-java-6.0.1/debian/rules --- libnb-platform7-java-6.0.1/debian/rules +++ libnb-platform7-java-6.0.1/debian/rules @@ -2,7 +2,7 @@ #export DH_VERBOSE=1 -JAVA_HOME=/usr/lib/jvm/java-7-icedtea +export JAVA_HOME=/usr/lib/jvm/java-6-openjdk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/debhelper.mk @@ -14,86 +14,48 @@ libnb-platform7-devel-java := $(pkg-lib-base)-devel-java libnb-platform7-java-doc := $(pkg-lib-base)-java-doc +export MKDIRP := mkdir -p +export RMF := rm -f +export JAVADOCDIR := usr/share/doc/$(libnb-platform7-java-doc)/api +export NBDIR := usr/share/netbeans +export JHJAR := jhall.jar + build/$(libnb-platform7-java):: stamp-build-$(libnb-platform7-java) # This target is here to avoid multiple invocation of build target. # build/$(libnb-platform7-java) is invoked 2 times when building binary packages. stamp-build-$(libnb-platform7-java): - # generate empty javax.script file, so there is something in jsr223 API module - mkdir -p libs/jsr223/src/javax/script - echo "package javax.script; class empty { }" > libs/jsr223/src/javax/script/empty.java - mkdir -p libs/jsr223/external - jar cf libs/jsr223/external/jsr223-api.jar libs/jsr223/src/javax/script/empty.java - ln -sf /usr/share/java/swing-layout.jar libs/swing-layout/external/swing-layout-1.0.3.jar - ln -sf /usr/share/java/jsearch.jar apisupport/harness/external/jsearch-2.0_05.jar - ln -sf /usr/share/java/jh.jar core/javahelp/external/jh-2.0_05.jar - - ant \ - -Dpermit.jdk6.builds=true \ - -Dbuild.compiler.deprecation=false \ - -Dbuild.compiler.debug=false \ - -Dverify.checkout=false \ - -f nbbuild/build.xml build-platform + (export LNS="ln -sf"; export INS="dh_install"; export JAVADIR="/usr/share/java"; sh debian/scripts.sh setup) + (export LNS="ln -sf"; export INS="dh_install"; export JAVADIR="/usr/share/java"; sh debian/scripts.sh build) touch $@ install/$(libnb-platform7-java):: - rm -f nbbuild/netbeans/$(pkg-base)/modules/ext/swing-layout-1.0.3.jar - rm -f nbbuild/netbeans/$(pkg-base)/modules/ext/jsearch-2.0_05.jar - rm -f nbbuild/netbeans/$(pkg-base)/modules/ext/jh-2.0_05.jar - echo > nbbuild/netbeans/$(pkg-base)/.noautoupdate - dh_install -p$(libnb-platform7-java) nbbuild/netbeans/$(pkg-base)/* usr/share/netbeans/$(pkg-base) - dh_install -p$(libnb-platform7-java) nbbuild/netbeans/$(pkg-base)/.noautoupdate usr/share/netbeans/$(pkg-base) - dh_link -p$(libnb-platform7-java) usr/share/java/swing-layout.jar usr/share/netbeans/$(pkg-base)/modules/ext/swing-layout-1.0.3.jar - dh_link -p$(libnb-platform7-java) usr/share/java/jh.jar usr/share/netbeans/$(pkg-base)/modules/ext/jh-2.0_05.jar + (export LNS="dh_link -p$(libnb-platform7-java)"; export INS="dh_install -p$(libnb-platform7-java)"; \ + export JAVADIR="usr/share/java"; sh debian/scripts.sh install) build/$(libnb-platform7-devel-java):: stamp-build-$(libnb-platform7-devel-java) # This target is here to avoid multiple invocation of build target. # build/$(libnb-platform7-devel-java) is invoked 2 times when building binary packages. stamp-build-$(libnb-platform7-devel-java): - ant \ - -Dpermit.jdk6.builds=true \ - -Dbuild.compiler.deprecation=false \ - -Dbuild.compiler.debug=false \ - -Dverify.checkout=false \ - -f apisupport/harness/build.xml + (export LNS="ls -sf"; export INS="dh_install"; export JAVADIR="usr/share/java"; sh debian/scripts.sh build_devel) touch $@ install/$(libnb-platform7-devel-java):: - rm -f nbbuild/netbeans/harness/jsearch-2.0_05.jar - echo > nbbuild/netbeans/harness/.noautoupdate - dh_install -p$(libnb-platform7-devel-java) nbbuild/netbeans/harness/* usr/share/netbeans/harness - dh_install -p$(libnb-platform7-devel-java) nbbuild/netbeans/harness/.noautoupdate usr/share/netbeans/harness - dh_link -p$(libnb-platform7-devel-java) usr/share/java/jsearch.jar usr/share/netbeans/harness/jsearch-2.0_05.jar + (export LNS="dh_link -p$(libnb-platform7-devel-java)"; export INS="dh_install -p$(libnb-platform7-devel-java)"; \ + export JAVADIR="usr/share/java"; sh debian/scripts.sh install_devel) build/$(libnb-platform7-java-doc):: stamp-build-$(libnb-platform7-java-doc) # This target is here to avoid multiple invocation of build target. # build/$(libnb-platform7-java-doc) is invoked 2 times when building binary packages. stamp-build-$(libnb-platform7-java-doc): - ant \ - -Dpermit.jdk6.builds=true \ - -Dbuild.compiler.deprecation=false \ - -Dbuild.compiler.debug=false \ - -Dverify.checkout=false \ - -Dallmodules= \ - -Dcluster.config=platform \ - -Dconfig.javadoc.cluster=platform7 \ - -Dconfig.javadoc.netbeans=openide/util,openide/actions,openide/options,openide/awt,\ - openide/dialogs,openide/nodes,openide/explorer,openide/fs,openide/modules,\ - openide/text,openide/windows,openide/loaders,openide/io,projects/queries,\ - core/progress,core/settings,core/javahelp,openide/execution,\ - core/sendopts,core/options,editor/mimelookup \ - -Djavadoc.docs.org-netbeans-api-java=http://www.netbeans.org/download/6_0/javadoc/org-netbeans-api-java/ \ - -Djavadoc.docs.org-netbeans-modules-project-ant=http://www.netbeans.org/download/6_0/javadoc/org-netbeans-modules-project-ant/ \ - -Djavadoc.docs.org-netbeans-modules-projectapi=http://www.netbeans.org/download/6_0/javadoc/org-netbeans-modules-projectapi/ \ - -f nbbuild/build.xml build-javadoc + (export LNS="ls -sf"; export INS="dh_install"; export JAVADIR="usr/share/java"; sh debian/scripts.sh build_javadoc) touch $@ install/$(libnb-platform7-java-doc):: - # copy core platform files - rm -f nbbuild/build/javadoc/*.zip - dh_install -p$(libnb-platform7-java-doc) nbbuild/build/javadoc/* usr/share/doc/$(libnb-platform7-java-doc)/api + (export LNS="dh_link"; export INS="dh_install -p$(libnb-platform7-java-doc)"; export JAVADIR="usr/share/java"; \ + sh debian/scripts.sh install_javadoc) clean:: # these files are left by cdbs (a bug?) diff -u libnb-platform7-java-6.0.1/debian/control libnb-platform7-java-6.0.1/debian/control --- libnb-platform7-java-6.0.1/debian/control +++ libnb-platform7-java-6.0.1/debian/control @@ -4,7 +4,7 @@ Maintainer: Ubuntu MOTU Developers XSBC-Original-Maintainer: Marek Slama Build-Depends: debhelper (>=5), cdbs (>=0.4.8), ant (>=1.7.0), ant-optional (>=1.7.0), - icedtea-java7-jdk, javahelp2 + openjdk-6-jdk, javahelp2 Build-Depends-Indep: libswing-layout-java Standards-Version: 3.7.3 Homepage: http://www.netbeans.org @@ -12,7 +12,7 @@ Package: libnb-platform7-java Architecture: all Section: libs -Depends: icedtea-java7-jre | sun-java6-jre, javahelp2, libswing-layout-java +Depends: openjdk-6-jre | sun-java6-jre, javahelp2, libswing-layout-java Suggests: Description: NetBeans Platform for building rich desktop applications in Java NetBeans Platform is the framework for building rich desktop applications @@ -21,7 +21,7 @@ Package: libnb-platform7-devel-java Architecture: all Section: libdevel -Depends: icedtea-java7-jre | sun-java6-jre, javahelp2 +Depends: openjdk-6-jre | sun-java6-jre, javahelp2 Suggests: libnb-platform7-java Description: Build harness for NetBeans Platform Harness with build scripts and ant tasks for everyone who builds diff -u libnb-platform7-java-6.0.1/debian/changelog libnb-platform7-java-6.0.1/debian/changelog --- libnb-platform7-java-6.0.1/debian/changelog +++ libnb-platform7-java-6.0.1/debian/changelog @@ -1,3 +1,12 @@ +libnb-platform7-java (6.0.1-0ubuntu3) hardy; urgency=low + + * Bug fix update (LP: #201341) + - Update dependency to openjdk-6 (LP: #201337) + - Refactoring of build script to share essential parts + with rpm build (LP: #201339) + + -- Marek Slama Fri, 07 Mar 2008 14:00:00 +0100 + libnb-platform7-java (6.0.1-0ubuntu2) hardy; urgency=low * Updated copyright file from Marek Slama (LP: #193099) only in patch2: unchanged: --- libnb-platform7-java-6.0.1.orig/debian/scripts.sh +++ libnb-platform7-java-6.0.1/debian/scripts.sh @@ -0,0 +1,124 @@ +#!/bin/sh + +set -x + +[ -z "$MKDIRP" ] && exit 1 +[ -z "$RMF" ] && exit 1 +[ -z "$LNS" ] && exit 1 +[ -z "$INS" ] && exit 1 +[ -z "$JAVADIR" ] && exit 1 +[ -z "$JAVADOCDIR" ] && exit 1 +[ -z "$NBDIR" ] && exit 1 +[ -z "$JHJAR" ] && exit 1 + +setup() { + # generate empty javax.script file, so there is something in jsr223 API module + $MKDIRP libs/jsr223/src/javax/script + echo "package javax.script; class empty { }" > libs/jsr223/src/javax/script/empty.java + $MKDIRP libs/jsr223/external + jar cf libs/jsr223/external/jsr223-api.jar libs/jsr223/src/javax/script/empty.java + $LNS $JAVADIR/swing-layout.jar libs/swing-layout/external/swing-layout-1.0.3.jar + $LNS $JAVADIR/$JHJAR apisupport/harness/external/jsearch-2.0_05.jar + $LNS $JAVADIR/$JHJAR core/javahelp/external/jh-2.0_05.jar +} + +build() { + ant \ + -Dpermit.jdk6.builds=true \ + -Dbuild.compiler.deprecation=false \ + -Dbuild.compiler.debug=false \ + -Dverify.checkout=false \ + -f nbbuild/build.xml build-platform +} + + +install() { + $RMF nbbuild/netbeans/platform7/modules/ext/swing-layout-1.0.3.jar + $RMF nbbuild/netbeans/platform7/modules/ext/jsearch-2.0_05.jar + $RMF nbbuild/netbeans/platform7/modules/ext/jh-2.0_05.jar + echo > nbbuild/netbeans/platform7/.noautoupdate + $MKDIRP $NBDIR/platform7 + $INS nbbuild/netbeans/platform7/* ${NBDIR}/platform7 + $INS nbbuild/netbeans/platform7/.noautoupdate ${NBDIR}/platform7 + $LNS ${JAVADIR}/swing-layout.jar ${NBDIR}/platform7/modules/ext/swing-layout-1.0.3.jar + $LNS ${JAVADIR}/$JHJAR ${NBDIR}/platform7/modules/ext/jh-2.0_05.jar +} + + +build_devel() { + ant \ + -Dpermit.jdk6.builds=true \ + -Dbuild.compiler.deprecation=false \ + -Dbuild.compiler.debug=false \ + -Dverify.checkout=false \ + -f apisupport/harness/build.xml +} + + +install_devel() { + $RMF nbbuild/netbeans/harness/jsearch-2.0_05.jar + echo > nbbuild/netbeans/harness/.noautoupdate + $MKDIRP $NBDIR/harness + $INS nbbuild/netbeans/harness/* $NBDIR/harness + $INS nbbuild/netbeans/harness/.noautoupdate $NBDIR/harness + $LNS $JAVADIR/$JHJAR $NBDIR/harness/jsearch-2.0_05.jar +} + +build_javadoc() { + ant \ + -Dpermit.jdk6.builds=true \ + -Dbuild.compiler.deprecation=false \ + -Dbuild.compiler.debug=false \ + -Dverify.checkout=false \ + -Dallmodules= \ + -Dcluster.config=platform \ + -Dconfig.javadoc.cluster=platform7 \ + -Dconfig.javadoc.netbeans=\ +openide/util,openide/actions,openide/options,openide/awt,\ +openide/dialogs,openide/nodes,openide/explorer,openide/fs,openide/modules,\ +openide/text,openide/windows,openide/loaders,openide/io,projects/queries,\ +core/progress,core/settings,core/javahelp,openide/execution,\ +core/sendopts,core/options,editor/mimelookup \ + -Djavadoc.docs.org-netbeans-api-java=http://www.netbeans.org/download/6_0/javadoc/org-netbeans-api-java/ \ + -Djavadoc.docs.org-netbeans-modules-project-ant=http://www.netbeans.org/download/6_0/javadoc/org-netbeans-modules-project-ant/ \ + -Djavadoc.docs.org-netbeans-modules-projectapi=http://www.netbeans.org/download/6_0/javadoc/org-netbeans-modules-projectapi/ \ + -f nbbuild/build.xml build-javadoc +} + +install_javadoc() { + # copy core platform files + $RMF nbbuild/build/javadoc/*.zip + $MKDIRP $JAVADOCDIR + $INS nbbuild/build/javadoc/* $JAVADOCDIR +} + + + + +case $1 in +setup) + setup + ;; +build) + build + ;; +build_devel) + build_devel + ;; +build_javadoc) + build_javadoc + ;; +install) + install + ;; +install_devel) + install_devel + ;; +install_javadoc) + install_javadoc + ;; +*) + exit 1 + ;; +esac +