[Pkg-samba-maint] r3628 - trunk/samba4/debian

jelmer at alioth.debian.org jelmer at alioth.debian.org
Sun Oct 17 19:58:33 UTC 2010


Author: jelmer
Date: 2010-10-17 19:58:32 +0000 (Sun, 17 Oct 2010)
New Revision: 3628

Modified:
   trunk/samba4/debian/changelog
   trunk/samba4/debian/control
   trunk/samba4/debian/libdcerpc-dev.install
   trunk/samba4/debian/libdcerpc0.install
   trunk/samba4/debian/libsamba-util-dev.install
   trunk/samba4/debian/libsamba-util0.install
   trunk/samba4/debian/rules
   trunk/samba4/debian/samba4-clients.install
   trunk/samba4/debian/winbind4.install
Log:
Update paths, new upstream snapshot.

Modified: trunk/samba4/debian/changelog
===================================================================
--- trunk/samba4/debian/changelog	2010-10-17 19:58:24 UTC (rev 3627)
+++ trunk/samba4/debian/changelog	2010-10-17 19:58:32 UTC (rev 3628)
@@ -1,4 +1,4 @@
-samba4 (4.0.0~alpha13+bzr12290.dfsg1-1) experimental; urgency=low
+samba4 (4.0.0~alpha13+git+bzr12292.dfsg1-1) experimental; urgency=low
 
   * New upstream snapshot.
    + Fixes provision to be able to find the data path again.

Modified: trunk/samba4/debian/control
===================================================================
--- trunk/samba4/debian/control	2010-10-17 19:58:24 UTC (rev 3627)
+++ trunk/samba4/debian/control	2010-10-17 19:58:32 UTC (rev 3628)
@@ -16,7 +16,7 @@
 Recommends: samba-ldb-tools
 Suggests: bind9 (>= 1:9.5.1), phpldapadmin, swat2
 Conflicts: samba-tools, samba (<< 2:3.3.0~rc2-5)
-Depends: ${shlibs:Depends}, ${misc:Depends}, samba4-common-bin (=${binary:Version}), python, python-samba, ${python:Depends}, python-dnspython
+Depends: ${shlibs:Depends}, ${misc:Depends}, samba4-common-bin (=${source:Version}), python, python-samba, ${python:Depends}, python-dnspython
 XB-Python-Version: ${python:Versions}
 Description: SMB/CIFS file, print and logon server (version 4)
  The Samba software suite is a collection of programs that
@@ -31,8 +31,8 @@
  This package contains smbd, the Samba file, print and domain server.
 
 Package: samba4-common-bin
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, samba-common (>= 2:3.4.0~pre2-1)
+Architecture: all
+Depends: ${misc:Depends}, samba-common (>= 2:3.4.0~pre2-1), ${python:Depends}
 Conflicts: samba (<< 2:3.3.0~rc2-5), samba-common (<< 2:3.3.0~rc2-5)
 Replaces: samba4-common (<< 2:3.4.0~pre2-1), samba4-common (<< 4.0.0~alpha7-1)
 XB-Python-Version: ${python:Versions}
@@ -44,7 +44,7 @@
  .
  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. 
+ not be used in production.
  .
  This package contains the common files that are used by both the server
  (provided in the samba package) and the client (provided in the samba-clients
@@ -52,7 +52,7 @@
 
 Package: samba4-clients
 Architecture: any
-Depends: ${shlibs:Depends}, samba4-common-bin (=${binary:Version}), ${misc:Depends}
+Depends: ${shlibs:Depends}, samba4-common-bin (=${source:Version}), ${misc:Depends}
 Conflicts: smbclient, samba-common (<< 2:3.3.0~rc2-5)
 XB-Python-Version: ${python:Versions}
 Provides: smbclient
@@ -63,7 +63,7 @@
  is sometimes also referred to as the LanManager or NetBIOS protocol.
  .
  These packages contain snapshot versions of Samba 4, the next-generation
- version of Samba. 
+ version of Samba.
  .
  This package contains some client components of the Samba suite. In
  particular it includes the command line utilities smbclient, net,
@@ -81,14 +81,14 @@
  files to Windows, NT, OS/2 and DOS clients, as well as
  run as a domain controller for Active Directory.
  .
- This package contains programs for testing the reliability and speed 
+ This package contains programs for testing the reliability and speed
  of SMB servers, Samba in particular.
- 
+
 Package: registry-tools
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 XB-Python-Version: ${python:Versions}
-Description: tools for viewing and manipulating the Windows registry 
+Description: tools for viewing and manipulating the Windows registry
  The Samba software suite is a collection of programs that
  implements the SMB protocol for unix systems, allowing you to serve
  files to Windows, NT, OS/2 and DOS clients, as well as
@@ -96,7 +96,7 @@
  .
  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. 
+ not be used in production.
  .
  This package contains tools for viewing and manipulating the binary
  "registry" found on Windows machines, both locally and remote.
@@ -130,9 +130,9 @@
  .
  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. 
+ not be used in production.
  .
- This package contains include files shared by the various Samba-based 
+ This package contains include files shared by the various Samba-based
  libraries.
 
 Package: samba-ldb-tools
@@ -166,7 +166,7 @@
  These packages contain snapshot versions of Samba 4, the next-generation
  version of Samba.
  .
- This library provides a generalized API for several security protocols. 
+ This library provides a generalized API for several security protocols.
 
 Package: libgensec-dev
 Architecture: any
@@ -182,7 +182,7 @@
  These packages contain snapshot versions of Samba 4, the next-generation
  version of Samba.
  .
- This library provides a generalized API for several security protocols. 
+ This library provides a generalized API for several security protocols.
  .
  This package contains the files required for development.
 
@@ -197,7 +197,7 @@
  files to Windows, NT, OS/2 and DOS clients, as well as
  run as a domain controller for Active Directory.
  .
- This package contains the library for encoding and decoding data structures 
+ This package contains the library for encoding and decoding data structures
  using the Network Data Representation format as used by DCE/RPC.
 
 Package: libndr-dev
@@ -211,7 +211,7 @@
  files to Windows, NT, OS/2 and DOS clients, as well as
  run as a domain controller for Active Directory.
  .
- This package contains the library for encoding and decoding data structures 
+ This package contains the library for encoding and decoding data structures
  using the Network Data Representation format as used by DCE/RPC.
  .
  This package contains the files required for development.
@@ -227,7 +227,7 @@
  files to Windows, NT, OS/2 and DOS clients, as well as
  run as a domain controller for Active Directory.
  .
- This package contains NDR encoders/decoders for the set of standard 
+ This package contains NDR encoders/decoders for the set of standard
  DCE/RPC interfaces found on Windows and Samba servers.
 
 Package: libndr-standard-dev
@@ -241,7 +241,7 @@
  files to Windows, NT, OS/2 and DOS clients, as well as
  run as a domain controller for Active Directory.
  .
- This package contains NDR encoders/decoders for the set of standard 
+ This package contains NDR encoders/decoders for the set of standard
  DCE/RPC interfaces found on Windows and Samba servers.
  .
  This package contains the files required for development.
@@ -257,9 +257,9 @@
  run as a domain controller for Active Directory.
  .
  These packages contain snapshot versions of Samba 4, the next-generation
- version of Samba. 
+ version of Samba.
  .
- Client-side implementation of the DCE/RPC protocol. 
+ Client-side implementation of the DCE/RPC protocol.
  Support for the following transports is provided:
   - ncacn_np
   - ncacn_ip_tcp
@@ -278,9 +278,9 @@
  run as a domain controller for Active Directory.
  .
  These packages contain snapshot versions of Samba 4, the next-generation
- version of Samba. 
+ version of Samba.
  .
- Client-side implementation of the DCE/RPC protocol. 
+ Client-side implementation of the DCE/RPC protocol.
  Support for the following transports is provided:
   - ncacn_np
   - ncacn_ip_tcp
@@ -294,14 +294,14 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}
 XB-Python-Version: ${python:Versions}
 Description: Registry library
- The Samba registry library provides read and write access to Windows 
+ The Samba registry library provides read and write access to Windows
  registries. At the moment the following formats are supported:
-  - The default Windows NT, 2000 and XP registry format (such as NTUSER.DAT 
+  - The default Windows NT, 2000 and XP registry format (such as NTUSER.DAT
     files)
   - Remote Windows and Samba registries over the DCE/RPC protocol
   - Samba native registry files (basically LDB files)
  .
- The library also contains support for applying and generating 
+ The library also contains support for applying and generating
  registry patch files.
 
 Package: libregistry-dev
@@ -310,14 +310,14 @@
 Depends: libregistry0 (=${binary:Version}), libndr-dev, pkg-config, ${misc:Depends}
 XB-Python-Version: ${python:Versions}
 Description: Registry library - development files
- The Samba registry library provides read and write access to Windows 
+ The Samba registry library provides read and write access to Windows
  registries. At the moment the following formats are supported:
-  - The default Windows NT, 2000 and XP registry format (such as NTUSER.DAT 
+  - The default Windows NT, 2000 and XP registry format (such as NTUSER.DAT
     files)
   - Remote Windows and Samba registries over the DCE/RPC protocol
   - Samba native registry files (basically LDB files)
  .
- The library also contains support for applying and generating 
+ The library also contains support for applying and generating
  registry patch files.
  .
  This package contains the files required for development.
@@ -334,12 +334,12 @@
  run as a domain controller for Active Directory.
  .
  These packages contain snapshot versions of Samba 4, the next-generation
- version of Samba. 
+ version of Samba.
  .
  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.). Please 
- note that the functionality of this version of winbind is behind on that 
+ in most modern C libraries (like the GNU C Library - glibc.). Please
+ note that the functionality of this version of winbind is behind on that
  of the winbind package.
  .
  The service provided by winbindd is called `winbind' and
@@ -359,7 +359,7 @@
  run as a domain controller for Active Directory.
  .
  These packages contain snapshot versions of Samba 4, the next-generation
- version of Samba. 
+ version of Samba.
  .
  Library for accessing the Samba4 host-specific configuration files.
 
@@ -375,7 +375,7 @@
  run as a domain controller for Active Directory.
  .
  These packages contain snapshot versions of Samba 4, the next-generation
- version of Samba. 
+ version of Samba.
  .
  Library for accessing the Samba4 host-specific configuration files.
  .
@@ -393,7 +393,7 @@
  run as a domain controller for Active Directory.
  .
  These packages contain snapshot versions of Samba 4, the next-generation
- version of Samba. 
+ version of Samba.
  .
  Library for running Samba 4 unittests.
 
@@ -443,7 +443,7 @@
  files to Windows, NT, OS/2 and DOS clients, as well as
  run as a domain controller for Active Directory.
  .
- libsamba-util is a collection of generic data structures and functions 
+ libsamba-util is a collection of generic data structures and functions
  used within Samba.
  .
  This package contains the development files.
@@ -459,5 +459,5 @@
  files to Windows, NT, OS/2 and DOS clients, as well as
  run as a domain controller for Active Directory.
  .
- libsamba-util is a collection of generic data structures and functions 
+ libsamba-util is a collection of generic data structures and functions
  used within Samba.

Modified: trunk/samba4/debian/libdcerpc-dev.install
===================================================================
--- trunk/samba4/debian/libdcerpc-dev.install	2010-10-17 19:58:24 UTC (rev 3627)
+++ trunk/samba4/debian/libdcerpc-dev.install	2010-10-17 19:58:32 UTC (rev 3628)
@@ -13,3 +13,5 @@
 usr/lib/libdcerpc-samr.so
 usr/lib/pkgconfig/dcerpc_atsvc.pc
 usr/lib/libdcerpc-atsvc.so
+usr/lib/pkgconfig/dcerpc_server.pc
+usr/lib/libdcerpc-server.so

Modified: trunk/samba4/debian/libdcerpc0.install
===================================================================
--- trunk/samba4/debian/libdcerpc0.install	2010-10-17 19:58:24 UTC (rev 3627)
+++ trunk/samba4/debian/libdcerpc0.install	2010-10-17 19:58:32 UTC (rev 3628)
@@ -1,3 +1,4 @@
 usr/lib/libdcerpc.so.*
 usr/lib/libdcerpc-samr.so.*
 usr/lib/libdcerpc-atsvc.so.*
+usr/lib/libdcerpc-server.so.*

Modified: trunk/samba4/debian/libsamba-util-dev.install
===================================================================
--- trunk/samba4/debian/libsamba-util-dev.install	2010-10-17 19:58:24 UTC (rev 3627)
+++ trunk/samba4/debian/libsamba-util-dev.install	2010-10-17 19:58:32 UTC (rev 3628)
@@ -9,3 +9,7 @@
 usr/include/samba-4.0/util/safe_string.h
 usr/include/samba-4.0/util/talloc_stack.h
 usr/include/samba-4.0/util/xfile.h
+usr/include/samba-4.0/policy.h
+usr/lib/pkgconfig/policy.pc
+usr/lib/libpolicy.so
+usr/lib/pkgconfig/samba-util.pc

Modified: trunk/samba4/debian/libsamba-util0.install
===================================================================
--- trunk/samba4/debian/libsamba-util0.install	2010-10-17 19:58:24 UTC (rev 3627)
+++ trunk/samba4/debian/libsamba-util0.install	2010-10-17 19:58:32 UTC (rev 3628)
@@ -1 +1,2 @@
 usr/lib/libsamba-util.so.*
+usr/lib/libpolicy.so.*

Modified: trunk/samba4/debian/rules
===================================================================
--- trunk/samba4/debian/rules	2010-10-17 19:58:24 UTC (rev 3627)
+++ trunk/samba4/debian/rules	2010-10-17 19:58:32 UTC (rev 3628)
@@ -49,6 +49,7 @@
 binary-indep: build install
 	dh_installdocs -i
 	dh_installchangelogs -i
+	dh_pycentral -i
 	dh_compress -i
 	dh_fixperms -i
 	dh_installdebconf -i
@@ -84,6 +85,8 @@
 	# System ldb loads its modules from a different path
 	mv $(DESTDIR)/usr/lib/samba/ldb $(DESTDIR)/usr/lib/ldb
 	ln -sf ../ldb $(DESTDIR)/usr/lib/samba/ldb
+	mkdir -p $(DESTDIR)/lib/security
+	mv $(DESTDIR)/usr/lib/pam_winbind.so $(DESTDIR)/lib/security/pam_winbind.so
 	dh_install --sourcedir=$(DESTDIR) --list-missing --fail-missing
 
 get-orig-source:
@@ -119,7 +122,6 @@
 	dh_md5sums -a
 	dh_builddeb -a
 
-binary: binary-arch 
-#binary-indep 
+binary: binary-arch binary-indep 
 
 .PHONY: configure build install binary binary-arch binary-indep clean

Modified: trunk/samba4/debian/samba4-clients.install
===================================================================
--- trunk/samba4/debian/samba4-clients.install	2010-10-17 19:58:24 UTC (rev 3627)
+++ trunk/samba4/debian/samba4-clients.install	2010-10-17 19:58:32 UTC (rev 3628)
@@ -1,6 +1,5 @@
 usr/bin/cifsdd
 usr/bin/net.samba4
 usr/bin/nmblookup.samba4
-usr/bin/setnttoken
 usr/bin/smbclient
 usr/share/man/man1/nmblookup.samba4.1

Modified: trunk/samba4/debian/winbind4.install
===================================================================
--- trunk/samba4/debian/winbind4.install	2010-10-17 19:58:24 UTC (rev 3627)
+++ trunk/samba4/debian/winbind4.install	2010-10-17 19:58:32 UTC (rev 3628)
@@ -1,3 +1,5 @@
 usr/bin/ntlm_auth
+usr/lib/libnss_winbind.so
+lib/security/pam_winbind.so
 usr/bin/wbinfo
 usr/share/man/man1/ntlm_auth.1





More information about the Pkg-samba-maint mailing list