[Pkg-samba-maint] r1371 - branches/samba4/debian
Jelmer Vernooij
ctrlsoft-guest at alioth.debian.org
Wed May 9 13:22:34 UTC 2007
Author: ctrlsoft-guest
Date: 2007-05-09 13:22:33 +0000 (Wed, 09 May 2007)
New Revision: 1371
Modified:
branches/samba4/debian/ldb-tools.install
branches/samba4/debian/libgensec0.install
branches/samba4/debian/libldb0.install
branches/samba4/debian/libsamba-dev.install
branches/samba4/debian/libsamba0.install
branches/samba4/debian/rules
branches/samba4/debian/samba-testsuite.install
branches/samba4/debian/samba.install
branches/samba4/debian/swat.install
Log:
Fix build for svn19515.
Modified: branches/samba4/debian/ldb-tools.install
===================================================================
--- branches/samba4/debian/ldb-tools.install 2007-05-09 13:16:18 UTC (rev 1370)
+++ branches/samba4/debian/ldb-tools.install 2007-05-09 13:22:33 UTC (rev 1371)
@@ -5,6 +5,7 @@
usr/bin/ldbrename
usr/bin/ldbsearch
usr/bin/oLschema2ldif
+usr/bin/ad2oLschema
usr/share/man/man1/ldbadd.1
usr/share/man/man1/ldbdel.1
usr/share/man/man1/ldbedit.1
@@ -12,3 +13,4 @@
usr/share/man/man1/ldbrename.1
usr/share/man/man1/ldbsearch.1
usr/share/man/man1/oLschema2ldif.1
+usr/share/man/man1/ad2oLschema.1
Modified: branches/samba4/debian/libgensec0.install
===================================================================
--- branches/samba4/debian/libgensec0.install 2007-05-09 13:16:18 UTC (rev 1370)
+++ branches/samba4/debian/libgensec0.install 2007-05-09 13:22:33 UTC (rev 1371)
@@ -1,2 +1,2 @@
usr/lib/libgensec.so.0.*
-usr/lib/samba/gensec/*.so
+#usr/lib/samba/gensec/*.so
Modified: branches/samba4/debian/libldb0.install
===================================================================
--- branches/samba4/debian/libldb0.install 2007-05-09 13:16:18 UTC (rev 1370)
+++ branches/samba4/debian/libldb0.install 2007-05-09 13:22:33 UTC (rev 1371)
@@ -1,21 +1 @@
usr/lib/libldb.so.0.*
-usr/lib/samba/ldb/asq.so
-usr/lib/samba/ldb/extended_dn.so
-usr/lib/samba/ldb/kludge_acl.so
-usr/lib/samba/ldb/objectclass.so
-usr/lib/samba/ldb/objectguid.so
-usr/lib/samba/ldb/ildap.so
-usr/lib/samba/ldb/ldap.so
-usr/lib/samba/ldb/ldaps.so
-usr/lib/samba/ldb/ldapi.so
-usr/lib/samba/ldb/operational.so
-usr/lib/samba/ldb/paged_results.so
-usr/lib/samba/ldb/password_hash.so
-usr/lib/samba/ldb/rdn_name.so
-usr/lib/samba/ldb/rootdse.so
-usr/lib/samba/ldb/samldb.so
-usr/lib/samba/ldb/schema.so
-usr/lib/samba/ldb/server_sort.so
-usr/lib/samba/ldb/skel.so
-usr/lib/samba/ldb/tdb.so
-usr/lib/samba/ldb/wins_ldb.so
Modified: branches/samba4/debian/libsamba-dev.install
===================================================================
--- branches/samba4/debian/libsamba-dev.install 2007-05-09 13:16:18 UTC (rev 1370)
+++ branches/samba4/debian/libsamba-dev.install 2007-05-09 13:22:33 UTC (rev 1371)
@@ -1,4 +1,6 @@
-usr/include/samba-4.0/gen_ndr/samr.h
+usr/include/samba-4.0/dcerpc/samr.h
+usr/include/samba-4.0/dcerpc/ndr_samr.h
+usr/include/samba-4.0/dcerpc/ndr_samr_c.h
usr/include/samba-4.0/gen_ndr/dcerpc.h
usr/include/samba-4.0/gen_ndr/ndr_dcerpc.h
usr/include/samba-4.0/gen_ndr/lsa.h
@@ -7,8 +9,12 @@
usr/include/samba-4.0/gen_ndr/misc.h
usr/include/samba-4.0/gen_ndr/ndr_misc.h
usr/include/samba-4.0/gen_ndr/nbt.h
-usr/include/samba-4.0/gen_ndr/nbt.h.old
+usr/include/samba-4.0/events/events.h
+usr/include/samba-4.0/events/events_internal.h
usr/include/samba-4.0/util.h
+usr/include/samba-4.0/util_tdb.h
+usr/include/samba-4.0/wrap_xattr.h
+usr/include/samba-4.0/dlinklist.h
usr/include/samba-4.0/util/byteorder.h
usr/include/samba-4.0/util/debug.h
usr/include/samba-4.0/util/mutex.h
@@ -28,6 +34,8 @@
usr/include/samba-4.0/credentials/proto.h
usr/include/samba-4.0/auth.h
usr/include/samba-4.0/auth/proto.h
+usr/include/samba-4.0/param/share.h
+usr/include/samba-4.0/param/share_proto.h
usr/include/samba-4.0/libnet.h
usr/include/samba-4.0/libnet/join.h
usr/include/samba-4.0/libnet/lookup.h
@@ -41,9 +49,10 @@
usr/include/samba-4.0/libnet/userinfo.h
usr/include/samba-4.0/libnet/userman.h
usr/include/samba-4.0/socket_wrapper.h
-usr/include/samba-4.0/torture.h
+usr/include/samba-4.0/torture/torture.h
usr/include/samba-4.0/torture/proto.h
usr/include/samba-4.0/torture/util.h
+usr/include/samba-4.0/torture/ui.h
usr/include/samba-4.0/ldap.h
usr/include/samba-4.0/ldap_proto.h
usr/include/samba-4.0/charset.h
@@ -52,6 +61,7 @@
usr/include/samba-4.0/ntvfs.h
usr/include/samba-4.0/ndr.h
usr/include/samba-4.0/ndr/proto.h
+usr/include/samba-4.0/winbind.h
usr/include/samba-4.0/client/proto.h
usr/include/samba-4.0/domain_credentials.h
usr/include/samba-4.0/registry.h
@@ -73,12 +83,30 @@
usr/include/samba-4.0/db_wrap.h
usr/include/samba-4.0/samdb/proto.h
usr/include/samba-4.0/db_wrap/proto.h
+usr/include/samba-4.0/dcerpc/svcctl.h
+usr/include/samba-4.0/dcerpc/ndr_svcctl.h
+usr/include/samba-4.0/dcerpc/ndr_svcctl_c.h
+usr/include/samba-4.0/dcerpc/epmapper.h
+usr/include/samba-4.0/dcerpc/ndr_epmapper.h
+usr/include/samba-4.0/dcerpc/ndr_epmapper_c.h
+usr/include/samba-4.0/dcerpc/mgmt.h
+usr/include/samba-4.0/dcerpc/ndr_mgmt.h
+usr/include/samba-4.0/dcerpc/ndr_mgmt_c.h
+usr/include/samba-4.0/dcerpc/atsvc.h
+usr/include/samba-4.0/dcerpc/ndr_atsvc.h
+usr/include/samba-4.0/dcerpc/ndr_atsvc_c.h
usr/lib/pkgconfig/samba-util.pc
+usr/lib/pkgconfig/share.pc
usr/lib/pkgconfig/tdr.pc
usr/lib/pkgconfig/dcerpc.pc
+usr/lib/pkgconfig/dcerpc_atsvc.pc
+usr/lib/pkgconfig/dcerpc_samr.pc
+usr/lib/pkgconfig/dcerpc_svcctl.pc
+usr/lib/pkgconfig/dcerpc_mgmt.pc
usr/lib/pkgconfig/samba-net.pc
usr/lib/pkgconfig/socket_wrapper.pc
usr/lib/pkgconfig/cli_wrepl.pc
+usr/lib/pkgconfig/cli_smb.pc
usr/lib/pkgconfig/torture.pc
usr/lib/pkgconfig/winbind-client.pc
usr/lib/pkgconfig/ntvfs.pc
@@ -90,97 +118,25 @@
usr/lib/pkgconfig/samba3.pc
usr/lib/libsamba-config.so
usr/lib/libndr_compression.so
-usr/lib/librpc_ndr_policyagent.so
-usr/lib/libndr_efs.so
-usr/lib/libndr_winsrepl.so
-usr/lib/libndr_scerpc.so
usr/lib/libcli_cldap.so
-usr/lib/libndr_wins.so
-usr/lib/libndr_irpc.so
-usr/lib/libndr_dsbackup.so
usr/lib/libsamba3.so
-usr/lib/librpc_ndr_wkssvc.so
-usr/lib/librpc_ndr_svcctl.so
-usr/lib/librpc_ndr_scerpc.so
-usr/lib/librpc_ndr_spoolss.so
-usr/lib/librpc_ndr_samr.so
+usr/lib/libdcerpc_svcctl.so
+usr/lib/libdcerpc_samr.so
+usr/lib/libdcerpc_mgmt.so
usr/lib/libtorture.so
usr/lib/libcli_wrepl.so
-usr/lib/libndr_mgmt.so
-usr/lib/libndr_spoolss.so
+usr/lib/libcli_smb.so
usr/lib/libheimdal.so
usr/lib/libsocket_wrapper.so
usr/lib/libsamba-net.so
-usr/lib/librpc_ndr_dbgidl.so
-usr/lib/libndr_srvsvc.so
usr/lib/libdcerpc.so
-usr/lib/libndr_eventlog.so
-usr/lib/libndr_dssetup.so
-usr/lib/libndr_oxidresolver.so
usr/lib/libtdr.so
-usr/lib/librpc_ndr_drsuapi.so
-usr/lib/libndr_wkssvc.so
-usr/lib/librpc_ndr_keysvc.so
-usr/lib/librpc_ndr_oxidresolver.so
-usr/lib/libndr_dfs.so
-usr/lib/libndr_wzcsvc.so
usr/lib/libsamba-util.so
-usr/lib/librpc_ndr_rot.so
-usr/lib/librpc_ndr_w32time.so
-usr/lib/librpc_ndr_eventlog.so
-usr/lib/librpc_ndr_ntsvcs.so
-usr/lib/libndr_table.so
-usr/lib/librpc_ndr_efs.so
-usr/lib/libndr_winstation.so
-usr/lib/libndr_samr.so
-usr/lib/librpc_ndr_wzcsvc.so
-usr/lib/librpc_ndr_srvsvc.so
-usr/lib/librpc_ndr_initshutdown.so
usr/lib/libwinbind-client.so
-usr/lib/libndr_msgsvc.so
-usr/lib/libndr_remact.so
-usr/lib/libndr_lsa.so
usr/lib/libsmbcalls.so
-usr/lib/libndr_dnsserver.so
-usr/lib/libndr_security.so
-usr/lib/libndr_unixinfo.so
-usr/lib/libndr_winreg.so
-usr/lib/librpc_ndr_atsvc.so
-usr/lib/librpc_ndr_netlogon.so
-usr/lib/librpc_ndr_trkwks.so
-usr/lib/libndr_atsvc.so
-usr/lib/libndr_dbgidl.so
-usr/lib/librpc_ndr_dfs.so
-usr/lib/libndr_trkwks.so
-usr/lib/libndr_browser.so
-usr/lib/libndr_audiosrv.so
-usr/lib/libndr_drsuapi.so
-usr/lib/libndr_keysvc.so
+usr/lib/libdcerpc_atsvc.so
usr/lib/libntvfs.so
-usr/lib/libndr_ntsvcs.so
-usr/lib/libndr_protected_storage.so
-usr/lib/librpc_ndr_msgsvc.so
-usr/lib/librpc_ndr_protected_storage.so
-usr/lib/libdynconfig.so
-usr/lib/libndr_netlogon.so
-usr/lib/librpc_ndr_unixinfo.so
-usr/lib/librpc_ndr_dsbackup.so
-usr/lib/libndr_xattr.so
usr/lib/libndr.so
-usr/lib/libndr_epmapper.so
-usr/lib/librpc_ndr_epmapper.so
-usr/lib/librpc_ndr_remact.so
-usr/lib/librpc_ndr_winreg.so
-usr/lib/libndr_initshutdown.so
-usr/lib/libndr_drsblobs.so
-usr/lib/librpc_ndr_audiosrv.so
-usr/lib/librpc_ndr_dssetup.so
usr/lib/libprocess_model.so
-usr/lib/libndr_svcctl.so
-usr/lib/librpc_ndr_lsa.so
usr/lib/libregistry.so
-usr/lib/librpc_ndr_wins.so
-usr/lib/librpc_ndr_mgmt.so
-usr/lib/libndr_w32time.so
-usr/lib/librpc_ndr_echo.so
-usr/lib/libndr_policyagent.so
+usr/lib/libshare.so
Modified: branches/samba4/debian/libsamba0.install
===================================================================
--- branches/samba4/debian/libsamba0.install 2007-05-09 13:16:18 UTC (rev 1370)
+++ branches/samba4/debian/libsamba0.install 2007-05-09 13:22:33 UTC (rev 1371)
@@ -1,102 +1,28 @@
-usr/lib/librpc_ndr_efs.so.*
-usr/lib/libndr_winstation.so.*
-usr/lib/libndr_samr.so.*
-usr/lib/libndr_table.so.*
-usr/lib/librpc_ndr_ntsvcs.so.*
-usr/lib/librpc_ndr_eventlog.so.*
-usr/lib/librpc_ndr_w32time.so.*
-usr/lib/librpc_ndr_rot.so.*
+usr/lib/libcli_smb.so.*
+usr/lib/libshare.so.*
usr/lib/libsamba-util.so.*
-usr/lib/libndr_wzcsvc.so.*
-usr/lib/libndr_dfs.so.*
-usr/lib/librpc_ndr_oxidresolver.so.*
-usr/lib/librpc_ndr_keysvc.so.*
-usr/lib/libndr_wkssvc.so.*
-usr/lib/librpc_ndr_drsuapi.so.*
usr/lib/libtdr.so.*
-usr/lib/libndr_oxidresolver.so.*
-usr/lib/libndr_dssetup.so.*
-usr/lib/libndr_eventlog.so.*
usr/lib/libdcerpc.so.*
-usr/lib/libndr_srvsvc.so.*
-usr/lib/librpc_ndr_dbgidl.so.*
usr/lib/libsamba-net.so.*
usr/lib/libsocket_wrapper.so.*
usr/lib/libheimdal.so.*
-usr/lib/libndr_spoolss.so.*
-usr/lib/libndr_mgmt.so.*
usr/lib/libcli_wrepl.so.*
usr/lib/libtorture.so.*
-usr/lib/librpc_ndr_samr.so.*
-usr/lib/librpc_ndr_spoolss.so.*
-usr/lib/librpc_ndr_scerpc.so.*
-usr/lib/librpc_ndr_svcctl.so.*
-usr/lib/librpc_ndr_wkssvc.so.*
+usr/lib/libdcerpc_samr.so.*
+usr/lib/libdcerpc_svcctl.so.*
+usr/lib/libdcerpc_mgmt.so.*
usr/lib/libwinbind-client.so.*
-usr/lib/libndr_msgsvc.so.*
-usr/lib/libndr_remact.so.*
-usr/lib/libndr_lsa.so.*
usr/lib/libsmbcalls.so.*
-usr/lib/libndr_dnsserver.so.*
-usr/lib/libndr_security.so.*
-usr/lib/libndr_unixinfo.so.*
-usr/lib/libndr_winreg.so.*
-usr/lib/librpc_ndr_atsvc.so.*
-usr/lib/librpc_ndr_netlogon.so.*
-usr/lib/librpc_ndr_trkwks.so.*
-usr/lib/libndr_atsvc.so.*
-usr/lib/libndr_dbgidl.so.*
-usr/lib/librpc_ndr_dfs.so.*
-usr/lib/libndr_trkwks.so.*
-usr/lib/libndr_browser.so.*
-usr/lib/libndr_audiosrv.so.*
-usr/lib/libndr_drsuapi.so.*
-usr/lib/libndr_keysvc.so.*
+usr/lib/libdcerpc_atsvc.so.*
usr/lib/libntvfs.so.*
-usr/lib/libndr_ntsvcs.so.*
-usr/lib/libndr_protected_storage.so.*
-usr/lib/librpc_ndr_msgsvc.so.*
-usr/lib/librpc_ndr_protected_storage.so.*
-usr/lib/libdynconfig.so.*
-usr/lib/libndr_netlogon.so.*
-usr/lib/librpc_ndr_unixinfo.so.*
-usr/lib/librpc_ndr_dsbackup.so.*
-usr/lib/libndr_xattr.so.*
+#usr/lib/libdynconfig.so.*
usr/lib/libndr.so.*
-usr/lib/libndr_epmapper.so.*
-usr/lib/librpc_ndr_epmapper.so.*
-usr/lib/librpc_ndr_remact.so.*
-usr/lib/librpc_ndr_winreg.so.*
-usr/lib/libndr_initshutdown.so.*
-usr/lib/libndr_drsblobs.so.*
-usr/lib/librpc_ndr_audiosrv.so.*
-usr/lib/librpc_ndr_dssetup.so.*
+usr/lib/libndr_compression.so.*
usr/lib/libprocess_model.so.*
-usr/lib/libndr_svcctl.so.*
-usr/lib/librpc_ndr_lsa.so.*
usr/lib/libregistry.so.*
-usr/lib/librpc_ndr_wins.so.*
-usr/lib/librpc_ndr_mgmt.so.*
-usr/lib/libndr_w32time.so.*
-usr/lib/librpc_ndr_echo.so.*
-usr/lib/libndr_policyagent.so.*
usr/lib/libsamba-config.so.*
-usr/lib/libndr_efs.so.*
-usr/lib/libndr_winsrepl.so.*
-usr/lib/libndr_scerpc.so.*
-usr/lib/libndr_compression.so.*
usr/lib/libcli_cldap.so.*
-usr/lib/librpc_ndr_policyagent.so.*
-usr/lib/libndr_wins.so.*
-usr/lib/libndr_dsbackup.so.*
-usr/lib/libndr_irpc.so.*
usr/lib/libsamba3.so.*
-usr/lib/librpc_ndr_srvsvc.so.*
-usr/lib/librpc_ndr_initshutdown.so.*
-usr/lib/librpc_ndr_wzcsvc.so.*
-usr/lib/samba/registry/w95.so
-usr/lib/samba/registry/ldb.so
-usr/lib/samba/registry/nt4.so
-usr/lib/samba/registry/dir.so
+#usr/lib/samba/registry/*.so
usr/bin/tdbdump
usr/bin/samba3dump
Modified: branches/samba4/debian/rules
===================================================================
--- branches/samba4/debian/rules 2007-05-09 13:16:18 UTC (rev 1370)
+++ branches/samba4/debian/rules 2007-05-09 13:22:33 UTC (rev 1371)
@@ -3,6 +3,10 @@
SOURCEPATH=./source
+# turn DEB_BUILD_OPTIONS='foo,bar' into DEB_BUILD_OPT_FOO and DEB_BUILD_OPT_BAR
+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
configure-stamp:
dh_testdir
@@ -13,16 +17,18 @@
--with-syslog \
--with-readline \
--with-ldap \
- --enable-dso
+ #--enable-dso
cd $(SOURCEPATH)/pidl && perl Makefile.PL verbose INSTALLDIRS=vendor PREFIX=/usr
touch $@
build: build-stamp
build-stamp: configure
dh_testdir
- $(MAKE) -C $(SOURCEPATH) pch
$(MAKE) -C $(SOURCEPATH) all
$(MAKE) -C $(SOURCEPATH)/pidl all
+ifndef DEB_BUILD_OPT_NOTEST
+ $(MAKE) -C $(SOURCEPATH) test
+endif
touch $@
clean:
@@ -45,7 +51,6 @@
dh_builddeb -i
install: build
- dh_clean -k
dh_installdirs
mkdir -p $(CURDIR)/debian/tmp/usr/share/man/man1
mkdir -p $(CURDIR)/debian/tmp/etc/samba
Modified: branches/samba4/debian/samba-testsuite.install
===================================================================
--- branches/samba4/debian/samba-testsuite.install 2007-05-09 13:16:18 UTC (rev 1370)
+++ branches/samba4/debian/samba-testsuite.install 2007-05-09 13:22:33 UTC (rev 1371)
@@ -4,7 +4,7 @@
usr/bin/gentest
usr/bin/locktest
usr/bin/masktest
-usr/lib/samba/torture
+usr/lib/torture
usr/share/man/man1/smbtorture.1
usr/share/man/man1/ndrdump.1
usr/share/man/man1/gentest.1
Modified: branches/samba4/debian/samba.install
===================================================================
--- branches/samba4/debian/samba.install 2007-05-09 13:16:18 UTC (rev 1370)
+++ branches/samba4/debian/samba.install 2007-05-09 13:22:33 UTC (rev 1371)
@@ -2,13 +2,7 @@
usr/bin/ntlm_auth
usr/bin/smbstatus
usr/bin/smbscript
-usr/lib/samba/smbcalls
-usr/lib/samba/process_model
-usr/lib/samba/auth
-usr/lib/samba/service
-usr/lib/samba/ntptr
-usr/lib/samba/ntvfs
-usr/lib/samba/dcerpc_server
+usr/lib/samba
usr/share/samba/setup
usr/share/man/man1/ntlm_auth.1
usr/share/man/man8/smbd.8
Modified: branches/samba4/debian/swat.install
===================================================================
--- branches/samba4/debian/swat.install 2007-05-09 13:16:18 UTC (rev 1370)
+++ branches/samba4/debian/swat.install 2007-05-09 13:22:33 UTC (rev 1371)
@@ -1 +1,2 @@
-usr/share/samba/swat
+usr/share/samba/services
+usr/share/samba/webapps
More information about the Pkg-samba-maint
mailing list