r7942: Debian packages updates and fixes. Use dh_install for diverting

files to different packages.
(This used to be commit da706b14ab9391cc8af1789f3533a94ab935150f)

6 files changed, 21 insertions, 7 deletions

diff --git a/packaging/debian/changelog b/packaging/debian/changelog
index c7022ae4a6..2db1fa1bc5 100644
--- a/packaging/debian/changelog
+++ b/packaging/debian/changelog
@@ -1,3 +1,9 @@
+samba4 (3.9.0-SVN-build-7941-1) unstable; urgency=low
+
+  * New upstream snapshot.
+
+ -- Jelmer Vernooij <jelmer@rhonwyn.lan.vernstok.nl>  Mon, 27 Jun 2005 11:25:57 +0200
+
 samba4 (3.9.0-SVN-build-6710-1) unstable; urgency=low
 
   * Newer upstream version
diff --git a/packaging/debian/control b/packaging/debian/control
index 14bdbc6008..6b872d424d 100644
--- a/packaging/debian/control
+++ b/packaging/debian/control
@@ -12,8 +12,7 @@ Description: Samba4
  Foobar
 
 Package: samba4-common
-Architecture: any
-Depends: ${shlibs:Depends}
+Architecture: all
 Description: Common samba files
  Files common for all programs in Samba
 
diff --git a/packaging/debian/rules b/packaging/debian/rules
index 7b303f728e..2d0505d225 100755
--- a/packaging/debian/rules
+++ b/packaging/debian/rules
@@ -3,7 +3,7 @@
 # Made with the aid of debmake, by Christoph Lameter,
 # based on the sample debian/rules file for GNU hello by Ian Jackson.
 
-SOURCEPATH=../../source
+SOURCEPATH=../source
 
 package=samba4
 
@@ -27,18 +27,21 @@ configure:
 
 build: configure
 	dh_testdir
-	cd $(SOURCEPATH) && $(MAKE) proto all
+	$(MAKE) -C $(SOURCEPATH) proto 
+	-$(MAKE) -C $(SOURCEPATH) pch
+	$(MAKE) -C $(SOURCEPATH) all
 	touch $@
 
 clean:
 	dh_testdir
 	dh_clean
 	rm -f build
-	-cd $(SOURCEPATH) && $(MAKE) clean
+	-$(MAKE) -C $(SOURCEPATH) clean
 
 binary-indep: build install
 	dh_testdir -i
 	dh_testroot -i
+	dh_install -i --sourcedir=debian/tmp
 	dh_installdocs -i
 	dh_installchangelogs -i
 	dh_compress -i
@@ -55,11 +58,13 @@ binary-indep: build install
 install: build
 	dh_clean -k
 	dh_installdirs
-	$(MAKE) -C $(SOURCEPATH) install DESTDIR=`pwd`/../packaging/debian/tmp
+	$(MAKE) -C $(SOURCEPATH) install DESTDIR=$(CURDIR)/debian/tmp
+	cp debian/smb.conf $(CURDIR)/debian/tmp/etc/samba4
 
 binary-arch: build install
 	dh_testdir -a
 	dh_testroot -a
+	dh_install -a --sourcedir=debian/tmp
 	dh_installdocs -a
 	dh_installman -a
 	dh_strip -a
diff --git a/packaging/debian/samba4-common.conffiles b/packaging/debian/samba4-common.conffiles
index 69f3994af2..aa61ab61e6 100644
--- a/packaging/debian/samba4-common.conffiles
+++ b/packaging/debian/samba4-common.conffiles
@@ -1 +1 @@
-etc/samba4/smb.conf
+/etc/samba4/smb.conf
diff --git a/packaging/debian/samba4-common.install b/packaging/debian/samba4-common.install
new file mode 100644
index 0000000000..9406328a45
--- /dev/null
+++ b/packaging/debian/samba4-common.install
@@ -0,0 +1,2 @@
+etc/samba4
+etc/samba4/smb.conf
diff --git a/packaging/debian/smb.conf b/packaging/debian/smb.conf
new file mode 100644
index 0000000000..f7e3060e30
--- /dev/null
+++ b/packaging/debian/smb.conf
@@ -0,0 +1,2 @@
+[global]
+# Example configuration file