Rev 11330: Fix build of the Debian packages. in file:///home/jelmer/bzr.samba/4.0-debian/

Jelmer Vernooij jelmer at samba.org
Tue Mar 13 18:21:28 GMT 2007 

At file:///home/jelmer/bzr.samba/4.0-debian/

------------------------------------------------------------
revno: 11330
revision-id: jelmer at samba.org-20070313182056-8gpj9l61j9mcsolu
parent: jelmer at samba.org-20070313144919-vlg160m9fjw9phdz
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 4.0-debian
timestamp: Tue 2007-03-13 19:20:56 +0100
message:
  Fix build of the Debian packages.
modified:
  .bzrignore                     svn-v2:17811 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-.bzrignore
  debian/libgensec0.install      svn-v2:1044 at fc4039ab-9d04-0410-8cac-899223bdd6b0-branches%2fsamba4-libgensec0.install
  debian/libsamba-dev.install    svn-v2:1044 at fc4039ab-9d04-0410-8cac-899223bdd6b0-branches%2fsamba4-libsamba%2ddev.install
  debian/libsamba0.install       svn-v2:1044 at fc4039ab-9d04-0410-8cac-899223bdd6b0-branches%2fsamba4-libsamba0.install
  source/lib/util/config.mk      svn-v2:13658 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flib%2futil%2fconfig.mk
  source/librpc/config.mk        svn-v2:3433 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flibrpc%2fconfig.mk
=== modified file '.bzrignore'
--- a/.bzrignore	2007-03-13 14:49:19 +0000
+++ b/.bzrignore	2007-03-13 18:20:56 +0000
@@ -193,3 +193,6 @@
 webapps/qooxdoo-0.6.5-sdk/frontend/framework/source/translation/messages.pot
 source/torture/ndr/proto.h
 source/bin/modules/*
+debian/*.substvars
+debian/*.debhelper
+debian/files

=== modified file 'debian/libgensec0.install'
--- a/debian/libgensec0.install	2007-01-27 22:11:08 +0000
+++ b/debian/libgensec0.install	2007-03-13 18:20:56 +0000
@@ -1,2 +1,2 @@
 usr/lib/libgensec.so.0.*
-usr/lib/samba/gensec/*.so
+#usr/lib/samba/gensec/*.so

=== modified file 'debian/libsamba-dev.install'
--- a/debian/libsamba-dev.install	2007-01-27 22:11:08 +0000
+++ b/debian/libsamba-dev.install	2007-03-13 18:20:56 +0000
@@ -1,4 +1,4 @@
-usr/include/samba-4.0/gen_ndr/samr.h
+usr/include/samba-4.0/dcerpc/samr.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
@@ -41,7 +41,7 @@
 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/ldap.h
@@ -90,97 +90,23 @@
 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/libtorture.so
 usr/lib/libcli_wrepl.so
-usr/lib/libndr_mgmt.so
-usr/lib/libndr_spoolss.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/libdcerpc_mgmt.so

=== modified file 'debian/libsamba0.install'
--- a/debian/libsamba0.install	2007-01-27 22:11:08 +0000
+++ b/debian/libsamba0.install	2007-03-13 18:20:56 +0000
@@ -1,102 +1,25 @@
-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/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/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/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/libdcerpc_mgmt.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 file 'source/lib/util/config.mk'
--- a/source/lib/util/config.mk	2006-11-12 00:54:43 +0000
+++ b/source/lib/util/config.mk	2007-03-13 18:20:56 +0000
@@ -1,7 +1,7 @@
-[SUBSYSTEM::LIBSAMBA-UTIL]
-#VERSION = 0.0.1
-#SO_VERSION = 0
-#DESCRIPTION = Generic utility functions
+[LIBRARY::LIBSAMBA-UTIL]
+VERSION = 0.0.1
+SO_VERSION = 0
+DESCRIPTION = Generic utility functions
 PUBLIC_PROTO_HEADER = util_proto.h
 PUBLIC_HEADERS = util.h \
 				 byteorder.h \

=== modified file 'source/librpc/config.mk'
--- a/source/librpc/config.mk	2007-02-27 18:00:15 +0000
+++ b/source/librpc/config.mk	2007-03-13 18:20:56 +0000
@@ -348,6 +348,13 @@
 SO_VERSION = 0
 DESCRIPTION = DCE/RPC client library - SAMR
 
+[LIBRARY::dcerpc_svcctl]
+OBJ_FILES = gen_ndr/ndr_svcctl.o
+PUBLIC_DEPENDENCIES = dcerpc NDR_SVCCTL
+VERSION = 0.0.1
+SO_VERSION = 0
+DESCRIPTION = DCE/RPC client library - SVCCTL
+
 [SUBSYSTEM::RPC_NDR_SPOOLSS]
 OBJ_FILES = gen_ndr/ndr_spoolss_c.o
 PUBLIC_DEPENDENCIES = dcerpc NDR_SPOOLSS

More information about the samba-cvs mailing list