diff -Nru sqlline-1.0.2/debian/changelog sqlline-1.0.2/debian/changelog --- sqlline-1.0.2/debian/changelog 2011-08-29 17:42:40.000000000 +0000 +++ sqlline-1.0.2/debian/changelog 2014-03-07 06:16:42.000000000 +0000 @@ -1,3 +1,20 @@ +sqlline (1.0.2-5) unstable; urgency=medium + + * Team upload. + * Add the known JDBC drivers to the classpath instead of setting + the java.ext.dirs system property (Closes: #705645) + * Renamed the 'enum' variables to fix a build failure (Closes: #738425) + * Updated the Lintian overrides to use capitalization-error-in-description + instead of spelling-error-in-description + * debian/control: + - Standards-Version updated to 3.9.5 (no changes) + - Use canonical URLs for the Vcs-* fields + - Recommend libpostgresql-jdbc-java instead of libpg-java + * Switch to debhelper level 9 + * Added a clean target to debian/rules + + -- Emmanuel Bourg Thu, 06 Mar 2014 09:30:18 +0100 + sqlline (1.0.2-4) unstable; urgency=low * Team upload. diff -Nru sqlline-1.0.2/debian/compat sqlline-1.0.2/debian/compat --- sqlline-1.0.2/debian/compat 2011-08-29 12:35:33.000000000 +0000 +++ sqlline-1.0.2/debian/compat 2014-03-07 06:16:42.000000000 +0000 @@ -1 +1 @@ -7 +9 diff -Nru sqlline-1.0.2/debian/control sqlline-1.0.2/debian/control --- sqlline-1.0.2/debian/control 2011-08-29 12:35:33.000000000 +0000 +++ sqlline-1.0.2/debian/control 2014-03-07 06:16:42.000000000 +0000 @@ -4,16 +4,16 @@ Maintainer: Debian Java Maintainers Uploaders: Damien Raude-Morvan Build-Depends-Indep: libjline-java -Build-Depends: ant, default-jdk, debhelper (>= 7), cdbs -Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/sqlline/ -Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/sqlline/ -Standards-Version: 3.9.1 -Homepage: http://sqlline.sourceforge.net/ +Build-Depends: ant, default-jdk, debhelper (>= 9), cdbs +Standards-Version: 3.9.5 +Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/sqlline +Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/sqlline +Homepage: http://sqlline.sourceforge.net Package: sqlline Architecture: all Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless, libjline-java, java-wrappers -Recommends: libhsqldb-java | libmysql-java | libpg-java +Recommends: libhsqldb-java | libmysql-java | libpostgresql-jdbc-java | libjtds-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. diff -Nru sqlline-1.0.2/debian/patches/02_rename_enum_variables.patch sqlline-1.0.2/debian/patches/02_rename_enum_variables.patch --- sqlline-1.0.2/debian/patches/02_rename_enum_variables.patch 1970-01-01 00:00:00.000000000 +0000 +++ sqlline-1.0.2/debian/patches/02_rename_enum_variables.patch 2014-03-07 06:16:42.000000000 +0000 @@ -0,0 +1,20 @@ +Description: Renames the 'enum' variables to fix a build failure +Author: Emmanuel Bourg +Forwarded: no +Bug-Debian: https://bugs.debian.org/738425 +--- a/src/sqlline/SqlLine.java ++++ b/src/sqlline/SqlLine.java +@@ -1720,10 +1720,10 @@ + int total = zf.size (); + int index = 0; + +- for (Enumeration enum = zf.entries (); +- enum.hasMoreElements (); ) ++ for (Enumeration enumeration = zf.entries (); ++ enumeration.hasMoreElements (); ) + { +- ZipEntry entry = (ZipEntry)enum.nextElement (); ++ ZipEntry entry = (ZipEntry)enumeration.nextElement (); + String name = entry.getName (); + progress (index++, total); + diff -Nru sqlline-1.0.2/debian/patches/series sqlline-1.0.2/debian/patches/series --- sqlline-1.0.2/debian/patches/series 2009-07-17 13:32:57.000000000 +0000 +++ sqlline-1.0.2/debian/patches/series 2014-03-07 06:16:42.000000000 +0000 @@ -1 +1,2 @@ 01_build_lib_release.patch +02_rename_enum_variables.patch diff -Nru sqlline-1.0.2/debian/rules sqlline-1.0.2/debian/rules --- sqlline-1.0.2/debian/rules 2011-08-29 12:35:33.000000000 +0000 +++ sqlline-1.0.2/debian/rules 2014-03-07 06:16:42.000000000 +0000 @@ -17,6 +17,9 @@ binary-post-install/sqlline:: mv $(CURDIR)/debian/sqlline/usr/bin/sqlline.sh $(CURDIR)/debian/sqlline/usr/bin/sqlline +clean:: + rm -Rf VERSION.txt tmp release + # Rename upstream src.jar to an orig.tar.gz get-orig-source: uscan --force-download --rename diff -Nru sqlline-1.0.2/debian/sqlline.lintian-overrides sqlline-1.0.2/debian/sqlline.lintian-overrides --- sqlline-1.0.2/debian/sqlline.lintian-overrides 2009-09-26 18:34:43.000000000 +0000 +++ sqlline-1.0.2/debian/sqlline.lintian-overrides 2014-03-07 06:16:42.000000000 +0000 @@ -1,2 +1,2 @@ # Here, "mysql" is the CLI utility -sqlline: spelling-error-in-description mysql MySQL +sqlline: capitalization-error-in-description mysql MySQL diff -Nru sqlline-1.0.2/debian/sqlline.sh sqlline-1.0.2/debian/sqlline.sh --- sqlline-1.0.2/debian/sqlline.sh 2009-07-13 19:08:44.000000000 +0000 +++ sqlline-1.0.2/debian/sqlline.sh 2014-03-07 06:16:42.000000000 +0000 @@ -1,7 +1,5 @@ #!/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 @@ -9,8 +7,7 @@ find_java_runtime all # Define our classpath -find_jars jline sqlline +find_jars jline sqlline postgresql-jdbc4 mysql-connector-java hsqldb jtds # Run SQLLine run_java sqlline.SqlLine $extra_args "$@" -