CVS libstruts1.1-java/debian

Stefan Gybas sgybas@haydn.debian.org
Thu Aug 12 05:49:02 2004


Update of /cvsroot/pkg-java/libstruts1.1-java/debian
In directory haydn:/tmp/cvs-serv9257

Modified Files:
	ant.properties changelog control rules 
Log Message:
Debian release 1.1-2


--- /cvsroot/pkg-java/libstruts1.1-java/debian/ant.properties	2003/09/09 14:07:33	1.2
+++ /cvsroot/pkg-java/libstruts1.1-java/debian/ant.properties	2004/08/12 11:48:45	1.3
@@ -1,3 +1,4 @@
+compile.target=1.3
 commons-beanutils.jar=/usr/share/java/commons-beanutils.jar
 commons-collections.jar=/usr/share/java/commons-collections.jar
 commons-digester.jar=/usr/share/java/commons-digester.jar
--- /cvsroot/pkg-java/libstruts1.1-java/debian/changelog	2003/09/09 12:42:41	1.2
+++ /cvsroot/pkg-java/libstruts1.1-java/debian/changelog	2004/08/12 11:48:45	1.3
@@ -1,3 +1,14 @@
+libstruts1.1-java (1.1-2) unstable; urgency=low
+
+  * Changed dependency to classpath-common | java2-runtime
+  * Updated package description and home page URL
+  * Set target=1.3 attribute for javac so the classes are usable by JDK 1.3
+    when compiled using newer Jikes versions
+  * Build using SableVM and Ant 1.6. This package can go into main as soon
+    as libxalan2-java is there.
+
+ -- Stefan Gybas <sgybas@debian.org>  Thu, 12 Aug 2004 13:25:41 +0200
+
 libstruts1.1-java (1.1-1) unstable; urgency=low
 
   * Initial release
--- /cvsroot/pkg-java/libstruts1.1-java/debian/control	2003/09/09 14:07:33	1.3
+++ /cvsroot/pkg-java/libstruts1.1-java/debian/control	2004/08/12 11:48:45	1.4
@@ -3,20 +3,20 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Stefan Gybas <sgybas@debian.org>, Takashi Okamoto <tora@debian.org>
-Build-Depends: debhelper (>= 4.1.0), cdbs (>= 0.4.6.1), sharutils, j2re1.4, jikes, ant (>= 1.5), libxerces-java, libcommons-beanutils-java, libcommons-collections-java, libcommons-digester-java, libcommons-fileupload-java (>= 1.0-1), libcommons-lang-java, libcommons-logging-java, libcommons-validator-java, liboro-java, libservlet2.3-java
+Build-Depends: debhelper (>= 4.1.0), cdbs (>= 0.4.8), sharutils, free-java-sdk, sablevm (>= 1.1.6), libant1.6-java, libxerces2-java, libxalan2-java, libcommons-beanutils-java, libcommons-collections-java, libcommons-digester-java, libcommons-fileupload-java (>= 1.0-1), libcommons-lang-java, libcommons-logging-java, libcommons-validator-java, liboro-java, libservlet2.3-java
 Standards-Version: 3.6.1
 
 Package: libstruts1.1-java
 Architecture: all
 Section: contrib/devel
 Priority: optional
-Depends: j2re1.4 | java2-runtime, libcommons-beanutils-java, libcommons-collections-java, libcommons-digester-java, libcommons-fileupload-java (>= 1.0-1), libcommons-lang-java, libcommons-logging-java, libcommons-validator-java, liboro-java, libservlet2.3-java
-Description: Framework MVC web applications in Java
+Depends: classpath-common | java2-runtime, libcommons-beanutils-java, libcommons-collections-java, libcommons-digester-java, libcommons-fileupload-java (>= 1.0-1), libcommons-lang-java, libcommons-logging-java, libcommons-validator-java, liboro-java, libservlet2.3-java
+Description: Java Framework for MVC web applications
  The core of the Struts framework is a flexible control layer based on standard
- technologies like Java Servlets, JavaBeans, ResourceBundles, and Extensible
+ technologies like Servlets, JavaBeans, ResourceBundles, and Extensible
  Markup Language (XML), as well as various Jakarta Commons packages. Struts
  encourages application architectures based on the Model 2 approach, a
- variation of the classic  Model-View-Controller (MVC) design paradigm.
+ variation of the classic Model-View-Controller (MVC) design paradigm.
  .
  Struts provides its own Controller component and integrates with other
  technologies to provide the Model and the View. For the Model, Struts can
@@ -25,4 +25,4 @@
  well with JavaServer Pages (JSP), including JSTL and JSF, as well as Velocity
  Templates, XSLT, and other presentation systems. 
  .
- For more information see http://jakarta.apache.org/struts/.
+ For more information see http://struts.apache.org/.
--- /cvsroot/pkg-java/libstruts1.1-java/debian/rules	2003/09/09 14:07:33	1.3
+++ /cvsroot/pkg-java/libstruts1.1-java/debian/rules	2004/08/12 11:48:45	1.4
@@ -2,15 +2,16 @@
 # debian/rules file for libstruts1.1-java (uses cdbs)
 
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/class/ant.mk
 
 # These two must be specified
-JAVA_HOME := /usr/lib/j2se/1.4
-ANT_HOME := /usr/share/ant
+JAVA_HOME := /usr/lib/fjsdk
+ANT_HOME := /usr/share/ant1.6
 
 # Additional JARs to add to the class path, either full path or just the
 # basename for JARs in /usr/share/java. The ".jar" suffix may also be ommitted
-DEB_JARS := xerces $(ANT_HOME)/lib/ant-optional.jar
+DEB_JARS := xercesImpl xml-apis xalan2 $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-trax.jar
 
 # Build compiler
 DEB_ANT_COMPILER := jikes