[pkg-java] r12610 - in trunk/ow-util-ant-tasks/debian: . patches

[Niels Thykier]

Author: nthykier-guest
Date: 2010-06-21 16:16:09 +0000 (Mon, 21 Jun 2010)
New Revision: 12610

Added:
   trunk/ow-util-ant-tasks/debian/patches/08_link_javadoc.patch
Modified:
   trunk/ow-util-ant-tasks/debian/changelog
   trunk/ow-util-ant-tasks/debian/control
   trunk/ow-util-ant-tasks/debian/copyright
   trunk/ow-util-ant-tasks/debian/patches/series
Log:
  [ Niels Thykier ]
  * Added patch to link the javadoc against the system installed javadoc.
  * Made d/copyright refer to the LGPL-2 instead of the versionless symlink.
  * Added copyright years to d/copyright and changed the wording slightly.




Modified: trunk/ow-util-ant-tasks/debian/changelog
===================================================================
--- trunk/ow-util-ant-tasks/debian/changelog	2010-06-21 15:17:56 UTC (rev 12609)
+++ trunk/ow-util-ant-tasks/debian/changelog	2010-06-21 16:16:09 UTC (rev 12610)
@@ -1,5 +1,6 @@
 ow-util-ant-tasks (1.3.2-4) unstable; urgency=low
 
+  [ Onkar Shinde ]
   * Team upload.
   * Use cdbs for building. Makes rules file compact.
   * asm2 -> asm3 transition. Patch 06_fix_build_with_asm3.diff added to fix
@@ -12,6 +13,11 @@
   * debian/libow-util-ant-tasks-java.doc-base
     - Rename to debian/libow-util-ant-tasks-java-doc.doc-base
 
+  [ Niels Thykier ]
+  * Added patch to link the javadoc against the system installed javadoc.
+  * Made d/copyright refer to the LGPL-2 instead of the versionless symlink.
+  * Added copyright years to d/copyright and changed the wording slightly.
+
  -- Onkar Shinde <onkarshinde at ubuntu.com>  Mon, 21 Jun 2010 18:19:38 +0530
 
 ow-util-ant-tasks (1.3.2-3) unstable; urgency=low

Modified: trunk/ow-util-ant-tasks/debian/control
===================================================================
--- trunk/ow-util-ant-tasks/debian/control	2010-06-21 15:17:56 UTC (rev 12609)
+++ trunk/ow-util-ant-tasks/debian/control	2010-06-21 16:16:09 UTC (rev 12610)
@@ -4,7 +4,8 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Michael Koch <konqueror at gmx.de>
 Build-Depends: debhelper (>= 7), cdbs
-Build-Depends-Indep: default-jdk, ant (>= 1.7), junit, libxalan2-java, libasm3-java
+Build-Depends-Indep: default-jdk, ant (>= 1.7), junit, libxalan2-java, libasm3-java,
+ default-jdk-doc, libxalan2-java-doc, libasm3-java-doc
 Standards-Version: 3.8.4
 Homepage: http://forge.ow2.org/projects/monolog/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/ow-util-ant-tasks
@@ -26,6 +27,7 @@
 Section: doc
 Architecture: all
 Depends: ${misc:Depends}
+Recommends: default-jdk-doc, libxalan2-java-doc, libasm3-java-doc
 Replaces: libow-util-ant-tasks-java (<< 1.3.2-4)
 Description: ObjectWeb utility Ant tasks library (API docs)
  This library is used in the build process of several key frameworks

Modified: trunk/ow-util-ant-tasks/debian/copyright
===================================================================
--- trunk/ow-util-ant-tasks/debian/copyright	2010-06-21 15:17:56 UTC (rev 12609)
+++ trunk/ow-util-ant-tasks/debian/copyright	2010-06-21 16:16:09 UTC (rev 12610)
@@ -3,8 +3,8 @@
 
 It was downloaded from http://forge.objectweb.org/project/showfiles.php?group_id=41
 
-Copyright Holder: France Telecom Research and Development
-                  Sébastien Chassande-Barrioz <sebastien.chassandebarrioz at rd.francetelecom.com>
+Copyright: 2001-2005, France Telecom Research and Development
+           2000-2002, Sébastien Chassande-Barrioz <sebastien.chassandebarrioz at rd.francetelecom.com>
 
 License:
 
@@ -23,4 +23,4 @@
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 On Debian systems, the complete text of the GNU Lesser General
-Public License can be found in `/usr/share/common-licenses/LGPL'.
+Public License can be found in `/usr/share/common-licenses/LGPL-2'.

Added: trunk/ow-util-ant-tasks/debian/patches/08_link_javadoc.patch
===================================================================
--- trunk/ow-util-ant-tasks/debian/patches/08_link_javadoc.patch	                        (rev 0)
+++ trunk/ow-util-ant-tasks/debian/patches/08_link_javadoc.patch	2010-06-21 16:16:09 UTC (rev 12610)
@@ -0,0 +1,15 @@
+Description: Makes the javadoc target link against system javadocs.
+Author: Niels Thykier <niels at thykier.net>
+
+--- a/build.xml	2010-06-21 17:44:15.637980890 +0200
++++ b/build.xml	2010-06-21 17:45:54.164999379 +0200
+@@ -46,6 +46,9 @@
+ 			sourcepath="${prj.src}"
+ 			author="true" version="true" use="true">
+ 			<package name="org.objectweb.util.ant"/>
++			<link href="/usr/share/doc/default-jdk-doc/api/" />
++			<link href="/usr/share/doc/libxalan2-java/api/" />
++			<link href="/usr/share/doc/libasm3-java-doc/api/" />
+          </javadoc>
+ 	</target>
+ </project>

Modified: trunk/ow-util-ant-tasks/debian/patches/series
===================================================================
--- trunk/ow-util-ant-tasks/debian/patches/series	2010-06-21 15:17:56 UTC (rev 12609)
+++ trunk/ow-util-ant-tasks/debian/patches/series	2010-06-21 16:16:09 UTC (rev 12610)
@@ -3,3 +3,4 @@
 05_MultipleCopy.dpatch
 06_fix_build_with_asm3.diff
 07_fix_classpath.diff
+08_link_javadoc.patch
\ No newline at end of file