The following commit has been merged in the master branch: commit 656bf870ce96e913f1f7a98b6d71c663355d98eb Author: Andrew Ross <ubu...@rossfamily.co.uk> Date: Mon Oct 17 23:01:17 2011 +0100
Update dependencies. diff --git a/debian/changelog b/debian/changelog index 1ffd709..1d7f046 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +netbeans (7.0.1+dfsg1-3) unstable; urgency=low + + * Use libosgi-core-java and libosgi-compendium-java for osgi. + * Use libflute-java instead of libflute-1.3-jfree-java. + + -- Andrew Ross <ubu...@rossfamily.co.uk> Sun, 16 Oct 2011 20:53:51 +0100 + netbeans (7.0.1+dfsg1-2) unstable; urgency=low * Handle rename of libcommons-net-java to libcommons-net1-java. diff --git a/debian/control b/debian/control index 7ea97d5..a3dd3ea 100644 --- a/debian/control +++ b/debian/control @@ -9,12 +9,13 @@ Build-Depends: debhelper (>= 7.0.50~), javahelper, ant (>= 1.7.0), w3c-dtd-xhtml, javacc, libjemmy2-java, javahelp2, libbindex-java, libswing-layout-java (>= 1.0.3), libjna-java (>= 3.2.7-2~), - libfelix-framework-java, libfelix-main-java, libequinox-osgi-java, - antlr3 (>= 3.2), libstringtemplate-java, junit4 (>= 4.6), libhamcrest-java, + libfelix-framework-java, libfelix-main-java, libosgi-core-java, + libosgi-compendium-java, antlr3 (>= 3.2), libstringtemplate-java, + junit4 (>= 4.6), libhamcrest-java, libcommons-codec-java, libbytelist-java, libcommons-logging-java, - libcommons-net1-java, libflute-1.3-jfree-java, libfreemarker-java, + libcommons-net1-java, libflute-java, libfreemarker-java, libini4j-java (>=0.5), liboro-java, libjsch-java (>= 0.1.42), - libjvyamlb-java (>= 0.2.5-2~), libjzlib-java (>= 1.0.7), + libjvyamlb-java (>= 0.2.5-2~), libjzlib-java (>= 1.0.7), liblucene2-java (>= 2.4.1), libxml-commons-resolver1.1-java (>= 1.2-3), libsac-java, libservlet2.5-java, libsvnclientadapter-java, libsvn-java, libsvnkit-java, libswingx1-java, libtrilead-ssh2-java, @@ -31,9 +32,9 @@ Package: libnb-platform13-java Architecture: all Depends: ${misc:Depends}, ${java:Depends}, javahelp2, 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 + libfelix-framework-java, libfelix-main-java, libosgi-core-java, + libosgi-compendium-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 @@ -123,7 +124,7 @@ Package: libnb-ide13-java Architecture: all Depends: ${java:Depends}, ${misc:Depends}, libnb-platform13-java (>= 7.0), antlr3 (>= 3.2), libcommons-codec-java, libbytelist-java, - libcommons-logging-java, libcommons-net1-java, libflute-1.3-jfree-java, + libcommons-logging-java, libcommons-net1-java, libflute-java, libfreemarker-java, libini4j-java (>= 0.5), liboro-java, libjsch-java (>= 0.1.42), libjvyamlb-java (>= 0.2.5-2~), libjzlib-java (>= 1.0.7), liblucene2-java (>= 2.4.1), diff --git a/debian/linked-jars b/debian/linked-jars index ab02977..c75e721 100644 --- a/debian/linked-jars +++ b/debian/linked-jars @@ -8,7 +8,8 @@ $JAVADIR/jna.jar libs.jna/external platform/modules/ext jna-3.2.7.jar $JAVADIR/jna-platform.jar core.nativeaccess/external platform/modules/ext platform-3.2.7.jar $JAVADIR/org.apache.felix.framework.jar libs.felix/external platform/modules/ext felix-2.0.3.jar $JAVADIR/org.apache.felix.main.jar libs.felix/external platform/modules/ext felix-main-2.0.2.jar -$JAVADIR/org.eclipse.osgi.services.jar libs.osgi/external platform/modules/ext osgi.cmpn-4.2.jar +$JAVADIR/osgi.compendium.jar libs.osgi/external platform/modules/ext osgi.cmpn-4.2.jar +$JAVADIR/osgi.core.jar libs.osgi/external platform/modules/ext osgi.core-4.2.jar $JAVADIR/antlr3.jar libs.antlr3.devel/external platform/modules/ext antlr-3.1.3.jar $JAVADIR/stringtemplate.jar libs.antlr3.devel/external platform/modules/ext stringtemplate-3.2.jar $JAVADIR/junit4.jar libs.junit4/external platform/modules/ext junit-4.8.2.jar @@ -19,7 +20,7 @@ $JAVADIR/commons-codec.jar libs.commons_codec/external ide/modules/ext apache-co $JAVADIR/bytelist.jar libs.bytelist/external ide/modules/ext bytelist-0.1.jar $JAVADIR/commons-logging.jar libs.commons_logging/external ide/modules/ext commons-logging-1.1.jar $JAVADIR/commons-net.jar libs.commons_net/external ide/modules/ext commons-net-1.4.1.jar -$JAVADIR/flute-1.3-jfree.jar css.visual/external ide/modules/ext flute-1.3.jar +$JAVADIR/flute.jar css.visual/external ide/modules/ext flute-1.3.jar $JAVADIR/freemarker.jar libs.freemarker/external ide/modules/ext freemarker-2.3.8.jar $JAVADIR/ini4j.jar libs.ini4j/external ide/modules/ext ini4j-0.5.1.jar $JAVADIR/oro.jar libs.jakarta_oro/external ide/modules/ext jakarta-oro-2.0.8.jar diff --git a/debian/rules b/debian/rules index 02cfc8d..b4a6433 100755 --- a/debian/rules +++ b/debian/rules @@ -67,11 +67,11 @@ override_dh_auto_build: # link the required jars $(shell awk 'NF==4 {printf("ln -sf %s %s/%s;\n",$$1,$$2,$$4)}' debian/linked-jars) ######## Remove services and org/eclipse/* from equinox osgi.jar##################### - mkdir debian/jar_tmp; cd debian/jar_tmp; \ - jar -xf $(JAVADIR)/org.eclipse.osgi.jar; \ - rm -rf META-INF/services org/eclipse; \ - jar -cf ../../libs.osgi/external/osgi.core-4.2.jar ./*; - rm -rf debian/jar_tmp +# mkdir debian/jar_tmp; cd debian/jar_tmp; \ +# jar -xf $(JAVADIR)/org.eclipse.osgi.jar; \ +# rm -rf META-INF/services org/eclipse; \ +# jar -cf ../../libs.osgi/external/osgi.core-4.2.jar ./*; +# rm -rf debian/jar_tmp #TODO $(call symlink, /usr/share/ant/lib, o.apache.tools.ant.module/external/lib) ################################################################ # Build the Windows launcher @@ -223,11 +223,11 @@ override_dh_auto_clean: mh_clean # remove all the symlinks to jar files we created find . -name "*.jar" -type l -execdir rm -f \{\} \; - -rm -f libs.osgi/external/osgi.core-4.2.jar +# -rm -f libs.osgi/external/osgi.core-4.2.jar -rm -rf nbbuild/external/xhtml1-dtds -rm -f nbbuild/nbproject/private/scan-cache-standard.ser # -rm -f nbbuild/nbantext.jar - -rm -rf debian/jar_tmp +# -rm -rf debian/jar_tmp -rm -f debian/license_accepted # these files are not deleted by ant clean though it should so delete here -rm -f swingapp/src/org/netbeans/modules/swingapp/resources/CRUDShellApp.zip -- 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