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

[jelmer at alioth.debian.org]

Author: jelmer
Date: 2010-06-18 21:06:02 +0000 (Fri, 18 Jun 2010)
New Revision: 3520

Modified:
   trunk/samba4/debian/libdcerpc-dev.install
   trunk/samba4/debian/libdcerpc0.install
   trunk/samba4/debian/libndr-standard-dev.install
   trunk/samba4/debian/libndr-standard0.install
   trunk/samba4/debian/rules
   trunk/samba4/debian/samba4-dev.install
   trunk/samba4/debian/samba4.install
Log:
Update to newer version of Samba.

Modified: trunk/samba4/debian/libdcerpc-dev.install
===================================================================
--- trunk/samba4/debian/libdcerpc-dev.install	2010-06-18 21:05:59 UTC (rev 3519)
+++ trunk/samba4/debian/libdcerpc-dev.install	2010-06-18 21:06:02 UTC (rev 3520)
@@ -10,6 +10,6 @@
 usr/lib/pkgconfig/dcerpc.pc
 usr/lib/libdcerpc.so
 usr/lib/pkgconfig/dcerpc_samr.pc
-usr/lib/libdcerpc_samr.so
+usr/lib/libdcerpc-samr.so
 usr/lib/pkgconfig/dcerpc_atsvc.pc
-usr/lib/libdcerpc_atsvc.so
+usr/lib/libdcerpc-atsvc.so

Modified: trunk/samba4/debian/libdcerpc0.install
===================================================================
--- trunk/samba4/debian/libdcerpc0.install	2010-06-18 21:05:59 UTC (rev 3519)
+++ trunk/samba4/debian/libdcerpc0.install	2010-06-18 21:06:02 UTC (rev 3520)
@@ -1,3 +1,3 @@
 usr/lib/libdcerpc.so.*
-usr/lib/libdcerpc_samr.so.*
-usr/lib/libdcerpc_atsvc.so.*
+usr/lib/libdcerpc-samr.so.*
+usr/lib/libdcerpc-atsvc.so.*

Modified: trunk/samba4/debian/libndr-standard-dev.install
===================================================================
--- trunk/samba4/debian/libndr-standard-dev.install	2010-06-18 21:05:59 UTC (rev 3519)
+++ trunk/samba4/debian/libndr-standard-dev.install	2010-06-18 21:06:02 UTC (rev 3520)
@@ -1,2 +1,2 @@
-usr/lib/libndr_standard.so
+usr/lib/libndr-standard.so
 usr/lib/pkgconfig/ndr_standard.pc

Modified: trunk/samba4/debian/libndr-standard0.install
===================================================================
--- trunk/samba4/debian/libndr-standard0.install	2010-06-18 21:05:59 UTC (rev 3519)
+++ trunk/samba4/debian/libndr-standard0.install	2010-06-18 21:06:02 UTC (rev 3520)
@@ -1 +1 @@
-usr/lib/libndr_standard.so.*
+usr/lib/libndr-standard.so.*

Modified: trunk/samba4/debian/rules
===================================================================
--- trunk/samba4/debian/rules	2010-06-18 21:05:59 UTC (rev 3519)
+++ trunk/samba4/debian/rules	2010-06-18 21:06:02 UTC (rev 3520)
@@ -71,36 +71,13 @@
 	mv $(DESTDIR)/usr/share/man/man1/nmblookup.1 $(DESTDIR)/usr/share/man/man1/nmblookup.samba4.1
 	mv $(DESTDIR)/usr/bin/net $(DESTDIR)/usr/bin/net.samba4
 	mv $(DESTDIR)/usr/bin/testparm $(DESTDIR)/usr/bin/testparm.samba4
-	# Provided by samba-common
-	rm $(DESTDIR)/usr/share/samba/*.dat
 	# Already provided by libparse-yapp-perl
 	rm $(DESTDIR)/usr/share/perl5/Parse/Yapp/Driver.pm
 	# Binaries not ready for installation
 	rm $(DESTDIR)/usr/lib/mit_samba.so
-	rm $(DESTDIR)/usr/bin/subunitrun
-	rm $(DESTDIR)/usr/bin/winreg
-	rm $(DESTDIR)/usr/bin/samba3dump
-	rm $(DESTDIR)/usr/bin/winreg.py
-	rm $(DESTDIR)/usr/bin/minschema
-	rm $(DESTDIR)/usr/bin/rpcclient
-	# No need to do development using nss_winbind
-	rm $(DESTDIR)/usr/lib/libnss_winbind.so
-	rm $(DESTDIR)/usr/lib/pkgconfig/nss_winbind.pc
-	rm $(DESTDIR)/usr/share/man/man3/talloc.3
-	# Already included in python-tdb
 	rm $(DESTDIR)/usr/lib/python*/*-packages/tdb.so
-	# Already included in the version of Python we depend on
-	rm $(DESTDIR)/usr/lib/python*/*-packages/uuid.so
 	# Already included in various system packages
 	rm -r $(DESTDIR)/usr/lib/python*/*-packages/samba/external
-	# Already included in tdb-tools
-	rm $(DESTDIR)/usr/bin/tdb*
-	# Already included in smbfs
-	rm $(DESTDIR)/usr/bin/mount.cifs
-	rm $(DESTDIR)/usr/bin/umount.cifs
-	# Not mature enough
-	rm $(DESTDIR)/usr/bin/autoidl
-	rm $(DESTDIR)/usr/bin/mymachinepw
 	# Already documented in debian/copyright
 	rm $(DESTDIR)/usr/share/samba/setup/ad-schema/licence.txt
 	# System ldb loads its modules from a different path

Modified: trunk/samba4/debian/samba4-dev.install
===================================================================
--- trunk/samba4/debian/samba4-dev.install	2010-06-18 21:05:59 UTC (rev 3519)
+++ trunk/samba4/debian/samba4-dev.install	2010-06-18 21:06:02 UTC (rev 3520)
@@ -10,7 +10,6 @@
 usr/include/samba-4.0/dcerpc_server/common.h
 usr/include/samba-4.0/tdr.h
 usr/include/samba-4.0/credentials.h
-usr/include/samba-4.0/smbtorture.h
 usr/include/samba-4.0/ldap-util.h
 usr/include/samba-4.0/ldap_errors.h
 usr/include/samba-4.0/ldap_message.h

Modified: trunk/samba4/debian/samba4.install
===================================================================
--- trunk/samba4/debian/samba4.install	2010-06-18 21:05:59 UTC (rev 3519)
+++ trunk/samba4/debian/samba4.install	2010-06-18 21:06:02 UTC (rev 3520)
@@ -7,3 +7,4 @@
 usr/lib/ldb
 usr/share/samba/setup
 usr/share/man/man8/samba.8
+usr/sbin/samba_spnupdate