summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packaging/debian/compat1
-rw-r--r--packaging/debian/control19
-rw-r--r--packaging/debian/diversions1
-rw-r--r--packaging/debian/libparse-pidl-perl.install3
-rwxr-xr-xpackaging/debian/rules30
-rw-r--r--packaging/debian/samba4-common.conffiles1
-rw-r--r--packaging/debian/samba4-common.dirs4
-rw-r--r--packaging/debian/samba4-common.files3
-rw-r--r--packaging/debian/samba4-common.install2
-rw-r--r--packaging/debian/samba4-dev.install3
-rw-r--r--packaging/debian/samba4-swat.install2
11 files changed, 37 insertions, 32 deletions
diff --git a/packaging/debian/compat b/packaging/debian/compat
new file mode 100644
index 0000000000..b8626c4cff
--- /dev/null
+++ b/packaging/debian/compat
@@ -0,0 +1 @@
+4
diff --git a/packaging/debian/control b/packaging/debian/control
index 91c390c2c4..0608d13d4a 100644
--- a/packaging/debian/control
+++ b/packaging/debian/control
@@ -2,13 +2,8 @@ Source: samba4
Section: net
Priority: optional
Maintainer: Jelmer Vernooij <jelmer@samba.org>
-Standards-Version: 3.6.1.0
-Build-Depends: build-essential, libgtk2.0-dev, libgconf2-dev, libldap-dev, debhelper (>> 4.0.0), libparse-yapp-perl, perl
-
-Package: samba4
-Architecture: all
-Description: Samba4 misc
- Files common for all programs in Samba
+Standards-Version: 3.6.2
+Build-Depends: libgtk2.0-dev, libgconf2-dev, libldap-dev, debhelper (>> 4.0.0), libparse-yapp-perl, perl, docbook-xsl, xsltproc
Package: samba4-common
Architecture: all
@@ -17,7 +12,7 @@ Description: Common samba files
Package: samba4-client
Architecture: any
-Depends: ${shlibs:Depends},
+Depends: ${shlibs:Depends}
Description: Client utilities from Samba4
Client utilities for NetBIOS, SMB and RPC.
@@ -41,9 +36,9 @@ Depends: ${shlibs:Depends}
Description: Graphical Samba client utilities
Contains GTK+ programs for maintaining:
.
- * Remote SAM databases
- * Local and remote registries
- * DCE/RPC endpoints
+ * Remote SAM databases
+ * Local and remote registries
+ * DCE/RPC endpoints
Package: winregistry-tools
Architecture: any
@@ -53,7 +48,7 @@ Description: Tools for viewing and manipulating
Package: libparse-pidl-perl
Architecture: any
-Depends: perl
+Depends: ${perl:Depends}
Description: IDL compiler written in Perl
FIXME
diff --git a/packaging/debian/diversions b/packaging/debian/diversions
index d38f892909..e69de29bb2 100644
--- a/packaging/debian/diversions
+++ b/packaging/debian/diversions
@@ -1 +0,0 @@
-smbd smb.samba3 samba
diff --git a/packaging/debian/libparse-pidl-perl.install b/packaging/debian/libparse-pidl-perl.install
index 96bc8b92aa..8dca43da77 100644
--- a/packaging/debian/libparse-pidl-perl.install
+++ b/packaging/debian/libparse-pidl-perl.install
@@ -1,2 +1,5 @@
usr/bin/pidl
usr/share/perl5
+usr/share/man/man3/*.3pm
+usr/share/man/man1/pidl.1p
+
diff --git a/packaging/debian/rules b/packaging/debian/rules
index 61002f4a32..35c6c7a45b 100755
--- a/packaging/debian/rules
+++ b/packaging/debian/rules
@@ -7,7 +7,8 @@ SOURCEPATH=../source
package=samba4
-configure:
+configure: configure-stamp
+configure-stamp:
dh_testdir
cd $(SOURCEPATH) && ./autogen.sh
cd $(SOURCEPATH) && ./configure --with-fhs \
@@ -17,6 +18,7 @@ configure:
--enable-static \
--sysconfdir=/etc \
--libdir=/etc/samba4 \
+ --with-configdir=/etc/samba4 \
--with-privatedir=/etc/samba4 \
--with-piddir=/var/run/samba4 \
--localstatedir=/var \
@@ -27,29 +29,31 @@ configure:
cd $(SOURCEPATH)/pidl && perl Makefile.PL verbose INSTALLDIRS=vendor PREFIX=/usr
touch $@
-build: configure
+build: build-stamp
+build-stamp: configure
dh_testdir
$(MAKE) -C $(SOURCEPATH) proto
-$(MAKE) -C $(SOURCEPATH) pch
$(MAKE) -C $(SOURCEPATH) all
- $(MAKE) -C $(SOURCEPATH)/pidl all doc
+ $(MAKE) -C $(SOURCEPATH)/pidl all
touch $@
clean:
dh_testdir
+ dh_testroot
dh_clean
- rm -f build configure
+ $(RM) debian/tmp
-$(MAKE) -C $(SOURCEPATH) clean
+ $(RM) build-stamp configure-stamp
binary-indep: build install
- dh_testdir -i
- dh_testroot -i
+ dh_testdir
+ dh_testroot
dh_install -i --sourcedir=debian/tmp
dh_installdocs -i
dh_installchangelogs -i
dh_compress -i
dh_fixperms -i
- dh_python -i
dh_installdeb -i
dh_gencontrol -i
dh_md5sums -i
@@ -61,20 +65,20 @@ binary-indep: build install
install: build
dh_clean -k
dh_installdirs
+ mkdir -p $(CURDIR)/debian/tmp/usr/share/man/man1
+ mkdir -p $(CURDIR)/debian/tmp/etc/samba4
$(MAKE) -C $(SOURCEPATH) install DESTDIR=$(CURDIR)/debian/tmp
$(MAKE) -C $(SOURCEPATH) manpages installman DESTDIR=$(CURDIR)/debian/tmp
- mkdir -p $(CURDIR)/debian/tmp/etc/samba4
cp $(CURDIR)/debian/smb.conf $(CURDIR)/debian/tmp/etc/samba4
$(MAKE) -C $(SOURCEPATH)/pidl install DESTDIR=$(CURDIR)/debian/tmp
binary-arch: build install
- dh_testdir -a
- dh_testroot -a
+ dh_testdir
+ dh_testroot
dh_install -a --sourcedir=debian/tmp
dh_installchangelogs -a
- dh_installdocs -a
dh_strip -a
- dh_python -a
+ dh_perl -a
dh_compress -a
dh_fixperms -a
dh_makeshlibs -a
@@ -86,4 +90,4 @@ binary-arch: build install
binary: binary-arch binary-indep
-.PHONY: binary binary-arch binary-indep clean
+.PHONY: configure build install binary binary-arch binary-indep clean
diff --git a/packaging/debian/samba4-common.conffiles b/packaging/debian/samba4-common.conffiles
index aa61ab61e6..e69de29bb2 100644
--- a/packaging/debian/samba4-common.conffiles
+++ b/packaging/debian/samba4-common.conffiles
@@ -1 +0,0 @@
-/etc/samba4/smb.conf
diff --git a/packaging/debian/samba4-common.dirs b/packaging/debian/samba4-common.dirs
index a059ef707d..48b36e7fe9 100644
--- a/packaging/debian/samba4-common.dirs
+++ b/packaging/debian/samba4-common.dirs
@@ -1,3 +1,3 @@
-var/cache/samba
-etc/samba4
+etc/samba4/tls
usr/lib/samba
+var/cache/samba
diff --git a/packaging/debian/samba4-common.files b/packaging/debian/samba4-common.files
index f79c4947cd..e69de29bb2 100644
--- a/packaging/debian/samba4-common.files
+++ b/packaging/debian/samba4-common.files
@@ -1,3 +0,0 @@
-usr/lib/samba/lowcase.dat
-usr/lib/samba/upcase.dat
-usr/lib/valid.dat
diff --git a/packaging/debian/samba4-common.install b/packaging/debian/samba4-common.install
index 69f3994af2..1589590a08 100644
--- a/packaging/debian/samba4-common.install
+++ b/packaging/debian/samba4-common.install
@@ -1 +1,3 @@
etc/samba4/smb.conf
+usr/lib/samba/*.dat
+usr/lib/samba/setup
diff --git a/packaging/debian/samba4-dev.install b/packaging/debian/samba4-dev.install
new file mode 100644
index 0000000000..ba6f8f3baf
--- /dev/null
+++ b/packaging/debian/samba4-dev.install
@@ -0,0 +1,3 @@
+usr/include
+usr/share/man/man3/talloc.3
+usr/share/man/man3/ldb.3
diff --git a/packaging/debian/samba4-swat.install b/packaging/debian/samba4-swat.install
new file mode 100644
index 0000000000..3877db7422
--- /dev/null
+++ b/packaging/debian/samba4-swat.install
@@ -0,0 +1,2 @@
+usr/share/samba/swat
+usr/lib/samba/js