[pkg-java] r11392 - trunk/tomcat6/debian

[Torsten Werner]

Author: twerner
Date: 2010-01-23 18:41:17 +0000 (Sat, 23 Jan 2010)
New Revision: 11392

Modified:
   trunk/tomcat6/debian/changelog
   trunk/tomcat6/debian/control
   trunk/tomcat6/debian/orig-tar.sh
Log:
* Fix debian/orig-tar.sh to exclude binary only standard.jar and jstl.jar.
  (Closes: #528119)
* Upload a cleaned tarball.

Modified: trunk/tomcat6/debian/changelog
===================================================================
--- trunk/tomcat6/debian/changelog	2010-01-23 14:04:19 UTC (rev 11391)
+++ trunk/tomcat6/debian/changelog	2010-01-23 18:41:17 UTC (rev 11392)
@@ -1,3 +1,11 @@
+tomcat6 (6.0.20-dfsg1-1) unstable; urgency=low
+
+  * Fix debian/orig-tar.sh to exclude binary only standard.jar and jstl.jar.
+    (Closes: #528119)
+  * Upload a cleaned tarball.
+
+ -- Torsten Werner <twerner at debian.org>  Sat, 23 Jan 2010 19:03:13 +0100
+
 tomcat6 (6.0.20-9) unstable; urgency=low
 
   * Fix spelling issues.

Modified: trunk/tomcat6/debian/control
===================================================================
--- trunk/tomcat6/debian/control	2010-01-23 14:04:19 UTC (rev 11391)
+++ trunk/tomcat6/debian/control	2010-01-23 18:41:17 UTC (rev 11392)
@@ -14,7 +14,7 @@
 
 Package: tomcat6-common
 Architecture: all
-Depends: libtomcat6-java (>= ${source:Version})
+Depends: libtomcat6-java (>= ${source:Version}), ${misc:Depends}
 Description: Servlet and JSP engine -- common files
  Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
  specifications from Sun Microsystems, and provides a "pure Java" HTTP web
@@ -28,7 +28,7 @@
 Architecture: all
 Depends: tomcat6-common (>= ${source:Version}),
 	adduser,
-	jsvc
+	jsvc, ${misc:Depends}
 Suggests: tomcat6-docs (>= ${source:Version}),
 	tomcat6-admin (>= ${source:Version}),
 	tomcat6-examples (>= ${source:Version})
@@ -44,7 +44,7 @@
 
 Package: tomcat6-user
 Architecture: all
-Depends: tomcat6-common (>= ${source:Version}), netcat
+Depends: tomcat6-common (>= ${source:Version}), netcat, ${misc:Depends}
 Description: Servlet and JSP engine -- tools to create user instances
  Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
  specifications from Sun Microsystems, and provides a "pure Java" HTTP web
@@ -59,7 +59,7 @@
 	libecj-java,
 	libcommons-dbcp-java,
 	libcommons-pool-java,
-	libservlet2.5-java (>= ${source:Version})
+	libservlet2.5-java (>= ${source:Version}), ${misc:Depends}
 Suggests: tomcat6 (>= ${source:Version})
 Conflicts: tomcat6-common (<< 6.0.20-5)
 Description: Servlet and JSP engine -- core libraries
@@ -74,7 +74,7 @@
 Package: libservlet2.5-java
 Architecture: all
 Depends: default-jre-headless | java2-runtime-headless |
-         java5-runtime-headless | java6-runtime-headless
+         java5-runtime-headless | java6-runtime-headless, ${misc:Depends}
 Description: Servlet 2.5 and JSP 2.1 Java API classes
  Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
  specifications from Sun Microsystems, and provides a "pure Java" HTTP web
@@ -86,7 +86,7 @@
 Package: libservlet2.5-java-doc
 Section: doc
 Architecture: all
-Depends: libservlet2.5-java (>= ${source:Version})
+Depends: libservlet2.5-java (>= ${source:Version}), ${misc:Depends}
 Description: Servlet 2.5 and JSP 2.1 Java API documentation
  Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
  specifications from Sun Microsystems, and provides a "pure Java" HTTP web
@@ -97,7 +97,7 @@
 
 Package: tomcat6-admin
 Architecture: all
-Depends: tomcat6 (>= ${source:Version})
+Depends: tomcat6 (>= ${source:Version}), ${misc:Depends}
 Description: Servlet and JSP engine -- admin web applications
  Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
  specifications from Sun Microsystems, and provides a "pure Java" HTTP web
@@ -108,7 +108,7 @@
 
 Package: tomcat6-examples
 Architecture: all
-Depends: tomcat6 (>= ${source:Version})
+Depends: tomcat6 (>= ${source:Version}), ${misc:Depends}
 Description: Servlet and JSP engine -- example web applications
  Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
  specifications from Sun Microsystems, and provides a "pure Java" HTTP web
@@ -120,7 +120,7 @@
 Package: tomcat6-docs
 Section: doc
 Architecture: all
-Depends: tomcat6 (>= ${source:Version})
+Depends: tomcat6 (>= ${source:Version}), ${misc:Depends}
 Description: Servlet and JSP engine -- documentation
  Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
  specifications from Sun Microsystems, and provides a "pure Java" HTTP web

Modified: trunk/tomcat6/debian/orig-tar.sh
===================================================================
--- trunk/tomcat6/debian/orig-tar.sh	2010-01-23 14:04:19 UTC (rev 11391)
+++ trunk/tomcat6/debian/orig-tar.sh	2010-01-23 18:41:17 UTC (rev 11392)
@@ -3,10 +3,10 @@
 VERSION=$2
 TAR=../tomcat6_$VERSION.orig.tar.gz
 DIR=tomcat6-$VERSION
-TAG=$(echo TOMCAT-$VERSION | sed 's/./_/g')
+TAG=$(echo TOMCAT_$VERSION | sed -e 's/\./_/g')
 
 svn export http://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/$TAG $DIR
-tar -c -z -f $TAR $DIR
+tar -c -z -f $TAR --exclude 'standard.jar' --exclude 'jstl.jar' $DIR
 rm -rf $DIR ../$TAG
 
 # move to directory 'tarballs'