[Pkg-samba-maint] [samba] 03/05: integrate samba-ad-dc into samba
Ivo De Decker
idd-guest at alioth.debian.org
Sun Sep 8 17:14:49 UTC 2013
This is an automated email from the git hooks/post-receive script.
idd-guest pushed a commit to branch samba_4.0_integrate
in repository samba.
commit f5a6cad6698875c2b5dd787be4256522c1b6719b
Author: Ivo De Decker <ivo.dedecker at ugent.be>
Date: Sun Sep 8 18:55:15 2013 +0200
integrate samba-ad-dc into samba
The packaging from samba-ad-dc is not removed in this commit. Parts of it
still need to be integrated in the samba package.
---
debian/control | 68 +++++++++++++++++++++-----------------------
debian/samba-ad-dc.install | 19 -------------
debian/samba.install | 19 +++++++++++++
3 files changed, 51 insertions(+), 55 deletions(-)
diff --git a/debian/control b/debian/control
index f8dc3fb..56fd8fc 100644
--- a/debian/control
+++ b/debian/control
@@ -66,11 +66,34 @@ Depends: adduser,
samba-common (= ${source:Version}),
update-inetd,
${misc:Depends},
- ${shlibs:Depends}
-Recommends: logrotate, tdb-tools
-Suggests: ctdb, ldb-tools, smbldap-tools, winbind
-Replaces: samba-common (<= 2.0.5a-2), samba-doc (<< 2:4.0.5~)
-Conflicts: samba-doc (<< 2:4.0.5~), samba4 (<< 4.0.0~alpha6-2)
+ ${shlibs:Depends},
+ python,
+ python-dnspython,
+ python-samba,
+ samba-common-bin (=${binary:Version}),
+ samba-dsdb-modules,
+ tdb-tools,
+ ${python:Depends},
+Recommends: logrotate, tdb-tools, attr
+Suggests: ctdb,
+ ldb-tools,
+ smbldap-tools,
+ winbind,
+ bind9 (>= 1:9.5.1),
+ bind9utils,
+ ntp
+Enhances: bind9, ntp
+Replaces: samba-common (<= 2.0.5a-2),
+ samba-doc (<< 2:4.0.5~),
+ libsamdb0 (<< 4.0.0~alpha17~),
+ samba4,
+ samba-ad-dc
+Conflicts: samba-doc (<< 2:4.0.5~),
+ samba4 (<< 4.0.0~alpha6-2),
+ libldb1 (<< 1:1.1.15),
+ samba (<< 2:3.3.0~rc2-5),
+ samba-tools,
+ samba-ad-dc
Description: SMB/CIFS file, print, and login server for Unix
Samba is an implementation of the SMB/CIFS protocol for Unix systems,
providing support for cross-platform file and printer sharing with
@@ -78,41 +101,14 @@ Description: SMB/CIFS file, print, and login server for Unix
as an NT4-style domain controller, and can integrate with both NT4 domains
and Active Directory realms as a member server.
.
- This package provides the components necessary to use Samba as a
- stand-alone file and print server. For use in an NT4 domain or Active
- Directory realm, you will also need the winbind package.
+ This package provides the components necessary to use Samba as a stand-alone
+ file and print server or as an NT4 or Active Directory domain controller.
+ For use in an NT4 domain or Active Directory realm, you will also need the
+ winbind package.
.
This package is not required for connecting to existing SMB/CIFS servers
(see smbclient) or for mounting remote filesystems (see cifs-utils).
-Package: samba-ad-dc
-Architecture: any
-Recommends: attr, bind9 (>= 1:9.5.1), bind9utils, ldb-tools
-Suggests: ntp
-Enhances: bind9, ntp
-Conflicts: libldb1 (<< 1:1.1.15),
- samba (<< 2:3.3.0~rc2-5),
- samba-doc (<< 2:4.0.5~),
- samba-tools
-Replaces: libsamdb0 (<< 4.0.0~alpha17~), samba-doc (<< 2:4.0.5~), samba4
-Depends: python,
- python-dnspython,
- python-samba,
- samba,
- samba-common-bin (=${binary:Version}),
- samba-dsdb-modules,
- tdb-tools,
- ${misc:Depends},
- ${python:Depends},
- ${shlibs:Depends}
-Description: SMB/CIFS file, NT domain and active directory server
- Samba is an implementation of the SMB/CIFS protocol for Unix systems,
- providing support for cross-platform file sharing with Microsoft Windows, OS X,
- and other Unix systems. Samba can also function as a domain controller
- or member server in both NT4-style and Active Directory domains.
- .
- This package contains the main daemon for the active directory server.
-
Package: samba-libs
Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
diff --git a/debian/samba-ad-dc.install b/debian/samba-ad-dc.install
deleted file mode 100644
index 48d4f0e..0000000
--- a/debian/samba-ad-dc.install
+++ /dev/null
@@ -1,19 +0,0 @@
-usr/bin/oLschema2ldif
-usr/lib/*/samba/bind9/dlz_bind9.so
-usr/lib/*/samba/bind9/dlz_bind9_9.so
-usr/lib/*/samba/hdb/hdb_samba4.so
-usr/lib/*/samba/libdfs_server_ad.so.*
-usr/lib/*/samba/libntvfs.so.*
-usr/lib/*/samba/libpac.so.*
-usr/lib/*/samba/libposix_eadb.so.*
-usr/lib/*/samba/libprocess_model.so.*
-usr/lib/*/samba/libservice.so.*
-usr/lib/*/samba/process_model/*.so
-usr/lib/*/samba/service/*.so
-usr/sbin/samba
-usr/sbin/samba_dnsupdate
-usr/sbin/samba_spnupdate
-usr/sbin/samba_upgradedns
-usr/share/man/man1/oLschema2ldif.1
-usr/share/man/man8/samba.8
-usr/share/samba/setup
diff --git a/debian/samba.install b/debian/samba.install
index a4f891f..66804d2 100644
--- a/debian/samba.install
+++ b/debian/samba.install
@@ -1,16 +1,33 @@
lib/systemd/system/nmb.service
lib/systemd/system/smb.service
usr/bin/eventlogadm
+usr/bin/oLschema2ldif
usr/bin/pdbedit
usr/bin/profiles
usr/bin/sharesec
usr/bin/smbcontrol
usr/bin/smbstatus
usr/bin/smbta-util
+usr/lib/*/samba/bind9/dlz_bind9.so
+usr/lib/*/samba/bind9/dlz_bind9_9.so
+usr/lib/*/samba/hdb/hdb_samba4.so
+usr/lib/*/samba/libdfs_server_ad.so.*
+usr/lib/*/samba/libntvfs.so.*
+usr/lib/*/samba/libpac.so.*
+usr/lib/*/samba/libposix_eadb.so.*
+usr/lib/*/samba/libprocess_model.so.*
+usr/lib/*/samba/libservice.so.*
+usr/lib/*/samba/process_model/*.so
+usr/lib/*/samba/service/*.so
usr/sbin/mksmbpasswd
usr/sbin/nmbd
+usr/sbin/samba
+usr/sbin/samba_dnsupdate
+usr/sbin/samba_spnupdate
+usr/sbin/samba_upgradedns
usr/sbin/smbd
usr/share/man/man1/log2pcap.1
+usr/share/man/man1/oLschema2ldif.1
usr/share/man/man1/profiles.1
usr/share/man/man1/sharesec.1
usr/share/man/man1/smbcontrol.1
@@ -18,5 +35,7 @@ usr/share/man/man1/smbstatus.1
usr/share/man/man8/eventlogadm.8
usr/share/man/man8/nmbd.8
usr/share/man/man8/pdbedit.8
+usr/share/man/man8/samba.8
usr/share/man/man8/smbd.8
usr/share/man/man8/smbta-util.8
+usr/share/samba/setup
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/samba.git
More information about the Pkg-samba-maint
mailing list