[vecmath] 34/58: Cleaned up packaging a bit
Markus Koschany
apo at moszumanska.debian.org
Wed Jul 5 09:58:14 UTC 2017
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository vecmath.
commit bf0ceed4f88a0b167e7db3135cfa50769d3d51b0
Author: Niels Thykier <nthykier at debian.org>
Date: Tue Feb 8 15:54:22 2011 +0000
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)
---
debian/changelog | 13 ++++++++++++-
debian/control | 19 ++++++++++++-------
debian/libvecmath-java-doc.javadoc | 1 +
debian/libvecmath-java.jlibs | 1 +
debian/patches/link-javadoc.patch | 15 +++++++++++++++
debian/patches/series | 1 +
debian/rules | 13 ++-----------
debian/source/format | 1 +
8 files changed, 45 insertions(+), 19 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d1ac094..18365e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,18 @@ vecmath (1.5.2-3) UNRELEASED; urgency=low
[ 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
diff --git a/debian/control b/debian/control
index eb8dfcd..656a439 100644
--- a/debian/control
+++ b/debian/control
@@ -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 @@ Package: libvecmath-java-doc
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
diff --git a/debian/libvecmath-java-doc.javadoc b/debian/libvecmath-java-doc.javadoc
new file mode 100644
index 0000000..fc3b9a8
--- /dev/null
+++ b/debian/libvecmath-java-doc.javadoc
@@ -0,0 +1 @@
+vecmath/build/javadocs
diff --git a/debian/libvecmath-java.jlibs b/debian/libvecmath-java.jlibs
new file mode 100644
index 0000000..7a19f93
--- /dev/null
+++ b/debian/libvecmath-java.jlibs
@@ -0,0 +1 @@
+vecmath/build/opt/lib/ext/vecmath.jar
diff --git a/debian/patches/link-javadoc.patch b/debian/patches/link-javadoc.patch
new file mode 100644
index 0000000..6acd608
--- /dev/null
+++ b/debian/patches/link-javadoc.patch
@@ -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 -->
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..78d8c9e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+link-javadoc.patch
diff --git a/debian/rules b/debian/rules
index de03c02..ae67631 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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
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)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/vecmath.git
More information about the pkg-java-commits
mailing list