[SCM] libnb-javaparser-java packaging branch, master, updated. debian/6.9-0ubuntu1-3-ge5caa86
Andres Mejia
ceros-guest at alioth.debian.org
Sat Jan 22 17:53:46 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-javaparser-java packaging".
The branch, master has been updated
via e5caa8684eca206d4d422162723a8abaf6481cb0 (commit)
via faac68da13beadcbf4e9f89be8ef95192548baaa (commit)
from 2f2d5842b5a4d082635359e9d463a97489c2dca4 (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 e5caa8684eca206d4d422162723a8abaf6481cb0
Author: Andres Mejia <mcitadel at gmail.com>
Date: Sat Jan 22 12:30:41 2011 -0500
Update changelog.
commit faac68da13beadcbf4e9f89be8ef95192548baaa
Author: Andres Mejia <mcitadel at gmail.com>
Date: Sat Jan 22 12:29:32 2011 -0500
Update packaging to use dh with javahelper.
Provide versioning for jar files.
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 13 ++++++--
debian/control | 19 ++++++-----
debian/libnb-javaparser-java.dirs | 2 -
debian/libnb-javaparser-java.jlibs | 1 +
debian/patches/javac-libs-versioning.patch | 46 ++++++++++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 31 +++++-------------
7 files changed, 77 insertions(+), 36 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b4ac6e7..86365c9 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,16 @@
libnb-javaparser-java (6.9-1) unstable; urgency=low
- * Upload for Debian.
+ * Upload for Debian. (Closes: #492263)
* Add Debian Java team as maintainer, Marek and myself as Uploaders.
-
- -- Andres Mejia <mcitadel at gmail.com> Sat, 08 Jan 2011 00:11:18 -0500
+ * Update packaging to use dh with javahelper.
+ * Update homepage of Netbeans javaparser package.
+ * Provide Vcs entries to control file.
+ * Bump Standards-Version to 3.9.1.
+ * Remove redundant Section and Priority fields.
+ * Update packaging to use dh with javahelper.
+ * Provide versioning for jar files.
+
+ -- Andres Mejia <mcitadel at gmail.com> Sat, 22 Jan 2011 12:30:02 -0500
libnb-javaparser-java (6.9-0ubuntu1) maverick; urgency=low
diff --git a/debian/control b/debian/control
index ab501c3..f7ea04e 100755
--- a/debian/control
+++ b/debian/control
@@ -4,16 +4,17 @@ Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Marek Slama <marek.slama at sun.com>,
Andres Mejia <mcitadel at gmail.com>
-Build-Depends: debhelper (>=7.3.3), cdbs (>=0.4.63)
-Build-Depends-Indep: ant, ant-optional, default-jdk
-Standards-Version: 3.9.0
-Homepage: http://java.netbeans.org/javaparser/
+Build-Depends: debhelper (>= 7.0.50~), javahelper, ant, ant-optional,
+ default-jdk
+Standards-Version: 3.9.1
+Homepage: http://netbeans.org/
+Vcs-Browser: http://git.debian.org/?p=pkg-java/libnb-javaparser-java.git
+Vcs-Git: git://git.debian.org/git/pkg-java/libnb-javaparser-java.git
Package: libnb-javaparser-java
Architecture: all
-Priority: optional
-Depends: ${shlibs:Depends}, ${misc:Depends},
- default-jre-headless | java2-runtime-headless
+Depends: default-jre-headless | java2-runtime-headless, ${java:Depends},
+ ${misc:Depends}
Description: Parser for the Java language which is good for use in tools
NetBeans parser for Java is patched version of the Java compiler.
The patches are necessary for making the compiler usable in tools.
@@ -21,6 +22,6 @@ Description: Parser for the Java language which is good for use in tools
improvements etc.
.
Please notice that the NetBeans Java parser is intended solely for use
- in development tools and can not and should not be used as Java compiler.
+ in development tools and can not and should not be used as a Java compiler.
It does not produce class files. If you want to compile Java source code
- use the javac included in JDK releases.
+ use the javac compiler included in JDK releases.
diff --git a/debian/libnb-javaparser-java.dirs b/debian/libnb-javaparser-java.dirs
deleted file mode 100755
index 6dbe9df..0000000
--- a/debian/libnb-javaparser-java.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/java
-
diff --git a/debian/libnb-javaparser-java.jlibs b/debian/libnb-javaparser-java.jlibs
new file mode 100644
index 0000000..a3393bd
--- /dev/null
+++ b/debian/libnb-javaparser-java.jlibs
@@ -0,0 +1 @@
+make/netbeans/nb-javac/dist/*.jar
diff --git a/debian/patches/javac-libs-versioning.patch b/debian/patches/javac-libs-versioning.patch
new file mode 100644
index 0000000..fd82ae4
--- /dev/null
+++ b/debian/patches/javac-libs-versioning.patch
@@ -0,0 +1,46 @@
+Description: Build jar files with versions. Set version from one variable in
+ project properties' file.
+Author: Andres Mejia <mcitadel at gmail.com>
+Forwarded: no
+Last-Update: 2011-01-22
+
+--- a/make/netbeans/nb-javac/build.xml
++++ b/make/netbeans/nb-javac/build.xml
+@@ -75,7 +75,7 @@
+ </target>
+
+ <target name="-separate-jars">
+- <jar destfile="${dist.dir}/javac-api.jar">
++ <jar destfile="${dist.dir}/javac-api-${application.version}.jar">
+ <fileset dir="${build.classes.dir}">
+ <include name="com/sun/javadoc/**/*"/>
+ <include name="com/sun/source/**/*"/>
+@@ -84,7 +84,7 @@
+ <include name="javax/annotation/**/*"/>
+ </fileset>
+ </jar>
+- <jar destfile="${dist.dir}/javac-impl.jar">
++ <jar destfile="${dist.dir}/javac-impl-${application.version}.jar">
+ <fileset dir="${build.classes.dir}">
+ <include name="com/sun/tools/**/*"/>
+ </fileset>
+@@ -93,8 +93,8 @@
+ </target>
+
+ <target name="-copy-jars-to-build" if="modules.ext.exists">
+- <copy file="${dist.dir}/javac-api.jar" tofile="../../../../nbbuild/netbeans/java/modules/ext/javac-api-nb-7.0-b07.jar" />
+- <copy file="${dist.dir}/javac-impl.jar" tofile="../../../../nbbuild/netbeans/java/modules/ext/javac-impl-nb-7.0-b07.jar" />
++ <copy file="${dist.dir}/javac-api-${application.version}.jar" tofile="../../../../nbbuild/netbeans/java/modules/ext/javac-api-${application.version}.jar" />
++ <copy file="${dist.dir}/javac-impl-${application.version}.jar" tofile="../../../../nbbuild/netbeans/java/modules/ext/javac-impl-${application.version}.jar" />
+ <touch file="../../../../nbbuild/netbeans/java/.lastModified" />
+ </target>
+ <target name="-post-jar" depends="-post-init,-separate-jars,-copy-jars-to-build">
+--- a/make/netbeans/nb-javac/nbproject/project.properties
++++ b/make/netbeans/nb-javac/nbproject/project.properties
+@@ -1,5 +1,6 @@
+ application.title=nb-javac
+ application.vendor=lahvac
++application.version=nb-7.0-b07
+ build.classes.dir=${build.dir}/classes
+ build.classes.excludes=**/*.java,**/*.form
+ # This directory is removed when the project is cleaned:
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..cf9ebb6
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+javac-libs-versioning.patch
diff --git a/debian/rules b/debian/rules
index a89cd90..f23488d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,27 +1,14 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+export JAVA_HOME=/usr/lib/jvm/default-java
-JAVA_HOME := /usr/lib/jvm/default-java
+%:
+ dh $@ --with javahelper
-DEB_ANT_BUILDFILE := $(DEB_SRCDIR)/make/netbeans/nb-javac/build.xml
-DEB_ANT_BUILD_TARGET := jar
-DEB_JARS := ant-nodeps.jar
+override_dh_auto_build:
+ cd make/netbeans/nb-javac && \
+ ant -f build.xml jar
-# package name
-p_javap := libnb-javaparser-java
-d_javap := debian/$(p_javap)
-BUILDDIR := $(DEB_SRCDIR)/make/netbeans/nb-javac
-
-#install dir
-INSTALL_DIR := usr/share/java
-
-install/$(p_javap):: build
- install -m 644 -D $(BUILDDIR)/dist/javac-api.jar $(d_javap)/$(INSTALL_DIR)/javac-api-$(DEB_UPSTREAM_VERSION).jar
- dh_link -p$(p_javap) $(INSTALL_DIR)/javac-api-$(DEB_UPSTREAM_VERSION).jar $(INSTALL_DIR)/javac-api.jar
- install -m 644 -D $(BUILDDIR)/dist/javac-impl.jar $(d_javap)/$(INSTALL_DIR)/javac-impl-$(DEB_UPSTREAM_VERSION).jar
- dh_link -p$(p_javap) $(INSTALL_DIR)/javac-impl-$(DEB_UPSTREAM_VERSION).jar $(INSTALL_DIR)/javac-impl.jar
-
-get-orig-source:
- uscan --verbose --rename --force-download
+override_dh_auto_clean:
+ cd make/netbeans/nb-javac && \
+ ant -f build.xml clean
hooks/post-receive
--
libnb-javaparser-java packaging
More information about the pkg-java-commits
mailing list