[pkg-java] r9214 - in trunk/sqlline: . debian debian/patches

Damien Raude-Morvan drazzib-guest at alioth.debian.org
Mon Jul 13 19:08:45 UTC 2009


Author: drazzib-guest
Date: 2009-07-13 19:08:44 +0000 (Mon, 13 Jul 2009)
New Revision: 9214

Added:
   trunk/sqlline/debian/
   trunk/sqlline/debian/README.Debian
   trunk/sqlline/debian/changelog
   trunk/sqlline/debian/compat
   trunk/sqlline/debian/control
   trunk/sqlline/debian/copyright
   trunk/sqlline/debian/docs
   trunk/sqlline/debian/install
   trunk/sqlline/debian/manpages
   trunk/sqlline/debian/patches/
   trunk/sqlline/debian/patches/01_build_lib_release.patch
   trunk/sqlline/debian/rules
   trunk/sqlline/debian/sqlline.1
   trunk/sqlline/debian/sqlline.sh
   trunk/sqlline/debian/watch
Log:
[svn-inject] Applying Debian modifications to trunk


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

Added: trunk/sqlline/debian/README.Debian
===================================================================
--- trunk/sqlline/debian/README.Debian	                        (rev 0)
+++ trunk/sqlline/debian/README.Debian	2009-07-13 19:08:44 UTC (rev 9214)
@@ -0,0 +1,16 @@
+sqlline for Debian
+------------------
+
+* No JDBC driver included in this package. SQLLine is only useful with a JDBC
+  driver to connect to a database.
+  For example, you can install the following drivers (debian package name):
+  - libhsqldb-java: JDBC driver for HSQLDB
+  - libmysql-java: JDBC driver for mysql
+  - libpg-java: JDBC driver for pgsql
+
+* You can run SQLLine by using the /usr/bin/sqlline launcher which takes care of
+  looking for JDBC drivers (jar) in the following directories:
+  - /usr/share/java/
+  - /usr/local/share/java/
+
+ -- Damien Raude-Morvan <drazzib at drazzib.com>  Tue, 22 Jul 2008 00:39:39 +0200

Added: trunk/sqlline/debian/changelog
===================================================================
--- trunk/sqlline/debian/changelog	                        (rev 0)
+++ trunk/sqlline/debian/changelog	2009-07-13 19:08:44 UTC (rev 9214)
@@ -0,0 +1,29 @@
+sqlline (1.0.2-2) unstable; urgency=low
+
+  * debian/sqlline.sh: Use java-wrappers for launch script
+  * debian/control:
+    - Build-Depend on default-jdk-builddep instead of java-gcj-compat-dev
+    - Depends on java-wrappers for launch script
+  * debian/rules: Use default-java from default-jdk-builddep as JAVA_HOME
+  * debian/watch: Use uversionmangle=s/_/./g to replace _ by . in upstream version 
+
+ -- Damien Raude-Morvan <drazzib at drazzib.com>  Sun, 30 Nov 2008 12:56:57 +0100
+
+sqlline (1.0.2-1) unstable; urgency=low
+
+  * Initial release (Closes: #491805)
+  * debian/sqlline.1: create manpage for sqlline program
+  * Use debian/install to install jar and shell script (instead of
+    install/sqlline:: rule) and just strip .sh from script name in
+    binary-post-install/sqlline::
+  * debian/control:
+    - Recommends a JDBC driver (all drivers available as alternative)
+    - Depends on a JRE (has required by Debian Java-Policy).
+      Use java-gcj-compat-headless as default and java2-runtime-headless for
+      alternatives
+    - Keep java-gcj-compat-dev in B-D as it's needed for clean target
+  * debian/copyright:
+    - Add a note for vestigious LICENCE file (see #491805)
+    - Licence packaging work under BSD (using same licence as upstream)
+
+ -- Damien Raude-Morvan <drazzib at drazzib.com>  Sat, 09 Aug 2008 09:27:18 +0200

Added: trunk/sqlline/debian/compat
===================================================================
--- trunk/sqlline/debian/compat	                        (rev 0)
+++ trunk/sqlline/debian/compat	2009-07-13 19:08:44 UTC (rev 9214)
@@ -0,0 +1 @@
+5

Added: trunk/sqlline/debian/control
===================================================================
--- trunk/sqlline/debian/control	                        (rev 0)
+++ trunk/sqlline/debian/control	2009-07-13 19:08:44 UTC (rev 9214)
@@ -0,0 +1,23 @@
+Source: sqlline
+Section: utils
+Priority: extra
+Maintainer: Damien Raude-Morvan <drazzib at drazzib.com>
+Build-Depends-Indep: libjline-java
+Build-Depends: ant, default-jdk-builddep, debhelper (>= 5), cdbs
+Vcs-Svn: http://svn.drazzib.com/debian-pkg/sqlline/trunk
+Vcs-Browser: http://svn.drazzib.com/wsvn/Debian-Pkg/sqlline/trunk
+Standards-Version: 3.8.0
+
+Package: sqlline
+Architecture: all
+Depends: java-gcj-compat-headless | java2-runtime-headless, libjline-java, java-wrappers
+Recommends: libhsqldb-java | libmysql-java | libpg-java
+Description: JDBC command-line utility for issuing SQL
+ SQLLine is a pure-Java console based utility for connecting to
+ relational databases and executing SQL commands.
+ .
+ It is similar to other command-line database access utilities like
+ sqlplus for Oracle, mysql for MySQL, and isql for Sybase/SQL Server.
+ .
+ Since it is pure-Java, it is platform independent, and will run on
+ any platform that can run Java 1.3 or higher.

Added: trunk/sqlline/debian/copyright
===================================================================
--- trunk/sqlline/debian/copyright	                        (rev 0)
+++ trunk/sqlline/debian/copyright	2009-07-13 19:08:44 UTC (rev 9214)
@@ -0,0 +1,34 @@
+This package was debianized by Damien Raude-Morvan <drazzib at drazzib.com> on
+Tue, 22 Jul 2008 00:39:39 +0200.
+
+It was downloaded from http://sqlline.sourceforge.net/
+
+Upstream Author:
+    Marc Prud'hommeaux <mwp1 at cornell.edu>
+
+Copyright:
+    Copyright (C) 2002, 2003, 2004, 2005 Marc Prud'hommeaux
+
+Note:
+  The upstream orig.tar.gz file of sqlline contains an outdated LICENCE file
+  as stated by upstream author "Marc Prud'hommeaux":
+
+  > SQLLine was once GPL, but it was changed to be BSD a few years back.
+  > Any references to the GPL are vestigial. Hopefully the license
+  > declaration at http://sqlline.sourceforge.net/#license is sufficiently
+  > authoritative in this regard.
+
+  This file has been superseed by BSD LICENCE file in upstream CVS but no new
+  release had been made since then.
+
+  debian/copyright is synchronised with src/sqlline/SqlLine.java.
+
+License:
+BSD (3 clause)
+
+On Debian systems, the complete text of the BSD License
+can be found in `/usr/share/common-licenses/BSD'.
+
+The Debian packaging is
+Copyright (C) 2008, Damien Raude-Morvan <drazzib at drazzib.com>
+and is licensed under the BSD, see `/usr/share/common-licenses/BSD'.

Added: trunk/sqlline/debian/docs
===================================================================
--- trunk/sqlline/debian/docs	                        (rev 0)
+++ trunk/sqlline/debian/docs	2009-07-13 19:08:44 UTC (rev 9214)
@@ -0,0 +1,2 @@
+VERSION.txt
+AUTHORS

Added: trunk/sqlline/debian/install
===================================================================
--- trunk/sqlline/debian/install	                        (rev 0)
+++ trunk/sqlline/debian/install	2009-07-13 19:08:44 UTC (rev 9214)
@@ -0,0 +1,2 @@
+release/sqlline.jar usr/share/java
+debian/sqlline.sh usr/bin

Added: trunk/sqlline/debian/manpages
===================================================================
--- trunk/sqlline/debian/manpages	                        (rev 0)
+++ trunk/sqlline/debian/manpages	2009-07-13 19:08:44 UTC (rev 9214)
@@ -0,0 +1 @@
+debian/sqlline.1

Added: trunk/sqlline/debian/patches/01_build_lib_release.patch
===================================================================
--- trunk/sqlline/debian/patches/01_build_lib_release.patch	                        (rev 0)
+++ trunk/sqlline/debian/patches/01_build_lib_release.patch	2009-07-13 19:08:44 UTC (rev 9214)
@@ -0,0 +1,18 @@
+--- build.xml.orig	2008-08-24 22:25:18.000000000 +0200
++++ build.xml	2008-08-24 22:24:51.000000000 +0200
+@@ -259,6 +259,7 @@
+ 	<target name="jars.init" depends="init">
+ 		<tstamp/>
+ 		<delete dir="${relbuild}"/>
++		<delete dir="${basedir}/lib-release"/>
+ 	</target>
+ 
+ 	<target name="jars.native" depends="init" unless="jars.native.skip">
+@@ -274,6 +275,7 @@
+ 
+ 	<target name="jars.core.build" depends="jars.init" unless="jars.core.skip">
+ 		<mkdir dir="${relbuild}"/>
++		<mkdir dir="${basedir}/lib-release"/>
+ 		<javac listfiles="yes" srcdir="${src}" debug="off" 
+ 			source="${javac.source}"
+ 			destdir="${relbuild}" fork="no">

Added: trunk/sqlline/debian/rules
===================================================================
--- trunk/sqlline/debian/rules	                        (rev 0)
+++ trunk/sqlline/debian/rules	2009-07-13 19:08:44 UTC (rev 9214)
@@ -0,0 +1,33 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/class/ant.mk
+
+JAVA_HOME := /usr/lib/jvm/default-java
+ANT_HOME := /usr/share/ant
+
+DEB_JARS := jline
+
+# override build and clean target
+DEB_ANT_BUILD_TARGET = all
+DEB_ANT_CLEAN_TARGET = clean
+DEB_ANT_INSTALL_TARGET = jars.core.build
+
+# Strip .sh from script name
+binary-post-install/sqlline::
+	mv $(CURDIR)/debian/sqlline/usr/bin/sqlline.sh $(CURDIR)/debian/sqlline/usr/bin/sqlline
+
+# Rename upstream src.jar to an orig.tar.gz
+get-orig-source:
+	uscan --force-download --rename
+	mkdir orig_tmp
+	(cd orig_tmp && \
+	unzip ../../${DEB_SOURCE_PACKAGE}-src-*.jar && \
+	mv ${DEB_SOURCE_PACKAGE}-* ${DEB_SOURCE_PACKAGE}-${DEB_UPSTREAM_VERSION} && \
+	tar -czf ../../${DEB_SOURCE_PACKAGE}_${DEB_UPSTREAM_VERSION}.orig.tar.gz ${DEB_SOURCE_PACKAGE}-*)
+	rm -rf orig_tmp
+


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

Added: trunk/sqlline/debian/sqlline.1
===================================================================
--- trunk/sqlline/debian/sqlline.1	                        (rev 0)
+++ trunk/sqlline/debian/sqlline.1	2009-07-13 19:08:44 UTC (rev 9214)
@@ -0,0 +1,179 @@
+.TH SQLLINE: "1" "August 2008" "sqlline" "User Commands"
+.SH NAME
+sqlline \- JDBC command-line utility for issuing SQL
+.SH SYNOPSIS
+\fBsqlline\fR [ \fB\fIoption\fB\fR\fI...\fR ]
+.SH DESCRIPTION
+.TP
+\fB\-u\fR <database url>
+the JDBC URL to connect to
+.TP
+\fB\-n\fR <username>
+the username to connect as
+.TP
+\fB\-p\fR <password>
+the password to connect as
+.TP
+\fB\-d\fR <driver class>
+the driver class to use
+.TP
+\fB\-\-color\fR=\fI[true\fR/false]
+control whether color is used for display
+.TP
+\fB\-\-showHeader\fR=\fI[true\fR/false]
+show column names in query results
+.TP
+\fB\-\-headerInterval\fR=\fIROWS\fR;
+the interval between which heades are displayed
+.TP
+\fB\-\-fastConnect\fR=\fI[true\fR/false]
+skip building table/column list for tab\-completion
+.TP
+\fB\-\-autoCommit\fR=\fI[true\fR/false]
+enable/disable automatic transaction commit
+.TP
+\fB\-\-verbose\fR=\fI[true\fR/false]
+show verbose error messages and debug info
+.TP
+\fB\-\-showWarnings\fR=\fI[true\fR/false]
+display connection warnings
+.TP
+\fB\-\-force\fR=\fI[true\fR/false]
+continue running script even after errors
+.TP
+\fB\-\-maxWidth\fR=\fIMAXWIDTH\fR
+the maximum width of the terminal
+.TP
+\fB\-\-maxColumnWidth\fR=\fIMAXCOLWIDTH\fR
+the maximum width to use when displaying columns
+.TP
+\fB\-\-silent\fR=\fI[true\fR/false]
+be more silent
+.TP
+\fB\-\-autosave\fR=\fI[true\fR/false]
+automatically save preferences
+.TP
+\fB\-\-outputformat\fR=\fI[table\fR/vertical/csv/tsv]
+format mode for result display
+.TP
+\fB\-\-isolation\fR=\fILEVEL\fR
+set the transaction isolation level
+.TP
+\fB\-\-help\fR
+display this message
+.PP
+Usage: java sqlline.SqlLine
+.TP
+\fB\-u\fR <database url>
+the JDBC URL to connect to
+.TP
+\fB\-n\fR <username>
+the username to connect as
+.TP
+\fB\-p\fR <password>
+the password to connect as
+.TP
+\fB\-d\fR <driver class>
+the driver class to use
+.TP
+\fB\-\-color\fR=\fI[true\fR/false]
+control whether color is used for display
+.TP
+\fB\-\-showHeader\fR=\fI[true\fR/false]
+show column names in query results
+.TP
+\fB\-\-headerInterval\fR=\fIROWS\fR;
+the interval between which heades are displayed
+.TP
+\fB\-\-fastConnect\fR=\fI[true\fR/false]
+skip building table/column list for tab\-completion
+.TP
+\fB\-\-autoCommit\fR=\fI[true\fR/false]
+enable/disable automatic transaction commit
+.TP
+\fB\-\-verbose\fR=\fI[true\fR/false]
+show verbose error messages and debug info
+.TP
+\fB\-\-showWarnings\fR=\fI[true\fR/false]
+display connection warnings
+.TP
+\fB\-\-force\fR=\fI[true\fR/false]
+continue running script even after errors
+.TP
+\fB\-\-maxWidth\fR=\fIMAXWIDTH\fR
+the maximum width of the terminal
+.TP
+\fB\-\-maxColumnWidth\fR=\fIMAXCOLWIDTH\fR
+the maximum width to use when displaying columns
+.TP
+\fB\-\-silent\fR=\fI[true\fR/false]
+be more silent
+.TP
+\fB\-\-autosave\fR=\fI[true\fR/false]
+automatically save preferences
+.TP
+\fB\-\-outputformat\fR=\fI[table\fR/vertical/csv/tsv]
+format mode for result display
+.TP
+\fB\-\-isolation\fR=\fILEVEL\fR
+set the transaction isolation level
+.TP
+\fB\-\-help\fR
+display this message
+.TP
+\fB\-u\fR <database url>
+the JDBC URL to connect to
+.TP
+\fB\-n\fR <username>
+the username to connect as
+.TP
+\fB\-p\fR <password>
+the password to connect as
+.TP
+\fB\-d\fR <driver class>
+the driver class to use
+.TP
+\fB\-\-color\fR=\fI[true\fR/false]
+control whether color is used for display
+.TP
+\fB\-\-showHeader\fR=\fI[true\fR/false]
+show column names in query results
+.TP
+\fB\-\-headerInterval\fR=\fIROWS\fR;
+the interval between which heades are displayed
+.TP
+\fB\-\-fastConnect\fR=\fI[true\fR/false]
+skip building table/column list for tab\-completion
+.TP
+\fB\-\-autoCommit\fR=\fI[true\fR/false]
+enable/disable automatic transaction commit
+.TP
+\fB\-\-verbose\fR=\fI[true\fR/false]
+show verbose error messages and debug info
+.TP
+\fB\-\-showWarnings\fR=\fI[true\fR/false]
+display connection warnings
+.TP
+\fB\-\-force\fR=\fI[true\fR/false]
+continue running script even after errors
+.TP
+\fB\-\-maxWidth\fR=\fIMAXWIDTH\fR
+the maximum width of the terminal
+.TP
+\fB\-\-maxColumnWidth\fR=\fIMAXCOLWIDTH\fR
+the maximum width to use when displaying columns
+.TP
+\fB\-\-silent\fR=\fI[true\fR/false]
+be more silent
+.TP
+\fB\-\-autosave\fR=\fI[true\fR/false]
+automatically save preferences
+.TP
+\fB\-\-outputformat\fR=\fI[table\fR/vertical/csv/tsv]
+format mode for result display
+.TP
+\fB\-\-isolation\fR=\fILEVEL\fR
+set the transaction isolation level
+.TP
+\fB\-\-help\fR
+display this message

Added: trunk/sqlline/debian/sqlline.sh
===================================================================
--- trunk/sqlline/debian/sqlline.sh	                        (rev 0)
+++ trunk/sqlline/debian/sqlline.sh	2009-07-13 19:08:44 UTC (rev 9214)
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+JAVA_ARGS="-Djava.ext.dirs=/usr/share/java/:/usr/local/share/java/"
+
+# Include the wrappers utility script
+. /usr/lib/java-wrappers/java-wrappers.sh
+
+# We need a java runtime (any 1.4 work)
+find_java_runtime all
+
+# Define our classpath
+find_jars jline sqlline
+
+# Run SQLLine
+run_java sqlline.SqlLine $extra_args "$@"
+

Added: trunk/sqlline/debian/watch
===================================================================
--- trunk/sqlline/debian/watch	                        (rev 0)
+++ trunk/sqlline/debian/watch	2009-07-13 19:08:44 UTC (rev 9214)
@@ -0,0 +1,3 @@
+version=3
+opts="uversionmangle=s/_/./g" \
+http://sf.net/sqlline/sqlline-src-(.*)\.jar




More information about the pkg-java-commits mailing list