Author: vorlon
Date: 2007-12-05 02:26:15 +0000 (Wed, 05 Dec 2007)
New Revision: 1660
Removed:
trunk/samba/debian/control.in
Modified:
trunk/samba/debian/changelog
trunk/samba/debian/control
trunk/samba/debian/rules
Log:
* Get rid of the build-dependency on type-handling:
- add a new target, "update-archs", to be invoked by hand to refresh
the list of known Linux architectures for the libacl1-dev
build-dep; this avoids the clean target making changes to
debian/control
- rework the sed line so that it works in-place on debian/control,
so we can get rid of debian/control.in as well and just update
debian/control directly
Closes: #340570.
Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog 2007-12-04 18:54:15 UTC (rev 1659)
+++ trunk/samba/debian/changelog 2007-12-05 02:26:15 UTC (rev 1660)
@@ -19,8 +19,17 @@
* Drop smbldap-tools to Suggests:, consistent with the textbook meaning of
recommends/suggests which is now implemented correctly in apt.
Closes: #453144.
+ * Get rid of the build-dependency on type-handling:
+ - add a new target, "update-archs", to be invoked by hand to refresh
+ the list of known Linux architectures for the libacl1-dev
+ build-dep; this avoids the clean target making changes to
+ debian/control
+ - rework the sed line so that it works in-place on debian/control,
+ so we can get rid of debian/control.in as well and just update
+ debian/control directly
+ Closes: #340570.
- -- Steve Langasek <vorlon at debian.org> Thu, 29 Nov 2007 14:11:43 -0800
+ -- Steve Langasek <vorlon at debian.org> Tue, 04 Dec 2007 18:13:43 -0800
samba (3.0.27a-1) unstable; urgency=low
Modified: trunk/samba/debian/control
===================================================================
--- trunk/samba/debian/control 2007-12-04 18:54:15 UTC (rev 1659)
+++ trunk/samba/debian/control 2007-12-05 02:26:15 UTC (rev 1660)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Samba Maintainers <pkg-samba-maint at lists.alioth.debian.org>
Uploaders: Eloy A. Paris <peloy at debian.org>, Steve Langasek <vorlon at debian.org>, Christian Perrier <bubulle at debian.org>, Noèl Köthe <noel at debian.org>, Adam Conrad <adconrad at 0c3.net>, Peter Eisentraut <petere at debian.org>
-Build-Depends: debhelper (>= 5.0.37.2), libpam0g-dev, libreadline5-dev, libcupsys2-dev (>=1.1.20final+cvs20040330-4), libacl1-dev (>= 2.2.11-1) [i386 ia64 alpha amd64 armeb arm hppa m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc], libkrb5-dev, libldap2-dev, po-debconf, binutils (>= 2.14.90.0.7), type-handling (>= 0.2.1), libpopt-dev, dpkg-dev (>= 1.13.9), quilt (>= 0.40), uuid-dev
+Build-Depends: debhelper (>= 5.0.37.2), libpam0g-dev, libreadline5-dev, libcupsys2-dev (>=1.1.20final+cvs20040330-4), libacl1-dev (>= 2.2.11-1) [i386 ia64 alpha amd64 armeb arm hppa m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc], libkrb5-dev, libldap2-dev, po-debconf, binutils (>= 2.14.90.0.7), libpopt-dev, dpkg-dev (>= 1.13.9), quilt (>= 0.40), uuid-dev
Build-Conflicts: libfam-dev
Standards-Version: 3.7.2
Deleted: trunk/samba/debian/control.in
===================================================================
--- trunk/samba/debian/control.in 2007-12-04 18:54:15 UTC (rev 1659)
+++ trunk/samba/debian/control.in 2007-12-05 02:26:15 UTC (rev 1660)
@@ -1,205 +0,0 @@
-Source: samba
-Section: net
-Priority: optional
-Maintainer: Debian Samba Maintainers <pkg-samba-maint at lists.alioth.debian.org>
-Uploaders: Eloy A. Paris <peloy at debian.org>, Steve Langasek <vorlon at debian.org>, Christian Perrier <bubulle at debian.org>, Noèl Köthe <noel at debian.org>, Adam Conrad <adconrad at 0c3.net>, Peter Eisentraut <petere at debian.org>
-Build-Depends: debhelper (>= 5.0.37.2), libpam0g-dev, libreadline5-dev, libcupsys2-dev (>=1.1.20final+cvs20040330-4), libacl1-dev (>= 2.2.11-1) [@libacl@], libkrb5-dev, libldap2-dev, po-debconf, binutils (>= 2.14.90.0.7), type-handling (>= 0.2.1), libpopt-dev, dpkg-dev (>= 1.13.9), quilt (>= 0.40), uuid-dev
-Build-Conflicts: libfam-dev
-Standards-Version: 3.7.2
-
-Package: samba
-Architecture: any
-Depends: samba-common (= ${binary:Version}), logrotate, ${shlibs:Depends}, ${misc:Depends}, libpam-runtime (>= 0.76-13.1), libpam-modules, lsb-base (>= 3.0-6), procps, update-inetd, adduser
-Suggests: openbsd-inetd | inet-superserver, smbldap-tools
-Replaces: samba-common (<= 2.0.5a-2)
-Description: a LanManager-like file and printer server for Unix
- The Samba software suite is a collection of programs that
- implements the SMB/CIFS protocol for unix systems, allowing you to serve
- files and printers to Windows, NT, OS/2 and DOS clients. This protocol
- is sometimes also referred to as the LanManager or NetBIOS protocol.
- .
- This package contains all the components necessary to turn your
- Debian GNU/Linux box into a powerful file and printer server.
- .
- Currently, the Samba Debian packages consist of the following:
- .
- samba - LanManager-like file and printer server for Unix.
- samba-common - Samba common files used by both the server and the client.
- smbclient - LanManager-like simple client for Unix.
- swat - Samba Web Administration Tool
- samba-doc - Samba documentation.
- samba-doc-pdf - Samba documentation in PDF format.
- smbfs - Mount and umount commands for the smbfs (kernels 2.2.x and above).
- libpam-smbpass - pluggable authentication module for SMB/CIFS password
- database
- libsmbclient - Shared library that allows applications to talk to SMB/CIFS
- servers
- libsmbclient-dev - libsmbclient shared libraries
- winbind - Service to resolve user and group information from Windows NT
- servers
- .
- It is possible to install a subset of these packages depending on
- your particular needs. For example, to access other SMB/CIFS servers you
- should only need the smbclient and samba-common packages.
- .
- http://www.samba.org/
-
-Package: samba-common
-Architecture: any
-Depends: libpam-modules, ${shlibs:Depends}, ${misc:Depends}
-Replaces: samba (<< 3.0.20b-1)
-Description: Samba common files used by both the server and the client
- The Samba software suite is a collection of programs that
- implements the SMB/CIFS protocol for unix systems, allowing you to serve
- files and printers to Windows, NT, OS/2 and DOS clients. This protocol
- is sometimes also referred to as the LanManager or NetBIOS protocol.
- .
- This package contains the common files that are used by both the server
- (provided in the samba package) and the client (provided in the smbclient
- package).
-
-Package: smbclient
-Architecture: any
-Depends: samba-common (= ${binary:Version}), ${shlibs:Depends}
-Replaces: samba (<< 2.999+3.0.alpha21-4), smbget
-Conflicts: smbget
-Provides: samba-client
-Suggests: smbfs
-Description: a LanManager-like simple client for Unix
- The Samba software suite is a collection of programs that
- implements the SMB/CIFS protocol for unix systems, allowing you to serve
- files and printers to Windows, NT, OS/2 and DOS clients. This protocol
- is sometimes also referred to as the LanManager or NetBIOS protocol.
- .
- This package contains some client components of the Samba suite. In
- particular it includes the command line utilities smbclient, smbtar,
- and smbspool. If you want to mount shares exported from Microsoft
- Windows machines or a Samba server you must install the smbfs package.
-
-Package: swat
-Architecture: any
-Depends: samba (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, openbsd-inetd | inet-superserver
-Recommends: samba-doc (= ${source:Version})
-Description: Samba Web Administration Tool
- The Samba software suite is a collection of programs that
- implements the SMB/CIFS protocol for unix systems, allowing you to serve
- files and printers to Windows, NT, OS/2 and DOS clients. This protocol
- is sometimes also referred to as the LanManager or NetBIOS protocol.
- .
- This package contains the components of the Samba suite that are needed
- for Web administration of the Samba server.
- .
- SWAT will rewrite the smb.conf file. It will rearrange the entries and
- delete all comments, include= and copy= options. If you use a carefully
- crafted smb.conf, you should probably avoid using SWAT.
-
-Package: samba-doc
-Section: doc
-Architecture: all
-Suggests: samba-doc-pdf
-Description: Samba documentation
- The Samba software suite is a collection of programs that
- implements the SMB/CIFS protocol for unix systems, allowing you to serve
- files and printers to Windows, NT, OS/2 and DOS clients. This protocol
- is sometimes also referred to as the LanManager or NetBIOS protocol.
- .
- This package contains all the documentation that comes in the original
- tarball, except in PDF format.
-
-Package: samba-doc-pdf
-Section: doc
-Architecture: all
-Description: Samba documentation (PDF format)
- The Samba software suite is a collection of programs that
- implements the SMB/CIFS protocol for unix systems, allowing you to serve
- files and printers to Windows, NT, OS/2 and DOS clients. This protocol
- is sometimes also referred to as the LanManager or NetBIOS protocol.
- .
- This package contains all the documentation that comes in the original
- tarball in PDF format.
-
-Package: smbfs
-Section: otherosfs
-Priority: optional
-Architecture: any
-Depends: netbase (>= 2.02), samba-common (= ${binary:Version}), ${shlibs:Depends}
-Suggests: smbclient
-Replaces: smbfsx
-Conflicts: smbfsx, suidmanager (<< 0.50)
-Description: mount and umount commands for the smbfs (for kernels >= than 2.2.x)
- Smbfs is a filesystem which understands the SMB/CIFS protocol.
- This is the protocol Windows for Workgroups, Windows NT or
- LAN Manager use to talk to each other. It was inspired by
- samba, the program by Andrew Tridgell that turns any unix
- site into a file server for DOS or Windows clients.
- .
- If you want to use command-line utilities like smbclient, smbtar
- and/or smbspool you just need to install the smbclient package.
-
-Package: libpam-smbpass
-Section: admin
-Priority: extra
-Architecture: any
-Depends: ${shlibs:Depends}, samba-common (= ${binary:Version})
-Suggests: samba
-Description: pluggable authentication module for SMB/CIFS password database
- This is a stackable PAM module that allows a system administrator to easily
- migrate to using encrypted passwords for Samba and to keep smb passwords in
- sync with unix passwords. Unlike other solutions, it does this without
- requiring users to change their existing passwords or login to Samba using
- cleartext passwords.
-
-Package: libsmbclient
-Section: libs
-Priority: optional
-Architecture: any
-Depends: ${shlibs:Depends}
-Description: shared library that allows applications to talk to SMB/CIFS servers
- libsmbclient allows to write applications that use the SMB/CIFS protocol.
- This gives applications the ability to talk to Microsoft Windows servers
- and Unix servers running Samba.
- .
- This package contains the libsmbclient shared library.
-
-Package: libsmbclient-dev
-Section: libdevel
-Priority: extra
-Architecture: any
-Depends: libsmbclient (= ${binary:Version})
-Description: libsmbclient static libraries and headers
- libsmbclient allows to write applications that use the SMB/CIFS protocol.
- This gives applications the ability to talk to Microsoft Windows servers
- and Unix servers running Samba.
- .
- This package contains libraries and headers needed to build applications
- that use SMB/CIFS services.
-
-Package: winbind
-Section: net
-Priority: optional
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, samba-common (= ${binary:Version}), lsb-base (>= 3.0-6), adduser
-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
- service for the Name Service Switch capability that is present
- in most modern C libraries (like the GNU C Library - glibc.)
- .
- The service provided by winbindd is called `winbind' and
- can be used to resolve user and group information from a
- Windows NT server. The service can also provide authentication
- services via an associated PAM module.
-
-Package: samba-dbg
-Section: devel
-Priority: extra
-Architecture: any
-Depends: samba (= ${binary:Version})
-Description: Samba debugging symbols
- The Samba software suite is a collection of programs that
- implements the SMB/CIFS protocol for unix systems, allowing you to serve
- files and printers to Windows, NT, OS/2 and DOS clients. This protocol
- is sometimes also referred to as the LanManager or NetBIOS protocol.
- .
- This package contains debugging symbols for the programs included in
- the samba and smbclient packages.
Modified: trunk/samba/debian/rules
===================================================================
--- trunk/samba/debian/rules 2007-12-04 18:54:15 UTC (rev 1659)
+++ trunk/samba/debian/rules 2007-12-05 02:26:15 UTC (rev 1660)
@@ -110,9 +110,6 @@
source/client/mount.cifs source/client/umount.cifs \
source/include/stamp-h
- sed -e "s/@libacl@/`type-handling any linux-gnu`/g" \
- < debian/control.in > debian/control
-
debconf-updatepo
dh_clean
@@ -235,4 +232,9 @@
dh_builddeb
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure patch unpatch
+
+update-archs:
+ sed -i -e "s/libacl1-dev \(([^)]\+)\) \[[^]]\+\]/libacl1-dev \1 [`type-handling any linux-gnu`]/g" \
+ debian/control
+
+.PHONY: build clean binary-indep binary-arch binary install configure patch unpatch update-archs