[Pkg-samba-maint] r995 - trunk

[Peter Eisentraut]

Author: petere
Date: 2006-01-24 23:46:39 +0000 (Tue, 24 Jan 2006)
New Revision: 995

Added:
   trunk/smbfs.lintian
Removed:
   trunk/python2.3-samba.dirs
Modified:
   trunk/changelog
   trunk/rules
   trunk/samba.dirs
   trunk/source.lintian-overrides
   trunk/winbind.dirs
Log:
Fix lintian overrides and install them into the right packages.


Modified: trunk/changelog
===================================================================
--- trunk/changelog	2006-01-24 22:43:20 UTC (rev 994)
+++ trunk/changelog	2006-01-24 23:46:39 UTC (rev 995)
@@ -2,8 +2,9 @@
 
   * Put correct paths for Debian installations into the man pages, and
     remove outdated swat setup instructions therein. Closes: #321005
+  * Fix lintian overrides and install them into the right packages.
 
- -- Peter Eisentraut <petere at debian.org>  Tue, 24 Jan 2006 23:39:24 +0100
+ -- Peter Eisentraut <petere at debian.org>  Wed, 25 Jan 2006 00:25:25 +0100
 
 samba (3.0.21a-4) unstable; urgency=low
 

Deleted: trunk/python2.3-samba.dirs
===================================================================
--- trunk/python2.3-samba.dirs	2006-01-24 22:43:20 UTC (rev 994)
+++ trunk/python2.3-samba.dirs	2006-01-24 23:46:39 UTC (rev 995)
@@ -1 +0,0 @@
-usr/share/lintian/overrides

Modified: trunk/rules
===================================================================
--- trunk/rules	2006-01-24 22:43:20 UTC (rev 994)
+++ trunk/rules	2006-01-24 23:46:39 UTC (rev 995)
@@ -273,9 +273,9 @@
 	dh_installcron 
 #	dh_installmanpages
 #	dh_installinfo
-	cp debian/winbind.lintian debian/winbind/usr/share/lintian/overrides/winbind
-	cp debian/samba.lintian debian/samba/usr/share/lintian/overrides/samba
-	cp debian/python2.3-samba.lintian debian/samba/usr/share/lintian/overrides/python2.3-samba
+	for pkg in python2.3-samba samba smbfs winbind; do \
+	  install -m 0644 -D debian/$$pkg.lintian debian/$$pkg/usr/share/lintian/overrides/$$pkg || exit; \
+	done
 #	dh_undocumented
 	dh_installchangelogs -Nlibpam-smbpass
 	DH_OPTIONS= dh_installchangelogs -plibpam-smbpass source/pam_smbpass/CHANGELOG

Modified: trunk/samba.dirs
===================================================================
--- trunk/samba.dirs	2006-01-24 22:43:20 UTC (rev 994)
+++ trunk/samba.dirs	2006-01-24 23:46:39 UTC (rev 995)
@@ -1,5 +1,4 @@
 usr/bin
-usr/share/lintian/overrides
 usr/sbin
 var/log/samba
 var/lib/samba/printers/W32X86

Added: trunk/smbfs.lintian
===================================================================
--- trunk/smbfs.lintian	2006-01-24 22:43:20 UTC (rev 994)
+++ trunk/smbfs.lintian	2006-01-24 23:46:39 UTC (rev 995)
@@ -0,0 +1,4 @@
+smbfs: setuid-binary sbin/mount.cifs 4755 root/root
+smbfs: setuid-binary sbin/umount.cifs 4755 root/root
+smbfs: setuid-binary usr/bin/smbumount 4755 root/root
+smbfs: setuid-binary usr/bin/smbmnt 4755 root/root

Modified: trunk/source.lintian-overrides
===================================================================
--- trunk/source.lintian-overrides	2006-01-24 22:43:20 UTC (rev 994)
+++ trunk/source.lintian-overrides	2006-01-24 23:46:39 UTC (rev 995)
@@ -1,11 +1,12 @@
-samba source: invalid-arch-string-in-source-relation m32r
-samba source: invalid-arch-string-in-source-relation s390x
-samba source: invalid-arch-string-in-source-relation sh3
-samba source: invalid-arch-string-in-source-relation sh3eb
-samba source: invalid-arch-string-in-source-relation sh4
-samba source: invalid-arch-string-in-source-relation sh4eb
+samba source: invalid-arch-string-in-source-relation m32r [build-depends: libacl1-dev (>= 2.2.11-1) [i386 ia64 alpha amd64 arm hppa m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc]]
+samba source: invalid-arch-string-in-source-relation s390x [build-depends: libacl1-dev (>= 2.2.11-1) [i386 ia64 alpha amd64 arm hppa m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc]]
+samba source: invalid-arch-string-in-source-relation sh3 [build-depends: libacl1-dev (>= 2.2.11-1) [i386 ia64 alpha amd64 arm hppa m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc]]
+samba source: invalid-arch-string-in-source-relation sh3eb [build-depends: libacl1-dev (>= 2.2.11-1) [i386 ia64 alpha amd64 arm hppa m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc]]
+samba source: invalid-arch-string-in-source-relation sh4 [build-depends: libacl1-dev (>= 2.2.11-1) [i386 ia64 alpha amd64 arm hppa m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc]]
+samba source: invalid-arch-string-in-source-relation sh4eb [build-depends: libacl1-dev (>= 2.2.11-1) [i386 ia64 alpha amd64 arm hppa m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc]]
 # These are *not* configure-generated files
 samba source: configure-generated-file-in-source debian/config.cache
 # Those aren't even part of the diff.gz
-samba source: configure-generated-file-in-source packaging/Debian/debian-stable/config.cache
+samba source: configure-generated-file-in-source packaging/Debian/debian-sarge/config.cache
 samba source: configure-generated-file-in-source packaging/Debian/debian-unstable/config.cache
+samba source: configure-generated-file-in-source packaging/Debian/debian-woody/config.cache

Modified: trunk/winbind.dirs
===================================================================
--- trunk/winbind.dirs	2006-01-24 22:43:20 UTC (rev 994)
+++ trunk/winbind.dirs	2006-01-24 23:46:39 UTC (rev 995)
@@ -1,3 +1,2 @@
-usr/share/lintian/overrides
 var/log/samba
 var/run/samba