[pkg-java] r14769 - trunk/libjasper-java/debian

[Torsten Werner]

Author: twerner
Date: 2011-09-08 19:28:03 +0000 (Thu, 08 Sep 2011)
New Revision: 14769

Added:
   trunk/libjasper-java/debian/orig-tar.sh
Modified:
   trunk/libjasper-java/debian/changelog
   trunk/libjasper-java/debian/osgi.MF
   trunk/libjasper-java/debian/rules
   trunk/libjasper-java/debian/watch
Log:
* Team upload
* Change debian/watch to point to upstream's svn repo. Create orig tarball
  by debian/orig-tar.sh.
* Add a symlink /usr/share/java/jasper-5.5.jar.

Modified: trunk/libjasper-java/debian/changelog
===================================================================
--- trunk/libjasper-java/debian/changelog	2011-09-08 19:12:27 UTC (rev 14768)
+++ trunk/libjasper-java/debian/changelog	2011-09-08 19:28:03 UTC (rev 14769)
@@ -1,3 +1,12 @@
+libjasper-java (5.5.33-1) unstable; urgency=low
+
+  * Team upload
+  * Change debian/watch to point to upstream's svn repo. Create orig tarball
+    by debian/orig-tar.sh.
+  * Add a symlink /usr/share/java/jasper-5.5.jar.
+
+ -- Torsten Werner <twerner at debian.org>  Thu, 08 Sep 2011 21:26:21 +0200
+
 libjasper-java (5.5.26-5) unstable; urgency=low
 
   * Removed versionless symlink of jasper.jar to avoid conflict with

Added: trunk/libjasper-java/debian/orig-tar.sh
===================================================================
--- trunk/libjasper-java/debian/orig-tar.sh	                        (rev 0)
+++ trunk/libjasper-java/debian/orig-tar.sh	2011-09-08 19:28:03 UTC (rev 14769)
@@ -0,0 +1,16 @@
+#!/bin/sh -e
+
+VERSION=$2
+TAR=../libjasper-java_$VERSION.orig.tar.gz
+DIR=libjasper-java-$VERSION
+TAG=$(echo "TOMCAT_$VERSION" | sed -re's,\.,_,g')
+
+svn export http://svn.apache.org/repos/asf/tomcat/tc5.5.x/tags/${TAG}/jasper $DIR
+tar -c -z -f $TAR $DIR
+rm -rf $DIR ../$TAG
+
+# move to directory 'tarballs'
+if [ -r .svn/deb-layout ]; then
+  . .svn/deb-layout
+  mv $TAR $origDir && echo "moved $TAR to $origDir"
+fi


Property changes on: trunk/libjasper-java/debian/orig-tar.sh
___________________________________________________________________
Added: svn:executable
   + *

Modified: trunk/libjasper-java/debian/osgi.MF
===================================================================
--- trunk/libjasper-java/debian/osgi.MF	2011-09-08 19:12:27 UTC (rev 14768)
+++ trunk/libjasper-java/debian/osgi.MF	2011-09-08 19:28:03 UTC (rev 14769)
@@ -10,7 +10,7 @@
  sper.runtime,org.apache.jasper.security,org.apache.jasper.servlet,org
  .apache.jasper.tagplugins.jstl,org.apache.jasper.tagplugins.jstl.core
  ,org.apache.jasper.util,org.apache.jasper.xmlparser
-Bundle-Version: 5.5.26
+Bundle-Version: 5.5.33
 Bundle-ManifestVersion: 2
 Import-Package: javax.servlet;version="2.4",javax.servlet.http;version
  ="2.4",javax.servlet.jsp;version="2.0",javax.servlet.jsp.el;version="

Modified: trunk/libjasper-java/debian/rules
===================================================================
--- trunk/libjasper-java/debian/rules	2011-09-08 19:12:27 UTC (rev 14768)
+++ trunk/libjasper-java/debian/rules	2011-09-08 19:28:03 UTC (rev 14769)
@@ -5,7 +5,6 @@
 
 DEB_ANT_CLEAN_TARGET := build-clean
 DEB_ANT_BUILD_TARGET := build-prepare build-only -propertyfile debian/ant.properties
-DEB_ANT_INSTALL_TARGET := 
 
 JAVA_HOME	:= /usr/lib/jvm/default-java
 
@@ -15,4 +14,10 @@
 	cd build/shared/classes/ && zip -r ../../jasper.jar *
 	jar umf debian/osgi.MF build/jasper.jar
 	mv build/jasper.jar build/jasper-$(DEB_UPSTREAM_VERSION).jar
-	dh_install -plibjasper-java build/jasper-$(DEB_UPSTREAM_VERSION).jar usr/share/java
+	dh_install -plibjasper-java build/jasper-$(DEB_UPSTREAM_VERSION).jar /usr/share/java
+	dh_link -plibjasper-java /usr/share/java/jasper-$(DEB_UPSTREAM_VERSION).jar \
+	    /usr/share/java/jasper-5.5.jar
+
+get-orig-source:
+	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download
+

Modified: trunk/libjasper-java/debian/watch
===================================================================
--- trunk/libjasper-java/debian/watch	2011-09-08 19:12:27 UTC (rev 14768)
+++ trunk/libjasper-java/debian/watch	2011-09-08 19:28:03 UTC (rev 14769)
@@ -1,2 +1,4 @@
 version=3
-http://www.apache.org/dist/tomcat/tomcat-5/v(5\.5\.\d*)/src/apache-tomcat-(5\.5\.\d*)-src\.tar\.gz debian uupdate
+
+http://svn.apache.org/repos/asf/tomcat/tc5.5.x/tags/ TOMCAT_(\d+)_(\d+)_(\d+)/ \
+    debian debian/orig-tar.sh