CVS libstruts1.2-java/debian

[Wolfgang B??r]

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

Modified Files:
	ant.properties changelog control rules 
Removed Files:
	struts-legacy.jar.uu 
Log Message:
libstruts1.2-java (1.2.4-2) unstable; urgency=low

  * Move to main - as ant moved to main
  * Added java1-runtime dependency as alternative
  * Changed Build-Depends to Build-Depends-Indep to fix lintian warning
  * Deleted extra license file in examples to fix lintian warning
  * Changed Standards-Version to 3.6.2 - no changes


--- /cvsroot/pkg-java/libstruts1.2-java/debian/ant.properties	2004/11/19 14:50:30	1.1.1.1
+++ /cvsroot/pkg-java/libstruts1.2-java/debian/ant.properties	2005/09/11 11:46:17	1.2
@@ -9,5 +9,4 @@
 jakarta-oro.jar=/usr/share/java/oro.jar
 jdbc20ext.jar=/usr/share/java/jdbc2_0-stdext.jar
 servlet.jar=/usr/share/java/servlet-2.3.jar
-struts-legacy.jar=debian/struts-legacy.jar
 antlr.jar=/usr/share/java/antlr.jar
--- /cvsroot/pkg-java/libstruts1.2-java/debian/changelog	2004/11/19 14:50:30	1.1.1.1
+++ /cvsroot/pkg-java/libstruts1.2-java/debian/changelog	2005/09/11 11:46:17	1.2
@@ -1,3 +1,16 @@
+libstruts1.2-java (1.2.4-2) unstable; urgency=low
+
+  * Move to main - as ant moved to main
+  * Added java1-runtime dependency as alternative
+  * Changed Build-Depends to Build-Depends-Indep to fix lintian warning
+  * Deleted extra license file in examples to fix lintian warning
+  * Changed Standards-Version to 3.6.2 - no changes
+  * Added myself to uploaders
+
+  * Upload sponsored by Petter Reinholdtsen
+
+ -- Wolfgang Baer <WBaer at gmx.de>  Sat, 10 Sep 2005 14:04:11 +0200
+
 libstruts1.2-java (1.2.4-1) unstable; urgency=low
 
   * New upstream release based on libstruts1.1.
--- /cvsroot/pkg-java/libstruts1.2-java/debian/control	2004/11/19 14:50:30	1.1.1.1
+++ /cvsroot/pkg-java/libstruts1.2-java/debian/control	2005/09/11 11:46:17	1.2
@@ -1,16 +1,16 @@
 Source: libstruts1.2-java
-Section: contrib/devel
+Section: devel
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Arnaud Vandyck <avdyk at debian.org>, Stefan Gybas <sgybas at debian.org>, Takashi Okamoto <tora at debian.org>
-Build-Depends: debhelper (>= 4.1.0), cdbs (>= 0.4.8), sharutils, free-java-sdk, sablevm (>= 1.1.6), ant, 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 (>= 1.1.3), liboro-java, libservlet2.3-java, antlr, 
-Standards-Version: 3.6.1
+Uploaders: Arnaud Vandyck <avdyk at debian.org>, Stefan Gybas <sgybas at debian.org>, Takashi Okamoto <tora at debian.org>, Wolfgang Baer <WBaer at gmx.de>
+Build-Depends-Indep: debhelper (>= 4.2.30), cdbs (>= 0.4.8), sharutils, free-java-sdk, sablevm (>= 1.1.6), ant, 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 (>= 1.1.3), liboro-java, libservlet2.3-java, antlr, 
+Standards-Version: 3.6.2
 
 Package: libstruts1.2-java
 Architecture: all
-Section: contrib/devel
+Section: devel
 Priority: optional
-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 (>= 1.1.3), liboro-java, libservlet2.3-java
+Depends: classpath-common | java1-runtime | 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 (>= 1.1.3), 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 Servlets, JavaBeans, ResourceBundles, and Extensible
--- /cvsroot/pkg-java/libstruts1.2-java/debian/rules	2004/11/19 14:50:30	1.1.1.1
+++ /cvsroot/pkg-java/libstruts1.2-java/debian/rules	2005/09/11 11:46:17	1.2
@@ -7,7 +7,6 @@
 
 # These two must be specified
 JAVA_HOME := /usr/lib/fjsdk
-#ANT_HOME := /usr/share/ant1.6
 ANT_HOME := /usr/share/ant
 
 # Additional JARs to add to the class path, either full path or just the
@@ -20,9 +19,5 @@
 DEB_INSTALL_DIRS_libstruts1.2-java := /usr/share/java /usr/share/struts1.2
 DEB_INSTALL_DOCS_libstruts1.2-java := NOTICE.txt STATUS.txt src/tiles-documentation src/examples src/example
 
-clean::
-	rm -f debian/struts-legacy.jar
-
-configure/libstruts1.2-java::
-	uudecode -o debian/struts-legacy.jar debian/struts-legacy.jar.uu
-
+install/libstruts1.2-java::
+	rm -f src/example/org/apache/struts/webapp/example/LICENSE.txt