[Pkg-samba-maint] r1721 - trunk/ctdb/debian
mparent-guest at alioth.debian.org
mparent-guest at alioth.debian.org
Wed Jan 30 16:00:50 UTC 2008
Author: mparent-guest
Date: 2008-01-30 16:00:50 +0000 (Wed, 30 Jan 2008)
New Revision: 1721
Removed:
trunk/ctdb/debian/README.Debian
trunk/ctdb/debian/ctdb.postinst
trunk/ctdb/debian/ctdb.postrm
trunk/ctdb/debian/ctdb.preinst
trunk/ctdb/debian/ctdb.prerm
Modified:
trunk/ctdb/debian/build-orig.sh
trunk/ctdb/debian/changelog
trunk/ctdb/debian/control
trunk/ctdb/debian/ctdb.docs
trunk/ctdb/debian/rules
Log:
Commit changes suggested by Peter Eisentraut.
http://lists.alioth.debian.org/pipermail/pkg-samba-maint/2008-January/003491.html
Deleted: trunk/ctdb/debian/README.Debian
===================================================================
--- trunk/ctdb/debian/README.Debian 2008-01-28 20:50:47 UTC (rev 1720)
+++ trunk/ctdb/debian/README.Debian 2008-01-30 16:00:50 UTC (rev 1721)
@@ -1,11 +0,0 @@
-ctdb for Debian
----------------
-
-For more information, see the man pages.
-
-To install ctdb, follow documentation found in /usr/share/doc/ctdb/web,
-beginning with ''Configuring CTDB''.
-
-Upstream site is : http://ctdb.samba.org/
-
- -- Mathieu PARENT <math.parent at gmail.com> Tue, 15 Jan 2008 23:43:47 +0100
Modified: trunk/ctdb/debian/build-orig.sh
===================================================================
--- trunk/ctdb/debian/build-orig.sh 2008-01-28 20:50:47 UTC (rev 1720)
+++ trunk/ctdb/debian/build-orig.sh 2008-01-30 16:00:50 UTC (rev 1721)
@@ -6,7 +6,7 @@
cd ctdb.git
CTDB_GIT_VERSION=`git-log -1 --pretty="format:%ci" | awk -F "[ -:]" '{print $1$2$3$4$5}'`
cd ..
-CTDB_VERSION=$VERSION.$RELEASE.$CTDB_GIT_VERSION
+CTDB_VERSION=$VERSION.$RELEASE+git$CTDB_GIT_VERSION
echo Version is $CTDB_VERSION
rm -rf ctdb.git/.git
mv ctdb.git ctdb-$CTDB_VERSION.orig
Modified: trunk/ctdb/debian/changelog
===================================================================
--- trunk/ctdb/debian/changelog 2008-01-28 20:50:47 UTC (rev 1720)
+++ trunk/ctdb/debian/changelog 2008-01-30 16:00:50 UTC (rev 1721)
@@ -1,9 +1,9 @@
-ctdb (1.0.24.200801221422-1) unstable; urgency=low
+ctdb (1.0.25+git200801291431-1) unstable; urgency=low
* Initial release (Closes: #460114)
- * 02_ctdb_diagnostics.diff : adapt ctdb_diagnostics to debian
- * 03_web.diff : correct various paths in documentation
- * 04_install_chmod.patch : correct Makefile to install proper execution
+ * 02_ctdb_diagnostics.diff: adapt ctdb_diagnostics to debian
+ * 03_web.diff: correct various paths in documentation
+ * 04_install_chmod.patch: correct Makefile to install proper execution
permissions
* init script with start/stop/status
* logrotate for /var/log/log.ctdb
Modified: trunk/ctdb/debian/control
===================================================================
--- trunk/ctdb/debian/control 2008-01-28 20:50:47 UTC (rev 1720)
+++ trunk/ctdb/debian/control 2008-01-30 16:00:50 UTC (rev 1721)
@@ -1,19 +1,43 @@
Source: ctdb
Section: net
-Priority: optional
+Priority: extra
Maintainer: Debian Samba Maintainers <pkg-samba-maint at lists.alioth.debian.org>
Uploaders: Mathieu PARENT <math.parent at gmail.com>
Build-Depends: debhelper (>= 5), quilt (>= 0.40)
Homepage: http://ctdb.samba.org/
Standards-Version: 3.7.3
XS-DM-Upload-Allowed: yes
-Vcs-Svn: svn://svn.debian.org/pkg-samba/trunk/ctdb
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-samba/trunk/ctdb/
+XS-Vcs-Svn: svn://svn.debian.org/pkg-samba/trunk/ctdb/
+XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-samba/trunk/ctdb/
Package: ctdb
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base, lsof, ethtool, logrotate, iproute, psmisc
-Suggests: samba | vsftpd | nfs | nfs-kernel-server, pciutils, net-tools, cron, iptablesq, nfs-common, smbclient, multipath-tools, selinux-utils
+Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base, lsof, ethtool, iproute, psmisc
+Suggests: logrotate
Description: clustered database to store temporary data
CTDB is a cluster implementation of the TDB database used by Samba and other
- projects to store temporary data.
+ projects to store temporary data. If an application is already using TDB for
+ temporary data it is very easy to convert that application to be cluster aware
+ and use CTDB instead.
+ .
+ CTDB provides the same types of functions as TDB but in a clustered fashion,
+ providing a TDB-style database that spans multiple physical hosts in a cluster.
+ .
+ Features include:
+ * CTDB provides a TDB that has consistent data and consistent locking across
+ all nodes in a cluster.
+ * CTDB is very fast.
+ * In case of node failures, CTDB will automatically recover and repair all TDB
+ databases that it manages.
+ * CTDB is the core component that provides pCIFS ("parallel CIFS") with
+ Samba3/4.
+ * CTDB provides HA features such as node monitoring, node failover, and IP
+ takeover.
+ * CTDB provides a reliable messaging transport to allow applications linked
+ with CTDB to communicate to other instances of the application running on
+ different nodes in the cluster.
+ * CTDB has pluggable transport backends. Currently implemented backends are
+ TCP and Infiniband.
+ * CTDB supports a system of application specific management scripts, allowing
+ applications that depend on network or filesystem resources to be managed in
+ a highly available manner on a cluster.
\ No newline at end of file
Modified: trunk/ctdb/debian/ctdb.docs
===================================================================
--- trunk/ctdb/debian/ctdb.docs 2008-01-28 20:50:47 UTC (rev 1720)
+++ trunk/ctdb/debian/ctdb.docs 2008-01-30 16:00:50 UTC (rev 1721)
@@ -1,2 +1 @@
-debian/README.build
web
Deleted: trunk/ctdb/debian/ctdb.postinst
===================================================================
--- trunk/ctdb/debian/ctdb.postinst 2008-01-28 20:50:47 UTC (rev 1720)
+++ trunk/ctdb/debian/ctdb.postinst 2008-01-30 16:00:50 UTC (rev 1721)
@@ -1,41 +0,0 @@
-#!/bin/sh
-# postinst script for ctdb
-#
-# 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>
-# * <postinst> `abort-remove'
-# * <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)
- ;;
-
- 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
-
-
Deleted: trunk/ctdb/debian/ctdb.postrm
===================================================================
--- trunk/ctdb/debian/ctdb.postrm 2008-01-28 20:50:47 UTC (rev 1720)
+++ trunk/ctdb/debian/ctdb.postrm 2008-01-30 16:00:50 UTC (rev 1721)
@@ -1,39 +0,0 @@
-#!/bin/sh
-# postrm script for ctdb
-#
-# 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' <overwriter>
-# <overwriter-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)
- ;;
-
- *)
- 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
-
-
Deleted: trunk/ctdb/debian/ctdb.preinst
===================================================================
--- trunk/ctdb/debian/ctdb.preinst 2008-01-28 20:50:47 UTC (rev 1720)
+++ trunk/ctdb/debian/ctdb.preinst 2008-01-30 16:00:50 UTC (rev 1721)
@@ -1,37 +0,0 @@
-#!/bin/sh
-# preinst script for ctdb
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-# * <new-preinst> `install'
-# * <new-preinst> `install' <old-version>
-# * <new-preinst> `upgrade' <old-version>
-# * <old-preinst> `abort-upgrade' <new-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
- install|upgrade)
- ;;
-
- abort-upgrade)
- ;;
-
- *)
- echo "preinst 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
-
-
Deleted: trunk/ctdb/debian/ctdb.prerm
===================================================================
--- trunk/ctdb/debian/ctdb.prerm 2008-01-28 20:50:47 UTC (rev 1720)
+++ trunk/ctdb/debian/ctdb.prerm 2008-01-30 16:00:50 UTC (rev 1721)
@@ -1,40 +0,0 @@
-#!/bin/sh
-# prerm script for ctdb
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-# * <prerm> `remove'
-# * <old-prerm> `upgrade' <new-version>
-# * <new-prerm> `failed-upgrade' <old-version>
-# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
-# * <deconfigured's-prerm> `deconfigure' `in-favour'
-# <package-being-installed> <version> `removing'
-# <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
- remove|upgrade|deconfigure)
- ;;
-
- failed-upgrade)
- ;;
-
- *)
- echo "prerm 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
-
-
Modified: trunk/ctdb/debian/rules
===================================================================
--- trunk/ctdb/debian/rules 2008-01-28 20:50:47 UTC (rev 1720)
+++ trunk/ctdb/debian/rules 2008-01-30 16:00:50 UTC (rev 1721)
@@ -1,14 +1,4 @@
#!/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.
-#
-# Modified to make a template file for a multi-binary package with separated
-# build-arch and build-indep targets by Bill Allombert 2001
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
@@ -46,25 +36,20 @@
configure: patch configure-stamp
configure-stamp:
dh_testdir
- # Add here commands to configure the package.
CFLAGS="$(CFLAGS)" ./configure $(conf_args)
touch configure-stamp
-
#Architecture
build: build-arch build-indep
build-arch: build-arch-stamp
build-arch-stamp: patch configure-stamp
- # Add here commands to compile the arch part of the package.
[ ! -f Makefile ] || $(MAKE)
build-indep: build-indep-stamp
build-indep-stamp: patch configure-stamp
- # Add here commands to compile the indep part of the package.
- #$(MAKE) doc
touch $@
clean: clean-patched unpatch
@@ -75,7 +60,6 @@
rm -f build-arch-stamp build-indep-stamp configure-stamp
rm -f utils/smnotify/smnotify.h utils/smnotify/gen_smnotify.c
- # Add here commands to clean up after the build process.
rm -rf $(DESTDIR)
[ ! -f Makefile ] || $(MAKE) distclean
@@ -88,10 +72,6 @@
dh_clean -k -i
dh_installdirs -i
- # Add here commands to install the indep part of the package into
- # debian/<package>-doc.
- #INSTALLDOC#
-
dh_install -i
install-arch:
@@ -103,36 +83,23 @@
# Create the target build directory hierarchy
mkdir -p $(DESTDIR)/etc/init.d
mkdir -p $(DESTDIR)/etc/default
- # Add here commands to install the arch part of the package into
- # debian/tmp.
$(MAKE) DESTDIR=$(DESTDIR) install
install -m644 config/ctdb.sysconfig $(DESTDIR)/etc/default/ctdb
dh_install -s
-# Must not depend on anything. This is to be called by
-# binary-arch/binary-indep
-# in another 'make' thread.
binary-common:
dh_testdir
dh_testroot
dh_installchangelogs
dh_installdocs
dh_installexamples
-# dh_installmenu
-# dh_installdebconf
- dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_python
+ dh_installlogrotate
+ #install init script
DH_OPTIONS= dh_installinit -pctdb --no-start --no-restart-on-upgrade
-# dh_installcron
-# dh_installinfo
dh_installman
dh_link
dh_strip
dh_compress
dh_fixperms
-# dh_perl
dh_makeshlibs
dh_installdeb
dh_shlibdeps
@@ -149,19 +116,7 @@
binary: binary-arch binary-indep
-CTDB_BZR_VERSION = 0~20080104223653
-get-orig-source-bzr:
- @echo Downloading ctdb from bzr via rsync...
- rsync -avz samba.org::ftp/unpacked/ctdb .
- rm -rf ctdb/.bzr
- mv ctdb ctdb-$(CTDB_BZR_VERSION).orig
- cd ctdb-$(CTDB_BZR_VERSION).orig && ./autogen.sh && cd ..
- tar cvfz ctdb_$(CTDB_BZR_VERSION).orig.tar.gz ctdb-$(CTDB_BZR_VERSION).orig
- rm -rf ctdb-$(CTDB_BZR_VERSION).orig
-
-get-orig-source-git:
- @echo Please use build-orig.sh instead
-
get-orig-source: get-orig-source-git
+ sh debian/build-orig.sh
.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure patch unpatch
More information about the Pkg-samba-maint
mailing list