[Pkg-samba-maint] r1970 - in trunk/samba4/debian: . patches

[ctrlsoft-guest at alioth.debian.org]

Author: ctrlsoft-guest
Date: 2008-06-16 23:38:56 +0000 (Mon, 16 Jun 2008)
New Revision: 1970

Added:
   trunk/samba4/debian/patches/01_disable_events_lib.patch
Modified:
   trunk/samba4/debian/changelog
   trunk/samba4/debian/control
   trunk/samba4/debian/patches/series
   trunk/samba4/debian/rules
Log:
Package new snapshot, avoid dependency on libevents.

Modified: trunk/samba4/debian/changelog
===================================================================
--- trunk/samba4/debian/changelog	2008-06-16 22:53:55 UTC (rev 1969)
+++ trunk/samba4/debian/changelog	2008-06-16 23:38:56 UTC (rev 1970)
@@ -1,8 +1,10 @@
-samba4 (4.0.0~alpha4~20080616-2) experimental; urgency=low
+samba4 (4.0.0~alpha4~20080617-1) experimental; urgency=low
 
   * Fixed maintainer email address.
+  * New upstream snapshot.
+  * Remove dependency on unpackaged libevents in ldb pkg-config file.
 
- -- Jelmer Vernooij <jelmer at samba.org>  Mon, 16 Jun 2008 17:32:50 +0200
+ -- Jelmer Vernooij <jelmer at samba.org>  Mon, 16 Jun 2008 21:29:43 +0200
 
 samba4 (4.0.0~alpha4~20080616-1) experimental; urgency=low
 

Modified: trunk/samba4/debian/control
===================================================================
--- trunk/samba4/debian/control	2008-06-16 22:53:55 UTC (rev 1969)
+++ trunk/samba4/debian/control	2008-06-16 23:38:56 UTC (rev 1970)
@@ -5,7 +5,7 @@
 Uploaders: Steve Langasek <vorlon at debian.org>, Christian Perrier <bubulle at debian.org>, Noèl Köthe <noel at debian.org>, Steinar H. Gunderson <sesse at debian.org>, Jelmer Vernooij <jelmer at samba.org>
 Homepage: http://www.samba.org/
 Standards-Version: 3.8.0
-Build-Depends: debhelper (>> 5.0.0), libparse-yapp-perl, perl, docbook-xsl, docbook-xml, xsltproc, po-debconf, libgnutls-dev, libreadline5-dev, libpam0g-dev, libblkid-dev, libattr1-dev, flex, bison, tdb-dev (>= 1.1.0), libtalloc-dev, libtalloc1, perl-modules, python2.5-dev, python-central (>= 0.5.6)
+Build-Depends: debhelper (>> 5.0.0), libparse-yapp-perl, perl, docbook-xsl, docbook-xml, xsltproc, po-debconf, libgnutls-dev, libreadline5-dev, libpam0g-dev, libblkid-dev, libattr1-dev, flex, bison, tdb-dev (>= 1.1.0), libtalloc-dev, libtalloc1, perl-modules, python2.5-dev, python-central (>= 0.5.6), quilt
 Build-Conflicts: libldb-dev
 Vcs-Svn: svn://svn.debian.org/svn/pkg-samba/branches/samba4
 XS-Python-Version: 2.5

Added: trunk/samba4/debian/patches/01_disable_events_lib.patch
===================================================================
--- trunk/samba4/debian/patches/01_disable_events_lib.patch	                        (rev 0)
+++ trunk/samba4/debian/patches/01_disable_events_lib.patch	2008-06-16 23:38:56 UTC (rev 1970)
@@ -0,0 +1,17 @@
+Goal: Avoid dependency on libevents, which is not packaged yet.
+
+Status wrt upstream: Debian-specific
+
+diff -ur ldb-0.92~git20080616/source/lib/ldb/ldb.pc.in ldb-0.92~git20080616-fixed/source/lib/ldb/ldb.pc.in
+--- ldb-0.92~git20080616/source/lib/ldb/ldb.pc.in	2008-06-16 21:03:50.000000000 +0200
++++ ldb-0.92~git20080616-fixed/source/lib/ldb/ldb.pc.in	2008-06-16 21:05:14.000000000 +0200
+@@ -8,7 +8,7 @@
+ Description: An LDAP-like embedded database
+ Version: @PACKAGE_VERSION@
+ Requires.private: tdb
+-Requires: talloc events
++Requires: talloc
+ Libs: -L${libdir} -lldb
+ Libs.private: @LDAP_LIBS@
+ Cflags: -I${includedir} 
+Nur in ldb-0.92~git20080616-fixed: ldb.pc.in~.

Modified: trunk/samba4/debian/patches/series
===================================================================
--- trunk/samba4/debian/patches/series	2008-06-16 22:53:55 UTC (rev 1969)
+++ trunk/samba4/debian/patches/series	2008-06-16 23:38:56 UTC (rev 1970)
@@ -0,0 +1 @@
+01_disable_events_lib.patch

Modified: trunk/samba4/debian/rules
===================================================================
--- trunk/samba4/debian/rules	2008-06-16 22:53:55 UTC (rev 1969)
+++ trunk/samba4/debian/rules	2008-06-16 23:38:56 UTC (rev 1970)
@@ -9,7 +9,9 @@
 d_b_o:=$(shell echo "$$DEB_BUILD_OPTIONS"|sed 's/[^-[:alnum:]]/ /g'|tr a-z A-Z)
 $(foreach o, $(d_b_o), $(eval DEB_BUILD_OPT_$o := 1))
 
-configure: configure-stamp
+include /usr/share/quilt/quilt.make
+
+configure: patch configure-stamp
 configure-stamp:
 	dh_testdir
 	cd $(SOURCEPATH) && ./configure --with-fhs \
@@ -29,7 +31,8 @@
 	$(MAKE) -C $(SOURCEPATH) all
 	touch $@
 
-clean:
+clean: clean-patched unpatch
+clean-patched:
 	dh_testdir
 	dh_testroot
 	dh_clean