[SCM] libnb-platform-java packaging branch, master, updated. debian/6.9-0ubuntu2-6-g36c64f9
Andres Mejia
ceros-guest at alioth.debian.org
Sat Jan 22 21:02:50 UTC 2011
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "libnb-platform-java packaging".
The branch, master has been updated
via 36c64f9fdbf82c8b5db2162e0e17635e7a930ffb (commit)
via 59d9e7df8d8fc5bc900fe42e7e0db13d8fdec4d2 (commit)
from 5c374459c171b8ffdcfbfed962f8eb0fd24ea370 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 36c64f9fdbf82c8b5db2162e0e17635e7a930ffb
Author: Andres Mejia <mcitadel at gmail.com>
Date: Sat Jan 22 16:02:15 2011 -0500
Update changelog.
commit 59d9e7df8d8fc5bc900fe42e7e0db13d8fdec4d2
Author: Andres Mejia <mcitadel at gmail.com>
Date: Sat Jan 22 16:00:32 2011 -0500
Update packaging to use source format 3.0 (quilt) and dh with javahelper.
Refreshed patches.
Bumped to Standards-Version 3.9.1.
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 5 +-
debian/control | 37 ++--
debian/libnb-platform-devel-java.dirs | 2 -
debian/libnb-platform12-java-doc.dirs | 2 -
debian/libnb-platform12-java.dirs | 3 -
.../patches/netbeans-platform-6.9~bootstrap.patch | 5 +-
debian/patches/netbeans-platform-6.9~junit.patch | 20 +-
.../patches/netbeans-platform-6.9~launcher.patch | 5 +-
debian/patches/netbeans-platform-6.9~nbi.patch | 5 +-
.../patches/netbeans-platform-6.9~properties.patch | 5 +-
.../patches/netbeans-platform-6.9~suite-xml.patch | 5 +-
debian/patches/series | 6 +
debian/rules | 233 +++++++++----------
debian/source/format | 1 +
14 files changed, 160 insertions(+), 174 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 0014efb..6020c82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,11 @@ libnb-platform-java (6.9-1) unstable; urgency=low
* Define a function for creation of symlinks.
* Add symlinks for xhtml entries found only in /usr/share/xml/entities/xhtml
for Debian.
+ * Update packaging to use source format 3.0 (quilt) and dh with javahelper.
+ * Refreshed patches.
+ * Bumped to Standards-Version 3.9.1.
- -- Andres Mejia <mcitadel at gmail.com> Fri, 07 Jan 2011 13:52:05 -0500
+ -- Andres Mejia <mcitadel at gmail.com> Sat, 22 Jan 2011 16:01:28 -0500
libnb-platform-java (6.9-0ubuntu2) maverick; urgency=low
diff --git a/debian/control b/debian/control
index ff9a4a9..f1b3fd3 100644
--- a/debian/control
+++ b/debian/control
@@ -1,33 +1,36 @@
Source: libnb-platform-java
-Section: devel
+Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Yulia Novozhilova <Yulia.Novozhilova at sun.com>,
Andres Mejia <mcitadel at gmail.com>
-Build-Depends: cdbs, debhelper (>= 7), ant, ant-optional, default-jdk, javahelp2
-Build-Depends-Indep: libswing-layout-java(>= 1.0.3), libjna-java (>= 3.1.0), junit4 (>= 4.6),
- liboro-java (>= 2.0.8), liblog4j1.2-java (>= 1.2.9), libasm2-java (>= 2.2.1), libcobertura-java(>=1.9.3),
- w3c-dtd-xhtml, libequinox-osgi-java, libfelix-framework-java, libfelix-main-java, libbindex-java
-Standards-Version: 3.9.0
-Homepage: http://www.netbeans.org
+Build-Depends: debhelper (>= 7.0.50~), javahelper, ant, ant-optional,
+ default-jdk, javahelp2, libswing-layout-java (>= 1.0.3),
+ libjna-java (>= 3.1.0), junit4 (>= 4.6), liboro-java (>= 2.0.8),
+ liblog4j1.2-java (>= 1.2.9), libasm2-java (>= 2.2.1),
+ libcobertura-java(>=1.9.3), w3c-dtd-xhtml, libequinox-osgi-java,
+ libfelix-framework-java, libfelix-main-java, libbindex-java
+Standards-Version: 3.9.1
+Homepage: http://netbeans.org/
+Vcs-Browser: http://git.debian.org/?p=pkg-java/libnb-platform-java.git
+Vcs-Git: git://git.debian.org/git/pkg-java/libnb-platform-java.git
Package: libnb-platform12-java
Architecture: all
-Section: java
-Depends: ${misc:Depends}, default-jre | java2-runtime, javahelp2,
- libswing-layout-java (>= 1.0.3), libjna-java(>= 3.1.0), junit4 (>= 4.6),
- libequinox-osgi-java, libfelix-framework-java, libfelix-main-java
-Suggests: libnb-platform11-java-doc
+Depends: default-jre | java2-runtime, javahelp2,
+ libswing-layout-java (>= 1.0.3), libjna-java (>= 3.1.0), junit4 (>= 4.6),
+ libequinox-osgi-java, libfelix-framework-java, libfelix-main-java,
+ ${java:Depends}, ${misc:Depends}
+Suggests: libnb-platform12-java-doc
Description: NetBeans Platform for building rich desktop applications in Java
NetBeans Platform is the framework for building rich desktop applications
in Java. It is the core of the NetBeans IDE.
-
+
Package: libnb-platform-devel-java
Architecture: all
-Section: java
-Depends: ${misc:Depends}, default-jre | java2-runtime, javahelp2, libnb-platform12-java,
+Depends: default-jre | java2-runtime, javahelp2, libnb-platform12-java,
liboro-java (>= 2.0.8), liblog4j1.2-java (>= 1.2.9), libasm2-java (>= 2.2.1),
- libcobertura-java (>=1.9.3), libbindex-java
+ libcobertura-java (>=1.9.3), libbindex-java, ${java:Depends}, ${misc:Depends}
Replaces: libnb-platform8-devel-java, libnb-platform7-devel-java
Conflicts: libnb-platform8-devel-java, libnb-platform7-devel-java
Description: Build harness for NetBeans Platform
@@ -38,10 +41,10 @@ Package: libnb-platform12-java-doc
Architecture: all
Section: doc
Depends: ${misc:Depends}
+Recommends: ${java:Recommends}
Suggests: libnb-platform12-java
Enhances: libnb-platform12-java
Description: NetBeans Platform javadoc
NetBeans Platform is a set of modules, each providing their own APIs
and working together or in a standalone mode. This package provides
one master javadoc to all of them.
-
diff --git a/debian/libnb-platform-devel-java.dirs b/debian/libnb-platform-devel-java.dirs
deleted file mode 100644
index 4ad9e03..0000000
--- a/debian/libnb-platform-devel-java.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/netbeans/harness
-
diff --git a/debian/libnb-platform12-java-doc.dirs b/debian/libnb-platform12-java-doc.dirs
deleted file mode 100644
index 02fb3bb..0000000
--- a/debian/libnb-platform12-java-doc.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/doc/libnb-platform12-java-doc/api
-
diff --git a/debian/libnb-platform12-java.dirs b/debian/libnb-platform12-java.dirs
deleted file mode 100644
index 1fd97d7..0000000
--- a/debian/libnb-platform12-java.dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/share/netbeans/platform12
-
-
diff --git a/debian/patches/netbeans-platform-6.9~bootstrap.patch b/debian/patches/netbeans-platform-6.9~bootstrap.patch
index f426cdf..f439dd4 100644
--- a/debian/patches/netbeans-platform-6.9~bootstrap.patch
+++ b/debian/patches/netbeans-platform-6.9~bootstrap.patch
@@ -1,6 +1,5 @@
-diff -Nur netbeans-platform-6.9/o.n.bootstrap/nbproject/project.properties netbeans-platform-6.9.new/o.n.bootstrap/nbproject/project.properties
---- netbeans-platform-6.9/o.n.bootstrap/nbproject/project.properties 2010-05-31 20:58:20.000000000 +0400
-+++ netbeans-platform-6.9.new/o.n.bootstrap/nbproject/project.properties 2010-06-09 06:00:01.324176694 +0400
+--- a/o.n.bootstrap/nbproject/project.properties
++++ b/o.n.bootstrap/nbproject/project.properties
@@ -45,8 +45,8 @@
module.jar.dir=lib
module.jar.basename=boot.jar
diff --git a/debian/patches/netbeans-platform-6.9~junit.patch b/debian/patches/netbeans-platform-6.9~junit.patch
index cc4442b..530fc38 100644
--- a/debian/patches/netbeans-platform-6.9~junit.patch
+++ b/debian/patches/netbeans-platform-6.9~junit.patch
@@ -1,6 +1,5 @@
-diff -Nur -x '*.orig' -x '*~' netbeans-6.9/libs.junit4/nbproject/project.xml netbeans-6.9.new/libs.junit4/nbproject/project.xml
---- netbeans-6.9/libs.junit4/nbproject/project.xml 2010-06-10 15:20:24.000000000 +0400
-+++ netbeans-6.9.new/libs.junit4/nbproject/project.xml 2010-08-05 16:02:54.000000000 +0400
+--- a/libs.junit4/nbproject/project.xml
++++ b/libs.junit4/nbproject/project.xml
@@ -63,8 +63,12 @@
<package>org.junit.runners</package>
</public-packages>
@@ -16,9 +15,8 @@ diff -Nur -x '*.orig' -x '*~' netbeans-6.9/libs.junit4/nbproject/project.xml net
</class-path-extension>
</data>
</configuration>
-diff -Nur -x '*.orig' -x '*~' netbeans-6.9/nbbuild/build.properties netbeans-6.9.new/nbbuild/build.properties
---- netbeans-6.9/nbbuild/build.properties 2010-06-10 15:20:46.000000000 +0400
-+++ netbeans-6.9.new/nbbuild/build.properties 2010-08-05 16:03:22.000000000 +0400
+--- a/nbbuild/build.properties
++++ b/nbbuild/build.properties
@@ -79,7 +79,7 @@
stop.when.clean.error=true
@@ -28,10 +26,9 @@ diff -Nur -x '*.orig' -x '*~' netbeans-6.9/nbbuild/build.properties netbeans-6.9
netbeans/harness/modules/org-netbeans-modules-nbjunit.jar:\
netbeans/harness/modules/org-netbeans-insane.jar:\
../o.apache.tools.ant.module/external/lib/ant-nodeps.jar:\
-diff -Nur -x '*.orig' -x '*~' libnb-platform-java-6.7.1/libs.junit4/nbproject/project.properties libnb-platform-java-6.7.1.new/libs.junit4/nbproject/project.properties
---- libnb-platform-java-6.7.1/libs.junit4/nbproject/project.properties 2009-07-23 02:38:40.000000000 +0400
-+++ libnb-platform-java-6.7.1.new/libs.junit4/nbproject/project.properties 2009-08-13 19:36:14.000000000 +0400
-@@ -38,8 +38,8 @@
+--- a/libs.junit4/nbproject/project.properties
++++ b/libs.junit4/nbproject/project.properties
+@@ -41,8 +41,8 @@
# made subject to such option by the copyright holder.
is.autoload=true
@@ -40,4 +37,5 @@ diff -Nur -x '*.orig' -x '*~' libnb-platform-java-6.7.1/libs.junit4/nbproject/pr
+release.external/junit-4.8.jar=modules/ext/junit-4.8.jar
+release.external/hamcrest-core.jar=modules/ext/hamcrest-core.jar
- sigtest.skip.check=true
\ No newline at end of file
+ sigtest.skip.check=true
+
diff --git a/debian/patches/netbeans-platform-6.9~launcher.patch b/debian/patches/netbeans-platform-6.9~launcher.patch
index 4661468..95b7587 100644
--- a/debian/patches/netbeans-platform-6.9~launcher.patch
+++ b/debian/patches/netbeans-platform-6.9~launcher.patch
@@ -1,6 +1,5 @@
-diff -Nur -x '*.orig' -x '*~' libnb-platform-java-6.9/o.n.bootstrap/launcher/unix/nbexec libnb-platform-java-6.9.new/o.n.bootstrap/launcher/unix/nbexec
---- libnb-platform-java-6.9/o.n.bootstrap/launcher/unix/nbexec 2010-08-11 13:31:24.000000000 +0400
-+++ libnb-platform-java-6.9.new/o.n.bootstrap/launcher/unix/nbexec 2010-08-11 13:37:28.000000000 +0400
+--- a/o.n.bootstrap/launcher/unix/nbexec
++++ b/o.n.bootstrap/launcher/unix/nbexec
@@ -192,7 +192,7 @@
fi
diff --git a/debian/patches/netbeans-platform-6.9~nbi.patch b/debian/patches/netbeans-platform-6.9~nbi.patch
index 9f4b66d..85e7c98 100644
--- a/debian/patches/netbeans-platform-6.9~nbi.patch
+++ b/debian/patches/netbeans-platform-6.9~nbi.patch
@@ -1,6 +1,5 @@
-diff -Nur -x '*.orig' -x '*~' libnb-platform-java-6.9/nbbuild/cluster.properties libnb-platform-java-6.9.new/nbbuild/cluster.properties
---- libnb-platform-java-6.9/nbbuild/cluster.properties 2010-06-10 15:20:46.000000000 +0400
-+++ libnb-platform-java-6.9.new/nbbuild/cluster.properties 2010-08-10 16:48:29.000000000 +0400
+--- a/nbbuild/cluster.properties
++++ b/nbbuild/cluster.properties
@@ -829,8 +829,6 @@
apisupport.tc.cobertura,\
jellytools.platform,\
diff --git a/debian/patches/netbeans-platform-6.9~properties.patch b/debian/patches/netbeans-platform-6.9~properties.patch
index 347e894..e517274 100644
--- a/debian/patches/netbeans-platform-6.9~properties.patch
+++ b/debian/patches/netbeans-platform-6.9~properties.patch
@@ -1,6 +1,5 @@
-diff -Nur netbeans-platform-6.9/o.jdesktop.layout/nbproject/project.properties netbeans-platform-6.9.new/o.jdesktop.layout/nbproject/project.properties
---- netbeans-platform-6.9/o.jdesktop.layout/nbproject/project.properties 2010-05-31 20:58:16.000000000 +0400
-+++ netbeans-platform-6.9.new/o.jdesktop.layout/nbproject/project.properties 2010-06-10 09:34:11.689150157 +0400
+--- a/o.jdesktop.layout/nbproject/project.properties
++++ b/o.jdesktop.layout/nbproject/project.properties
@@ -42,6 +42,6 @@
is.autoload=true
diff --git a/debian/patches/netbeans-platform-6.9~suite-xml.patch b/debian/patches/netbeans-platform-6.9~suite-xml.patch
index f54c6d8..3b187f3 100644
--- a/debian/patches/netbeans-platform-6.9~suite-xml.patch
+++ b/debian/patches/netbeans-platform-6.9~suite-xml.patch
@@ -1,6 +1,5 @@
-diff -Nur -x '*.orig' -x '*~' libnb-platform-java-6.9/apisupport.harness/release/suite.xml libnb-platform-java-6.9.new/apisupport.harness/release/suite.xml
---- libnb-platform-java-6.9/apisupport.harness/release/suite.xml 2010-06-10 15:17:40.000000000 +0400
-+++ libnb-platform-java-6.9.new/apisupport.harness/release/suite.xml 2010-08-20 16:36:43.000000000 +0400
+--- a/apisupport.harness/release/suite.xml
++++ b/apisupport.harness/release/suite.xml
@@ -313,8 +313,6 @@
<condition property="app.exe.prefix" value="" else="pre7_">
<isset property="nbexec.dll.found"/>
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..3b760b3
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,6 @@
+netbeans-platform-6.9~bootstrap.patch
+netbeans-platform-6.9~junit.patch
+netbeans-platform-6.9~launcher.patch
+netbeans-platform-6.9~nbi.patch
+netbeans-platform-6.9~properties.patch
+netbeans-platform-6.9~suite-xml.patch
diff --git a/debian/rules b/debian/rules
index d5dc16a..3e7993f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,7 @@
#!/usr/bin/make -f
-#export DH_VERBOSE=1
-
export JAVA_HOME=/usr/lib/jvm/default-java
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-
#package names
pkg-base := platform12
pkg-lib-base := libnb-$(pkg-base)
@@ -69,62 +64,81 @@ define symlink
ln -sf $(1) $(2)
endef
-build/$(libnb-platform-java):: stamp-build-$(libnb-platform-java)
-# This target is here to avoid multiple invocation of build target.
-# build/$(libnb-platform-java) is invoked 2 times when building binary packages.
-stamp-build-$(libnb-platform-java):
+%:
+ dh $@ --with javahelper
+
+override_dh_auto_build:
# generate empty javax.script file, so there is something in jsr223 API module
- mkdir -p $(DEB_SRCDIR)/libs.jsr223/src/javax/script
- echo "package javax.script; class empty { }" > $(DEB_SRCDIR)/libs.jsr223/src/javax/script/empty.java
- mkdir -p $(DEB_SRCDIR)/libs.jsr223/external
- jar cf $(DEB_SRCDIR)/libs.jsr223/external/$(NB_JSR223_JAR) $(DEB_SRCDIR)/libs.jsr223/src/javax/script/empty.java
- mkdir -p $(DEB_SRCDIR)/nbbuild/external/xhtml1-dtds
- ln -sf /usr/share/xml/xhtml/schema/dtd/1.0/xhtml* $(DEB_SRCDIR)/nbbuild/external/xhtml1-dtds
- ln -sf /usr/share/xml/entities/xhtml/xhtml* $(DEB_SRCDIR)/nbbuild/external/xhtml1-dtds
- $(call symlink, $(JAVADIR)/$(SWINGL_JAR), $(DEB_SRCDIR)/o.jdesktop.layout/external/$(NB_SWINGL_JAR))
- $(call symlink, $(JAVADIR)/$(JHALL_JAR), $(DEB_SRCDIR)/javahelp/external/$(NB_JH_JAR))
- $(call symlink, $(JAVADIR)/$(JNA_JAR), $(DEB_SRCDIR)/libs.jna/external/$(NB_JNA_JAR))
- $(call symlink, $(JAVADIR)/$(JUNIT_JAR), $(DEB_SRCDIR)/libs.junit4/external/$(NB_JUNIT_JAR))
- $(call symlink, $(JAVADIR)/$(HAMCREST_JAR), $(DEB_SRCDIR)/libs.junit4/external/$(NB_HAMCREST_JAR))
- $(call symlink, $(JAVADIR)/$(FELIX_FRW_JAR), $(DEB_SRCDIR)/libs.felix/external/$(NB_FELIX_FRW_JAR))
- $(call symlink, $(JAVADIR)/$(FELIX_MAIN_JAR), $(DEB_SRCDIR)/libs.felix/external/$(NB_FELIX_MAIN_JAR))
-# $(call symlink, $(JAVADIR)/$(OSGI_CORE_JAR), $(DEB_SRCDIR)/libs.osgi/external/$(NB_OSGI_CORE_JAR))
- $(call symlink, $(JAVADIR)/$(OSGI_CMPN_JAR), $(DEB_SRCDIR)/libs.osgi/external/$(NB_OSGI_CMPN_JAR))
-
- $(call symlink, $(JAVADIR)/$(JHALL_JAR), $(DEB_SRCDIR)/apisupport.harness/external/$(NB_JSEARCH_JAR))
- $(call symlink, $(JAVADIR)/$(BINDEX_JAR), $(DEB_SRCDIR)/apisupport.harness/external/$(NB_BINDEX_JAR))
- $(call symlink, $(JAVADIR)/$(ASM_JAR), $(DEB_SRCDIR)/apisupport.tc.cobertura/external/$(NB_ASM_JAR))
- $(call symlink, $(JAVADIR)/$(ASM_TREE_JAR), $(DEB_SRCDIR)/apisupport.tc.cobertura/external/$(NB_ASM_TREE_JAR))
- $(call symlink, $(JAVADIR)/$(ORO_JAR), $(DEB_SRCDIR)/apisupport.tc.cobertura/external/$(NB_ORO_JAR))
- $(call symlink, $(JAVADIR)/$(LOG4J_JAR), $(DEB_SRCDIR)/apisupport.tc.cobertura/external/$(NB_LOG4J_JAR))
- $(call symlink, $(JAVADIR)/$(COBERTURA_JAR), $(DEB_SRCDIR)/apisupport.tc.cobertura/external/$(NB_COBERTURA_JAR))
-
+ 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/$(NB_JSR223_JAR) libs.jsr223/src/javax/script/empty.java
+ mkdir -p nbbuild/external/xhtml1-dtds
+ ln -sf /usr/share/xml/xhtml/schema/dtd/1.0/xhtml* nbbuild/external/xhtml1-dtds
+ ln -sf /usr/share/xml/entities/xhtml/xhtml* nbbuild/external/xhtml1-dtds
+ $(call symlink, $(JAVADIR)/$(SWINGL_JAR), o.jdesktop.layout/external/$(NB_SWINGL_JAR))
+ $(call symlink, $(JAVADIR)/$(JHALL_JAR), javahelp/external/$(NB_JH_JAR))
+ $(call symlink, $(JAVADIR)/$(JNA_JAR), libs.jna/external/$(NB_JNA_JAR))
+ $(call symlink, $(JAVADIR)/$(JUNIT_JAR), libs.junit4/external/$(NB_JUNIT_JAR))
+ $(call symlink, $(JAVADIR)/$(HAMCREST_JAR), libs.junit4/external/$(NB_HAMCREST_JAR))
+ $(call symlink, $(JAVADIR)/$(FELIX_FRW_JAR), libs.felix/external/$(NB_FELIX_FRW_JAR))
+ $(call symlink, $(JAVADIR)/$(FELIX_MAIN_JAR), libs.felix/external/$(NB_FELIX_MAIN_JAR))
+# $(call symlink, $(JAVADIR)/$(OSGI_CORE_JAR), libs.osgi/external/$(NB_OSGI_CORE_JAR))
+ $(call symlink, $(JAVADIR)/$(OSGI_CMPN_JAR), libs.osgi/external/$(NB_OSGI_CMPN_JAR))
+
+ $(call symlink, $(JAVADIR)/$(JHALL_JAR), apisupport.harness/external/$(NB_JSEARCH_JAR))
+ $(call symlink, $(JAVADIR)/$(BINDEX_JAR), apisupport.harness/external/$(NB_BINDEX_JAR))
+ $(call symlink, $(JAVADIR)/$(ASM_JAR), apisupport.tc.cobertura/external/$(NB_ASM_JAR))
+ $(call symlink, $(JAVADIR)/$(ASM_TREE_JAR), apisupport.tc.cobertura/external/$(NB_ASM_TREE_JAR))
+ $(call symlink, $(JAVADIR)/$(ORO_JAR), apisupport.tc.cobertura/external/$(NB_ORO_JAR))
+ $(call symlink, $(JAVADIR)/$(LOG4J_JAR), apisupport.tc.cobertura/external/$(NB_LOG4J_JAR))
+ $(call symlink, $(JAVADIR)/$(COBERTURA_JAR), apisupport.tc.cobertura/external/$(NB_COBERTURA_JAR))
+
######## Remove services and org/eclipse/* from equinox osgi.jar#####################
- mkdir $(DEB_SRCDIR)/debian/jar_tmp; cd $(DEB_SRCDIR)/debian/jar_tmp; \
+ mkdir debian/jar_tmp; cd debian/jar_tmp; \
jar -xf $(JAVADIR)/$(OSGI_CORE_JAR); \
rm -rf META-INF/services org/eclipse; \
jar -cf ../../libs.osgi/external/$(NB_OSGI_CORE_JAR) ./*;
- rm -rf $(DEB_SRCDIR)/debian/jar_tmp
+ rm -rf debian/jar_tmp
################################################################
-
+
+ # Build main package
ant \
-Dpermit.jdk6.builds=true \
-Dbuild.compiler.deprecation=false \
-Dbuild.compiler.debug=false \
-Dverify.checkout=false \
- -f $(DEB_SRCDIR)/nbbuild/build.xml build-platform
-
- cd $(DEB_SRCDIR)/l10n && ant -v -f build.xml -Ddist.dir=../nbbuild/netbeans -Dnbms.dir="" -Dnbms.dist.dir="" build
+ -f nbbuild/build.xml build-platform
- touch $@
-
-install/$(libnb-platform-java)::
- echo > $(DEB_SRCDIR)/nbbuild/netbeans/platform/.noautoupdate
- echo > $(DEB_SRCDIR)/nbbuild/netbeans/platform/.lastModified
+ cd l10n && ant -v -f build.xml -Ddist.dir=../nbbuild/netbeans -Dnbms.dir="" -Dnbms.dist.dir="" build
+
+ # Build javadoc package
+ ant \
+ -Dbuild.compiler.deprecation=false \
+ -Dbuild.compiler.debug=false \
+ -Dverify.checkout=false \
+ -Dallmodules= \
+ -Dcluster.config=platform \
+ -Dconfig.javadoc.cluster=$(pkg-base) \
+ -Dconfig.javadoc.netbeans=\
+openide.util,openide.actions,openide.options,openide.awt,\
+openide.dialogs,openide.nodes,openide.explorer,openide.filesystems,openide.modules,\
+openide.text,openide.windows,openide.loaders,openide.io,queries,\
+o.n.api.progress,settings,javahelp,openide.execution,\
+sendopts,options.api,editor.mimelookup \
+ -Djavadoc.docs.org-netbeans-api-java=$(JAVADOC_WEBSITE)/org-netbeans-api-java/ \
+ -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
- $(INSTALL)$(libnb-platform-java) $(DEB_SRCDIR)/nbbuild/netbeans/platform/* $(NB_INSTALL_DIR)/$(pkg-base)
- $(INSTALL)$(libnb-platform-java) $(DEB_SRCDIR)/nbbuild/netbeans/platform/.noautoupdate $(NB_INSTALL_DIR)/$(pkg-base)
- $(INSTALL)$(libnb-platform-java) $(DEB_SRCDIR)/nbbuild/netbeans/platform/.lastModified $(NB_INSTALL_DIR)/$(pkg-base)
+override_dh_auto_install:
+ echo > nbbuild/netbeans/platform/.noautoupdate
+ echo > nbbuild/netbeans/platform/.lastModified
+
+ # Install main package
+ $(INSTALL)$(libnb-platform-java) nbbuild/netbeans/platform/* $(NB_INSTALL_DIR)/$(pkg-base)
+ $(INSTALL)$(libnb-platform-java) nbbuild/netbeans/platform/.noautoupdate $(NB_INSTALL_DIR)/$(pkg-base)
+ $(INSTALL)$(libnb-platform-java) nbbuild/netbeans/platform/.lastModified $(NB_INSTALL_DIR)/$(pkg-base)
$(LINK)$(libnb-platform-java) $(JAVADIR)/$(SWINGL_JAR) $(NB_INSTALL_DIR)/$(pkg-base)/modules/ext/$(NB_SWINGL_JAR)
$(LINK)$(libnb-platform-java) $(JAVADIR)/$(JH_JAR) $(NB_INSTALL_DIR)/$(pkg-base)/modules/ext/$(NB_JH_JAR)
$(LINK)$(libnb-platform-java) $(JAVADIR)/$(JNA_JAR) $(NB_INSTALL_DIR)/$(pkg-base)/modules/ext/$(NB_JNA_JAR)
@@ -135,13 +149,13 @@ install/$(libnb-platform-java)::
# $(LINK)$(libnb-platform-java) $(JAVADIR)/$(OSGI_CORE_JAR) $(NB_INSTALL_DIR)/$(pkg-base)/modules/ext/$(NB_OSGI_CORE_JAR)
$(LINK)$(libnb-platform-java) $(JAVADIR)/$(OSGI_CMPN_JAR) $(NB_INSTALL_DIR)/$(pkg-base)/modules/ext/$(NB_OSGI_CMPN_JAR)
-install/$(libnb-platform-devel-java)::
- rm -f $(DEB_SRCDIR)/nbbuild/netbeans/harness/antlib/$(NB_JSEARCH_JAR)
- echo > $(DEB_SRCDIR)/nbbuild/netbeans/harness/.noautoupdate
- echo > $(DEB_SRCDIR)/nbbuild/netbeans/harness/.lastModified
- $(INSTALL)$(libnb-platform-devel-java) $(DEB_SRCDIR)/nbbuild/netbeans/harness/* $(NB_INSTALL_DIR)/harness
- $(INSTALL)$(libnb-platform-devel-java) $(DEB_SRCDIR)/nbbuild/netbeans/harness/.noautoupdate $(NB_INSTALL_DIR)/harness
- $(INSTALL)$(libnb-platform-devel-java) $(DEB_SRCDIR)/nbbuild/netbeans/harness/.lastModified $(NB_INSTALL_DIR)/harness
+ # 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
$(LINK)$(libnb-platform-devel-java) $(JAVADIR)/$(JSEARCH_JAR) $(NB_INSTALL_DIR)/harness/antlib/$(NB_JSEARCH_JAR)
$(LINK)$(libnb-platform-devel-java) $(JAVADIR)/$(BINDEX_JAR) $(NB_INSTALL_DIR)/harness/antlib/$(NB_BINDEX_JAR)
$(LINK)$(libnb-platform-devel-java) $(JAVADIR)/$(ASM_JAR) $(NB_INSTALL_DIR)/harness/testcoverage/cobertura/lib/$(NB_ASM_JAR)
@@ -151,73 +165,46 @@ install/$(libnb-platform-devel-java)::
$(LINK)$(libnb-platform-devel-java) $(JAVADIR)/$(COBERTURA_JAR) $(NB_INSTALL_DIR)/harness/testcoverage/cobertura/$(NB_COBERTURA_JAR)
#Fixing permissions
- chmod 0755 $(DEB_SRCDIR)/debian/$(libnb-platform-devel-java)/$(NB_INSTALL_DIR)/harness/launchers/app.sh
-
-build/$(libnb-platform-java-doc):: stamp-build-$(libnb-platform-java-doc)
-# This target is here to avoid multiple invocation of build target.
-# build/$(libnb-platform-java-doc) is invoked 2 times when building binary packages.
-stamp-build-$(libnb-platform-java-doc):
-# This target is here to avoid multiple invocation of build target.
-# build/$(libnb-platform-java-doc) is invoked 2 times when building binary packages.
- ant \
- -Dbuild.compiler.deprecation=false \
- -Dbuild.compiler.debug=false \
- -Dverify.checkout=false \
- -Dallmodules= \
- -Dcluster.config=platform \
- -Dconfig.javadoc.cluster=$(pkg-base) \
- -Dconfig.javadoc.netbeans=\
-openide.util,openide.actions,openide.options,openide.awt,\
-openide.dialogs,openide.nodes,openide.explorer,openide.filesystems,openide.modules,\
-openide.text,openide.windows,openide.loaders,openide.io,queries,\
-o.n.api.progress,settings,javahelp,openide.execution,\
-sendopts,options.api,editor.mimelookup \
- -Djavadoc.docs.org-netbeans-api-java=$(JAVADOC_WEBSITE)/org-netbeans-api-java/ \
- -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 $(DEB_SRCDIR)/nbbuild/build.xml build-javadoc
-
- touch $@
-
-install/$(libnb-platform-java-doc)::
+ chmod 0755 debian/$(libnb-platform-devel-java)/$(NB_INSTALL_DIR)/harness/launchers/app.sh
+
+ # Install javadoc package
# copy core platform files
- rm -f $(DEB_SRCDIR)/nbbuild/build/javadoc/*.zip
- $(INSTALL)$(libnb-platform-java-doc) $(DEB_SRCDIR)/nbbuild/build/javadoc/* $(JAVADOC_INSTALL_DIR)
-
-clean::
- -rm -f $(DEB_SRCDIR)/*.cdbs-config_list
- -rm -f $(DEB_SRCDIR)/stamp-build-$(libnb-platform-java)
- -rm -f $(DEB_SRCDIR)/stamp-build-$(libnb-platform-devel-java)
- -rm -f $(DEB_SRCDIR)/stamp-build-$(libnb-platform-java-doc)
- $(call symlink, $(JAVADIR)/$(JHALL_JAR), $(DEB_SRCDIR)/javahelp/external/$(NB_JH_JAR))
- $(call symlink, $(JAVADIR)/$(JHALL_JAR), $(DEB_SRCDIR)/apisupport.harness/external/$(NB_JSEARCH_JAR))
-# cd $(DEB_SRCDIR)/l10n && ant -v -f build.xml -Ddist.dir=../nbbuild/netbeans -Dnbms.dir="" -Dnbms.dist.dir="" clean
- ant -Dpermit.jdk6.builds=true -f $(DEB_SRCDIR)/nbbuild/build.xml clean
- -rm -f $(DEB_SRCDIR)/apisupport.harness/external/$(NB_JSEARCH_JAR)
- -rm -f $(DEB_SRCDIR)/apisupport.harness/external/$(NB_BINDEX_JAR)
- -rm -f $(DEB_SRCDIR)/apisupport.tc.cobertura/external/$(NB_ASM_JAR)
- -rm -f $(DEB_SRCDIR)/apisupport.tc.cobertura/external/$(NB_ASM_TREE_JAR)
- -rm -f $(DEB_SRCDIR)/apisupport.tc.cobertura/external/$(NB_ORO_JAR)
- -rm -f $(DEB_SRCDIR)/apisupport.tc.cobertura/external/$(NB_LOG4J_JAR)
- -rm -f $(DEB_SRCDIR)/apisupport.tc.cobertura/external/$(NB_COBERTURA_JAR)
- -rm -f $(DEB_SRCDIR)/javahelp/external/$(NB_JH_JAR)
- -rm -f $(DEB_SRCDIR)/o.jdesktop.layout/external/$(NB_SWINGL_JAR)
- -rm -f $(DEB_SRCDIR)/libs.jna/external/$(NB_JNA_JAR)
- -rm -f $(DEB_SRCDIR)/libs.junit4/external/$(NB_JUNIT_JAR)
- -rm -f $(DEB_SRCDIR)/libs.junit4/external/$(NB_HAMCREST_JAR)
- -rm -f $(DEB_SRCDIR)/libs.felix/external/$(NB_FELIX_FRW_JAR)
- -rm -f $(DEB_SRCDIR)/libs.felix/external/$(NB_FELIX_MAIN_JAR)
- -rm -f $(DEB_SRCDIR)/libs.osgi/external/$(NB_OSGI_CORE_JAR)
- -rm -f $(DEB_SRCDIR)/libs.osgi/external/$(NB_OSGI_CMPN_JAR)
- -rm -f $(DEB_SRCDIR)/libs.jsr223/external/$(NB_JSR223_JAR)
- -rm -f $(DEB_SRCDIR)/libs.jsr223/src/javax/script/empty.java
- -rm -rf $(DEB_SRCDIR)/nbbuild/external/xhtml1-dtds
- -rm -f $(DEB_SRCDIR)/nbbuild/nbproject/private/scan-cache-standard.ser
- -rm -f $(DEB_SRCDIR)/nbbuild/nbantext.jar
- -rm -rf $(DEB_SRCDIR)/l10n/build
- -rm -f $(DEB_SRCDIR)/l10n/l10nantext.jar
- -rm -rf $(DEB_SRCDIR)/debian/jar_tmp
+ rm -f nbbuild/build/javadoc/*.zip
+ $(INSTALL)$(libnb-platform-java-doc) nbbuild/build/javadoc/* $(JAVADOC_INSTALL_DIR)
-get-orig-source:
- uscan --verbose --rename --force-download
-
+override_dh_auto_clean:
+ -rm -f *.cdbs-config_list
+ -rm -f stamp-build-$(libnb-platform-java)
+ -rm -f stamp-build-$(libnb-platform-devel-java)
+ -rm -f stamp-build-$(libnb-platform-java-doc)
+ $(call symlink, $(JAVADIR)/$(JHALL_JAR), javahelp/external/$(NB_JH_JAR))
+ $(call symlink, $(JAVADIR)/$(JHALL_JAR), apisupport.harness/external/$(NB_JSEARCH_JAR))
+# cd l10n && ant -v -f build.xml -Ddist.dir=../nbbuild/netbeans -Dnbms.dir="" -Dnbms.dist.dir="" clean
+ ant -Dpermit.jdk6.builds=true -f nbbuild/build.xml clean
+ -rm -f apisupport.harness/external/$(NB_JSEARCH_JAR)
+ -rm -f apisupport.harness/external/$(NB_BINDEX_JAR)
+ -rm -f apisupport.tc.cobertura/external/$(NB_ASM_JAR)
+ -rm -f apisupport.tc.cobertura/external/$(NB_ASM_TREE_JAR)
+ -rm -f apisupport.tc.cobertura/external/$(NB_ORO_JAR)
+ -rm -f apisupport.tc.cobertura/external/$(NB_LOG4J_JAR)
+ -rm -f apisupport.tc.cobertura/external/$(NB_COBERTURA_JAR)
+ -rm -f javahelp/external/$(NB_JH_JAR)
+ -rm -f o.jdesktop.layout/external/$(NB_SWINGL_JAR)
+ -rm -f libs.jna/external/$(NB_JNA_JAR)
+ -rm -f libs.junit4/external/$(NB_JUNIT_JAR)
+ -rm -f libs.junit4/external/$(NB_HAMCREST_JAR)
+ -rm -f libs.felix/external/$(NB_FELIX_FRW_JAR)
+ -rm -f libs.felix/external/$(NB_FELIX_MAIN_JAR)
+ -rm -f libs.osgi/external/$(NB_OSGI_CORE_JAR)
+ -rm -f libs.osgi/external/$(NB_OSGI_CMPN_JAR)
+ -rm -f libs.jsr223/external/$(NB_JSR223_JAR)
+ -rm -f libs.jsr223/src/javax/script/empty.java
+ -rm -rf nbbuild/external/xhtml1-dtds
+ -rm -f nbbuild/nbproject/private/scan-cache-standard.ser
+ -rm -f nbbuild/nbantext.jar
+ -rm -rf l10n/build
+ -rm -f l10n/l10nantext.jar
+ -rm -rf debian/jar_tmp
+
+override_jh_depends:
+ # Skipping jh_depends run. See bug #610817.
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
hooks/post-receive
--
libnb-platform-java packaging
More information about the pkg-java-commits
mailing list