[pkg-java] r13121 - in trunk/libspark-java: . debian debian/patches debian/source

Andrew Ross rockclimb-guest at alioth.debian.org
Mon Nov 29 22:41:03 UTC 2010


Author: rockclimb-guest
Date: 2010-11-29 22:41:03 +0000 (Mon, 29 Nov 2010)
New Revision: 13121

Added:
   trunk/libspark-java/debian/
   trunk/libspark-java/debian/changelog
   trunk/libspark-java/debian/compat
   trunk/libspark-java/debian/control
   trunk/libspark-java/debian/copyright
   trunk/libspark-java/debian/libspark-java-doc.javadoc
   trunk/libspark-java/debian/libspark-java.jlibs
   trunk/libspark-java/debian/orig-tar.sh
   trunk/libspark-java/debian/patches/
   trunk/libspark-java/debian/patches/build-xml.patch
   trunk/libspark-java/debian/patches/javadoc.patch
   trunk/libspark-java/debian/patches/series
   trunk/libspark-java/debian/rules
   trunk/libspark-java/debian/source/
   trunk/libspark-java/debian/source/format
   trunk/libspark-java/debian/watch
Log:
[svn-inject] Applying Debian modifications (1.2-1) to trunk


Property changes on: trunk/libspark-java/debian
___________________________________________________________________
Added: mergeWithUpstream
   + 1

Added: trunk/libspark-java/debian/changelog
===================================================================
--- trunk/libspark-java/debian/changelog	                        (rev 0)
+++ trunk/libspark-java/debian/changelog	2010-11-29 22:41:03 UTC (rev 13121)
@@ -0,0 +1,5 @@
+libspark-java (1.2-1) unstable; urgency=low
+
+  * Initial release of libspark-java package. (Closes #?????).
+
+ -- Andrew Ross <ubuntu at rossfamily.co.uk>  Mon, 29 Nov 2010 19:42:14 +0000

Added: trunk/libspark-java/debian/compat
===================================================================
--- trunk/libspark-java/debian/compat	                        (rev 0)
+++ trunk/libspark-java/debian/compat	2010-11-29 22:41:03 UTC (rev 13121)
@@ -0,0 +1 @@
+7

Added: trunk/libspark-java/debian/control
===================================================================
--- trunk/libspark-java/debian/control	                        (rev 0)
+++ trunk/libspark-java/debian/control	2010-11-29 22:41:03 UTC (rev 13121)
@@ -0,0 +1,29 @@
+Source: libspark-java
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Andrew Ross <ubuntu at rossfamily.co.uk>
+Build-Depends: debhelper (>= 7), javahelper (>=0.25) 
+Build-Depends-Indep: default-jdk, default-jdk-doc, ant
+Standards-Version: 3.9.1
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libspark-java
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libspark-java/
+Homepage: http://www.representqueens.com/spark/
+
+Package: libspark-java
+Architecture: all
+Depends: ${java:Depends}, ${misc:Depends}
+Recommends: ${java:Recommends}
+Description: TODO
+ TODO
+
+Package: libspark-java-doc
+Section: doc
+Architecture: all
+Depends: ${java:Depends}, ${misc:Depends}
+Recommends: ${java:Recommends}
+Description: TODO
+ TODO
+ .
+ This package contains the documentation.
+

Added: trunk/libspark-java/debian/copyright
===================================================================
--- trunk/libspark-java/debian/copyright	                        (rev 0)
+++ trunk/libspark-java/debian/copyright	2010-11-29 22:41:03 UTC (rev 13121)
@@ -0,0 +1,30 @@
+This work was packaged for Debian by:
+
+    Andrew Ross <ubuntu at rossfamily.co.uk> on Mon, 29 Nov 2010 19:42:14 +0000
+
+It was downloaded from http://www.representqueens.com/spark/
+
+Upstream Author(s):
+    Larry Ogrodnek <ogrodnek at gmail.com>
+    
+Copyright:
+
+    Copyright 2006 Larry Ogrodnek
+
+License:
+
+                 Apache License
+          Version 2.0, January 2004
+        http://www.apache.org/licenses/
+
+The full text of the license can be found at
+'/usr/share/common-licenses/Apache-2.0'.
+
+
+The Debian packaging is:
+
+    Copyright (C) 2010 Andrew Ross <ubuntu at rossfamily.co.uk>
+
+and is licensed under the GPL version 3, 
+see `/usr/share/common-licenses/GPL-3'.
+

Added: trunk/libspark-java/debian/libspark-java-doc.javadoc
===================================================================
--- trunk/libspark-java/debian/libspark-java-doc.javadoc	                        (rev 0)
+++ trunk/libspark-java/debian/libspark-java-doc.javadoc	2010-11-29 22:41:03 UTC (rev 13121)
@@ -0,0 +1 @@
+javadoc /usr/share/doc/libspark-java/api

Added: trunk/libspark-java/debian/libspark-java.jlibs
===================================================================
--- trunk/libspark-java/debian/libspark-java.jlibs	                        (rev 0)
+++ trunk/libspark-java/debian/libspark-java.jlibs	2010-11-29 22:41:03 UTC (rev 13121)
@@ -0,0 +1 @@
+build/spark.jar

Added: trunk/libspark-java/debian/orig-tar.sh
===================================================================
--- trunk/libspark-java/debian/orig-tar.sh	                        (rev 0)
+++ trunk/libspark-java/debian/orig-tar.sh	2010-11-29 22:41:03 UTC (rev 13121)
@@ -0,0 +1,19 @@
+#!/bin/bash -e
+
+VERSION=$2
+FILE=$3
+
+# Resolve symbolic links
+FILE=`readlink -f $FILE`
+
+gunzip $FILE
+
+TARFILE=${FILE%.gz}
+
+
+# Remove all files starting ._
+tar -f $TARFILE --wildcards --delete "*/._*"
+
+gzip $TARFILE
+
+echo "Repack complete."


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

Added: trunk/libspark-java/debian/patches/build-xml.patch
===================================================================
--- trunk/libspark-java/debian/patches/build-xml.patch	                        (rev 0)
+++ trunk/libspark-java/debian/patches/build-xml.patch	2010-11-29 22:41:03 UTC (rev 13121)
@@ -0,0 +1,22 @@
+Index: spark/build.xml
+===================================================================
+--- spark.orig/build.xml	2010-11-29 22:12:50.540491256 +0000
++++ spark/build.xml	2010-11-29 22:13:17.450491999 +0000
+@@ -30,7 +30,7 @@
+         </fileset>
+ 
+         <!-- Include all elements that Tomcat exposes to applications -->
+-        <pathelement location="${catalina.home}/common/classes" />
++<!--        <pathelement location="${catalina.home}/common/classes" />
+         <fileset dir="${catalina.home}/common/endorsed">
+             <include name="*.jar" />
+         </fileset>
+@@ -40,7 +40,7 @@
+         <pathelement location="${catalina.home}/shared/classes" />
+         <fileset dir="${catalina.home}/shared/lib">
+             <include name="*.jar" />
+-        </fileset>
++        </fileset>-->
+ 
+     </path>
+ 

Added: trunk/libspark-java/debian/patches/javadoc.patch
===================================================================
--- trunk/libspark-java/debian/patches/javadoc.patch	                        (rev 0)
+++ trunk/libspark-java/debian/patches/javadoc.patch	2010-11-29 22:41:03 UTC (rev 13121)
@@ -0,0 +1,28 @@
+Index: spark/build.xml
+===================================================================
+--- spark.orig/build.xml	2010-11-29 22:21:38.272168006 +0000
++++ spark/build.xml	2010-11-29 22:26:36.220492244 +0000
+@@ -47,7 +47,7 @@
+     <target name="clean" description="Delete old build and dist directories">
+         <delete dir="${build.home}" />
+         <delete dir="${dist.home}" />
+-
++	<delete dir="${basedir}/javadoc" />
+         <!-- delete emacs backup files -->
+         <delete>
+             <fileset dir="." defaultexcludes="false" includes="**/*~" />
+@@ -80,7 +80,13 @@
+                 <include name="spark.tld"/>
+             </fileset>
+         </copy>
+-    </target>
++
++        <mkdir dir="${basedir}/javadoc/"/>
++        <javadoc destdir="${basedir}/javadoc/">
++            <fileset dir="${basedir}/src/" includes="**/*.java" />
++            <link href="/usr/share/doc/default-jdk-doc/api" />
++        </javadoc>
++     </target>
+ 
+     <target name="package" description="Packages the Web Application's web archive file" depends="build">
+         <echo message="Packaging ${app.name}'s jar file ..."/>

Added: trunk/libspark-java/debian/patches/series
===================================================================
--- trunk/libspark-java/debian/patches/series	                        (rev 0)
+++ trunk/libspark-java/debian/patches/series	2010-11-29 22:41:03 UTC (rev 13121)
@@ -0,0 +1,2 @@
+build-xml.patch
+javadoc.patch

Added: trunk/libspark-java/debian/rules
===================================================================
--- trunk/libspark-java/debian/rules	                        (rev 0)
+++ trunk/libspark-java/debian/rules	2010-11-29 22:41:03 UTC (rev 13121)
@@ -0,0 +1,14 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+JAVA_HOME := /usr/lib/jvm/default-java
+export CLASSPATH := /usr/share/java/servlet-api-2.5.jar:/usr/share/java/jsp-api.jar
+
+%:
+	dh $@ --with javahelper
+
+
+# Get original source
+get-orig-source:
+	uscan --download-current-version
+


Property changes on: trunk/libspark-java/debian/rules
___________________________________________________________________
Added: svn:executable
   + *

Added: trunk/libspark-java/debian/source/format
===================================================================
--- trunk/libspark-java/debian/source/format	                        (rev 0)
+++ trunk/libspark-java/debian/source/format	2010-11-29 22:41:03 UTC (rev 13121)
@@ -0,0 +1 @@
+3.0 (quilt)

Added: trunk/libspark-java/debian/watch
===================================================================
--- trunk/libspark-java/debian/watch	                        (rev 0)
+++ trunk/libspark-java/debian/watch	2010-11-29 22:41:03 UTC (rev 13121)
@@ -0,0 +1,3 @@
+version=3
+http://www.representqueens.com/spark/ \
+  release/spark-(.*)-src.tar.gz debian debian/orig-tar.sh




More information about the pkg-java-commits mailing list