[pkg-java] r17064 - trunk/xom/debian

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2013-07-25 14:14:29 +0000 (Thu, 25 Jul 2013)
New Revision: 17064

Modified:
   trunk/xom/debian/changelog
   trunk/xom/debian/rules
Log:
Moved the samples jar in the documentation package



Modified: trunk/xom/debian/changelog
===================================================================
--- trunk/xom/debian/changelog	2013-07-25 13:54:18 UTC (rev 17063)
+++ trunk/xom/debian/changelog	2013-07-25 14:14:29 UTC (rev 17064)
@@ -8,6 +8,7 @@
   * Removed 0004-Remove-sun-imports.patch since the JDK15XML1_0Parser is really
     meant to be used with the parser provided by the JDK and not the standalone
     version of Xerces.
+  * Moved the samples jar in the documentation package
   * debian/control:
     - Added the missing runtime dependency on libxerces2-java (Closes: #628142)
     - Updated Standards-Version to 3.9.4 (no changes)

Modified: trunk/xom/debian/rules
===================================================================
--- trunk/xom/debian/rules	2013-07-25 13:54:18 UTC (rev 17063)
+++ trunk/xom/debian/rules	2013-07-25 14:14:29 UTC (rev 17064)
@@ -15,13 +15,13 @@
 	mh_clean
 
 install/libxom-java:: 
-	cp build/xom-samples.jar build/xom-samples-$(DEB_UPSTREAM_VERSION).jar
-	dh_install -plibxom-java build/xom-samples-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/
-	dh_link -plibxom-java /usr/share/java/xom-samples-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/xom-samples.jar
 	mh_installpoms -plib$(PACKAGE)-java
 	mh_installjar -plib$(PACKAGE)-java -l debian/poms/$(PACKAGE).pom build/$(PACKAGE)-$(DEB_UPSTREAM_VERSION).jar 
 
 install/libxom-java-doc::
+	cp build/xom-samples.jar build/xom-samples-$(DEB_UPSTREAM_VERSION).jar
+	dh_install -plibxom-java-doc build/xom-samples-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/
+	#dh_link -plibxom-java-doc /usr/share/java/xom-samples-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/xom-samples.jar
 	dh_installdocs -plibxom-java-doc build/apidocs
 
 get-orig-source: