[pkg-java] r13175 - in trunk/javacsv: . debian debian/patches debian/source

Andrew Ross rockclimb-guest at alioth.debian.org
Mon Dec 13 22:02:26 UTC 2010


Author: rockclimb-guest
Date: 2010-12-13 22:02:24 +0000 (Mon, 13 Dec 2010)
New Revision: 13175

Added:
   trunk/javacsv/debian/
   trunk/javacsv/debian/README.Debian-source
   trunk/javacsv/debian/changelog
   trunk/javacsv/debian/compat
   trunk/javacsv/debian/control
   trunk/javacsv/debian/copyright
   trunk/javacsv/debian/libjavacsv-java-doc.javadoc
   trunk/javacsv/debian/libjavacsv-java.jlibs
   trunk/javacsv/debian/orig-tar.sh
   trunk/javacsv/debian/patches/
   trunk/javacsv/debian/patches/build-process.patch
   trunk/javacsv/debian/patches/series
   trunk/javacsv/debian/rules
   trunk/javacsv/debian/source/
   trunk/javacsv/debian/source/format
   trunk/javacsv/debian/watch
Log:
[svn-inject] Applying Debian modifications (2.0+dfsg-1) to trunk


Property changes on: trunk/javacsv/debian
___________________________________________________________________
Added: mergeWithUpstream
   + 1

Added: trunk/javacsv/debian/README.Debian-source
===================================================================
--- trunk/javacsv/debian/README.Debian-source	                        (rev 0)
+++ trunk/javacsv/debian/README.Debian-source	2010-12-13 22:02:24 UTC (rev 13175)
@@ -0,0 +1,6 @@
+Debian README for javacsv.
+
+Upstream only provides a source .zip file. This is repackaged 
+for the .orig.tar.gz, and the file src/AllTests.java removed as 
+it has no license.
+

Added: trunk/javacsv/debian/changelog
===================================================================
--- trunk/javacsv/debian/changelog	                        (rev 0)
+++ trunk/javacsv/debian/changelog	2010-12-13 22:02:24 UTC (rev 13175)
@@ -0,0 +1,7 @@
+javacsv (2.0+dfsg-1) unstable; urgency=low
+
+  * Initial release of javacsv package. Source package is repackaged
+    from upstream zip with src/AllTests.java removed as it has no
+    license. (Closes: #607004)
+
+ -- Andrew Ross <ubuntu at rossfamily.co.uk>  Mon, 13 Dec 2010 21:46:11 +0000

Added: trunk/javacsv/debian/compat
===================================================================
--- trunk/javacsv/debian/compat	                        (rev 0)
+++ trunk/javacsv/debian/compat	2010-12-13 22:02:24 UTC (rev 13175)
@@ -0,0 +1 @@
+7

Added: trunk/javacsv/debian/control
===================================================================
--- trunk/javacsv/debian/control	                        (rev 0)
+++ trunk/javacsv/debian/control	2010-12-13 22:02:24 UTC (rev 13175)
@@ -0,0 +1,32 @@
+Source: javacsv
+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), ant
+Build-Depends-Indep: default-jdk, default-jdk-doc
+Standards-Version: 3.9.1
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/javacsv
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/javacsv
+Homepage: http://sourceforge.net/projects/javacsv/
+
+Package: libjavacsv-java
+Architecture: all
+Depends: ${java:Depends}, ${misc:Depends}
+Recommends: ${java:Recommends}
+Description: Simple Java library to read and write CSV
+ Java CSV is a small fast open source java library for 
+ reading and writing CSV and plain delimited text 
+ files. All kinds of CSV files can be handled.
+ 
+Package: libjavacsv-java-doc
+Section: doc
+Architecture: all
+Depends: ${java:Depends}, ${misc:Depends}
+Recommends: ${java:Recommends}
+Description: Simple Java library to read and write CSV (documentation)
+ Java CSV is a small fast open source java library for 
+ reading and writing CSV and plain delimited text 
+ files. All kinds of CSV files can be handled.
+ .
+ This package contains the documentation.

Added: trunk/javacsv/debian/copyright
===================================================================
--- trunk/javacsv/debian/copyright	                        (rev 0)
+++ trunk/javacsv/debian/copyright	2010-12-13 22:02:24 UTC (rev 13175)
@@ -0,0 +1,29 @@
+This work was packaged for Debian by:
+
+    Andrew Ross <ubuntu at rossfamily.co.uk> on Mon, 13 Dec 2010 21:46:11 +0000
+
+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'.
+
+
+It was downloaded from http://sourceforge.net/projects/javacsv/
+
+Upstream Author(s):
+    Bruce Dunwiddie <bruce at csvreader.com>
+
+Copyright:
+
+    Copyright (C) Bruce Dunwiddie <bruce at csvreader.com>
+
+License:
+
+          GNU LESSER GENERAL PUBLIC LICENSE
+               Version 2.1, February 1999
+
+The full text of the license can be found at
+'/usr/share/common-licenses/LGPL-2.1'.
+

Added: trunk/javacsv/debian/libjavacsv-java-doc.javadoc
===================================================================
--- trunk/javacsv/debian/libjavacsv-java-doc.javadoc	                        (rev 0)
+++ trunk/javacsv/debian/libjavacsv-java-doc.javadoc	2010-12-13 22:02:24 UTC (rev 13175)
@@ -0,0 +1 @@
+doc /usr/share/doc/libjavacsv-java/api

Added: trunk/javacsv/debian/libjavacsv-java.jlibs
===================================================================
--- trunk/javacsv/debian/libjavacsv-java.jlibs	                        (rev 0)
+++ trunk/javacsv/debian/libjavacsv-java.jlibs	2010-12-13 22:02:24 UTC (rev 13175)
@@ -0,0 +1 @@
+javacsv.jar

Added: trunk/javacsv/debian/orig-tar.sh
===================================================================
--- trunk/javacsv/debian/orig-tar.sh	                        (rev 0)
+++ trunk/javacsv/debian/orig-tar.sh	2010-12-13 22:02:24 UTC (rev 13175)
@@ -0,0 +1,19 @@
+#!/bin/bash -e
+
+VERSION=$2
+FILE=$3
+
+# Resolve symbolic links
+REALFILE=`readlink -f $FILE`
+
+# Remove unlicensed src/AllTests.java
+zip -d $REALFILE src/AllTests.java
+
+# Move file to the correct location
+OUTFILE=`dirname $REALFILE`/javacsv_${VERSION}+dfsg.orig.zip
+mv -f ${FILE} ${OUTFILE}
+
+# Repack using jh_repack
+jh_repack --upstream-version ${VERSION}+dfsg ${OUTFILE}
+
+echo "Repack complete."


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

Added: trunk/javacsv/debian/patches/build-process.patch
===================================================================
--- trunk/javacsv/debian/patches/build-process.patch	                        (rev 0)
+++ trunk/javacsv/debian/patches/build-process.patch	2010-12-13 22:02:24 UTC (rev 13175)
@@ -0,0 +1,36 @@
+Fix up the build process to build the jar and javadoc.
+Index: javacsv-2.0+dfsg/build.xml
+===================================================================
+--- javacsv-2.0+dfsg.orig/build.xml	2010-12-09 23:40:10.727476558 +0000
++++ javacsv-2.0+dfsg/build.xml	2010-12-09 23:40:51.507477871 +0000
+@@ -10,8 +10,16 @@
+ 		<!-- Compile the java code from ${src} into ${build} -->
+ 		<javac srcdir="${src}" destdir="${build}" />
+ 	</target>
+-	<target name="dist" depends="compile" description="generate the distribution">
++	<target name="dist" depends="compile,javadoc" description="generate the distribution">
+ 		<jar jarfile="javacsv.jar" basedir="${build}" />
+ 		<delete dir="${build}" />
+ 	</target>
++	<target name="clean">
++		<delete dir="${build}" />
++ 		<delete dir="doc" />
++		<delete file="javacsv.jar" />
++	</target>
++	<target name="javadoc">
++		<ant antfile="javadoc.xml" inheritAll="false" target="javadoc" />
++	</target>
+ </project>
+Index: javacsv-2.0+dfsg/javadoc.xml
+===================================================================
+--- javacsv-2.0+dfsg.orig/javadoc.xml	2010-12-09 23:41:02.877478626 +0000
++++ javacsv-2.0+dfsg/javadoc.xml	2010-12-09 23:41:36.327478632 +0000
+@@ -16,7 +16,7 @@
+ 			<packageset dir="${src}" />
+ 			<doctitle><![CDATA[<h1>JavaCSV</h1>]]></doctitle>
+ 			<bottom><![CDATA[<i>http://sourceforge.net/projects/javacsv/</i>]]></bottom>
+-			<link href="http://java.sun.com/j2se/1.4.1/docs/api/"/>
++			<link href="/usr/share/doc/default-jdk-doc/api"/>
+ 		</javadoc>
+ 	</target>
+ </project>

Added: trunk/javacsv/debian/patches/series
===================================================================
--- trunk/javacsv/debian/patches/series	                        (rev 0)
+++ trunk/javacsv/debian/patches/series	2010-12-13 22:02:24 UTC (rev 13175)
@@ -0,0 +1 @@
+build-process.patch

Added: trunk/javacsv/debian/rules
===================================================================
--- trunk/javacsv/debian/rules	                        (rev 0)
+++ trunk/javacsv/debian/rules	2010-12-13 22:02:24 UTC (rev 13175)
@@ -0,0 +1,12 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+JAVA_HOME               := /usr/lib/jvm/default-java
+DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+)\+dfsg.*,\1,p')
+
+%:
+	dh $@ --with javahelper
+
+
+get-orig-source:
+	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename


Property changes on: trunk/javacsv/debian/rules
___________________________________________________________________
Added: svn:executable
   + *

Added: trunk/javacsv/debian/source/format
===================================================================
--- trunk/javacsv/debian/source/format	                        (rev 0)
+++ trunk/javacsv/debian/source/format	2010-12-13 22:02:24 UTC (rev 13175)
@@ -0,0 +1 @@
+3.0 (quilt)

Added: trunk/javacsv/debian/watch
===================================================================
--- trunk/javacsv/debian/watch	                        (rev 0)
+++ trunk/javacsv/debian/watch	2010-12-13 22:02:24 UTC (rev 13175)
@@ -0,0 +1,4 @@
+version=3
+opts=dversionmangle=s/\+dfsg$// \
+http://qa.debian.org/watch/sf.php/javacsv/ \
+  javacsv(.*).zip debian debian/orig-tar.sh




More information about the pkg-java-commits mailing list