[pkg-java] r13260 - in trunk/vecmath/debian: . patches source
Niels Thykier
nthykier at alioth.debian.org
Tue Feb 8 15:54:23 UTC 2011
Author: nthykier
Date: 2011-02-08 15:54:22 +0000 (Tue, 08 Feb 2011)
New Revision: 13260
Added:
trunk/vecmath/debian/libvecmath-java-doc.javadoc
trunk/vecmath/debian/libvecmath-java.jlibs
trunk/vecmath/debian/patches/link-javadoc.patch
trunk/vecmath/debian/source/
trunk/vecmath/debian/source/format
Modified:
trunk/vecmath/debian/changelog
trunk/vecmath/debian/control
trunk/vecmath/debian/patches/series
trunk/vecmath/debian/rules
Log:
Cleaned up packaging a bit
[ Niels Thykier ]
* Team Upload
* Reduced JDK build-depends to default-jdk.
* Removed JRE depends in libvecmath-java; no longer required.
* Removed "Autobuild" field from d/control; the package is in
main, so it can always be built.
* Fixed the Vcs-Svn field.
* Link javadoc API to system java doc.
* Use javahelper to handle installation of javadoc and jar files.
* Converted source to 3.0 (quilt)
Modified: trunk/vecmath/debian/changelog
===================================================================
--- trunk/vecmath/debian/changelog 2011-02-08 13:11:54 UTC (rev 13259)
+++ trunk/vecmath/debian/changelog 2011-02-08 15:54:22 UTC (rev 13260)
@@ -6,8 +6,19 @@
[ Jonny Lamb ]
* Removed myself from Uploaders.
- -- Jonny Lamb <jonny at debian.org> Fri, 14 May 2010 09:29:33 +0100
+ [ Niels Thykier ]
+ * Team Upload
+ * Reduced JDK build-depends to default-jdk.
+ * Removed JRE depends in libvecmath-java; no longer required.
+ * Removed "Autobuild" field from d/control; the package is in
+ main, so it can always be built.
+ * Fixed the Vcs-Svn field.
+ * Link javadoc API to system java doc.
+ * Use javahelper to handle installation of javadoc and jar files.
+ * Converted source to 3.0 (quilt)
+ -- Niels Thykier <niels at thykier.net> Tue, 08 Feb 2011 16:28:32 +0100
+
vecmath (1.5.2-2) unstable; urgency=low
* debian/control:
Modified: trunk/vecmath/debian/control
===================================================================
--- trunk/vecmath/debian/control 2011-02-08 13:11:54 UTC (rev 13259)
+++ trunk/vecmath/debian/control 2011-02-08 15:54:22 UTC (rev 13260)
@@ -1,19 +1,23 @@
Source: vecmath
-Section: libs
+Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Petter Reinholdtsen <pere at debian.org>
-Build-Depends: debhelper (>= 5), cdbs, ant-optional
-Build-Depends-Indep: openjdk-6-jdk | default-jdk-builddep | sun-java6-jdk
+Build-Depends: ant-optional,
+ cdbs,
+ debhelper (>= 7),
+ default-jdk,
+ default-jdk-doc,
+ javahelper (>= 0.32~)
Standards-Version: 3.8.0
Homepage: https://vecmath.dev.java.net/
-Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/vecmath/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/vecmath/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-java/trunk/vecmath/
-XS-Autobuild: yes
Package: libvecmath-java
Architecture: all
-Depends: ${misc:Depends}, java-gcj-compat | java1-runtime | java2-runtime
+Depends: ${misc:Depends}, ${java:Depends}
+Recommends: ${java:Recommends}
Provides: libvecmath1.2-java
Description: javax.vecmath vector math package
This package includes classes for 3-space vector/point, 4-space vector, 4x4,
@@ -26,7 +30,8 @@
Architecture: all
Section: doc
Suggests: libvecmath-java
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, ${java:Depends}
+Recommends: ${java:Recommends}
Description: javax.vecmath vector math package (documentation)
This package includes classes for 3-space vector/point, 4-space vector, 4x4,
3x3 matrix, quaternion, axis-angle combination and etc. which are often
Added: trunk/vecmath/debian/libvecmath-java-doc.javadoc
===================================================================
--- trunk/vecmath/debian/libvecmath-java-doc.javadoc (rev 0)
+++ trunk/vecmath/debian/libvecmath-java-doc.javadoc 2011-02-08 15:54:22 UTC (rev 13260)
@@ -0,0 +1 @@
+vecmath/build/javadocs
Added: trunk/vecmath/debian/libvecmath-java.jlibs
===================================================================
--- trunk/vecmath/debian/libvecmath-java.jlibs (rev 0)
+++ trunk/vecmath/debian/libvecmath-java.jlibs 2011-02-08 15:54:22 UTC (rev 13260)
@@ -0,0 +1 @@
+vecmath/build/opt/lib/ext/vecmath.jar
Added: trunk/vecmath/debian/patches/link-javadoc.patch
===================================================================
--- trunk/vecmath/debian/patches/link-javadoc.patch (rev 0)
+++ trunk/vecmath/debian/patches/link-javadoc.patch 2011-02-08 15:54:22 UTC (rev 13260)
@@ -0,0 +1,15 @@
+Description: Make the ant file link the javadoc to system javadocs.
+Author: Niels Thykier <niels at thykier.net>
+
+diff --git a/build.xml.orig b/build.xml
+index 45ff891..feca902 100644
+--- a/build.xml
++++ b/build.xml
+@@ -185,6 +185,7 @@
+ maxmemory="128m"
+ destdir="${build}/javadocs"
+ windowtitle="Vecmath ${version}">
++ <link href="/usr/share/doc/default-jdk-doc/api/" />
+ </javadoc>
+
+ <!-- Copy the copyright file -->
Modified: trunk/vecmath/debian/patches/series
===================================================================
--- trunk/vecmath/debian/patches/series 2011-02-08 13:11:54 UTC (rev 13259)
+++ trunk/vecmath/debian/patches/series 2011-02-08 15:54:22 UTC (rev 13260)
@@ -0,0 +1 @@
+link-javadoc.patch
Modified: trunk/vecmath/debian/rules
===================================================================
--- trunk/vecmath/debian/rules 2011-02-08 13:11:54 UTC (rev 13259)
+++ trunk/vecmath/debian/rules 2011-02-08 15:54:22 UTC (rev 13260)
@@ -1,25 +1,16 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/javahelper.mk
include /usr/share/cdbs/1/class/ant.mk
-JAVA_HOME_DIRS := /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/default-java /usr/lib/jvm/java-6-sun
+JAVA_HOME_DIRS := /usr/lib/jvm/default-java
DEB_JARS := ant-launcher
DEB_ANT_CLEAN_TARGET := clean
DEB_ANT_BUILD_TARGET := jar docs
DEB_BUILDDIR := vecmath
-install/libvecmath-java::
- install -m 644 -D vecmath/build/opt/lib/ext/vecmath.jar debian/libvecmath-java/usr/share/java/vecmath-$(DEB_UPSTREAM_VERSION).jar
- ln -s vecmath-$(DEB_UPSTREAM_VERSION).jar debian/libvecmath-java/usr/share/java/vecmath.jar
-
-install/libvecmath-java-doc::
- install -d debian/libvecmath-java-doc/usr/share/doc/libvecmath-java-doc/.
- cp -r vecmath/build/javadocs debian/libvecmath-java-doc/usr/share/doc/libvecmath-java-doc/api
-
-clean::
-
CVS_TAG = rel-1_5_2-fcs
CVS_VER = 1.5.2
Added: trunk/vecmath/debian/source/format
===================================================================
--- trunk/vecmath/debian/source/format (rev 0)
+++ trunk/vecmath/debian/source/format 2011-02-08 15:54:22 UTC (rev 13260)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the pkg-java-commits
mailing list