[pkg-java] r9186 - in trunk/libcommons-validator-java/debian: . patches

[Ludovic Claude]

Author: ludovicc-guest
Date: 2009-07-12 23:29:00 +0000 (Sun, 12 Jul 2009)
New Revision: 9186

Added:
   trunk/libcommons-validator-java/debian/patches/
   trunk/libcommons-validator-java/debian/patches/build.patch
   trunk/libcommons-validator-java/debian/patches/series
Modified:
   trunk/libcommons-validator-java/debian/changelog
   trunk/libcommons-validator-java/debian/control
   trunk/libcommons-validator-java/debian/libcommons-validator-java-doc.docs
   trunk/libcommons-validator-java/debian/rules
Log:
Add a Build-Depends-Indep dependency on maven-repo-helper and quilt

Modified: trunk/libcommons-validator-java/debian/changelog
===================================================================
--- trunk/libcommons-validator-java/debian/changelog	2009-07-12 23:17:09 UTC (rev 9185)
+++ trunk/libcommons-validator-java/debian/changelog	2009-07-12 23:29:00 UTC (rev 9186)
@@ -1,8 +1,8 @@
-libcommons-validator-java (1:1.3.1-5) unstable; urgency=low
+libcommons-validator-java (1:1.3.1-5) experimental; urgency=low
 
   * Change section to java, bump up Standards-Version to 3.8.1
   * Add the Maven POM to the package,
-  * Add a Build-Depends-Indep dependency on maven-repo-helper
+  * Add a Build-Depends-Indep dependency on maven-repo-helper and quilt
   * Use mh_installpom and mh_installjar to install the POM and the jar to the
     Maven repository
   * Add ${misc:Depends} to Depends to clear Lintian warnings  

Modified: trunk/libcommons-validator-java/debian/control
===================================================================
--- trunk/libcommons-validator-java/debian/control	2009-07-12 23:17:09 UTC (rev 9185)
+++ trunk/libcommons-validator-java/debian/control	2009-07-12 23:29:00 UTC (rev 9186)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Arnaud Vandyck <avdyk at debian.org>, Kumar Appaiah <akumar at debian.org>, Varun Hiremath <varun at debian.org>
-Build-Depends: debhelper (>= 7), cdbs, default-jdk
+Build-Depends: debhelper (>= 7), cdbs, default-jdk, quilt
 Build-Depends-Indep: maven-repo-helper, ant, junit (>= 3.8.1), libcommons-beanutils-java (>= 1.7), 
  libcommons-collections-java (>= 2.1), libcommons-digester-java (>= 1.6), libcommons-logging-java (>= 1.0.6), 
  liboro-java (>= 2.0.8), sgml-base, rhino

Modified: trunk/libcommons-validator-java/debian/libcommons-validator-java-doc.docs
===================================================================
--- trunk/libcommons-validator-java/debian/libcommons-validator-java-doc.docs	2009-07-12 23:17:09 UTC (rev 9185)
+++ trunk/libcommons-validator-java/debian/libcommons-validator-java-doc.docs	2009-07-12 23:29:00 UTC (rev 9186)
@@ -1,2 +1,4 @@
 dist/docs/api
+dist/docs/javascript
 NOTICE.txt
+RELEASE-NOTES.txt

Added: trunk/libcommons-validator-java/debian/patches/build.patch
===================================================================
--- trunk/libcommons-validator-java/debian/patches/build.patch	                        (rev 0)
+++ trunk/libcommons-validator-java/debian/patches/build.patch	2009-07-12 23:29:00 UTC (rev 9186)
@@ -0,0 +1,20 @@
+--- a/build.xml
++++ b/build.xml
+@@ -262,7 +262,7 @@
+    description="Initializes Javadoc directories">
+     <mkdir      dir="${dist.home}"/>
+     <mkdir      dir="${dist.home}/docs"/>
+-    <mkdir      dir="${dist.home}/docs/apidocs"/>
++    <mkdir      dir="${dist.home}/docs/api"/>
+     <mkdir      dir="${dist.home}/docs/javascript"/>
+     <mkdir      dir="${dist.home}/docs/javascript/org/apache/commons/validator/javascript/doc-files"/>
+   </target>  
+@@ -293,7 +293,7 @@
+   <target name="javadoc" depends="compile, javadoc.js"
+    description="Create component Javadoc documentation">
+     <javadoc sourcepath="${source.home}"
+-                destdir="${dist.home}/docs/apidocs"
++                destdir="${dist.home}/docs/api"
+            packagenames="org.apache.commons.*"
+                  author="true"
+                 private="true"

Added: trunk/libcommons-validator-java/debian/patches/series
===================================================================
--- trunk/libcommons-validator-java/debian/patches/series	                        (rev 0)
+++ trunk/libcommons-validator-java/debian/patches/series	2009-07-12 23:29:00 UTC (rev 9186)
@@ -0,0 +1 @@
+build.patch

Modified: trunk/libcommons-validator-java/debian/rules
===================================================================
--- trunk/libcommons-validator-java/debian/rules	2009-07-12 23:17:09 UTC (rev 9185)
+++ trunk/libcommons-validator-java/debian/rules	2009-07-12 23:29:00 UTC (rev 9186)
@@ -6,6 +6,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 PACKAGE              := $(DEB_SOURCE_PACKAGE)
 VERSION              := $(DEB_UPSTREAM_VERSION)
@@ -13,9 +14,6 @@
 DEB_JARS             := junit commons-beanutils commons-collections commons-digester commons-logging oro
 DEB_ANT_BUILD_TARGET := dist
 
-clean:: 
-	$(RM) debian/install debian/sgmlcatalogs
-
 install/$(PACKAGE)::
 	cp conf/share/*.dtd dist/
 	$(RM) dist/RELEASE-NOTES.txt
@@ -23,10 +21,8 @@
 	mh_installpoms -p$(PACKAGE)
 	mh_installjar -p$(PACKAGE) -l debian/pom.xml dist/commons-validator-$(VERSION).jar
 
-install/$(PACKAGE)-doc::
-	mv dist/docs/apidocs dist/docs/api
-
 clean::
+	$(RM) debian/install debian/sgmlcatalogs
 	-rm -rf debian/tmp
 
 get-orig-source: