[Pkg-samba-maint] r3273 - trunk/samba/debian

[bubulle at alioth.debian.org]

Author: bubulle
Date: 2010-02-06 16:47:02 +0000 (Sat, 06 Feb 2010)
New Revision: 3273

Added:
   trunk/samba/debian/samba-common.lintian-overrides
   trunk/samba/debian/samba.lintian-overrides
   trunk/samba/debian/winbind.lintian-overrides
Removed:
   trunk/samba/debian/samba-common.lintian
   trunk/samba/debian/samba.lintian
   trunk/samba/debian/winbind.lintian
Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/control
   trunk/samba/debian/rules
Log:
Use dh_lintian instead of manual install of lintian overrides

Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2010-02-06 15:56:15 UTC (rev 3272)
+++ trunk/samba/debian/changelog	2010-02-06 16:47:02 UTC (rev 3273)
@@ -9,6 +9,7 @@
   * No longer maker (u)mount.cifs setuid root. Add a notice
     about this in the package's NEWS.Debian file
     Closes: #567554 
+  * Use dh_lintian instead of manual install of lintian overrides
 
  -- Steve Langasek <vorlon at debian.org>  Mon, 25 Jan 2010 20:28:24 -0800
 

Modified: trunk/samba/debian/control
===================================================================
--- trunk/samba/debian/control	2010-02-06 15:56:15 UTC (rev 3272)
+++ trunk/samba/debian/control	2010-02-06 16:47:02 UTC (rev 3273)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Samba Maintainers <pkg-samba-maint at lists.alioth.debian.org>
 Uploaders: Steve Langasek <vorlon at debian.org>, Christian Perrier <bubulle at debian.org>, Noèl Köthe <noel at debian.org>, Jelmer Vernooij <jelmer at debian.org>
-Build-Depends: debhelper (>= 6.0.0), libpam0g-dev, libreadline-dev,
+Build-Depends: debhelper (>= 6.0.7~), libpam0g-dev, libreadline-dev,
 	libcups2-dev | libcupsys2-dev,
 	libacl1-dev  [alpha amd64 arm armeb armel avr32 hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],
 	libkrb5-dev, libldap2-dev, po-debconf, libpopt-dev, uuid-dev,

Modified: trunk/samba/debian/rules
===================================================================
--- trunk/samba/debian/rules	2010-02-06 15:56:15 UTC (rev 3272)
+++ trunk/samba/debian/rules	2010-02-06 16:47:02 UTC (rev 3273)
@@ -229,9 +229,7 @@
 	DH_OPTIONS= dh_installinit -psamba -- "defaults 20 19"
 	DH_OPTIONS= dh_installinit -pwinbind
 	dh_installcron 
-	for pkg in samba samba-common winbind; do \
-	  install -m 0644 -D debian/$$pkg.lintian debian/$$pkg/usr/share/lintian/overrides/$$pkg || exit; \
-	done
+	dh_lintian
 	dh_installchangelogs -Nlibpam-smbpass
 	DH_OPTIONS= dh_installchangelogs -plibpam-smbpass source3/pam_smbpass/CHANGELOG
 	DH_OPTIONS= dh_strip -psamba -psmbclient -pwinbind -psamba-common-bin --dbg-package=samba-dbg

Deleted: trunk/samba/debian/samba-common.lintian
===================================================================
--- trunk/samba/debian/samba-common.lintian	2010-02-06 15:56:15 UTC (rev 3272)
+++ trunk/samba/debian/samba-common.lintian	2010-02-06 16:47:02 UTC (rev 3273)
@@ -1,2 +0,0 @@
-# This is on purpose to hide sensitive information
-samba-common: non-standard-dir-perm var/log/samba/ 0750 != 0755

Copied: trunk/samba/debian/samba-common.lintian-overrides (from rev 3271, trunk/samba/debian/samba-common.lintian)
===================================================================
--- trunk/samba/debian/samba-common.lintian-overrides	                        (rev 0)
+++ trunk/samba/debian/samba-common.lintian-overrides	2010-02-06 16:47:02 UTC (rev 3273)
@@ -0,0 +1,2 @@
+# This is on purpose to hide sensitive information
+samba-common: non-standard-dir-perm var/log/samba/ 0750 != 0755

Deleted: trunk/samba/debian/samba.lintian
===================================================================
--- trunk/samba/debian/samba.lintian	2010-02-06 15:56:15 UTC (rev 3272)
+++ trunk/samba/debian/samba.lintian	2010-02-06 16:47:02 UTC (rev 3273)
@@ -1 +0,0 @@
-samba: non-standard-dir-perm var/spool/samba/ 1777 != 0755

Copied: trunk/samba/debian/samba.lintian-overrides (from rev 3271, trunk/samba/debian/samba.lintian)
===================================================================
--- trunk/samba/debian/samba.lintian-overrides	                        (rev 0)
+++ trunk/samba/debian/samba.lintian-overrides	2010-02-06 16:47:02 UTC (rev 3273)
@@ -0,0 +1 @@
+samba: non-standard-dir-perm var/spool/samba/ 1777 != 0755

Deleted: trunk/samba/debian/winbind.lintian
===================================================================
--- trunk/samba/debian/winbind.lintian	2010-02-06 15:56:15 UTC (rev 3272)
+++ trunk/samba/debian/winbind.lintian	2010-02-06 16:47:02 UTC (rev 3273)
@@ -1,5 +0,0 @@
-winbind: no-shlibs-control-file lib/libnss_winbind.so.2
-winbind: no-shlibs-control-file lib/libnss_wins.so.2
-winbind: postinst-must-call-ldconfig lib/libnss_wins.so.2
-winbind: postrm-should-call-ldconfig lib/libnss_wins.so.2
-winbind: package-name-doesnt-match-sonames libnss-winbind2 libnss-wins2

Copied: trunk/samba/debian/winbind.lintian-overrides (from rev 3271, trunk/samba/debian/winbind.lintian)
===================================================================
--- trunk/samba/debian/winbind.lintian-overrides	                        (rev 0)
+++ trunk/samba/debian/winbind.lintian-overrides	2010-02-06 16:47:02 UTC (rev 3273)
@@ -0,0 +1,5 @@
+winbind: no-shlibs-control-file lib/libnss_winbind.so.2
+winbind: no-shlibs-control-file lib/libnss_wins.so.2
+winbind: postinst-must-call-ldconfig lib/libnss_wins.so.2
+winbind: postrm-should-call-ldconfig lib/libnss_wins.so.2
+winbind: package-name-doesnt-match-sonames libnss-winbind2 libnss-wins2