[Pkg-samba-maint] r1715 - trunk/ctdb/debian

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2008-01-24 13:00:15 +0000 (Thu, 24 Jan 2008)
New Revision: 1715

Added:
   trunk/ctdb/debian/ctdb.logrotate
Removed:
   trunk/ctdb/debian/build-orig.sh
Modified:
   trunk/ctdb/debian/changelog
   trunk/ctdb/debian/control
   trunk/ctdb/debian/rules
Log:
* better get-orig-source
* initial logrotate


Deleted: trunk/ctdb/debian/build-orig.sh
===================================================================
--- trunk/ctdb/debian/build-orig.sh	2008-01-22 16:52:11 UTC (rev 1714)
+++ trunk/ctdb/debian/build-orig.sh	2008-01-24 13:00:15 UTC (rev 1715)
@@ -1,9 +0,0 @@
-#!/bin/sh
-# Build a source tarball for ctdb
-rsync -avz samba.org::ftp/unpacked/ctdb .
-CTDB_VERSION=0~`cat ctdb/.bzr/checkout/last-revision | awk -F '-' '{print $2}'`
-rm -rf ctdb/.bzr
-mv ctdb ctdb-$CTDB_VERSION
-cd ctdb-$CTDB_VERSION && ./autogen.sh && cd ..
-
-tar -czf ctdb_$CTDB_VERSION.orig.tar.gz ctdb-$CTDB_VERSION

Modified: trunk/ctdb/debian/changelog
===================================================================
--- trunk/ctdb/debian/changelog	2008-01-22 16:52:11 UTC (rev 1714)
+++ trunk/ctdb/debian/changelog	2008-01-24 13:00:15 UTC (rev 1715)
@@ -6,6 +6,7 @@
   * 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/ctdb/ctdb.log
 
  -- Mathieu PARENT <math.parent at gmail.com>  Tue, 15 Jan 2008 23:16:44 +0100
 

Modified: trunk/ctdb/debian/control
===================================================================
--- trunk/ctdb/debian/control	2008-01-22 16:52:11 UTC (rev 1714)
+++ trunk/ctdb/debian/control	2008-01-24 13:00:15 UTC (rev 1715)
@@ -12,7 +12,7 @@
 
 Package: ctdb
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base, lsof, ethtool
+Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base, lsof, ethtool, logrotate
 Suggests: samba | vsftpd | nfs | nfs-kernel-server, pciutils, net-tools, iproute, cron, iptablesq, nfs-common, smbclient, multipath-tools, selinux-utils
 Description: clustered database to store temporary data
  CTDB is a cluster implementation of the TDB database used by Samba and other

Added: trunk/ctdb/debian/ctdb.logrotate
===================================================================
--- trunk/ctdb/debian/ctdb.logrotate	                        (rev 0)
+++ trunk/ctdb/debian/ctdb.logrotate	2008-01-24 13:00:15 UTC (rev 1715)
@@ -0,0 +1,8 @@
+/var/log/ctdb/ctdb.log {
+	weekly
+	missingok
+	rotate 7
+	copytruncate
+	compress
+	notifempty
+}

Modified: trunk/ctdb/debian/rules
===================================================================
--- trunk/ctdb/debian/rules	2008-01-22 16:52:11 UTC (rev 1714)
+++ trunk/ctdb/debian/rules	2008-01-24 13:00:15 UTC (rev 1715)
@@ -120,7 +120,7 @@
 	dh_installexamples
 #	dh_installmenu
 #	dh_installdebconf	
-#	dh_installlogrotate	
+	dh_installlogrotate	
 #	dh_installemacsen
 #	dh_installpam
 #	dh_installmime
@@ -149,4 +149,20 @@
 	$(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
 
 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:
+	#TODO
+
+get-orig-source: get-orig-source-bzr
+
 .PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure patch unpatch