[SCM] netbeans packaging branch, master, updated. debian/7.0.1+dfsg1-4-3-g2562835
The following commit has been merged in the master branch:
commit d3260ac08b1b8f2aa6e4aeaf7a0cdb2ac0c851a0
Author: Andrew Ross ubu...@rossfamily.co.uk
Date: Sun Dec 18 14:15:25 2011 +
Fix dependencies
diff --git a/debian/control b/debian/control
index cd35522..ef96a97 100644
--- a/debian/control
+++ b/debian/control
@@ -33,7 +33,7 @@ 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, libosgi-core-java,
- libosgi-compendium-java, libnb-org-openide-util-java,
+ libosgi-compendium-java, libnb-org-openide-util-java, antlr3 (= 3.2),
libnb-org-openide-util-lookup-java, libnb-org-openide-modules-java
Suggests: libnb-platform13-java-doc
Provides: netbeans-platform
diff --git a/debian/rules b/debian/rules
index c1871af..7077223 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,7 +45,7 @@ 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/')
+ perl -pi -e
's/^Version:\s+(.*)\+dfsg\d+-\d+.*$$/$$1/')
# Defined function to be used to create symlinks
define symlink
--
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
[SCM] netbeans packaging branch, master, updated. debian/7.0.1+dfsg1-4-3-g2562835
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 +
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 +
+
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: -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.0
+
-+++ netbeans/nbbuild/cluster.properties2011-12-18 17:43:17.0
+
+--- netbeans.orig/nbbuild/cluster.properties 2011-12-22 19:48:15.312713133
+
netbeans/nbbuild/cluster.properties2011-12-22 19:48:15.472713052
+
@@ -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.0 +
-+++ netbeans/junitlib/build.xml2011-12-18 17:43:17.0 +
[SCM] netbeans packaging branch, master, updated. debian/7.0.1+dfsg1-4-3-g2562835
The following commit has been merged in the master branch: commit 29637475d8867ab2f58a6c47edf4bd50045bcf5a Author: Andrew Ross ubu...@rossfamily.co.uk Date: Sun Dec 18 23:18:21 2011 + Include junit support diff --git a/debian/linked-jars b/debian/linked-jars index c75e721..c5ec2e8 100644 --- a/debian/linked-jars +++ b/debian/linked-jars @@ -48,3 +48,4 @@ $JAVADIR/cglib.jar libs.cglib/external java/modules/ext cglib-2.2.jar $JAVADIR/javac-api.jar libs.javacapi/external java/modules/ext javac-api-nb-7.0-b07.jar $JAVADIR/javac-impl.jar libs.javacimpl/external java/modules/ext javac-impl-nb-7.0-b07.jar $JAVA_HOME/jre/lib/rt.jar swingapp/external java/modules/ext swing-worker-1.1.jar +$JAVADIR/junit.jar junitlib/external java/modules/ext junit-3.8.2.jar diff --git a/debian/patches/netbeans~include-junit.patch b/debian/patches/netbeans~include-junit.patch new file mode 100644 index 000..83e1c32 --- /dev/null +++ b/debian/patches/netbeans~include-junit.patch @@ -0,0 +1,681 @@ +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: -MM-DD + +Index: netbeans/nbbuild/cluster.properties +=== +--- netbeans.orig/nbbuild/cluster.properties 2011-12-18 17:43:17.0 + netbeans/nbbuild/cluster.properties2011-12-18 17:43:17.0 + +@@ -426,6 +426,7 @@ + jellytools,\ + jellytools.java,\ + junit,\ ++junitlib,\ + libs.cglib,\ + libs.javacapi,\ + libs.javacimpl,\ +@@ -867,7 +868,6 @@ + jira,\ + jmx,\ + jmx.common,\ +-junitlib,\ + kenai,\ + kenai.ui,\ + libs.jira,\ +Index: netbeans/junitlib/build.xml +=== +--- /dev/null 1970-01-01 00:00:00.0 + netbeans/junitlib/build.xml2011-12-18 17:43:17.0 + +@@ -0,0 +1,6 @@ ++?xml version=1.0 encoding=UTF-8? ++project basedir=. default=netbeans name=junitlib ++property name=license.file location=../nbbuild/licenses/CPL-1.0/ ++target name=-create-license.file/ ++import file=../nbbuild/templates/projectized.xml/ ++/project +Index: netbeans/junitlib/manifest.mf +=== +--- /dev/null 1970-01-01 00:00:00.0 + netbeans/junitlib/manifest.mf 2011-12-18 17:43:17.0 + +@@ -0,0 +1,6 @@ ++Manifest-Version: 1.0 ++OpenIDE-Module: org.netbeans.modules.junitlib ++OpenIDE-Module-Layer: org/netbeans/modules/junitlib/layer.xml ++OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/junitlib/Bundle.properties ++OpenIDE-Module-Specification-Version: 1.0 ++ +Index: netbeans/junitlib/src/org/netbeans/modules/junitlib/junit-3.8.2.xml +=== +--- /dev/null 1970-01-01 00:00:00.0 + netbeans/junitlib/src/org/netbeans/modules/junitlib/junit-3.8.2.xml 2011-12-18 17:43:17.0 + +@@ -0,0 +1,26 @@ ++?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 ++namejunit/name ++typej2se/type ++ localizing-bundleorg.netbeans.modules.junitlib.Bundle/localizing-bundle ++volume ++typeclasspath/type ++ resourcejar:nbinst://org.netbeans.modules.junitlib/modules/ext/junit-3.8.2.jar!//resource ++/volume ++volume ++typejavadoc/type ++ resourcejar:nbinst://org.netbeans.modules.junitlib/docs/junit-3.8.2-api.zip!//resource ++/volume ++!-- Not currently bundled: ++volume ++typesrc/type ++
