[Pkg-samba-maint] r781 - trunk

Christian Perrier bubulle at costa.debian.org
Sun Dec 4 09:00:59 UTC 2005


Author: bubulle
Date: 2005-12-04 09:00:57 +0000 (Sun, 04 Dec 2005)
New Revision: 781

Added:
   trunk/python2.3-samba.dirs
   trunk/python2.3-samba.lintian
   trunk/samba.lintian
Modified:
   trunk/changelog
   trunk/control
   trunk/control.in
   trunk/copyright
   trunk/rules
   trunk/samba.dirs
Log:
A first round of lintian cleaning:
-ignore invalid-arch-string-in-source-relation in source
-ignore configure-generated-file-in-source in source
-correct the FSF address in debian/copyright
-add a dependency on netbase for swat
-ignore the non-standard-dir-perm for samba log directory
-ignore the script-not-executable warning for python2.3-samba



Modified: trunk/changelog
===================================================================
--- trunk/changelog	2005-12-04 07:49:07 UTC (rev 780)
+++ trunk/changelog	2005-12-04 09:00:57 UTC (rev 781)
@@ -1,4 +1,4 @@
-samba (3.0.20b-3) UNRELEASED; urgency=low
+samba (3.0.20b-3) unstable; urgency=low
 
   [ Steve Langasek ]
   * Drop the FHS transition code from the samba postinst, since it's
@@ -25,8 +25,12 @@
   * Add a dependency on samba-common for winbind and force versions to match
     Closes: #273007, #264855
   * Add /var/log/samba to winbind directories. Closes: #340833
+  * Add a few lintian overrides to avoid lintian complaining
+    for things done on purpose or just because it makes wrong assumptions
+  * Corrected FSF address in debian/copyright
+  * Make swat depend on netbase as it uses update-inetd in its postinst script
 
- -- Christian Perrier <bubulle at debian.org>  Sat, 26 Nov 2005 13:51:27 +0100
+ -- Christian Perrier <bubulle at debian.org>  Sat,  3 Dec 2005 07:30:40 +0100
 
 samba (3.0.20b-2) unstable; urgency=low
 

Modified: trunk/control
===================================================================
--- trunk/control	2005-12-04 07:49:07 UTC (rev 780)
+++ trunk/control	2005-12-04 09:00:57 UTC (rev 781)
@@ -9,6 +9,7 @@
 Package: samba
 Architecture: any
 Depends: samba-common (= ${Source-Version}), netbase, logrotate, ${shlibs:Depends}, ${misc:Depends}, libpam-runtime (>= 0.76-13.1), libpam-modules, lsb-base (>= 3.0-6)
+Recommends: smbldap-tools
 Replaces: samba-common (<= 2.0.5a-2)
 Suggests: samba-doc
 Description: a LanManager-like file and printer server for Unix
@@ -127,7 +128,7 @@
 Section: admin
 Priority: extra
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, samba-common (= ${Source-Version})
 Suggests: samba
 Description: pluggable authentication module for SMB password database
  This is a stackable PAM module that allows a system administrator to easily
@@ -165,7 +166,7 @@
 Section: net
 Priority: optional
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, samba-common (= ${Source-Version})
+Depends: samba-common (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
 Replaces: samba (<= 2.2.3-2)
 Description: service to resolve user and group information from Windows NT servers
  This package provides the winbindd daemon, which provides a

Modified: trunk/control.in
===================================================================
--- trunk/control.in	2005-12-04 07:49:07 UTC (rev 780)
+++ trunk/control.in	2005-12-04 09:00:57 UTC (rev 781)
@@ -74,7 +74,7 @@
 
 Package: swat
 Architecture: any
-Depends: samba (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: samba (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}, netbase
 Recommends: samba-doc
 Description: Samba Web Administration Tool
  The Samba software suite is a collection of programs that

Modified: trunk/copyright
===================================================================
--- trunk/copyright	2005-12-04 07:49:07 UTC (rev 780)
+++ trunk/copyright	2005-12-04 09:00:57 UTC (rev 781)
@@ -22,8 +22,9 @@
 
    You should have received a copy of the GNU General Public License
    along with this program;  if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+   MA 02110-1301, USA.
 
+
 On Debian GNU/Linux systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL'.

Added: trunk/python2.3-samba.dirs
===================================================================
--- trunk/python2.3-samba.dirs	2005-12-04 07:49:07 UTC (rev 780)
+++ trunk/python2.3-samba.dirs	2005-12-04 09:00:57 UTC (rev 781)
@@ -0,0 +1 @@
+usr/share/lintian/overrides

Added: trunk/python2.3-samba.lintian
===================================================================
--- trunk/python2.3-samba.lintian	2005-12-04 07:49:07 UTC (rev 780)
+++ trunk/python2.3-samba.lintian	2005-12-04 09:00:57 UTC (rev 781)
@@ -0,0 +1,5 @@
+# Lintian looks for any text file beginning with #!.  But not all
+# files that begin with #! should be executable scripts; this is a file that
+# should not be executable, and there's nothing wrong with having the
+# !/usr/bin/python line in it, so the warning should just be ignored.
+python2.3-samba: script-not-executable ./usr/lib/python2.3/site-packages/samba/printerdata.py

Modified: trunk/rules
===================================================================
--- trunk/rules	2005-12-04 07:49:07 UTC (rev 780)
+++ trunk/rules	2005-12-04 09:00:57 UTC (rev 781)
@@ -312,6 +312,8 @@
 #	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
 #	dh_undocumented
 	dh_installchangelogs -Nlibpam-smbpass
 	DH_OPTIONS= dh_installchangelogs -plibpam-smbpass source/pam_smbpass/CHANGELOG

Modified: trunk/samba.dirs
===================================================================
--- trunk/samba.dirs	2005-12-04 07:49:07 UTC (rev 780)
+++ trunk/samba.dirs	2005-12-04 09:00:57 UTC (rev 781)
@@ -1,4 +1,5 @@
 usr/bin
+usr/share/lintian/overrides
 usr/sbin
 var/log/samba
 var/lib/samba/printers/W32X86

Added: trunk/samba.lintian
===================================================================
--- trunk/samba.lintian	2005-12-04 07:49:07 UTC (rev 780)
+++ trunk/samba.lintian	2005-12-04 09:00:57 UTC (rev 781)
@@ -0,0 +1,2 @@
+# This is on purpose to hide sensitive information
+samba: non-standard-dir-perm var/log/samba/ 0750 != 0755




More information about the Pkg-samba-maint mailing list