[Pkg-samba-maint] r1354 - in trunk/talloc/debian: . patches

[Jelmer Vernooij]

Author: ctrlsoft-guest
Date: 2007-04-30 12:33:47 +0000 (Mon, 30 Apr 2007)
New Revision: 1354

Modified:
   trunk/talloc/debian/control
   trunk/talloc/debian/copyright
   trunk/talloc/debian/patches/solib.patch
Log:
Update for newer version of talloc, use tag.

Modified: trunk/talloc/debian/control
===================================================================
--- trunk/talloc/debian/control	2007-04-30 11:06:00 UTC (rev 1353)
+++ trunk/talloc/debian/control	2007-04-30 12:33:47 UTC (rev 1354)
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: Jelmer Vernooij <jelmer at samba.org>
-Build-Depends: debhelper (>= 5.0.37.2), quilt (>= 0.40), docbook-xml, docbook-xsl, xsltproc
+Build-Depends: debhelper (>= 5.0.37.2), quilt (>= 0.40), docbook-xml, docbook-xsl, xsltproc, libpopt-dev
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/pkg-samba/trunk/talloc
 

Modified: trunk/talloc/debian/copyright
===================================================================
--- trunk/talloc/debian/copyright	2007-04-30 11:06:00 UTC (rev 1353)
+++ trunk/talloc/debian/copyright	2007-04-30 12:33:47 UTC (rev 1354)
@@ -3,10 +3,9 @@
 
 It was obtained from the Samba projects' Subversion repository. 
 The tarball was created by running:
-svn export svn://svn.samba.org/samba/branches/SAMBA_4_0/source/lib/talloc talloc-VERSION
-svn export svn://svn.samba.org/samba/branches/SAMBA_4_0/source/lib/replace talloc-VERSION/libreplace
-cd talloc-VERSION && ./autogen.sh && cd ..
-tar cvz talloc-VERSION > talloc_VERSION.orig.tar.gz
+svn export svn://svn.samba.org/samba/tags/TALLOC_`echo -n $VERSION | tr . _` talloc-$VERSION
+cd talloc-$VERSION && ./autogen.sh && cd ..
+tar cvz talloc-$VERSION > talloc_$VERSION.orig.tar.gz
 
 where VERSION should be replaced with the version of talloc (currently 1.0).
 

Modified: trunk/talloc/debian/patches/solib.patch
===================================================================
--- trunk/talloc/debian/patches/solib.patch	2007-04-30 11:06:00 UTC (rev 1353)
+++ trunk/talloc/debian/patches/solib.patch	2007-04-30 12:33:47 UTC (rev 1354)
@@ -1,16 +1,14 @@
-Adds rules to build a shared library version of talloc.
-
-diff -ur talloc-1.0/Makefile.in talloc-1.0-debian/Makefile.in
---- talloc-1.0/Makefile.in	2007-04-25 16:18:22.000000000 +0200
-+++ talloc-1.0-debian/Makefile.in	2007-04-30 02:26:26.000000000 +0200
+diff -ur talloc-1.0/Makefile.in talloc-1.0-tmp/Makefile.in
+--- talloc-1.0/Makefile.in	2007-04-30 12:49:42.000000000 +0200
++++ talloc-1.0-tmp/Makefile.in	2007-04-30 15:30:45.000000000 +0200
 @@ -15,11 +15,17 @@
- CFLAGS = @CFLAGS@ -DHAVE_CONFIG_H= -I. -I at srcdir@ -I at libreplacedir@
+ CFLAGS = @CFLAGS@ -DHAVE_CONFIG_H= -I. -I at srcdir@
  EXTRA_TARGETS = @DOC_TARGET@
  
 -.SUFFIXES: .c .o .3 .3.xml .xml .html
 +.SUFFIXES: .c .o .po .3 .3.xml .xml .html
  
- LIBOBJ = @TALLOCOBJ@ @LIBREPLACEOBJ@
+ LIBOBJ = @TALLOC_OBJ@ @LIBREPLACEOBJ@
  
 -all: showflags libtalloc.a testsuite $(EXTRA_TARGETS)
 +SOLIB = libtalloc.so.1.0.0
@@ -31,8 +29,8 @@
 +	$(CC) -Wl,-soname,$(SONAME) -shared -o $@ $^
 +
  install: all 
- 	${INSTALLCMD} -d $(DESTDIR)${libdir}
- 	${INSTALLCMD} -d $(DESTDIR)${libdir}/pkgconfig
+ 	${INSTALLCMD} -d $(DESTDIR)$(libdir)
+ 	${INSTALLCMD} -d $(DESTDIR)$(libdir)/pkgconfig
  	${INSTALLCMD} -m 755 libtalloc.a $(DESTDIR)$(libdir)
 +	${INSTALLCMD} -m 755 $(SOLIB) $(DESTDIR)$(libdir)
  	${INSTALLCMD} -d $(DESTDIR)${includedir}
@@ -47,3 +45,5 @@
  
  test: testsuite
  	./testsuite
+Only in talloc-1.0-tmp: Makefile.in.orig
+Only in talloc-1.0-tmp: Makefile.in.rej