[Pkg-samba-maint] r3343 - in trunk/cifs-utils: . debian debian/source

[Steve Langasek]

On Mon, Mar 01, 2010 at 07:47:12AM +0000, bubulle at alioth.debian.org wrote:
> Added: trunk/cifs-utils/debian/changelog
> ===================================================================
> --- trunk/cifs-utils/debian/changelog	                        (rev 0)
> +++ trunk/cifs-utils/debian/changelog	2010-03-01 07:47:11 UTC (rev 3343)
> @@ -0,0 +1,6 @@
> +cifs-utils (4.0rc1-1) unstable; urgency=low

Should be 4.0~rc1-1 to sort before a 4.0 final release

> Added: trunk/cifs-utils/debian/cifs-utils.NEWS
> ===================================================================
> --- trunk/cifs-utils/debian/cifs-utils.NEWS	                        (rev 0)
> +++ trunk/cifs-utils/debian/cifs-utils.NEWS	2010-03-01 07:47:11 UTC (rev 3343)
> @@ -0,0 +1,12 @@
> +cifs-utils (4.0rc1-1) unstable; urgency=low

Ditto

> +
> +  * This NEWS file is copies from smbfs because the NEWS is important
> +    enough for users upgrading from lenny to squeeze.

What are you planning to do with the smbfs binary package?  We should
provide this as a transitional package depending on cifs-utils (and perhaps
put the smbmount, etc. symlinks in it); I think it makes sense for
cifs-utils to build that binary.

(In which case, we would want the cifs-utils package to inherit the epoch of
the samba package)

> Added: trunk/cifs-utils/debian/cifs-utils.dirs
> ===================================================================
> --- trunk/cifs-utils/debian/cifs-utils.dirs	                        (rev 0)
> +++ trunk/cifs-utils/debian/cifs-utils.dirs	2010-03-01 07:47:11 UTC (rev 3343)
> @@ -0,0 +1 @@
> +sbin

This is unnecessary; contrary to popular usage, you only ever need to
declare directories to debhelper if you want to ship an empty directory in
the package.

> Added: trunk/cifs-utils/debian/cifs-utils.files
> ===================================================================
> --- trunk/cifs-utils/debian/cifs-utils.files	                        (rev 0)
> +++ trunk/cifs-utils/debian/cifs-utils.files	2010-03-01 07:47:11 UTC (rev 3343)
> @@ -0,0 +1,7 @@
> +sbin/mount.smbfs
> +sbin/mount.cifs
> +sbin/umount.cifs
> +usr/sbin/cifs.upcall
> +usr/share/man/man8/mount.cifs.8
> +usr/share/man/man8/umount.cifs.8
> +usr/share/man/man8/cifs.upcall.8

From what I've seen, umount.cifs is no longer provided, so we should drop
the references to it.

> Added: trunk/cifs-utils/debian/cifs-utils.install
> ===================================================================
> --- trunk/cifs-utils/debian/cifs-utils.install	                        (rev 0)
> +++ trunk/cifs-utils/debian/cifs-utils.install	2010-03-01 07:47:11 UTC (rev 3343)
> @@ -0,0 +1 @@
> +debian/mount.smbfs sbin

Using both .files and .install is ugly... dh_install is meant to replace
dh_movefiles.  (In fact, dh doesn't call dh_movefiles at all by default, so
the .files is completely ignored right now AFAIK)

> Added: trunk/cifs-utils/debian/cifs-utils.manpages
> ===================================================================
> --- trunk/cifs-utils/debian/cifs-utils.manpages	                        (rev 0)
> +++ trunk/cifs-utils/debian/cifs-utils.manpages	2010-03-01 07:47:11 UTC (rev 3343)
> @@ -0,0 +1,2 @@
> +cifs.upcall.8
> +mount.cifs.8

These should only be listed once, either in .install or in .manpages.  I
think it's better to list them in .install since they're files installed by
the upstream build rules; that lets us use dh_install --fail-missing or
--list-missing if we want.

> Added: trunk/cifs-utils/debian/control
> ===================================================================
> --- trunk/cifs-utils/debian/control	                        (rev 0)
> +++ trunk/cifs-utils/debian/control	2010-03-01 07:47:11 UTC (rev 3343)
> @@ -0,0 +1,29 @@
> +Source: cifs-utils
> +Section: net

should be 'otherosfs' here, then there's no need to list the section again
below

> +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>
> +Standards-Version: 3.8.4
> +Build-Depends: debhelper (>= 7), libkrb5-dev, libtalloc-dev, libkeyutils-dev
> +Homepage: http://www.samba.org/~jlayton/cifs-utils/
> +Vcs-Browser: http://svn.debian.org/wsvn/pkg-samba/trunk/cifs-utils/
> +Vcs-Svn: svn://svn.debian.org/svn/pkg-samba/trunk/cifs-utils

> +Package: cifs-utils
> +Section: otherosfs
> +Priority: optional
> +Architecture: any
> +Provides: smbfs
> +Replaces: smbfs (<< 2:3.4.6~dfsg-1)
> +Conflicts: smbfs (<< 2:3.4.6~dfsg-1)

Wrong version, since -1 still ships the files we replace...

> +Depends: ${misc:Depends},${shlibs:Depends}
> +Description: utilities for CIFS file systems
> + The CIFS protocol for Unix systems provides support for

s/for Unix systems//

(cut'n'paste error from the samba description)

> + cross-platform file sharing with Microsoft Windows, OS X, and other
> + Unix systems. 
> + .
> + This package provides utilities for mounting and unmounting CIFS
> + network file systems.
> + .
> + These programs were originally part of Samba (distributed in the
> + "smbfs" package), but have now been split off into a separate package.

I think this last paragraph should probably be dropped.

> Added: trunk/cifs-utils/debian/copyright
> ===================================================================
> --- trunk/cifs-utils/debian/copyright	                        (rev 0)
> +++ trunk/cifs-utils/debian/copyright	2010-03-01 07:47:11 UTC (rev 3343)
> @@ -0,0 +1,24 @@
> +This is the Debian Linux prepackaged version of the CIFS utilities.
> +
> +This package was put together by Christian Perrier
> +<bubulle at debian.org>.
> +
> +Copyright © 1992-2010 Andrew Tridgell and the Samba Team
> +
> +   This program is free software; you can redistribute it and/or modify
> +   it under the terms of the GNU General Public License as published by
> +   the Free Software Foundation; version 3 dated June, 2007.
> +
> +   This program 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 General Public License for more details.
> +
> +   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., 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-3'.

While we're at it, I'd like to switch us to a DEP5 copyright file.  I have
one prepared locally which I'm happy to commit once the VCS question is
sorted.


> Added: trunk/cifs-utils/debian/rules
> ===================================================================
> --- trunk/cifs-utils/debian/rules	                        (rev 0)
> +++ trunk/cifs-utils/debian/rules	2010-03-01 07:47:11 UTC (rev 3343)
> @@ -0,0 +1,3 @@
> +#!/usr/bin/make -f
> +%:
> +	dh $@
> 

Hurray :)


-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
Ubuntu Developer                                    http://www.debian.org/
slangasek at ubuntu.com                                     vorlon at debian.org
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 828 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-samba-maint/attachments/20100301/8d18b8e5/attachment-0001.pgp>