Merge branch 'master' of ssh://git.b9.com/home/gitpub/clsql

diff --git a/ChangeLog b/ChangeLog
index 891b8e66b98c8291f03fa8acb7c025bb717cf909..986022402eab31b2e1603f7577b9b310941a29a3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2012-04-26  Kevin Rosenberg  <kevin@rosenberg.net>
+       * Version 6.2 released: thanks to all the contributors!
+
 2012-04-25  Nathan Bird  <nathan@acceleration.net>
 
        * doc/threading-warnings.txt: Adding some notes from J.T.Klein

diff --git a/debian/changelog b/debian/changelog
index c94a7cc58062cd57f0189d55c38f76ee74cf9f2a..dd21e327b4d94acc4d369b223f042d617518f5e1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cl-sql (6.2.0-1) unstable; urgency=low
+
+  * New upstream
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Thu, 26 Apr 2012 10:05:22 -0600
+
 cl-sql (6.1.1-1) unstable; urgency=low
 
   * New upstream

diff --git a/debian/control b/debian/control
index 225970a5a04a2dd944818c0d24591ed17e72e7a5..dc7ec890a1c48dfc62ac67ca32e2c481d53689fe 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: lisp
 Priority: extra
 Maintainer: Kevin M. Rosenberg <kmr@debian.org>
 Build-Depends: dh-lisp, debhelper (>= 7.0.0), libmysqlclient-dev, libpq-dev
-Standards-Version: 3.9.2.0
+Standards-Version: 3.9.3.1
 Homepage: http://clsql.b9.com/
 Vcs-Git: git://git.b9.com/clsql.git
 Vcs-Browser: http://git.b9.com/?p=clsql.git

diff --git a/debian/copyright b/debian/copyright
index 540d86f46af522aa684977c665f741d4c693f367..f9364eb4694a399ca38b7b653c6161ce4b30fdec 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,12 +10,12 @@ Upstream Copyright Statement
 ============================
 CLSQL is written and Copyright (c) 2002 by Kevin M. Rosenberg.
 
-CLSQL is licensed under the terms of the Lisp Lesser GNU Public
-License, known as the LLGPL.  The LLGPL consists of a preamble (see
-below) and the Lessor GNU Public License 2.1 (LGPL-2.1).  Where these
-conflict, the preamble takes precedence.  CLSQL is referenced in the
-preamble as the "LIBRARY."  The LGPL-2.1 is stored on a Debian system
-in the file /usr/share/common-licenses/LGPL-2.1.
+CLSQL is licensed under the terms of the Lisp Lesser GNU General
+Public License, known as the LLGPL.  The LLGPL consists of a preamble
+(see below) and the Lessor GNU General Public License 2.1 (LGPL-2.1).
+Where these conflict, the preamble takes precedence.  CLSQL is
+referenced in the preamble as the "LIBRARY."  The LGPL-2.1 is stored
+on a Debian system in the file /usr/share/common-licenses/LGPL-2.1.
 
 CLSQL is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/debian/rules b/debian/rules
index e1ee3a050ab1df271d059ba44147e9631eb6c9b6..74d450051afb07ddc0116befc80c58b0294b4efa 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -92,7 +92,7 @@ install: build
        dh_prep
        dh_installdirs
 
-       dh_installdirs --all  $(clc-systems) $(clc-source)
+       dh_installdirs --all $(clc-source)
        dh_installdirs -p $(pkg) $(lispdir-sql) etc
        dh_installdirs -p $(pkg-uffi) $(lispdir-uffi) $(sodir-uffi)
        dh_installdirs -p $(pkg-pg) $(lispdir-pg)

diff --git a/doc/clsql.pdf b/doc/clsql.pdf
index fd90e07dcba5510b4c6380f670d45417d03cca14..5ffe072b1ea36c87bb8a8397eb781299c66b3533 100644 (file)
Binary files a/doc/clsql.pdf and b/doc/clsql.pdf differ

diff --git a/doc/html.tar.gz b/doc/html.tar.gz
index 3f689e283c1440eddafee72565f70f7fafe126c1..38afb1d7770b5c0d572ba55e624f03d8410234c3 100644 (file)
Binary files a/doc/html.tar.gz and b/doc/html.tar.gz differ