[Pkg-samba-maint] r1730 - in trunk/ctdb/debian: . patches

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2008-02-25 16:49:08 +0000 (Mon, 25 Feb 2008)
New Revision: 1730

Added:
   trunk/ctdb/debian/patches/25_popt_lib.diff
Modified:
   trunk/ctdb/debian/build-orig.sh
   trunk/ctdb/debian/changelog
   trunk/ctdb/debian/control
   trunk/ctdb/debian/patches/series
   trunk/ctdb/debian/rules
Log:
  * fixed missing copyright :
  ** remove popt from upstream tarball (changing get-orig-source target)
  ** added 25_popt_lib to build with system popt lib



Modified: trunk/ctdb/debian/build-orig.sh
===================================================================
--- trunk/ctdb/debian/build-orig.sh	2008-02-20 17:38:26 UTC (rev 1729)
+++ trunk/ctdb/debian/build-orig.sh	2008-02-25 16:49:08 UTC (rev 1730)
@@ -10,6 +10,10 @@
 echo Version is $CTDB_VERSION
 rm -rf ctdb.git/.git
 mv ctdb.git ctdb-$CTDB_VERSION.orig
-cd ctdb-$CTDB_VERSION.orig && ./autogen.sh && cd ..
+cd ctdb-$CTDB_VERSION.orig
+./autogen.sh
+echo removing included popt
+rm -rf lib/popt
+cd ..
 tar cvfz ctdb_$CTDB_VERSION.orig.tar.gz ctdb-$CTDB_VERSION.orig
 rm -rf ctdb-$CTDB_VERSION.orig

Modified: trunk/ctdb/debian/changelog
===================================================================
--- trunk/ctdb/debian/changelog	2008-02-20 17:38:26 UTC (rev 1729)
+++ trunk/ctdb/debian/changelog	2008-02-25 16:49:08 UTC (rev 1730)
@@ -1,9 +1,12 @@
-ctdb (1.0.28+git200802191444) UNRELEASED; urgency=low
+ctdb (1.0.28+git200802191444-1) UNRELEASED; urgency=low
 
   * new upstream git snapshot
   * dropped 05_nice_service.diff, merged upstream
   * updated 04_install_chmod.patch, half has been merged upstream
   * updated 06_services_names, nfs is not patched anymore
+  * fixed missing copyright :
+  ** remove popt from upstream tarball (changing get-orig-source target)
+  ** added 25_popt_lib to build with system popt lib
 
  -- Mathieu PARENT <math.parent at gmail.com>  Wed, 13 Feb 2008 21:43:33 +0100
 

Modified: trunk/ctdb/debian/control
===================================================================
--- trunk/ctdb/debian/control	2008-02-20 17:38:26 UTC (rev 1729)
+++ trunk/ctdb/debian/control	2008-02-25 16:49:08 UTC (rev 1730)
@@ -3,7 +3,7 @@
 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)
+Build-Depends: debhelper (>= 5), quilt (>= 0.40), libpopt-dev
 Homepage: http://ctdb.samba.org/
 Standards-Version: 3.7.3
 XS-DM-Upload-Allowed: yes
@@ -40,4 +40,4 @@
     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
+    a highly available manner on a cluster. 

Added: trunk/ctdb/debian/patches/25_popt_lib.diff
===================================================================
--- trunk/ctdb/debian/patches/25_popt_lib.diff	                        (rev 0)
+++ trunk/ctdb/debian/patches/25_popt_lib.diff	2008-02-25 16:49:08 UTC (rev 1730)
@@ -0,0 +1,13 @@
+Index: ctdb-1.0.28+git200802191444/utils/smnotify/smnotify.c
+===================================================================
+--- ctdb-1.0.28+git200802191444.orig/utils/smnotify/smnotify.c	2008-02-25 17:19:37.000000000 +0100
++++ ctdb-1.0.28+git200802191444/utils/smnotify/smnotify.c	2008-02-25 17:19:55.000000000 +0100
+@@ -24,7 +24,7 @@
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include "smnotify.h"
+-#include "../../lib/popt/popt.h"
++#include "popt.h"
+ 
+ static char *client       = NULL;
+ static const char *ip     = NULL;

Modified: trunk/ctdb/debian/patches/series
===================================================================
--- trunk/ctdb/debian/patches/series	2008-02-20 17:38:26 UTC (rev 1729)
+++ trunk/ctdb/debian/patches/series	2008-02-25 16:49:08 UTC (rev 1730)
@@ -2,3 +2,4 @@
 03_web.diff
 04_install_chmod.patch
 06_services_names.diff
+25_popt_lib.diff

Modified: trunk/ctdb/debian/rules
===================================================================
--- trunk/ctdb/debian/rules	2008-02-20 17:38:26 UTC (rev 1729)
+++ trunk/ctdb/debian/rules	2008-02-25 16:49:08 UTC (rev 1730)
@@ -116,7 +116,7 @@
 
 binary: binary-arch binary-indep
 
-get-orig-source: get-orig-source-git
+get-orig-source:
 	sh debian/build-orig.sh
 
 .PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure patch unpatch