[pkg-java] r3581 - trunk/ant/debian

[mkoch at alioth.debian.org]

Author: mkoch
Date: 2007-06-03 17:01:48 +0000 (Sun, 03 Jun 2007)
New Revision: 3581

Modified:
   trunk/ant/debian/changelog
   trunk/ant/debian/control
   trunk/ant/debian/rules
Log:
* Build -gcj Packages for ant and ant-optional.
* Fix Homepage: tag in long descriptions.


Modified: trunk/ant/debian/changelog
===================================================================
--- trunk/ant/debian/changelog	2007-06-03 16:41:45 UTC (rev 3580)
+++ trunk/ant/debian/changelog	2007-06-03 17:01:48 UTC (rev 3581)
@@ -1,21 +1,20 @@
-ant (1.6.5-8) UNRELEASED; urgency=low
+ant (1.6.5-7) unstable; urgency=low
 
-  Arnaud Vandyck:
+  [ Arnaud Vandyck ]
   * debian/build.xml.5: correction of an exemple, thanks to LI Daobing
     (closes: #426345)
-
- --
-
-ant (1.6.5-7) unstable; urgency=low
-
   * debian/control: depends on java-gcj-compat-dev as it needs the
     tools.jar file (closes: #397045). So it does not recommends jikes |
     java-compiler no more.
   * debian/control: ant-optional does not depend on a virtual machine
     because it depends on ant.
 
- -- Arnaud Vandyck <avdyk at debian.org>  Mon,  6 Nov 2006 13:21:52 +0100
+  [ Michael Koch ]
+  * Build -gcj Packages for ant and ant-optional.
+  * Fix Homepage: tag in long descriptions.
 
+ -- Michael Koch <konqueror at gmx.de>  Sun, 03 Jun 2007 18:35:58 +0200
+
 ant (1.6.5-6) unstable; urgency=low
 
   * debian/patches/03_SplashTaskPatch_a.patch: Fixed to apply the new file

Modified: trunk/ant/debian/control
===================================================================
--- trunk/ant/debian/control	2007-06-03 16:41:45 UTC (rev 3580)
+++ trunk/ant/debian/control	2007-06-03 17:01:48 UTC (rev 3581)
@@ -3,8 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Stefan Gybas <sgybas at debian.org>, Arnaud Vandyck <avdyk at debian.org>, Wolfgang Baer <WBaer at gmx.de>, Michael Koch <konqueror at gmx.de>
-Build-Depends: cdbs (>= 0.4.8), debhelper (>= 4.2.0)
-Build-Depends-Indep: java-gcj-compat-dev, libxerces2-java, libbsf-java (>= 2.3.0rc1-1), liboro-java, libxalan2-java (>= 2.4.0-1), junit, antlr, liblog4j1.2-java, libregexp-java, libbcel-java (>= 5.0), libcommons-logging-java, libjdepend-java, libgnumail-java, libxml-commons-resolver1.1-java, libcommons-net-java, libjsch-java
+Build-Depends: cdbs (>= 0.4.8), debhelper (>= 4.2.0), java-gcj-compat-dev, libxerces2-java, libbsf-java (>= 2.3.0rc1-1), liboro-java, libxalan2-java (>= 2.4.0-1), junit, antlr, liblog4j1.2-java, libregexp-java, libbcel-java (>= 5.0), libcommons-logging-java, libjdepend-java, libgnumail-java, libxml-commons-resolver1.1-java, libcommons-net-java, libjsch-java
 Standards-Version: 3.7.2
 
 Package: ant
@@ -12,7 +11,7 @@
 Section: devel
 Priority: optional
 Depends: java-gcj-compat-dev | java-virtual-machine, java-gcj-compat | java1-runtime | java2-runtime, libxerces2-java
-Recommends: ant-optional
+Recommends: ant-optional, ant-gcj
 Suggests: ant-doc 
 Conflicts: libant1.6-java, ant-doc (<= 1.6.5-1)
 Replaces: libant1.6-java, ant-doc (<= 1.6.5-1)
@@ -21,20 +20,47 @@
  files as "Makefiles". This package contains the scripts and the core
  tasks libraries. 
  .
- For more information see http://ant.apache.org/index.html.
+  Homepage: http://ant.apache.org/
 
+Package: ant-gcj
+Architecture: any
+Section: devel
+Priority: optional
+Depends: ant
+Description: Java based build tool like make
+ A system independent (i.e. not shell based) build tool that uses XML
+ files as "Makefiles". This package contains the scripts and the core
+ tasks libraries. 
+ .
+  Homepage: http://ant.apache.org/
+
 Package: ant-optional
 Architecture: all
 Section: devel
 Priority: optional
 Depends: ant (= ${Source-Version})
+Recommends: ant-optional-gcj
 Suggests: libbsf-java, liboro-java, libxalan2-java (>= 2.4.0-1), junit, liblog4j1.2-java, libregexp-java, jython, antlr, libbcel-java (>= 5.0), libcommons-logging-java, libjdepend-java, libgnumail-java, libxml-commons-resolver1.1-java, libcommons-net-java, libjsch-java, javacc
 Conflicts: libant1.6-java
 Replaces: libant1.6-java
 Description: Java based build tool like make - optional libraries
  A system independent (i.e. not shell based) build tool that uses XML
  files as "Makefiles". This package contains the optional tasks libraries.
+ .
+  Homepage: http://ant.apache.org/
 
+Package: ant-optional-gcj
+Architecture: any
+Section: devel
+Priority: optional
+Depends: ant-optional
+Description: Java based build tool like make - API documentation and manual
+ A system independent (i.e. not shell based) build tool that uses XML files
+ as "Makefiles". This package contains the manual of ant as well as the
+ Javadoc API documentation.
+ .
+  Homepage: http://ant.apache.org/
+
 Package: ant-doc
 Architecture: all
 Section: doc
@@ -44,3 +70,5 @@
  A system independent (i.e. not shell based) build tool that uses XML files
  as "Makefiles". This package contains the manual of ant as well as the
  Javadoc API documentation.
+ .
+  Homepage: http://ant.apache.org/

Modified: trunk/ant/debian/rules
===================================================================
--- trunk/ant/debian/rules	2007-06-03 16:41:45 UTC (rev 3580)
+++ trunk/ant/debian/rules	2007-06-03 17:01:48 UTC (rev 3581)
@@ -43,6 +43,12 @@
 	install -m 755 src/script/antRun  debian/ant/usr/share/ant/bin
 	install -m 755 src/script/*.pl    debian/ant/usr/share/ant/bin
 
+install/ant-gcj:: install/ant
+	dh_nativejava -pant-gcj
+
+install/ant-optional-gcj:: install/ant-optional
+	dh_nativejava -pant-optional-gcj
+
 install/ant-doc::
 	-rm -f docs/manual/LICENSE
 	# install linda override - the changelog is not a changelog but a task description