[pkg-java] r18492 - trunk/libjtharness-java/debian

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2014-09-29 22:28:53 +0000 (Mon, 29 Sep 2014)
New Revision: 18492

Modified:
   trunk/libjtharness-java/debian/changelog
   trunk/libjtharness-java/debian/control
   trunk/libjtharness-java/debian/rules
Log:
Replaced the jars with symlinks when possible in the -doc package



Modified: trunk/libjtharness-java/debian/changelog
===================================================================
--- trunk/libjtharness-java/debian/changelog	2014-09-29 22:04:32 UTC (rev 18491)
+++ trunk/libjtharness-java/debian/changelog	2014-09-29 22:28:53 UTC (rev 18492)
@@ -4,6 +4,7 @@
   * New upstream relase
     - Refreshed the patches
   * No longer compress the examples in the -doc package
+  * Replaced the jars with symlinks when possible in the -doc package
   * debian/control:
     - Depend on libservlet3.1-java instead of libservlet3.0-java
     - Fixed the Vcs-Svn URL and added Vcs-Browser

Modified: trunk/libjtharness-java/debian/control
===================================================================
--- trunk/libjtharness-java/debian/control	2014-09-29 22:04:32 UTC (rev 18491)
+++ trunk/libjtharness-java/debian/control	2014-09-29 22:28:53 UTC (rev 18492)
@@ -34,8 +34,7 @@
 Package: libjtharness-java-doc
 Section: doc
 Architecture: all
-Depends: ${java:Depends}, ${misc:Depends}
-Suggests: libjtharness-java
+Depends: ${java:Depends}, ${misc:Depends}, libjtharness-java, javahelp2
 Description: JT harness (documentation)
  This is the javadoc for the libjtharness-java package.
  .

Modified: trunk/libjtharness-java/debian/rules
===================================================================
--- trunk/libjtharness-java/debian/rules	2014-09-29 22:04:32 UTC (rev 18491)
+++ trunk/libjtharness-java/debian/rules	2014-09-29 22:28:53 UTC (rev 18492)
@@ -8,6 +8,17 @@
 override_dh_auto_build:
 	ant -f build/build.xml
 
+	# Remove jh.jar and javatest.jar in the tutorial...
+	rm jar-build/binaries/examples/tutorial/demots/lib/jh.jar
+	rm jar-build/binaries/examples/tutorial/demots/lib/javatest.jar
+
+override_dh_auto_install:
+	dh_auto_install
+
+	# ...and replace them with links
+	dh_link -plibjtharness-java-doc /usr/share/java/jh.jar usr/share/doc/libjtharness-java/examples/tutorial/demots/lib/jh.jar
+	dh_link -plibjtharness-java-doc /usr/share/java/javatest.jar usr/share/doc/libjtharness-java/examples/tutorial/demots/lib/javatest.jar
+
 override_dh_compress:
 	dh_compress -X.java