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

[Ludovic Claude]

Author: ludovicc-guest
Date: 2009-08-04 17:10:08 +0000 (Tue, 04 Aug 2009)
New Revision: 9596

Modified:
   trunk/tomcat6/debian/changelog
   trunk/tomcat6/debian/orig-tar.sh
   trunk/tomcat6/debian/watch
Log:
Change watch to download fresh sources from SVN. 
Should fix wrong encoding in tomcat-i18n-fr/es.jar in the next upstream
version. (Closes: #522067)

Modified: trunk/tomcat6/debian/changelog
===================================================================
--- trunk/tomcat6/debian/changelog	2009-08-04 15:48:43 UTC (rev 9595)
+++ trunk/tomcat6/debian/changelog	2009-08-04 17:10:08 UTC (rev 9596)
@@ -6,6 +6,9 @@
     when logging is turned on, and restores the file layout
     defined in 6.0.20-2.
   * Restore links to the jars in usr/share/tomcat6/lib
+  * Change watch to download fresh sources from SVN. 
+    Should fix wrong encoding in tomcat-i18n-fr/es.jar in the next upstream
+    version. (Closes: #522067)
 
  -- Ludovic Claude <ludovic.claude at laposte.net>  Sat, 25 Jul 2009 11:15:00 +0100
 

Modified: trunk/tomcat6/debian/orig-tar.sh
===================================================================
--- trunk/tomcat6/debian/orig-tar.sh	2009-08-04 15:48:43 UTC (rev 9595)
+++ trunk/tomcat6/debian/orig-tar.sh	2009-08-04 17:10:08 UTC (rev 9596)
@@ -1,12 +1,18 @@
 #!/bin/sh -e
 
-# $2 = version
+VERSION=$2
+TAR=../tomcat6_$VERSION.orig.tar.gz
+DIR=tomcat6-$VERSION
+TAG=$(echo TOMCAT-$VERSION | sed 's/./_/g')
 
-URL=http://www.apache.org/dist/tomcat/tomcat-6/v$2/src/apache-tomcat-$2-src.tar.gz
+svn export http://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/$TAG $DIR
+tar -c -z -f $TAR $DIR
+rm -rf $DIR ../$TAG
 
-wget $URL || exit 2
+# move to directory 'tarballs'
+if [ -r .svn/deb-layout ]; then
+  . .svn/deb-layout
+  mv $TAR $origDir
+  echo "moved $TAR to $origDir"
+fi
 
-mv apache-tomcat-$2-src.tar.gz tomcat6_$2.orig.tar.gz || exit 2
-
-
-

Modified: trunk/tomcat6/debian/watch
===================================================================
--- trunk/tomcat6/debian/watch	2009-08-04 15:48:43 UTC (rev 9595)
+++ trunk/tomcat6/debian/watch	2009-08-04 17:10:08 UTC (rev 9596)
@@ -1,2 +1,3 @@
 version=3
-http://www.apache.org/dist/tomcat/tomcat-6/v(6[0-9.]*). debian debian/orig-tar.sh
+opts=uversionmangle=s/_/./g \
+  http://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/ TOMCAT_([0-9_]*)/ debian debian/orig-tar.sh