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

Sun Apr 29 23:28:25 UTC 2007

Author: ctrlsoft-guest
Date: 2007-04-29 23:28:25 +0000 (Sun, 29 Apr 2007)
New Revision: 1348

Added:
   trunk/talloc/debian/copyright
Modified:
   trunk/talloc/debian/control
   trunk/talloc/debian/libtalloc-dev.install
   trunk/talloc/debian/libtalloc1.install
   trunk/talloc/debian/patches/solib.patch
   trunk/talloc/debian/rules
Log:
Some more updates after running lintian.

Modified: trunk/talloc/debian/control
===================================================================

--- trunk/talloc/debian/control	2007-04-29 22:43:24 UTC (rev 1347)
+++ trunk/talloc/debian/control	2007-04-29 23:28:25 UTC (rev 1348)
@@ -1,8 +1,8 @@
 Source: talloc
 Section: devel
 Priority: optional
-Maintainer: Debian Samba Maintainers <samba-maint at alioth.debian.org>
-Build-Depends: debhelper (>= 5.0.37.2), quilt (>= 0.40)
+Maintainer: Jelmer Vernooij <jelmer at samba.org>
+Build-Depends: debhelper (>= 5.0.37.2), quilt (>= 0.40), docbook-xml, docbook-xsl
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/pkg-samba/trunk/talloc
 

Added: trunk/talloc/debian/copyright
===================================================================
--- trunk/talloc/debian/copyright	2007-04-29 22:43:24 UTC (rev 1347)
+++ trunk/talloc/debian/copyright	2007-04-29 23:28:25 UTC (rev 1348)
@@ -0,0 +1,23 @@
+Talloc was Debianized by Jelmer Vernooij <jelmer at samba.org> on 
+Mon Apr 30 01:48:43 CEST 2007.
+
+Talloc is copyright (C) Andrew Tridgell <tridge at samba.org> and published 
+under the following license:
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with this library; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
+
+On Debian GNU/Linux systems, the complete text of the GNU Lesser General
+Public License can be found in `/usr/share/common-licenses/LGPL'.

Modified: trunk/talloc/debian/libtalloc-dev.install
===================================================================
--- trunk/talloc/debian/libtalloc-dev.install	2007-04-29 22:43:24 UTC (rev 1347)
+++ trunk/talloc/debian/libtalloc-dev.install	2007-04-29 23:28:25 UTC (rev 1348)
@@ -1,4 +1,5 @@
 usr/lib/libtalloc.a
+usr/lib/libtalloc.so
 usr/share/man/man3/talloc.3
 usr/lib/pkgconfig/talloc.pc
 usr/include/talloc.h

Modified: trunk/talloc/debian/libtalloc1.install
===================================================================
--- trunk/talloc/debian/libtalloc1.install	2007-04-29 22:43:24 UTC (rev 1347)
+++ trunk/talloc/debian/libtalloc1.install	2007-04-29 23:28:25 UTC (rev 1348)
@@ -1 +1 @@
-usr/lib/libtalloc.so*
+usr/lib/libtalloc.so.*

Modified: trunk/talloc/debian/patches/solib.patch
===================================================================
--- trunk/talloc/debian/patches/solib.patch	2007-04-29 22:43:24 UTC (rev 1347)
+++ trunk/talloc/debian/patches/solib.patch	2007-04-29 23:28:25 UTC (rev 1348)
@@ -1,23 +1,32 @@
 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 01:15:47.000000000 +0200
-@@ -19,7 +19,9 @@
++++ talloc-1.0-debian/Makefile.in	2007-04-30 02:26:26.000000000 +0200
+@@ -15,11 +15,17 @@
+ CFLAGS = @CFLAGS@ -DHAVE_CONFIG_H= -I. -I at srcdir@ -I at libreplacedir@
+ EXTRA_TARGETS = @DOC_TARGET@
  
+-.SUFFIXES: .c .o .3 .3.xml .xml .html
++.SUFFIXES: .c .o .po .3 .3.xml .xml .html
+ 
  LIBOBJ = @TALLOCOBJ@ @LIBREPLACEOBJ@
  
 -all: showflags libtalloc.a testsuite $(EXTRA_TARGETS)
 +SOLIB = libtalloc.so.1.0.0
++SONAME = libtalloc.so.1
 +
++.c.po:
++	$(CC) -fPIC -o $@ -c $< $(CFLAGS)
++
 +all: showflags libtalloc.a $(SOLIB) testsuite $(EXTRA_TARGETS)
  
  showflags:
  	@echo 'talloc will be compiled with flags:'
-@@ -33,10 +35,14 @@
+@@ -33,10 +39,14 @@
  	ar -rv $@ $(LIBOBJ)
  	@-ranlib $@
  
-+$(SOLIB): $(LIBOBJ)
-+	$(CC) -Wl,-soname,$(SOLIB) -shared -o $@ $^
++$(SOLIB): $(LIBOBJ:.o=.po)
++	$(CC) -Wl,-soname,$(SONAME) -shared -o $@ $^
 +
  install: all 
  	${INSTALLCMD} -d $(DESTDIR)${libdir}
@@ -27,7 +36,7 @@
  	${INSTALLCMD} -d $(DESTDIR)${includedir}
  	${INSTALLCMD} -m 644 $(srcdir)/talloc.h $(DESTDIR)$(includedir)
  	${INSTALLCMD} -m 644 talloc.pc $(DESTDIR)$(libdir)/pkgconfig
-@@ -52,7 +58,7 @@
+@@ -52,7 +62,7 @@
  	-test -z "$(XSLTPROC)" || $(XSLTPROC) --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl $<
  
  clean:

Modified: trunk/talloc/debian/rules
===================================================================
--- trunk/talloc/debian/rules	2007-04-29 22:43:24 UTC (rev 1347)
+++ trunk/talloc/debian/rules	2007-04-29 23:28:25 UTC (rev 1348)
@@ -3,9 +3,9 @@
 CFLAGS = -g -Wall
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-  CFLAGS += -O0
+CFLAGS += -O0
 else
-  CFLAGS += -O2
+CFLAGS += -O2
 endif
 
 include /usr/share/quilt/quilt.make
@@ -15,9 +15,9 @@
 conf_args = --prefix=/usr
 
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
-  conf_args += --build $(DEB_BUILD_GNU_TYPE)
+conf_args += --build $(DEB_BUILD_GNU_TYPE)
 else
-  conf_args += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+conf_args += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
 endif
 
 configure: patch configure-stamp
@@ -53,13 +53,8 @@
 	$(MAKE) install DESTDIR=$(DESTDIR)
 	ln -s libtalloc.so.1.0.0 $(DESTDIR)/usr/lib/libtalloc.so.1
 	ln -s libtalloc.so.1 $(DESTDIR)/usr/lib/libtalloc.so
-
 	dh_install --list-missing --fail-missing --sourcedir=$(DESTDIR)
 
-# Build architecture-independent files here.
-# Pass -i to all debhelper commands in this target to reduce clutter.
-binary-indep: build install
-
 # Build architecture-dependent files here.
 # Pass -a to all debhelper commands in this target to reduce clutter.
 
@@ -82,5 +77,5 @@
 	dh_md5sums
 	dh_builddeb
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure patch unpatch
+binary: binary-arch
+.PHONY: build clean binary-arch binary install configure patch unpatch


