This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository sqlline.
commit 7931fa54e3c1e649ae337541153a11c60fa24ad3 Author: Damien Raude-Morvan <[email protected]> Date: Mon Jul 13 19:08:44 2009 +0000 [svn-inject] Applying Debian modifications to trunk --- debian/README.Debian | 16 +++ debian/changelog | 29 +++++ debian/compat | 1 + debian/control | 23 ++++ debian/copyright | 34 ++++++ debian/docs | 2 + debian/install | 2 + debian/manpages | 1 + debian/patches/01_build_lib_release.patch | 18 +++ debian/rules | 33 ++++++ debian/sqlline.1 | 179 ++++++++++++++++++++++++++++++ debian/sqlline.sh | 16 +++ debian/watch | 3 + 13 files changed, 357 insertions(+) diff --git a/debian/README.Debian b/debian/README.Debian new file mode 100644 index 0000000..00f0e76 --- /dev/null +++ b/debian/README.Debian @@ -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 <[email protected]> Tue, 22 Jul 2008 00:39:39 +0200 diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..bb9e321 --- /dev/null +++ b/debian/changelog @@ -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 <[email protected]> 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 <[email protected]> Sat, 09 Aug 2008 09:27:18 +0200 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..7ed6ff8 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +5 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..d5ac97e --- /dev/null +++ b/debian/control @@ -0,0 +1,23 @@ +Source: sqlline +Section: utils +Priority: extra +Maintainer: Damien Raude-Morvan <[email protected]> +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. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..86d638c --- /dev/null +++ b/debian/copyright @@ -0,0 +1,34 @@ +This package was debianized by Damien Raude-Morvan <[email protected]> on +Tue, 22 Jul 2008 00:39:39 +0200. + +It was downloaded from http://sqlline.sourceforge.net/ + +Upstream Author: + Marc Prud'hommeaux <[email protected]> + +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 <[email protected]> +and is licensed under the BSD, see `/usr/share/common-licenses/BSD'. diff --git a/debian/docs b/debian/docs new file mode 100644 index 0000000..31b1970 --- /dev/null +++ b/debian/docs @@ -0,0 +1,2 @@ +VERSION.txt +AUTHORS diff --git a/debian/install b/debian/install new file mode 100644 index 0000000..6353d92 --- /dev/null +++ b/debian/install @@ -0,0 +1,2 @@ +release/sqlline.jar usr/share/java +debian/sqlline.sh usr/bin diff --git a/debian/manpages b/debian/manpages new file mode 100644 index 0000000..9eb6037 --- /dev/null +++ b/debian/manpages @@ -0,0 +1 @@ +debian/sqlline.1 diff --git a/debian/patches/01_build_lib_release.patch b/debian/patches/01_build_lib_release.patch new file mode 100644 index 0000000..9d80861 --- /dev/null +++ b/debian/patches/01_build_lib_release.patch @@ -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"> diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..b4751a4 --- /dev/null +++ b/debian/rules @@ -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 + diff --git a/debian/sqlline.1 b/debian/sqlline.1 new file mode 100644 index 0000000..c61a6d2 --- /dev/null +++ b/debian/sqlline.1 @@ -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 diff --git a/debian/sqlline.sh b/debian/sqlline.sh new file mode 100644 index 0000000..71f5c14 --- /dev/null +++ b/debian/sqlline.sh @@ -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 "$@" + diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..ea3cafc --- /dev/null +++ b/debian/watch @@ -0,0 +1,3 @@ +version=3 +opts="uversionmangle=s/_/./g" \ +http://sf.net/sqlline/sqlline-src-(.*)\.jar -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sqlline.git _______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
