Date: Monday, February 13, 2006 @ 11:23:07
Author: csaba
Path: /cvsroot/carob/libmysequoia
Added: debian/compat (1.1) debian/libmysequoia-dev.dirs (1.1)
debian/libmysequoia-dev.install (1.1) debian/libmysequoia.dirs
(1.1) debian/libmysequoia.docs (1.1) debian/libmysequoia.install
(1.1) debian/libmysequoia.postinst (1.1)
debian/libmysequoia.postrm (1.1) debian/watch (1.1)
Modified: Makefile.am (1.7 -> 1.8) NEWS (1.1 -> 1.2) README (1.3 -> 1.4)
autogen.sh (1.4 -> 1.5) debian/changelog (1.2 -> 1.3)
debian/control (1.1 -> 1.2) debian/rules (1.3 -> 1.4)
libmysequoia.spec (1.6 -> 1.7)
Removed: debian/postinst (1.1) debian/postrm (1.1)
- splitted the debian package in two: libmysequoia and libmysequoia-dev.
- updated the README file
- added README and NEWS to the redhat package
---------------------------------+
Makefile.am | 3
NEWS | 3
README | 38 ++++++++
autogen.sh | 2
debian/changelog | 2
debian/compat | 1
debian/control | 14 ++-
debian/libmysequoia-dev.dirs | 2
debian/libmysequoia-dev.install | 3
debian/libmysequoia.dirs | 1
debian/libmysequoia.docs | 2
debian/libmysequoia.install | 2
debian/libmysequoia.postinst | 41 +++++++++
debian/libmysequoia.postrm | 39 ++++++++
debian/postinst | 25 -----
debian/postrm | 21 ----
debian/rules | 165 ++++++++++++++++++++++----------------
debian/watch | 10 ++
libmysequoia.spec | 6 -
19 files changed, 258 insertions(+), 122 deletions(-)
Index: libmysequoia/Makefile.am
diff -u libmysequoia/Makefile.am:1.7 libmysequoia/Makefile.am:1.8
--- libmysequoia/Makefile.am:1.7 Tue Jan 31 12:56:39 2006
+++ libmysequoia/Makefile.am Mon Feb 13 11:23:07 2006
@@ -77,6 +77,9 @@
install-data-local:
$(INSTALL_DATA) -D $(srcdir)/config/logger.cfg
$(DESTDIR)$(sysconfdir)/logger.cfg
$(INSTALL_SCRIPT) -D $(srcdir)/config/mysequoia_config
$(DESTDIR)$(bindir)/mysequoia_config
+ $(INSTALL_DATA) -D $(srcdir)/NEWS
$(DESTDIR)$(datadir)/doc/$(PACKAGE)/NEWS
+ $(INSTALL_DATA) -D $(srcdir)/README
$(DESTDIR)$(datadir)/doc/$(PACKAGE)/README
+ $(INSTALL_DATA) -D $(srcdir)/COPYING
$(DESTDIR)$(datadir)/doc/$(PACKAGE)/COPYING
clean-local:
rm -rf $(DOC_OUT_HTML) $(DOC_OUT_PDF) $(LCOV_TMP) $(LCOV_HTML)
Index: libmysequoia/NEWS
diff -u libmysequoia/NEWS:1.1 libmysequoia/NEWS:1.2
--- libmysequoia/NEWS:1.1 Sat Dec 17 15:03:46 2005
+++ libmysequoia/NEWS Mon Feb 13 11:23:07 2006
@@ -0,0 +1,3 @@
+New in release 0.7 (Feb 13, 2006)
+
+* Initial release.
\ No newline at end of file
Index: libmysequoia/README
diff -u libmysequoia/README:1.3 libmysequoia/README:1.4
--- libmysequoia/README:1.3 Fri Feb 10 14:50:13 2006
+++ libmysequoia/README Mon Feb 13 11:23:07 2006
@@ -4,10 +4,31 @@
clustering. So, native mysql client programs can use the Sequoia clustering
solution without changing any line of code in the application.
+ Project home page is at http://carob.continuent.org
+
HOW TO USE IT
- Install the debian or rpm package and you are ready.
+ Install the debian or rpm package and you are ready with the first step. Now
+ you can try one of the following steps:
+ * Make a symbolic link from the libmysqlclient.so.?? to libmysequoia.so
+ cd /usr/lib && ln -s libmysqlclient.so.15 libmysequoia.so
+ * If this will not work (on Debian seems to work on Redhat not) then you must
+ recompile the sources of the application. It's easy just replace every
ocurence
+ of "mysql_config" with "mysequoia_config" after that
+ ./configure && make && make install
+
+ In the CVS there are patch files for recompiling PHP, Python and Perl for
Redhat.
+
+APT-GET AND YUM REPOSITORIES
+ Include the following lines in your /etc/apt/sources.list file for apt-get:
+
+ ... (TODO) ...
+
+ Include the following lines in your /etc/yum.repos.d/mysequoia.repo for yum:
+
+ ... (TODO) ...
+
DEPENDENCIES
* carob - http://carob.continuent.org/
@@ -22,4 +43,17 @@
CURRENT LIMITATIONS
- The following MySQL API C functions are not implemented:
+ The following MySQL API C functions are not implemented (in fact they are
dummy
+ functions)
+ * mysql_ping
+ * mysql_insert_id
+ * mysql_warning_count
+ * mysql_debug
+ * mysql_shutdown
+ * mysql_list_processes
+ * mysql_stat
+ * mysql_thread_id
+ * mysql_kill
+
+ Also, please note that Sequoia does not implement the whole MySQL SQL
dialect. If
+ some queries are not working try to rewrite using standard SQL dialect.
Index: libmysequoia/autogen.sh
diff -u libmysequoia/autogen.sh:1.4 libmysequoia/autogen.sh:1.5
--- libmysequoia/autogen.sh:1.4 Thu Feb 9 13:05:59 2006
+++ libmysequoia/autogen.sh Mon Feb 13 11:23:07 2006
@@ -12,6 +12,6 @@
aclocal
autoheader
-automake --add-missing
+automake --add-missing --copy
autoconf
CXXFLAGS="-Wall -O0 -g3" ./configure --enable-gcov --enable-cppunit
Index: libmysequoia/debian/changelog
diff -u libmysequoia/debian/changelog:1.2 libmysequoia/debian/changelog:1.3
--- libmysequoia/debian/changelog:1.2 Thu Feb 9 13:05:59 2006
+++ libmysequoia/debian/changelog Mon Feb 13 11:23:07 2006
@@ -2,4 +2,4 @@
* Initial release.
- -- Csaba Simon <[EMAIL PROTECTED]> Sat, 17 Dec 2005 20:41:35 +0200
+ -- Csaba Simon <[EMAIL PROTECTED]> Mon, 13 Jan 2006 11:10:35 +0200
Index: libmysequoia/debian/compat
diff -u /dev/null libmysequoia/debian/compat:1.1
--- /dev/null Mon Feb 13 11:23:07 2006
+++ libmysequoia/debian/compat Mon Feb 13 11:23:07 2006
@@ -0,0 +1 @@
+4
Index: libmysequoia/debian/control
diff -u libmysequoia/debian/control:1.1 libmysequoia/debian/control:1.2
--- libmysequoia/debian/control:1.1 Sun Dec 18 11:43:58 2005
+++ libmysequoia/debian/control Mon Feb 13 11:23:07 2006
@@ -1,8 +1,9 @@
Source: libmysequoia
Priority: optional
Maintainer: Csaba Simon <[EMAIL PROTECTED]>
-Build-Depends: autotools-dev, liblog4cxx9-dev, doxygen
+Build-Depends: debhelper (>= 4.0.0), autotools-dev, liblog4cxx9-dev, doxygen
Standards-Version: 3.6.2
+Section: libs
Package: libmysequoia
Section: libs
@@ -12,3 +13,14 @@
Reimplementation of libmysqlclient library, using Carob to benefit from
clustering. So, native mysql client programs can use the Sequoia clustering
product without changing any line of code in the application.
+
+Package: libmysequoia-dev
+Section: libdevel
+Architecture: any
+Depends: libmysequoia (= ${Source-Version})
+Description: Native MySQL API library using Sequoia
+ Reimplementation of libmysqlclient library, using Carob to benefit from
+ clustering. So, native mysql client programs can use the Sequoia clustering
+ product without changing any line of code in the application.
+ This package contains development files - library headers and static library.
+
Index: libmysequoia/debian/libmysequoia-dev.dirs
diff -u /dev/null libmysequoia/debian/libmysequoia-dev.dirs:1.1
--- /dev/null Mon Feb 13 11:23:07 2006
+++ libmysequoia/debian/libmysequoia-dev.dirs Mon Feb 13 11:23:07 2006
@@ -0,0 +1,2 @@
+usr/bin
+usr/lib
Index: libmysequoia/debian/libmysequoia-dev.install
diff -u /dev/null libmysequoia/debian/libmysequoia-dev.install:1.1
--- /dev/null Mon Feb 13 11:23:07 2006
+++ libmysequoia/debian/libmysequoia-dev.install Mon Feb 13 11:23:07 2006
@@ -0,0 +1,3 @@
+usr/bin/mysequoia_config
+usr/lib/lib*.a
+usr/lib/lib*.la
Index: libmysequoia/debian/libmysequoia.dirs
diff -u /dev/null libmysequoia/debian/libmysequoia.dirs:1.1
--- /dev/null Mon Feb 13 11:23:07 2006
+++ libmysequoia/debian/libmysequoia.dirs Mon Feb 13 11:23:07 2006
@@ -0,0 +1 @@
+usr/lib
Index: libmysequoia/debian/libmysequoia.docs
diff -u /dev/null libmysequoia/debian/libmysequoia.docs:1.1
--- /dev/null Mon Feb 13 11:23:07 2006
+++ libmysequoia/debian/libmysequoia.docs Mon Feb 13 11:23:07 2006
@@ -0,0 +1,2 @@
+NEWS
+README
Index: libmysequoia/debian/libmysequoia.install
diff -u /dev/null libmysequoia/debian/libmysequoia.install:1.1
--- /dev/null Mon Feb 13 11:23:07 2006
+++ libmysequoia/debian/libmysequoia.install Mon Feb 13 11:23:07 2006
@@ -0,0 +1,2 @@
+etc/mysequoia/logger.cfg
+usr/lib/lib*.so.*
Index: libmysequoia/debian/libmysequoia.postinst
diff -u /dev/null libmysequoia/debian/libmysequoia.postinst:1.1
--- /dev/null Mon Feb 13 11:23:07 2006
+++ libmysequoia/debian/libmysequoia.postinst Mon Feb 13 11:23:07 2006
@@ -0,0 +1,41 @@
+#! /bin/sh
+# postinst script for libmysequoia
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+# * <postinst> `configure' <most-recently-configured-version>
+# * <old-postinst> `abort-upgrade' <new version>
+# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+# <new-version>
+# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+# <failed-install-package> <version> `removing'
+# <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+#
+
+case "$1" in
+ configure)
+ ldconfig
+
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
Index: libmysequoia/debian/libmysequoia.postrm
diff -u /dev/null libmysequoia/debian/libmysequoia.postrm:1.1
--- /dev/null Mon Feb 13 11:23:07 2006
+++ libmysequoia/debian/libmysequoia.postrm Mon Feb 13 11:23:07 2006
@@ -0,0 +1,39 @@
+#! /bin/sh
+# postrm script for libmysequoia
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+# * <postrm> `remove'
+# * <postrm> `purge'
+# * <old-postrm> `upgrade' <new-version>
+# * <new-postrm> `failed-upgrade' <old-version>
+# * <new-postrm> `abort-install'
+# * <new-postrm> `abort-install' <old-version>
+# * <new-postrm> `abort-upgrade' <old-version>
+# * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+
purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+
+ ldconfig
+
+ ;;
+
+ *)
+ echo "postrm called with unknown argument \`$1'" >&2
+ exit 1
+
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
Index: libmysequoia/debian/postinst
diff -u libmysequoia/debian/postinst:1.1 libmysequoia/debian/postinst:removed
--- libmysequoia/debian/postinst:1.1 Sun Dec 18 11:43:58 2005
+++ libmysequoia/debian/postinst Mon Feb 13 11:23:07 2006
@@ -1,25 +0,0 @@
-#! /bin/sh
-# postinst script for libmysequoia
-#
-
-set -e
-
-# TODO: make the libmysqlclient symbolic links
-
-case "$1" in
- configure)
- ldconfig
-
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
-
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-exit 0
Index: libmysequoia/debian/postrm
diff -u libmysequoia/debian/postrm:1.1 libmysequoia/debian/postrm:removed
--- libmysequoia/debian/postrm:1.1 Sun Dec 18 11:43:58 2005
+++ libmysequoia/debian/postrm Mon Feb 13 11:23:07 2006
@@ -1,21 +0,0 @@
-#! /bin/sh
-# postrm script for libmysequoia
-#
-
-set -e
-
-# TODO: remove the libmysqlclient symbolic links
-case "$1" in
-
purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-
- ldconfig
-
- ;;
-
- *)
- echo "postrm called with unknown argument \`$1'" >&2
- exit 1
-
-esac
-
-exit 0
Index: libmysequoia/debian/rules
diff -u libmysequoia/debian/rules:1.3 libmysequoia/debian/rules:1.4
--- libmysequoia/debian/rules:1.3 Thu Feb 9 13:05:59 2006
+++ libmysequoia/debian/rules Mon Feb 13 11:23:07 2006
@@ -1,88 +1,115 @@
#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
-CXXFLAGS = -Wall -g
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+
+CFLAGS = -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CXXFLAGS += -O0
+ CFLAGS += -O0
else
- CXXFLAGS += -O2
+ CFLAGS += -O2
endif
-define testdir
- @test -f debian/rules -a -f src/MySQLAPI.cpp || (echo "Not in correct
source directory"; exit 1)
-endef
-
-define testroot
- @test $$(id -u) = 0 || (echo "Need root privileges"; exit 1)
-endef
-
-# install directories
-DEST_DIR = $(CURDIR)/debian/tmp
-DOCS_DIR = $(DEST_DIR)/usr/share/doc/libmysequoia
-
-configure-stamp:
- $(testdir)
+# shared library versions, option 1
+version=2.0.5
+major=2
+# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
+#version=`ls src/.libs/lib*.so.* | \
+# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
+#major=`ls src/.libs/lib*.so.* | \
+# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
+
+config.status: config-stamp
+config-stamp:
+ dh_testdir
+ # Add here commands to configure the package.
CXXFLAGS="$(CXXFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE)
--build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --libdir=/usr/lib
--sysconfdir=/etc/mysequoia --mandir=/usr/share/man --infodir=/usr/share/info
- touch configure-stamp
+ touch config-stamp
build: build-stamp
+build-stamp: config.status
+ dh_testdir
-build-stamp: configure-stamp
- $(testdir)
- -rm -f build-stamp
+ # Add here commands to compile the package.
$(MAKE)
+
touch build-stamp
-clean: configure-stamp
- $(testdir)
- -rm -f *-stamp
- $(MAKE) distclean
- -rm -rf debian/tmp
- -rm -f debian/files
- -rm -f debian/substvars
-
-binary-indep: build
-
-# some handy defs
-MKDIR = install -p -d -o root -g root
-INSTALL = install -c -o root -g root
-
-binary-arch: build
- $(testdir)
- $(testroot)
-
- # install
- $(MAKE) install DESTDIR=$(DEST_DIR)
-
- # install documentation
- $(MKDIR) $(DOCS_DIR)
- $(INSTALL) -m 644 debian/copyright $(DOCS_DIR)/copyright
- $(INSTALL) -m 644 debian/changelog $(DOCS_DIR)/changelog.Debian
- $(INSTALL) -m 644 README $(DOCS_DIR)/README
- $(INSTALL) -m 644 NEWS $(DOCS_DIR)/NEWS
-
- # compress it
- gzip -9 $(DOCS_DIR)/changelog.Debian
-
- # create the DEBIAN directory
- $(MKDIR) -m 755 $(DEST_DIR)/DEBIAN
-
- # install postinst and postrm scripts
- $(INSTALL) -m 755 debian/postinst $(DEST_DIR)/DEBIAN
- $(INSTALL) -m 755 debian/postrm $(DEST_DIR)/DEBIAN
-
- # find out the library dependencies
- dpkg-shlibdeps ${DEST_DIR}/usr/lib/libmysequoia.so
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp config-stamp
+
+ # Add here commands to clean up after the build process.
+ -$(MAKE) clean
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+ cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+ cp -f /usr/share/misc/config.guess config.guess
+endif
- # generate control file
- dpkg-gencontrol -isp -P$(DEST_DIR)
- # generate md5sums
- cd $(DEST_DIR) && find . -type f ! -regex '.*DEBIAN/.*' -printf '%P\0'
| xargs -r0 md5sum > DEBIAN/md5sums
+ dh_clean
- # finally create the package
- dpkg-deb -b $(DEST_DIR) ../
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ # Add here commands to install the package into debian/tmp
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+
+
+# 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_installchangelogs ChangeLog
+ dh_installdocs
+ dh_installexamples
+ dh_install --sourcedir=debian/tmp
+# dh_installmenu
+# dh_installdebconf
+# dh_installlogrotate
+# dh_installemacsen
+# dh_installpam
+# dh_installmime
+# dh_installinit
+# dh_installcron
+# dh_installinfo
+ dh_installman
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+# dh_perl
+# dh_python
+# dh_makeshlibs
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
binary: binary-indep binary-arch
-
-.PHONY: binary binary-arch binary-indep clean build
+.PHONY: build clean binary-indep binary-arch binary install
Index: libmysequoia/debian/watch
diff -u /dev/null libmysequoia/debian/watch:1.1
--- /dev/null Mon Feb 13 11:23:07 2006
+++ libmysequoia/debian/watch Mon Feb 13 11:23:07 2006
@@ -0,0 +1,10 @@
+# Example watch control file for uscan
+# Rename this file to "watch" and then you can run the "uscan" command
+# to check for upstream updates and more.
+# See uscan(1) for format
+
+# Compulsory line, this is a version 3 file
+version=3
+
+# <Webpage URL> <string match>
+http://carob.continuent.org/repo/src libmysequoia-(.*)\.tar\.gz
Index: libmysequoia/libmysequoia.spec
diff -u libmysequoia/libmysequoia.spec:1.6 libmysequoia/libmysequoia.spec:1.7
--- libmysequoia/libmysequoia.spec:1.6 Thu Feb 9 13:05:59 2006
+++ libmysequoia/libmysequoia.spec Mon Feb 13 11:23:07 2006
@@ -2,6 +2,7 @@
%define prefix /usr
%define bindir /usr/bin
%define libdir /usr/lib/mysequoia
+%define docdir /usr/share/doc/libmysequoia
Summary: Native MySQL API using Sequoia
Name: libmysequoia
@@ -59,13 +60,14 @@
/sbin/ldconfig
%files
-%defattr(-,root,root,755)
+%defattr(-,root,root,644)
%attr(644,root,root) /etc/ld.so.conf.d/mysequoia-i386.conf
%attr(644,root,root) %{sysconfdir}/logger.cfg
%attr(755,root,root) %{libdir}/lib*.so*
+%attr(644,root,root) %{docdir}/*
%files devel
-%defattr(-,root,root,755)
+%defattr(-,root,root,644)
%attr(755,root,root) %{bindir}/mysequoia_config
%attr(644,root,root) %{libdir}/*.a
%attr(644,root,root) %{libdir}/*.la
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
