[Pkg-samba-maint] r1854 - trunk/samba4/debian

[ctrlsoft-guest at alioth.debian.org]

Author: ctrlsoft-guest
Date: 2008-05-10 13:18:56 +0000 (Sat, 10 May 2008)
New Revision: 1854

Removed:
   trunk/samba4/debian/samba4-testsuite.lintian
Modified:
   trunk/samba4/debian/
   trunk/samba4/debian/changelog
   trunk/samba4/debian/control
   trunk/samba4/debian/rules
Log:
Fix lintian warnings, dependencies, ignores.


Property changes on: trunk/samba4/debian
___________________________________________________________________
Name: svn:ignore
   + *.debhelper.log
*.debhelper
files
*.substvars


Modified: trunk/samba4/debian/changelog
===================================================================
--- trunk/samba4/debian/changelog	2008-05-09 06:52:41 UTC (rev 1853)
+++ trunk/samba4/debian/changelog	2008-05-10 13:18:56 UTC (rev 1854)
@@ -1,4 +1,4 @@
-samba4 (4.0.0~alpha4~20080508-1) experimental; urgency=low
+samba4 (4.0.0~alpha4~20080510-1) experimental; urgency=low
 
   * New upstream snapshot. (Closes: #478328)
 

Modified: trunk/samba4/debian/control
===================================================================
--- trunk/samba4/debian/control	2008-05-09 06:52:41 UTC (rev 1853)
+++ trunk/samba4/debian/control	2008-05-10 13:18:56 UTC (rev 1854)
@@ -11,9 +11,9 @@
 
 Package: samba4
 Architecture: any
-Recommends: ldb-tools
+Recommends: samba-ldb-tools
+Conflicts: samba
 Depends: ${shlibs:Depends}, ${misc:Depends}, samba4-common (=${binary:Version}), samba-ldb-tools
-Conflicts: samba-common
 Description: LanManager-like file and printer server for Unix (version 4)
  The Samba software suite is a collection of programs that
  implements the SMB protocol for unix systems, allowing you to serve
@@ -49,7 +49,7 @@
 Package: samba4-clients
 Architecture: any
 Depends: ${shlibs:Depends}, samba4-common (=${binary:Version})
-Conflicts: smbclient, samba-common
+Conflicts: smbclient
 Description: client utilities from Samba 4
  The Samba software suite is a collection of programs that
  implements the SMB protocol for unix systems, allowing you to serve
@@ -119,7 +119,7 @@
 
 Package: samba4-dev
 Architecture: any
-Depends: libparse-pidl-perl, libc6-dev, libldb-dev, tdb-dev (>= 1.1.0), libtalloc-dev
+Depends: libparse-pidl-perl, libc6-dev, libldb-samba4-dev, tdb-dev (>= 1.1.0), libtalloc-dev
 Section: devel
 Description: tools for extending Samba
  The Samba software suite is a collection of programs that

Modified: trunk/samba4/debian/rules
===================================================================
--- trunk/samba4/debian/rules	2008-05-09 06:52:41 UTC (rev 1853)
+++ trunk/samba4/debian/rules	2008-05-10 13:18:56 UTC (rev 1854)
@@ -71,6 +71,7 @@
 	rm -f $(CURDIR)/debian/tmp/usr/lib/libnss_winbind.so
 	rm -f $(CURDIR)/debian/tmp/usr/lib/pkgconfig/nss_winbind.pc
 	rm -f $(CURDIR)/debian/tmp/usr/share/man/man3/talloc.3
+	rmdir $(CURDIR)/debian/tmp/usr/lib/torture
 	dh_install --sourcedir=debian/tmp --list-missing --fail-missing
 
 binary-arch: build install
@@ -81,15 +82,16 @@
 	dh_compress -a
 	dh_fixperms -a
 	dh_makeshlibs -a
-	dh_link -plibsamba0 usr/lib/libsamba-config.so.0.0.1 usr/lib/libsamba-config.so.0 \
-		usr/lib/libtorture.so.0.0.1 usr/lib/libtorture.so.0
+	dh_link -plibsamba-hostconfig0 usr/lib/libsamba-hostconfig.so.0.0.1 usr/lib/libsamba-hostconfig.so.0
 	dh_link -plibndr0 usr/lib/libndr.so.0.0.1 usr/lib/libndr.so.0
 	dh_link -plibregistry0 usr/lib/libregistry.so.0.0.1 usr/lib/libregistry.so.0
 	dh_link -plibdcerpc0 usr/lib/libdcerpc.so.0.0.1 usr/lib/libdcerpc.so.0 \
 						 usr/lib/libdcerpc_samr.so.0.0.1 usr/lib/libdcerpc_samr.so.0 \
 						 usr/lib/libdcerpc_atsvc.so.0.0.1 usr/lib/libdcerpc_atsvc.so.0
 	dh_link -plibgensec0 usr/lib/libgensec.so.0.0.1 usr/lib/libgensec.so.0
-	for pkg in winbind4 libldb-samba4-0 samba4-testsuite; do \
+	dh_link -plibtorture0 usr/lib/libtorture.so.0.0.1 usr/lib/libgensec.so.0
+	dh_link -plibldb0 usr/lib/libldb.so.0.0.1 usr/lib/libldb.so.0
+	for pkg in winbind4 libldb-samba4-0; do \
 		install -m 0644 -D debian/$$pkg.lintian debian/$$pkg/usr/share/lintian/overrides/$$pkg || exit; \
 	done
 	dh_installinit -a 

Deleted: trunk/samba4/debian/samba4-testsuite.lintian
===================================================================
--- trunk/samba4/debian/samba4-testsuite.lintian	2008-05-09 06:52:41 UTC (rev 1853)
+++ trunk/samba4/debian/samba4-testsuite.lintian	2008-05-10 13:18:56 UTC (rev 1854)
@@ -1 +0,0 @@
-W: samba4-testsuite: package-contains-empty-directory usr/lib/torture/