[Pkg-samba-maint] r1461 - in branches/samba4/debian: . patches
ctrlsoft-guest at alioth.debian.org
ctrlsoft-guest at alioth.debian.org
Fri Jun 15 17:29:30 UTC 2007
Author: ctrlsoft-guest
Date: 2007-06-15 17:29:30 +0000 (Fri, 15 Jun 2007)
New Revision: 1461
Added:
branches/samba4/debian/patches/
branches/samba4/debian/patches/series
Modified:
branches/samba4/debian/control
branches/samba4/debian/rules
branches/samba4/debian/samba-common.templates
branches/samba4/debian/samba.init
Log:
Fix a bunch of lintian errors.
Modified: branches/samba4/debian/control
===================================================================
--- branches/samba4/debian/control 2007-06-15 16:58:17 UTC (rev 1460)
+++ branches/samba4/debian/control 2007-06-15 17:29:30 UTC (rev 1461)
@@ -3,13 +3,13 @@
Priority: optional
Maintainer: Jelmer Vernooij <jelmer at samba.org>
Uploaders: Steve Langasek <vorlon at debian.org>, Christian Perrier <bubulle at debian.org>, Noèl Köthe <noel at debian.org>, Steinar H. Gunderson <sesse at debian.org>
-Standards-Version: 3.6.2
-Build-Depends: debhelper (>> 5.0.0), libparse-yapp-perl, perl, docbook-xsl, docbook-xml, xsltproc, po-debconf, libgnutls-dev, libreadline5-dev, libpam0g-dev, libblkid-dev, libattr1-dev, flex, bison, tdb-dev (>= 1.1.0), libtalloc-dev, libtalloc1
+Standards-Version: 3.7.2
+Build-Depends: debhelper (>> 5.0.0), quilt (>= 0.40), libparse-yapp-perl, perl, docbook-xsl, docbook-xml, xsltproc, po-debconf, libgnutls-dev, libreadline5-dev, libpam0g-dev, libblkid-dev, libattr1-dev, flex, bison, tdb-dev (>= 1.1.0), libtalloc-dev, libtalloc1
Package: samba
Architecture: any
Recommends: swat, ldb-tools
-Depends: ${shlibs:Depends}, ${misc:Depends}, samba-common (=${Source-Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, samba-common (=${binary:Version})
Replaces: samba-common (<= 3.9.0+SVN12726-1)
Description: LanManager-like file and printer server for Unix (version 4)
The Samba software suite is a collection of programs that
@@ -46,7 +46,7 @@
Package: samba-clients
Architecture: any
-Depends: ${shlibs:Depends}, samba-common (=${Source-Version})
+Depends: ${shlibs:Depends}, samba-common (=${binary:Version})
Replaces: smbclient, samba-common (<< 3.9.0)
Conflicts: smbclient, samba-common (<< 3.9.0)
Description: client utilities from Samba 4
@@ -136,28 +136,9 @@
and extending Samba. In particular, it contains development files for
the talloc and ldb libraries.
-Package: ldb-tools
-Architecture: any
-Depends: ${shlibs:Depends}
-Description: tools for maintaining LDB database files
- The Samba software suite is a collection of programs that
- implements the SMB protocol for unix systems, allowing you to serve
- files and printers to Windows, NT, OS/2 and DOS clients, as well as
- run as a domain controller for Active Directory.
- .
- These packages contain snapshot versions of Samba 4, the next-generation
- version of Samba. These should be considered _experimental_, and should
- not be used in production. In particular, no guarantees are made with
- regard to upgrades between versions.
- .
- This package contains tools for maintaining, creating and editing
- LDB database files, which are central to Samba 4's operation. They
- are primarily useful for debugging and developing Samba or other
- applications using LDB.
-
Package: swat
Architecture: all
-Depends: samba (=${Source-Version})
+Depends: samba (=${binary:Version})
Description: data files for SWAT
The Samba software suite is a collection of programs that
implements the SMB protocol for unix systems, allowing you to serve
@@ -173,29 +154,9 @@
Tool. These are used by the embedded Samba 4 web server to provide web-based
administration of shares and other settings.
-Package: libldb0
-Architecture: any
-Depends: ${shlibs:Depends}
-Description: Light-Weight Database
- ldb is a LDAP-like embedded database. It provides a fast database with an
- LDAP-like API designed to be used within an application. In some ways it can
- be seen as a intermediate solution between key-value pair databases and a
- real LDAP database.
-
-Package: libldb-dev
-Architecture: all
-Depends: libldb0 (=${Source-Version}), libtdb-dev, libtalloc-dev
-Description: Light-Weight Database
- ldb is a LDAP-like embedded database. It provides a fast database with an
- LDAP-like API designed to be used within an application. In some ways it can
- be seen as a intermediate solution between key-value pair databases and a
- real LDAP database.
- .
- This package contains the files required for development.
-
Package: libgensec-dev
-Architecture: all
-Depends: libgensec0 (=${Source-Version})
+Architecture: any
+Depends: libgensec0 (=${binary:Version})
Description: Generic Security Library
FIXME
.
@@ -214,8 +175,8 @@
FIXME
Package: libsamba-dev
-Architecture: all
-Depends: libsamba0 (=${Source-Version})
+Architecture: any
+Depends: libsamba0 (=${binary:Version})
Description: Samba utility library
FIXME
.
Added: branches/samba4/debian/patches/series
===================================================================
Modified: branches/samba4/debian/rules
===================================================================
--- branches/samba4/debian/rules 2007-06-15 16:58:17 UTC (rev 1460)
+++ branches/samba4/debian/rules 2007-06-15 17:29:30 UTC (rev 1461)
@@ -7,7 +7,9 @@
d_b_o:=$(shell echo "$$DEB_BUILD_OPTIONS"|sed 's/[^-[:alnum:]]/ /g'|tr a-z A-Z)
$(foreach o, $(d_b_o), $(eval DEB_BUILD_OPT_$o := 1))
-configure: configure-stamp
+include /usr/share/quilt/quilt.make
+
+configure: patch configure-stamp
configure-stamp:
dh_testdir
cd $(SOURCEPATH) && ./configure --with-fhs \
@@ -31,7 +33,9 @@
endif
touch $@
-clean:
+
+clean: clean-patched unpatch
+clean-patched:
dh_testdir
dh_testroot
dh_clean
@@ -72,6 +76,31 @@
dh_compress -a
dh_fixperms -a
dh_makeshlibs -a
+ dh_link -plibsamba0 \
+ usr/lib/libsamba-net.so.0.0.1 usr/lib/libsamba-net.so.0 \
+ usr/lib/libtdr.so.0.0.1 usr/lib/libtdr.so.0 \
+ usr/lib/libcli_cldap.so.0.0.1 usr/lib/libcli_cldap.so.0 \
+ usr/lib/libwinbind-client.so.0.0.1 usr/lib/libwinbind-client.so.0 \
+ usr/lib/libndr_compression.so.0.0.1 usr/lib/libndr_compression.so.0 \
+ usr/lib/libndr.so.0.0.1 usr/lib/libndr.so.0 \
+ usr/lib/libheimdal.so.0.0.1 usr/lib/libheimdal.so.0 \
+ usr/lib/libsmbcalls.so.0.0.1 usr/lib/libsmbcalls.so.0 \
+ usr/lib/libdcerpc_mgmt.so.0.0.1 usr/lib/libdcerpc_mgmt.so.0 \
+ usr/lib/libsamba3.so.0.0.1 usr/lib/libsamba3.so.0 \
+ usr/lib/libsocket_wrapper.so.0.0.1 usr/lib/libsocket_wrapper.so.0 \
+ usr/lib/libprocess_model.so.0.0.1 usr/lib/libprocess_model.so.0 \
+ usr/lib/libntvfs.so.0.0.1 usr/lib/libntvfs.so.0 \
+ usr/lib/libcli_smb.so.0.0.1 usr/lib/libcli_smb.so.0 \
+ usr/lib/libdcerpc_samr.so.0.0.1 usr/lib/libdcerpc_samr.so.0 \
+ usr/lib/libdcerpc_atsvc.so.0.0.1 usr/lib/libdcerpc_atsvc.so.0 \
+ usr/lib/libsamba-config.so.0.0.1 usr/lib/libsamba-config.so.0 \
+ usr/lib/libregistry.so.0.0.1 usr/lib/libregistry.so.0 \
+ usr/lib/libcli_wrepl.so.0.0.1 usr/lib/libcli_wrepl.so.0 \
+ usr/lib/libshare.so.0.0.1 usr/lib/libshare.so.0 \
+ usr/lib/libtorture.so.0.0.1 usr/lib/libtorture.so.0 \
+ usr/lib/libdcerpc.so.0.0.1 usr/lib/libdcerpc.so.0
+ dh_link -plibgensec0 \
+ usr/lib/libgensec0.so.0.0.1 usr/lib/libgensec.so.0
dh_installinit -a
dh_installdebconf -a
dh_installdeb -a
Modified: branches/samba4/debian/samba-common.templates
===================================================================
--- branches/samba4/debian/samba-common.templates 2007-06-15 16:58:17 UTC (rev 1460)
+++ branches/samba4/debian/samba-common.templates 2007-06-15 17:29:30 UTC (rev 1461)
@@ -1,12 +1,12 @@
Template: samba-common/realm
Type: string
_Description: Realm
- What Kerberos realm will your server be in? In many cases, this will be
+ The Kerberos realm your server will be in. In many cases, this will be
the same as your DNS domain name (ie. YOUR.REALM).
Template: samba-common/domain
Type: string
_Description: Domain
- What will be the domain of your server? This is also known as the
+ The domain of your server. This is also known as the
"workgroup" of your server, and is typically a short name without any dots
(ie. DOMAIN).
Modified: branches/samba4/debian/samba.init
===================================================================
--- branches/samba4/debian/samba.init 2007-06-15 16:58:17 UTC (rev 1460)
+++ branches/samba4/debian/samba.init 2007-06-15 17:29:30 UTC (rev 1461)
@@ -1,5 +1,14 @@
#! /bin/sh
+### BEGIN INIT INFO
+# Provides: samba
+# Required-Start: $network $local_fs $remote_fs
+# Required-Stop: $network $local_fs $remote_fs
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: start Samba daemons (smbd)
+### END INIT INFO
+
#
# Start/stops the Samba daemon (smbd).
# Adapted from the Samba 3 packages.
More information about the Pkg-samba-maint
mailing list