[SCM] Interface for applications to support RELAX Core branch, master, updated. debian/20041111-5-1-g7b56f2e
Niels Thykier
niels at thykier.net
Fri Oct 28 22:18:33 UTC 2011
The following commit has been merged in the master branch:
commit 7b56f2eddd72d2ef67d0fdecedd61e50b983fc09
Author: Niels Thykier <niels at thykier.net>
Date: Sat Oct 29 00:15:31 2011 +0200
Added build-{arch,indep} targets etc.
Removed JRE dependency (not required for library packages), bumped
S-V to 3.9.2 (no changes), added missing call to mh_clean and linked
javadocs against system docs.
diff --git a/debian/changelog b/debian/changelog
index b46fbbb..5b3d35b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+isorelax (20041111-6) UNRELEASED; urgency=low
+
+ * Team upload.
+ * Added build-arch and build-indep targets.
+ * Removed unneeded JRE dependency from libisorelax-java.
+ * Bumped Standards-Versions to 3.9.2 - no changes required.
+ * Link javadoc API against system javadoc.
+ * Added missing call to mh_clean.
+
+ -- Niels Thykier <niels at thykier.net> Sat, 29 Oct 2011 00:00:48 +0200
+
isorelax (20041111-5) unstable; urgency=low
* Moving the package to the Java Team and adding myself as uploader,
diff --git a/debian/control b/debian/control
index 883f766..027e635 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,8 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
Uploaders: Samuel Thibault <sthibault at debian.org>,
Giovanni Mascellani <gio at debian.org>
Build-Depends: debhelper (>= 7)
-Build-Depends-Indep: default-jdk, ant, maven-repo-helper
-Standards-Version: 3.9.1
+Build-Depends-Indep: default-jdk, default-jdk-doc, ant, ant-doc, maven-repo-helper
+Standards-Version: 3.9.2
Section: java
Homepage: http://sourceforge.net/projects/iso-relax/
Vcs-Browser: http://git.debian.org/?p=pkg-java/isorelax.git;a=summary
@@ -13,7 +13,7 @@ Vcs-Git: git://git.debian.org/git/pkg-java/isorelax.git
Package: libisorelax-java
Architecture: all
-Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless
+Depends: ${misc:Depends}
Description: Interface for applications to support RELAX Core
The ISO RELAX project hosts the public interfaces useful for
applications to support RELAX Core.
@@ -24,6 +24,7 @@ Package: libisorelax-java-doc
Section: doc
Architecture: all
Depends: ${misc:Depends}
+Recommends: default-jdk-doc, ant-doc
Description: Interface for applications to support RELAX Core - documentation
The ISO RELAX project hosts the public interfaces useful for
applications to support RELAX Core.
diff --git a/debian/rules b/debian/rules
index a1923b8..abcb49b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,15 +7,20 @@ JAR=jar
JAVACLASSES=/usr/share/java
JAVAFLAGS=-classpath $(JAVACLASSES)/ant.jar
+JAVADOCFLAGS=-classpath $(JAVACLASSES)/ant.jar \
+ -link /usr/share/doc/default-jdk-doc/api \
+ -link /usr/share/doc/ant/api/
JARFILE=isorelax-20041111.jar
-build: build-stamp
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
build-stamp:
dh_testdir
$(JAVAC) $(JAVAFLAGS) `find . -name \*.java`
- $(JAVADOC) -d api `find . -name \*.java`
+ $(JAVADOC) $(JAVADOCFLAGS) -d api `find . -name \*.java`
$(JAR) c `find . -name \*.class -o -name \*.rxm -o -name \*.rxg -o -name \*.dtd -o -name \*.mod -o -name \*.MF` > $(JARFILE)
@@ -29,6 +34,7 @@ clean:
rm -f $(JARFILE)
rm -fr api
+ mh_clean
dh_clean
binary-indep: install
@@ -46,4 +52,4 @@ binary-indep: install
dh_builddeb
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install
--
Interface for applications to support RELAX Core
More information about the pkg-java-commits
mailing list