The following commit has been merged in the master branch:
commit 2562835dd84fee2fa99fdafea58e722d6d4f5bab
Author: Andrew Ross <ubu...@rossfamily.co.uk>
Date: Thu Dec 22 20:41:27 2011 +0000
Include junit library definitions
diff --git a/debian/changelog b/debian/changelog
index 62e7c1d..ae9b6af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+netbeans (7.0.1+dfsg1-5) unstable; urgency=low
+
+ * Include junit library definitions.
+ * Make libnb-platform13-java depend on antlr3. (Closes: #651214)
+ * Avoid including javadoc twice in libnb-platform13-java-doc.
+
+ -- Andrew Ross <ubu...@rossfamily.co.uk> Thu, 22 Dec 2011 20:36:14 +0000
+
netbeans (7.0.1+dfsg1-4) unstable; urgency=low
* Patch core.osgi to use osgi-core 4.3. (Closes: #649750)
diff --git a/debian/control b/debian/control
index ef96a97..0d24406 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Build-Depends: debhelper (>= 7.0.50~), javahelper, ant (>=
1.7.0),
libsimple-validation-java, libxerces2-java, libpg-java,
libmysql-java,
libbetter-appframework-java, libbeansbinding-java, libcglib-java,
- libnb-javaparser-java (>= 7.0.1~)
+ libnb-javaparser-java (>= 7.0.1~), junit
Standards-Version: 3.9.2
Homepage: http://netbeans.org/
Vcs-Browser: http://git.debian.org/?p=pkg-java/netbeans.git
@@ -151,7 +151,7 @@ Package: libnb-java5-java
Architecture: all
Depends: ${java:Depends}, ${misc:Depends},
libnb-platform13-java (>= 7.0), libnb-ide14-java (= ${binary:Version}),
- libnb-absolutelayout-java,
+ libnb-absolutelayout-java, junit, junit-doc, junit4-doc,
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
diff --git a/debian/libnb-java5-java.lintian-overrides
b/debian/libnb-java5-java.lintian-overrides
index c3bbbd7..579a139 100644
--- a/debian/libnb-java5-java.lintian-overrides
+++ b/debian/libnb-java5-java.lintian-overrides
@@ -4,8 +4,3 @@ 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/patches/netbeans~include-junit.patch
b/debian/patches/netbeans~include-junit.patch
index 83e1c32..619c840 100644
--- a/debian/patches/netbeans~include-junit.patch
+++ b/debian/patches/netbeans~include-junit.patch
@@ -1,38 +1,12 @@
-Description: Upstream changes introduced in version 7.0.1+dfsg1-4
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- 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)
- .
- The person named in the Author field signed this changelog entry.
-Author: Andrew Ross <ubu...@rossfamily.co.uk>
-Bug-Debian: http://bugs.debian.org/646856
-Bug-Debian: http://bugs.debian.org/646857
-Bug-Debian: http://bugs.debian.org/649750
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
+Include the junitlib module as part of the java cluster. This provides the
+necessary references to the junit jars (junit.jar and junit4.jar) in order
+to use the junit testing framework. This module would otherwise have to be
+downloaded from the Netbeans site.
Index: netbeans/nbbuild/cluster.properties
===================================================================
---- netbeans.orig/nbbuild/cluster.properties 2011-12-18 17:43:17.000000000
+0000
-+++ netbeans/nbbuild/cluster.properties 2011-12-18 17:43:17.000000000
+0000
+--- netbeans.orig/nbbuild/cluster.properties 2011-12-22 19:48:15.312713133
+0000
++++ netbeans/nbbuild/cluster.properties 2011-12-22 19:48:15.472713052
+0000
@@ -426,6 +426,7 @@
jellytools,\
jellytools.java,\
@@ -52,7 +26,7 @@ Index: netbeans/nbbuild/cluster.properties
Index: netbeans/junitlib/build.xml
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ netbeans/junitlib/build.xml 2011-12-18 17:43:17.000000000 +0000
++++ netbeans/junitlib/build.xml 2011-12-22 19:48:15.472713052 +0000
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project basedir="." default="netbeans" name="junitlib">
@@ -63,7 +37,7 @@ Index: netbeans/junitlib/build.xml
Index: netbeans/junitlib/manifest.mf
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ netbeans/junitlib/manifest.mf 2011-12-18 17:43:17.000000000 +0000
++++ netbeans/junitlib/manifest.mf 2011-12-22 19:48:15.472713052 +0000
@@ -0,0 +1,6 @@
+Manifest-Version: 1.0
+OpenIDE-Module: org.netbeans.modules.junitlib
@@ -74,8 +48,8 @@ Index: netbeans/junitlib/manifest.mf
Index: netbeans/junitlib/src/org/netbeans/modules/junitlib/junit-3.8.2.xml
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ netbeans/junitlib/src/org/netbeans/modules/junitlib/junit-3.8.2.xml
2011-12-18 17:43:17.000000000 +0000
-@@ -0,0 +1,26 @@
++++ netbeans/junitlib/src/org/netbeans/modules/junitlib/junit-3.8.2.xml
2011-12-22 20:02:43.922716077 +0000
+@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE library PUBLIC "-//NetBeans//DTD Library Declaration 1.0//EN"
"http://www.netbeans.org/dtds/library-declaration-1_0.dtd";>
+<library version="1.0">
@@ -88,24 +62,13 @@ Index:
netbeans/junitlib/src/org/netbeans/modules/junitlib/junit-3.8.2.xml
+ </volume>
+ <volume>
+ <type>javadoc</type>
-+
<resource>jar:nbinst://org.netbeans.modules.junitlib/docs/junit-3.8.2-api.zip!/</resource>
-+ </volume>
-+ <!-- Not currently bundled:
-+ <volume>
-+ <type>src</type>
-+
<resource>jar:nbinst://org.netbeans.modules.junitlib/docs/junit-3.8.2-src.jar!/</resource>
-+ </volume>
-+ -->
-+ <volume>
-+ <!-- please check with mkle...@netbeans.org before/after updating
this or "classpath" section -->
-+ <type>maven-pom</type>
-+
<resource>http://repo1.maven.org/maven2/junit/junit/3.8.2/junit-3.8.2.pom</resource>
++ <resource>file:/usr/share/doc/junit-doc/doc/api/</resource>
+ </volume>
+</library>
Index: netbeans/junitlib/src/org/netbeans/modules/junitlib/layer.xml
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ netbeans/junitlib/src/org/netbeans/modules/junitlib/layer.xml
2011-12-18 17:43:17.000000000 +0000
++++ netbeans/junitlib/src/org/netbeans/modules/junitlib/layer.xml
2011-12-22 19:48:15.472713052 +0000
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN"
"http://www.netbeans.org/dtds/filesystem-1_2.dtd";>
@@ -124,7 +87,7 @@ Index:
netbeans/junitlib/src/org/netbeans/modules/junitlib/layer.xml
Index: netbeans/junitlib/src/org/netbeans/modules/junitlib/Bundle.properties
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ netbeans/junitlib/src/org/netbeans/modules/junitlib/Bundle.properties
2011-12-18 17:43:17.000000000 +0000
++++ netbeans/junitlib/src/org/netbeans/modules/junitlib/Bundle.properties
2011-12-22 19:48:15.472713052 +0000
@@ -0,0 +1,7 @@
+OpenIDE-Module-Name=JUnit
+OpenIDE-Module-Display-Category=Java SE
@@ -136,8 +99,8 @@ Index:
netbeans/junitlib/src/org/netbeans/modules/junitlib/Bundle.properties
Index: netbeans/junitlib/src/org/netbeans/modules/junitlib/junit-4.8.2.xml
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ netbeans/junitlib/src/org/netbeans/modules/junitlib/junit-4.8.2.xml
2011-12-18 17:43:17.000000000 +0000
-@@ -0,0 +1,24 @@
++++ netbeans/junitlib/src/org/netbeans/modules/junitlib/junit-4.8.2.xml
2011-12-22 20:17:04.572712891 +0000
+@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE library PUBLIC "-//NetBeans//DTD Library Declaration 1.0//EN"
"http://www.netbeans.org/dtds/library-declaration-1_0.dtd";>
+<library version="1.0">
@@ -150,22 +113,13 @@ Index:
netbeans/junitlib/src/org/netbeans/modules/junitlib/junit-4.8.2.xml
+ </volume>
+ <volume>
+ <type>javadoc</type>
-+
<resource>jar:nbinst://org.netbeans.modules.junitlib/docs/junit-4.8.2-api.zip!/</resource>
-+ </volume>
-+ <volume>
-+ <type>src</type>
-+
<resource>jar:nbinst://org.netbeans.modules.junitlib/docs/junit-4.8.2-src.jar!/</resource>
-+ </volume>
-+ <volume>
-+ <!-- please check with mkle...@netbeans.org before/after updating
this or "classpath" section -->
-+ <type>maven-pom</type>
-+
<resource>http://repo1.maven.org/maven2/junit/junit/4.8.2/junit-4.8.2.pom</resource>
++ <resource>file:/usr/share/doc/junit4/api/</resource>
+ </volume>
+</library>
Index: netbeans/junitlib/external/junit-3.8.2-license.txt
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ netbeans/junitlib/external/junit-3.8.2-license.txt 2011-12-18
17:43:17.000000000 +0000
++++ netbeans/junitlib/external/junit-3.8.2-license.txt 2011-12-22
19:48:15.472713052 +0000
@@ -0,0 +1,220 @@
+Name: JUnit
+Version: 3.8.2
@@ -390,7 +344,7 @@ Index: netbeans/junitlib/external/junit-3.8.2-license.txt
Index: netbeans/junitlib/external/junit-4.8.2-license.txt
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ netbeans/junitlib/external/junit-4.8.2-license.txt 2011-12-18
17:43:17.000000000 +0000
++++ netbeans/junitlib/external/junit-4.8.2-license.txt 2011-12-22
19:48:15.472713052 +0000
@@ -0,0 +1,220 @@
+Name: JUnit
+Version: 4.8.2
@@ -615,7 +569,7 @@ Index: netbeans/junitlib/external/junit-4.8.2-license.txt
Index: netbeans/junitlib/release/modules/ext/junit-3.8.2.jar.external
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ netbeans/junitlib/release/modules/ext/junit-3.8.2.jar.external
2011-12-18 17:43:17.000000000 +0000
++++ netbeans/junitlib/release/modules/ext/junit-3.8.2.jar.external
2011-12-22 19:48:15.472713052 +0000
@@ -0,0 +1,3 @@
+CRC:857334496
+URL:m2:/junit:junit:3.8.2:jar
@@ -623,7 +577,7 @@ Index:
netbeans/junitlib/release/modules/ext/junit-3.8.2.jar.external
Index: netbeans/junitlib/release/docs/junit-3.8.2-api.zip.external
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ netbeans/junitlib/release/docs/junit-3.8.2-api.zip.external
2011-12-18 17:43:17.000000000 +0000
++++ netbeans/junitlib/release/docs/junit-3.8.2-api.zip.external
2011-12-22 19:48:15.472713052 +0000
@@ -0,0 +1,3 @@
+CRC:1744174913
+URL:m2:/junit:junit:3.8.2:jar:javadoc
@@ -631,23 +585,15 @@ Index:
netbeans/junitlib/release/docs/junit-3.8.2-api.zip.external
Index: netbeans/junitlib/release/docs/junit-4.8.2-api.zip.external
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ netbeans/junitlib/release/docs/junit-4.8.2-api.zip.external
2011-12-18 17:43:17.000000000 +0000
++++ netbeans/junitlib/release/docs/junit-4.8.2-api.zip.external
2011-12-22 19:48:15.472713052 +0000
@@ -0,0 +1,3 @@
+CRC:1619551478
+URL:m2:/junit:junit:4.8.2:jar:javadoc
+URL:http://repo1.maven.org/maven2/junit/junit/4.8.2/junit-4.8.2-javadoc.jar
-Index: netbeans/junitlib/release/docs/junit-4.8.2-src.jar.external
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ netbeans/junitlib/release/docs/junit-4.8.2-src.jar.external
2011-12-18 17:43:17.000000000 +0000
-@@ -0,0 +1,3 @@
-+CRC:2702705221
-+URL:m2:/junit:junit:4.8.2:jar:sources
-+URL:http://repo1.maven.org/maven2/junit/junit/4.8.2/junit-4.8.2-sources.jar
Index: netbeans/junitlib/nbproject/project.properties
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ netbeans/junitlib/nbproject/project.properties 2011-12-18
23:04:55.721321087 +0000
++++ netbeans/junitlib/nbproject/project.properties 2011-12-22
19:48:15.472713052 +0000
@@ -0,0 +1,7 @@
+javac.source=1.6
+javac.compilerargs=-Xlint -Xlint:-serial
@@ -659,7 +605,7 @@ Index: netbeans/junitlib/nbproject/project.properties
Index: netbeans/junitlib/nbproject/project.xml
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ netbeans/junitlib/nbproject/project.xml 2011-12-18 17:43:17.000000000
+0000
++++ netbeans/junitlib/nbproject/project.xml 2011-12-22 19:48:15.472713052
+0000
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1";>
diff --git a/debian/rules b/debian/rules
index 7077223..75b436a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,7 +30,6 @@ JSEARCH_JAR := jsearch.jar
NB_JH_JAR := jhall-2.0_05.jar
NB_JSEARCH_JAR := jsearch-2.0_05.jar
-JAVADOC_INSTALL_DIR := usr/share/doc/$(libnb-platform-java-doc)/api
JAVADOC_WEBSITE := http://bits.netbeans.org/7.0/javadoc
NB_INSTALL_DIR := usr/share/netbeans
@@ -100,6 +99,8 @@ override_dh_auto_build:
-Djavadoc.docs.org-netbeans-modules-project-ant=$(JAVADOC_WEBSITE)/org-netbeans-modules-project-ant/
\
-Djavadoc.docs.org-netbeans-modules-projectapi=$(JAVADOC_WEBSITE)/org-netbeans-modules-projectapi/
\
-f nbbuild/build.xml build-javadoc
+ # remove the zip files - we only want the extracted files
+ rm -f nbbuild/build/javadoc/*.zip
@@ -137,10 +138,6 @@ override_dh_auto_install:
$(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
- # Install javadoc
- rm -f nbbuild/build/javadoc/*.zip
- jh_installjavadoc
- #$(INSTALL)$(libnb-platform-java-doc) nbbuild/build/javadoc/*
$(JAVADOC_INSTALL_DIR)
#
#Fixing permissions
chmod 0755
debian/$(libnb-platform-devel-java)/$(NB_INSTALL_DIR)/harness/launchers/app.sh
--
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
