From: Kevin M. Rosenberg <kevin@rosenberg.net>
Date: Thu, 26 Apr 2012 16:17:56 +0000 (-0600)
Subject: Merge branch 'master' of ssh://git.b9.com/home/gitpub/clsql
X-Git-Tag: v6.3.0~17
X-Git-Url: http://git.kpe.io/?p=clsql.git;a=commitdiff_plain;h=231872ff68e6fe1ed4f904dd570a427672603fa3;hp=43a62abfe23b906e9d8906129ae1df4b31990567

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

diff --git a/ChangeLog b/ChangeLog
index 891b8e6..9860224 100644
--- 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 c94a7cc..dd21e32 100644
--- 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 225970a..dc7ec89 100644
--- 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 540d86f..f9364eb 100644
--- 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 e1ee3a0..74d4500 100755
--- 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 fd90e07..5ffe072 100644
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 3f689e2..38afb1d 100644
Binary files a/doc/html.tar.gz and b/doc/html.tar.gz differ