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

[sathieu at alioth.debian.org]

Author: sathieu
Date: 2011-03-26 17:27:50 +0000 (Sat, 26 Mar 2011)
New Revision: 3720

Added:
   trunk/ctdb/debian/ctdb-dev.install
   trunk/ctdb/debian/ctdb.install
Modified:
   trunk/ctdb/debian/changelog
   trunk/ctdb/debian/control
   trunk/ctdb/debian/rules
Log:
New package ctdb-dev (ctdb depend on it for smooth builddep migration)

Also explicitly install files in the ctdb package



Modified: trunk/ctdb/debian/changelog
===================================================================
--- trunk/ctdb/debian/changelog	2011-03-26 09:39:38 UTC (rev 3719)
+++ trunk/ctdb/debian/changelog	2011-03-26 17:27:50 UTC (rev 3720)
@@ -14,8 +14,9 @@
   * Added 99-fix-broken-readdir-test.diff (Closes: #603155)
   * Upgrading to debhelper 7
     - Replaced 'dh_clean -k -i' by 'dh_prep -i'
+  * New package ctdb-dev (ctdb depend on it for smooth builddep migration)
 
- -- Mathieu Parent <sathieu at debian.org>  Sat, 26 Mar 2011 10:38:03 +0100
+ -- Mathieu Parent <sathieu at debian.org>  Sat, 26 Mar 2011 18:24:01 +0100
 
 ctdb (1.0.112-12-1) unstable; urgency=low
 

Modified: trunk/ctdb/debian/control
===================================================================
--- trunk/ctdb/debian/control	2011-03-26 09:39:38 UTC (rev 3719)
+++ trunk/ctdb/debian/control	2011-03-26 17:27:50 UTC (rev 3720)
@@ -11,7 +11,7 @@
 
 Package: ctdb
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base, iproute [!hurd-i386], psmisc, tdb-tools, time
+Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base, iproute [!hurd-i386], psmisc, tdb-tools, time, ctdb-dev
 Recommends: ethtool
 Suggests: logrotate, lsof
 Description: clustered database to store temporary data
@@ -42,11 +42,25 @@
     applications that depend on network or filesystem resources to be managed in
     a highly available manner on a cluster. 
 
+Package: ctdb-dev
+Section: libdevel
+Architecture: any
+Depends: ctdb (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Description: clustered database to store temporary data -- development files
+ CTDB is a cluster implementation of the TDB database used by Samba and other
+ 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.
+ .
+ More detailed description can be found in the ctdb package.
+ .
+ This package provides development files for CTDB.
+
 Package: ctdb-dbg
 Section: debug
 Architecture: any
 Depends: ctdb (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: CTDB debugging symbols and test suite
+Description: clustered database to store temporary data -- debugging symbols and test suite
  CTDB is a cluster implementation of the TDB database used by Samba and other
  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 

Added: trunk/ctdb/debian/ctdb-dev.install
===================================================================
--- trunk/ctdb/debian/ctdb-dev.install	                        (rev 0)
+++ trunk/ctdb/debian/ctdb-dev.install	2011-03-26 17:27:50 UTC (rev 3720)
@@ -0,0 +1,3 @@
+usr/include/*
+usr/lib/lib*.a
+usr/lib/pkgconfig/*

Added: trunk/ctdb/debian/ctdb.install
===================================================================
--- trunk/ctdb/debian/ctdb.install	                        (rev 0)
+++ trunk/ctdb/debian/ctdb.install	2011-03-26 17:27:50 UTC (rev 3720)
@@ -0,0 +1,6 @@
+etc/ctdb
+etc/default/ctdb
+usr/bin/*
+usr/sbin/*
+usr/share/doc/ctdb/ctdb/*
+usr/share/man/man1/*

Modified: trunk/ctdb/debian/rules
===================================================================
--- trunk/ctdb/debian/rules	2011-03-26 09:39:38 UTC (rev 3719)
+++ trunk/ctdb/debian/rules	2011-03-26 17:27:50 UTC (rev 3720)
@@ -24,7 +24,7 @@
   CFLAGS += -O2
 endif
 
-DESTDIR=$(CURDIR)/debian/ctdb
+DESTDIR=$(CURDIR)/debian/tmp
 
 conf_args = \
 		--prefix=/usr \
@@ -77,10 +77,8 @@
 	dh_prep -s 
 	dh_installdirs -s
 	
-	# Create the target build directory hierarchy
-	mkdir -p $(DESTDIR)/etc/init.d
-	mkdir -p $(DESTDIR)/etc/default
 	$(MAKE) DESTDIR=$(DESTDIR) install
+	mkdir -p $(DESTDIR)/etc/default
 	install -m644 config/ctdb.sysconfig $(DESTDIR)/etc/default/ctdb
 	dh_install -s
 
@@ -93,9 +91,9 @@
 	dh_installdocs debian/README.hurd
 endif
 	#patch doc
-	sed -i 's|/etc/sysconfig/|/etc/default/|' $(DESTDIR)/usr/share/doc/ctdb/web/*.html
+	sed -i 's|/etc/sysconfig/|/etc/default/|' $(CURDIR)/debian/ctdb/usr/share/doc/ctdb/web/*.html
 	#upstream changelog 
-	grep -A 10000 '%changelog' packaging/RPM/ctdb.spec.in > $(DESTDIR)/usr/share/doc/ctdb/changelog
+	grep -A 10000 '%changelog' packaging/RPM/ctdb.spec.in > $(CURDIR)/debian/ctdb/usr/share/doc/ctdb/changelog
 	dh_installexamples
 	dh_installlogrotate
 	#install init script