From: Sven Hoexter Date: Mon, 17 Jan 2011 15:25:32 +0000 (+0100) Subject: Merge commit 'upstream/3.05' X-Git-Tag: debian/3.05-4~10 X-Git-Url: https://git.sven.stormbind.net/?p=sven%2Fmysqltcl.git;a=commitdiff_plain;h=49dfffaf7374577b124ad143aa5f42318a25d861;hp=8b83892bf9d924349d5e09c88f16790a8086a950 Merge commit 'upstream/3.05' --- diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..3d5f55c --- /dev/null +++ b/debian/README.source @@ -0,0 +1,3 @@ +This package uses quilt to manage the patches in debian/patches. +For further information please install the quilt package and read +/usr/share/doc/quilt/README.source. diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..dd8d5e6 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,161 @@ +mysqltcl (3.05-3) unstable; urgency=low + + * Move to section 'database' to fit the archive wide overrides. + + -- Sven Hoexter Wed, 05 Aug 2009 20:54:28 +0200 + +mysqltcl (3.05-2) unstable; urgency=low + + * Update debian/copyright with information about tests/all.tcl and + tclconfig/tcl.m4. Thanks to Ondrej Certik for noting it during a + package review. + * Bump Standards-Version to 3.8.2 + + Added a README.source. + * Add a short description to the man-section patch. + * Stretch the long description a bit with footage from the manpage. + (Noted by Ondrej Certik) + * Build-Dep on libmysqlclient-dev now that MySQL 5.1 is default. + + -- Sven Hoexter Tue, 04 Aug 2009 16:11:16 +0200 + +mysqltcl (3.05-1) unstable; urgency=low + + * New upstream release + + Bugfixes for mysql5 handling multiple result queries. + + -- Sven Hoexter Sun, 25 May 2008 11:30:10 +0200 + +mysqltcl (3.04-2) unstable; urgency=low + + * Re-add --with-tcl and --with-tclinclude. + + -- Sven Hoexter Thu, 14 Feb 2008 08:19:13 +0100 + +mysqltcl (3.04-1) unstable; urgency=low + + * New upstream release with + + Fix for mysql 5. + + Checking of mysql::state parameter length fixed. + * Standards-Version: 3.7.3 - no changes required. + * Changed compat to 5, Build-Depend on debhelper >> 5. + * Moved the homepage to the new Homepage field. + * Build-Depend now on tcl-dev instead of tcl8.4-dev. + * Use tcltk-depends to depend on the right Tcl version. + * Switched to use quilt to manage the patches. + * Added Vcs-Svn field to debian/control. + * Reworked debian/rules partly to make it a little bit clearer. + * Adopt the new Tcl/Tk policy and move the lib into /usr/lib/tcltk. + * Changed mysql to MySQL in the description. Thanks to Sergei and + lintian. + + -- Sven Hoexter Wed, 13 Feb 2008 21:03:46 +0100 + +mysqltcl (3.02-1) unstable; urgency=low + + * New upstream release + * Changed Standards-Version to 3.7.2 + + -- Sven Hoexter Sun, 7 May 2006 17:53:25 +0200 + +mysqltcl (3.01-2) unstable; urgency=low + + * ACK Luk Claes NMU (Closes: #359296, #343784, #353920). + * Added the mysqltcl Homepage to the control file. + * Changed Standards-Version to 3.6.2 + * Changed from DH_COMPAT 3 to DH_COMPAT 4 and moved it from rules + into the compat file. Build-Depends on debhelper >> 4 + * Build as a normal package with .diff.gz (closes: #353919) + * Removed the dot from the end of the synopsis line in control + * Edited the manpage to fit in section 3 + * Removed debian/dirs - everything we need is auto created + * Removed install-bin-binaries from Makefile.in so that we do not + create the empty bin directory in the package + * Removed commented out dh_* commands from rules + * Added myself as the current maintainer in the copyright and control file + * David N. Welton agreed that I take over the + maintenance of this package. + + -- Sven Hoexter Mon, 10 Apr 2006 16:17:32 +0200 + +mysqltcl (3.01-1.1) unstable; urgency=high + + * Non-maintainer upload. + * Fix syntax error in tcl.m4 (Closes: #353920). + * Upgrade build depends to libmysqlclient15-dev (Closes: #343784). + + -- Luk Claes Mon, 27 Mar 2006 19:55:25 +0200 + +mysqltcl (3.01-1) unstable; urgency=low + + * New upstream release. + * mysqltcl: New upstream release available (v2.50) + * mysqltcl: Typo results in: Tcl_Release couldn't find reference + + -- David N. Welton Sun, 30 Oct 2005 17:59:39 +0100 + +mysqltcl (2.30-3) unstable; urgency=low + + * Recompile against libmysqlclient12. Enable threads in Tcl configure. + + -- David N. Welton Fri, 28 Jan 2005 15:55:33 +0100 + +mysqltcl (2.30-2) unstable; urgency=low + + * Fixed problem with directories. + + -- David N. Welton Sat, 30 Aug 2003 13:27:31 +0200 + +mysqltcl (2.30-1) unstable; urgency=low + + * New upstream release + + -- David N. Welton Sat, 26 Jul 2003 12:50:47 +0200 + +mysqltcl (2.12-1) unstable; urgency=low + + * New upstream release. + + -- David N. Welton Wed, 26 Mar 2003 02:19:04 -0800 + +mysqltcl (2.1-1) unstable; urgency=low + + * New upstream release. + + -- David N. Welton Mon, 9 Dec 2002 13:48:03 -0800 + +mysqltcl (2.0rc11-5) unstable; urgency=low + + * Updated config.guess and config.sub from /usr/share/misc. Let's hope + this time it works. Auto* sucks. (closes: #131058) + + -- David N. Welton Fri, 1 Feb 2002 15:08:30 +0100 + +mysqltcl (2.0rc11-4) unstable; urgency=low + + * Updated config.guess and config.sub from ftp.gnu.org. + * (closes: #125964) + + -- David N. Welton Wed, 2 Jan 2002 14:06:02 +0100 + +mysqltcl (2.0rc11-3) unstable; urgency=low + + * Added dependencies on mysql and tcl -dev packages. + * (closes: #121368) + + -- David N. Welton Tue, 18 Dec 2001 23:30:28 +0100 + +mysqltcl (2.0rc11-2) unstable; urgency=low + + * Created package. (closes: #119129) + + * Added man page. + + -- David N. Welton Mon, 12 Nov 2001 13:33:19 +0100 + +mysqltcl (2.0rc11-1) unstable; urgency=low + + * Initial Release. + + -- David N. Welton Sun, 11 Nov 2001 15:25:08 +0100 + + 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..34e59d4 --- /dev/null +++ b/debian/control @@ -0,0 +1,18 @@ +Source: mysqltcl +Section: database +Priority: optional +Maintainer: Sven Hoexter +Build-Depends: debhelper (>> 5), tcl-dev, libmysqlclient-dev, quilt +Standards-Version: 3.8.2 +Homepage: http://www.xdobry.de/mysqltcl/ +Vcs-Svn: svn://www.stormbind.net/debian-pkgs-sven/mysqltcl/trunk + +Package: mysqltcl +Architecture: any +Depends: ${shlibs:Depends}, ${tclsh:Depends} +Description: Interface to the MySQL database for the Tcl language + The mysqltcl package provides a Tcl interface to the MySQL database system. + Within Tcl you've a range of Tcl commands and a global Tcl array available + to access the database server. + Written in C mysqltcl uses the official MySQL C-API so that almost all + Tcl commands correspond to MySQL C-API functions. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..88a3a78 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,83 @@ +This package was debianized by David N. Welton on +Sun, 11 Nov 2001 15:25:08 +0100. + +The current Debian maintainer is Sven Hoexter + +It was downloaded from http://www.xdobry.de/mysqltcl/ + +Upstream Authors: Tobias Ritzau , Artur Trzewik + +Copyright: + +Most of the sourcecode falls under the following license: + +/* + * Copyright (c) 1994, 1995 Hakan Soderstrom and Tom Poindexter + * + * Permission to use, copy, modify, distribute, and sell this software + * and its documentation for any purpose is hereby granted without fee, + * provided that the above copyright notice and this permission notice + * appear in all copies of the software and related documentation. + * + * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, + * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY + * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. + * + * IN NO EVENT SHALL HAKAN SODERSTROM OR SODERSTROM PROGRAMVARUVERKSTAD + * AB BE LIABLE FOR ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL + * DAMAGES OF ANY KIND, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS + * OF USE, DATA OR PROFITS, WHETHER OR NOT ADVISED OF THE POSSIBILITY + * OF DAMAGE, AND ON ANY THEORY OF LIABILITY, ARISING OUT OF OR IN + * CONNECTON WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + + + +The following files have a different license: +tests/all.tcl +tclconfig/tcl.m4 + + Copyright (c) 1998-2000 by Scriptics Corporation. + Copyright (c) 1999-2000 Ajuba Solutions. + Copyright (c) 2002-2005 ActiveState Corporation + +This software is copyrighted by the Regents of the University of +California, Sun Microsystems, Inc., Scriptics Corporation, ActiveState +Corporation and other parties. The following terms apply to all files +associated with the software unless explicitly disclaimed in +individual files. + +The authors hereby grant permission to use, copy, modify, distribute, +and license this software and its documentation for any purpose, provided +that existing copyright notices are retained in all copies and that this +notice is included verbatim in any distributions. No written agreement, +license, or royalty fee is required for any of the authorized uses. +Modifications to this software may be copyrighted by their authors +and need not follow the licensing terms described here, provided that +the new terms are clearly indicated on the first page of each file where +they apply. + +IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY +FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES +ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY +DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. + +THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS SOFTWARE +IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE +NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR +MODIFICATIONS. + +GOVERNMENT USE: If you are acquiring this software on behalf of the +U.S. government, the Government shall have only "Restricted Rights" +in the software and related documentation as defined in the Federal +Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2). If you +are acquiring the software on behalf of the Department of Defense, the +software shall be classified as "Commercial Computer Software" and the +Government shall have only "Restricted Rights" as defined in Clause +252.227-7013 (c) (1) of DFARs. Notwithstanding the foregoing, the +authors grant the U.S. Government and others acting in its behalf +permission to use and distribute the software in accordance with the +terms specified in this license. diff --git a/debian/docs b/debian/docs new file mode 100644 index 0000000..1a83401 --- /dev/null +++ b/debian/docs @@ -0,0 +1,3 @@ +AUTHORS +README +README-msqltcl diff --git a/debian/manpages b/debian/manpages new file mode 100644 index 0000000..57b8354 --- /dev/null +++ b/debian/manpages @@ -0,0 +1 @@ +doc/*.n diff --git a/debian/patches/man-section b/debian/patches/man-section new file mode 100644 index 0000000..55475b4 --- /dev/null +++ b/debian/patches/man-section @@ -0,0 +1,12 @@ +This patch adds a proper section to the mysqltcl manpage. +--- a/doc/mysqltcl.n ++++ b/doc/mysqltcl.n +@@ -238,7 +238,7 @@ Database Class: \\fB\\$3\\fR + .de UL + \\$1\l'|0\(ul'\\$2 + .. +-.TH "mysqltcl" n 3.0 "" ++.TH "mysqltcl" 3 3.0 "" + .BS + .SH "NAME" + mysqltcl \- MySQL server access commands for Tcl diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..a0ac2bf --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +man-section diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..723bf52 --- /dev/null +++ b/debian/rules @@ -0,0 +1,99 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include /usr/share/quilt/quilt.make + + +ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) + CONFIGURE_OPTIONS += --build $(DEB_HOST_GNU_TYPE) +else + CONFIGURE_OPTIONS += --build $(DEB_BUILD_GNU_TYPE) \ + --host $(DEB_HOST_GNU_TYPE) +endif + + +CONFIGURE_OPTIONS += \ + --prefix=/usr \ + --enable-threads \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --with-tcl=/usr/lib \ + --with-tclinclude=/usr/include/tcl \ + + +LDFLAGS += -Wl,-z,defs -Wl,--as-needed + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + + +configure: patch configure-stamp +configure-stamp: + dh_testdir + + CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ + ./configure $(CONFIGURE_OPTIONS) + + touch configure-stamp + +build: configure build-stamp +build-stamp: + dh_testdir + $(MAKE) + touch build-stamp + +clean: cleaner unpatch +cleaner: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + [ ! -f Makefile ] || $(MAKE) distclean + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + $(MAKE) install DESTDIR=$(CURDIR)/debian/mysqltcl + mkdir $(CURDIR)/debian/mysqltcl/usr/lib/tcltk + mv $(CURDIR)/debian/mysqltcl/usr/lib/mysqltcl* \ + $(CURDIR)/debian/mysqltcl/usr/lib/tcltk + rm -rf \ + $(CURDIR)/debian/mysqltcl/usr/share/man/mann \ + $(CURDIR)/debian/mysqltcl/usr/bin \ + $(CURDIR)/debian/mysqltcl/usr/include + + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installdocs + dh_installman + dh_installchangelogs ChangeLog + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + tcltk-depends + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure