Fix installed files.
authorJelmer Vernooij <jelmer@samba.org>
Fri, 4 Apr 2008 15:31:37 +0000 (17:31 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 4 Apr 2008 15:31:37 +0000 (17:31 +0200)
debian/control
debian/libdcerpc-dev.install
debian/libdcerpc0.install
debian/libgensec-dev.install
debian/libndr-dev.install
debian/libregistry-dev.install
debian/libsamba-dev.install
debian/libsamba0.install
debian/rules
debian/samba-ldb-tools.install
debian/swat.install [deleted file]

index f571fde..6a2b6a5 100644 (file)
@@ -11,7 +11,7 @@ Vcs-Svn: svn://svn.debian.org/svn/pkg-samba/branches/samba4
 
 Package: samba4
 Architecture: any
-Recommends: swat, ldb-tools
+Recommends: ldb-tools
 Depends: ${shlibs:Depends}, ${misc:Depends}, samba4-common (=${binary:Version}), samba-ldb-tools
 Conflicts: samba-common
 Description: LanManager-like file and printer server for Unix (version 4)
@@ -136,23 +136,6 @@ Description: tools for extending Samba
  and extending Samba. In particular, it contains development files for
  the talloc and ldb libraries.
 
-Package: swat
-Architecture: all
-Description: data files for SWAT
- The Samba software suite is a collection of programs that
- implements the SMB protocol for unix systems, allowing you to serve
- files and printers to Windows, NT, OS/2 and DOS clients, as well as
- run as a domain controller for Active Directory.
- .
- 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. In particular, no guarantees are made with
- regard to upgrades between versions.
- .
- This package contains the data files for SWAT, the Samba Web Administration
- Tool. These are used by the embedded Samba 4 web server to provide web-based
- administration of shares and other settings.
-
 Package: samba-ldb-tools
 Section: utils
 Architecture: any
@@ -170,6 +153,38 @@ Description: LDAP-like embedded database - tools
  This package contains bundled test and utility binaries built specifically
  for Samba.
 
+Package: libldb-samba4-dev
+Section: libdevel
+Architecture: any
+Conflicts: libldb-dev
+Depends: ${shlibs:Depends}
+Description: LDAP-like embedded database - Samba 4 version
+ ldb is a LDAP-like embedded database built on top of TDB.
+ .
+ What ldb does is provide a fast database with an LDAP-like API designed
+ to be used within an application. In some ways it can be seen as a
+ intermediate solution between key-value pair databases and a real LDAP
+ database.
+ .
+ This package contains a build of the LDB library built specifically
+ for Samba 4.
+
+Package: libldb-samba4-0
+Section: libs
+Architecture: any
+Conflicts: libldb0
+Depends: ${shlibs:Depends}
+Description: LDAP-like embedded database - Samba 4 version
+ ldb is a LDAP-like embedded database built on top of TDB.
+ .
+ What ldb does is provide a fast database with an LDAP-like API designed
+ to be used within an application. In some ways it can be seen as a
+ intermediate solution between key-value pair databases and a real LDAP
+ database.
+ .
+ This package contains a build of the LDB library built specifically
+ for Samba 4.
+
 Package: libgensec0
 Architecture: any
 Depends: ${shlibs:Depends}
index 4c32b60..715776e 100644 (file)
@@ -1,14 +1,15 @@
-usr/include/samba-4.0/dcerpc/samr.h
-usr/include/samba-4.0/dcerpc/ndr_samr_c.h
+usr/include/samba-4.0/gen_ndr/samr.h
+usr/include/samba-4.0/gen_ndr/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/dcerpc.h
-usr/include/samba-4.0/dcerpc/proto.h
-usr/include/samba-4.0/dcerpc/ndr_svcctl_c.h
-usr/include/samba-4.0/dcerpc/ndr_epmapper_c.h
-usr/include/samba-4.0/dcerpc/ndr_atsvc_c.h
-usr/include/samba-4.0/dcerpc/ndr_mgmt_c.h
+usr/include/samba-4.0/gen_ndr/ndr_svcctl_c.h
+usr/include/samba-4.0/gen_ndr/ndr_epmapper_c.h
+usr/include/samba-4.0/gen_ndr/ndr_atsvc_c.h
+usr/include/samba-4.0/gen_ndr/ndr_mgmt_c.h
 usr/lib/pkgconfig/dcerpc.pc
 usr/lib/libdcerpc.so
 usr/lib/pkgconfig/dcerpc_samr.pc
 usr/lib/libdcerpc_samr.so
+usr/lib/pkgconfig/dcerpc_atsvc.pc
+usr/lib/libdcerpc_atsvc.so
index 2cd854b..07bcfc0 100644 (file)
@@ -1,2 +1,3 @@
 usr/lib/libdcerpc.so.*
 usr/lib/libdcerpc_samr.so.*
+usr/lib/libdcerpc_atsvc.so.*
index 4842d09..7a60354 100644 (file)
@@ -1,5 +1,3 @@
 usr/lib/pkgconfig/gensec.pc
 usr/lib/libgensec.so
 usr/include/samba-4.0/gensec.h
-usr/include/samba-4.0/gensec/spnego.h
-usr/include/samba-4.0/gensec/proto.h
index 39f8e21..51ad858 100644 (file)
@@ -1,4 +1,3 @@
 usr/lib/libndr.so
 usr/lib/pkgconfig/ndr.pc
 usr/include/samba-4.0/ndr.h
-usr/include/samba-4.0/ndr/proto.h
index b23ba64..ba78e67 100644 (file)
@@ -1,5 +1,3 @@
-usr/include/samba-4.0/registry/registry.h
-usr/include/samba-4.0/registry/patchfile.h
-usr/include/samba-4.0/registry/hive.h
+usr/include/samba-4.0/registry.h
 usr/lib/pkgconfig/registry.pc
 usr/lib/libregistry.so
index ba6e30e..798ef1c 100644 (file)
@@ -1,21 +1,18 @@
-usr/lib/libsamba-config.so
+usr/lib/libsamba-hostconfig.so
 usr/lib/libtorture.so
-usr/lib/pkgconfig/samba-config.pc
+usr/lib/pkgconfig/samba-hostconfig.pc
 usr/lib/pkgconfig/torture.pc
 usr/include/samba-4.0/param.h
-usr/include/samba-4.0/param/proto.h
 usr/include/samba-4.0/gen_ndr/lsa.h
 usr/include/samba-4.0/gen_ndr/security.h
 usr/include/samba-4.0/gen_ndr/netlogon.h
 usr/include/samba-4.0/gen_ndr/misc.h
 usr/include/samba-4.0/gen_ndr/ndr_misc.h
-usr/include/samba-4.0/dcerpc/ndr_samr.h
+usr/include/samba-4.0/gen_ndr/ndr_samr.h
 usr/include/samba-4.0/gen_ndr/nbt.h
-usr/include/samba-4.0/events/events.h
-usr/include/samba-4.0/events/events_internal.h
+usr/include/samba-4.0/events.h
+usr/include/samba-4.0/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
@@ -25,73 +22,30 @@ usr/include/samba-4.0/util/time.h
 usr/include/samba-4.0/util/safe_string.h
 usr/include/samba-4.0/util/xfile.h
 usr/include/samba-4.0/dcerpc_server.h
-usr/include/samba-4.0/dcerpc_server/proto.h
-usr/include/samba-4.0/dcerpc_server/common.h
-usr/include/samba-4.0/dcerpc_server/common_proto.h
 usr/include/samba-4.0/tdr.h
-usr/include/samba-4.0/tdr/proto.h
 usr/include/samba-4.0/credentials.h
-usr/include/samba-4.0/credentials
-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
-usr/include/samba-4.0/libnet/passwd.h
-usr/include/samba-4.0/libnet/rpc.h
-usr/include/samba-4.0/libnet/share.h
-usr/include/samba-4.0/libnet/time.h
-usr/include/samba-4.0/libnet/user.h
-usr/include/samba-4.0/libnet/site.h
-usr/include/samba-4.0/libnet/vampire.h
-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/torture.h
-usr/include/samba-4.0/torture/proto.h
-usr/include/samba-4.0/torture/util.h
+usr/include/samba-4.0/torture.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
-usr/include/samba-4.0/charset/proto.h
-usr/include/samba-4.0/client.h
-usr/include/samba-4.0/ntvfs.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/core/werror.h
 usr/include/samba-4.0/core/doserr.h
 usr/include/samba-4.0/core/ntstatus.h
 usr/include/samba-4.0/samba/popt.h
 usr/include/samba-4.0/samba/version.h
-usr/include/samba-4.0/samba/asn1.h
-usr/include/samba-4.0/samba/asn1/proto.h
-usr/include/samba-4.0/cldap.h
-usr/include/samba-4.0/samba3.h
-usr/include/samba-4.0/samdb.h
 usr/include/samba-4.0/tdb_wrap.h
-usr/include/samba-4.0/samdb/proto.h
 usr/include/samba-4.0/ldb_wrap.h
-usr/include/samba-4.0/dcerpc/svcctl.h
-usr/include/samba-4.0/dcerpc/ndr_svcctl.h
-usr/include/samba-4.0/dcerpc/epmapper.h
-usr/include/samba-4.0/dcerpc/ndr_epmapper.h
-usr/include/samba-4.0/dcerpc/mgmt.h
-usr/include/samba-4.0/dcerpc/ndr_mgmt.h
-usr/include/samba-4.0/dcerpc/atsvc.h
-usr/include/samba-4.0/dcerpc/ndr_atsvc.h
+usr/include/samba-4.0/gen_ndr/svcctl.h
+usr/include/samba-4.0/gen_ndr/ndr_svcctl.h
+usr/include/samba-4.0/gen_ndr/epmapper.h
+usr/include/samba-4.0/gen_ndr/ndr_epmapper.h
+usr/include/samba-4.0/gen_ndr/mgmt.h
+usr/include/samba-4.0/gen_ndr/ndr_mgmt.h
+usr/include/samba-4.0/gen_ndr/atsvc.h
+usr/include/samba-4.0/gen_ndr/ndr_atsvc.h
 usr/include/samba-4.0/util_ldb.h
-usr/include/samba-4.0/nss_wrapper.h
-usr/include/samba-4.0/ldb/ldap_ndr.h
-usr/include/samba-4.0/samdb/common_proto.h
-usr/include/samba-4.0/samdb/schema_proto.h
-usr/include/samba-4.0/samdb/schema.h
+usr/include/samba-4.0/ldap_ndr.h
 usr/include/samba-4.0/util/attr.h
 usr/include/samba-4.0/core/error.h
-usr/include/samba-4.0/auth/session_proto.h
-usr/include/samba-4.0/auth/system_session.h
-usr/include/samba-4.0/auth/session.h
+usr/include/samba-4.0/share.h
index c0d944a..5c9635b 100644 (file)
@@ -1,2 +1,2 @@
-usr/lib/libsamba-config.so.*
+usr/lib/libsamba-hostconfig.so.*
 usr/lib/libtorture.so.*
index 4e5b4f4..f8fe01d 100755 (executable)
@@ -55,6 +55,8 @@ install: build
        install -m 644 $(CURDIR)/debian/gdbcommands $(CURDIR)/debian/tmp/etc/samba
        dh_testdir
        dh_testroot
+       # Remove files created when running install more than once
+       find debian/tmp -name "*.old" | xargs rm -f
        # Already provided by libparse-yapp-perl
        rm -f $(CURDIR)/debian/tmp/usr/share/perl5/Parse/Yapp/Driver.pm
        # Binaries not ready for installation
@@ -63,6 +65,7 @@ install: build
        rm -f $(CURDIR)/debian/tmp/usr/bin/samba3dump
        rm -f $(CURDIR)/debian/tmp/usr/bin/epdump.py
        rm -f $(CURDIR)/debian/tmp/usr/bin/winreg.py
+       rm -f $(CURDIR)/debian/tmp/usr/bin/minschema.py
        rm -f $(CURDIR)/debian/tmp/usr/bin/rpcclient
        # No need to do development using nss_winbind
        rm -f $(CURDIR)/debian/tmp/usr/lib/libnss_winbind.so
index 92e4d59..5297aad 100644 (file)
@@ -1,3 +1,5 @@
+usr/bin/ad2oLschema
+usr/bin/oLschema2ldif
 usr/bin/ldbadd
 usr/bin/ldbdel
 usr/bin/ldbedit
@@ -10,3 +12,5 @@ usr/share/man/man1/ldbedit.1
 usr/share/man/man1/ldbmodify.1
 usr/share/man/man1/ldbrename.1
 usr/share/man/man1/ldbsearch.1
+usr/share/man/man1/ad2oLschema.1
+usr/share/man/man1/oLschema2ldif.1
diff --git a/debian/swat.install b/debian/swat.install
deleted file mode 100644 (file)
index 0280407..0000000
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/samba/swat