svn commit: samba r7942 - in branches/SAMBA_4_0/packaging/debian: .
jelmer at samba.org
jelmer at samba.org
Mon Jun 27 10:00:44 GMT 2005
Author: jelmer
Date: 2005-06-27 10:00:43 +0000 (Mon, 27 Jun 2005)
New Revision: 7942
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=7942
Log:
Debian packages updates and fixes. Use dh_install for diverting
files to different packages.
Added:
branches/SAMBA_4_0/packaging/debian/samba4-common.install
branches/SAMBA_4_0/packaging/debian/smb.conf
Modified:
branches/SAMBA_4_0/packaging/debian/changelog
branches/SAMBA_4_0/packaging/debian/control
branches/SAMBA_4_0/packaging/debian/rules
branches/SAMBA_4_0/packaging/debian/samba4-common.conffiles
Changeset:
Modified: branches/SAMBA_4_0/packaging/debian/changelog
===================================================================
--- branches/SAMBA_4_0/packaging/debian/changelog 2005-06-27 07:02:39 UTC (rev 7941)
+++ branches/SAMBA_4_0/packaging/debian/changelog 2005-06-27 10:00:43 UTC (rev 7942)
@@ -1,3 +1,9 @@
+samba4 (3.9.0-SVN-build-7941-1) unstable; urgency=low
+
+ * New upstream snapshot.
+
+ -- Jelmer Vernooij <jelmer at 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
Modified: branches/SAMBA_4_0/packaging/debian/control
===================================================================
--- branches/SAMBA_4_0/packaging/debian/control 2005-06-27 07:02:39 UTC (rev 7941)
+++ branches/SAMBA_4_0/packaging/debian/control 2005-06-27 10:00:43 UTC (rev 7942)
@@ -12,8 +12,7 @@
Foobar
Package: samba4-common
-Architecture: any
-Depends: ${shlibs:Depends}
+Architecture: all
Description: Common samba files
Files common for all programs in Samba
Modified: branches/SAMBA_4_0/packaging/debian/rules
===================================================================
--- branches/SAMBA_4_0/packaging/debian/rules 2005-06-27 07:02:39 UTC (rev 7941)
+++ branches/SAMBA_4_0/packaging/debian/rules 2005-06-27 10:00:43 UTC (rev 7942)
@@ -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 @@
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 @@
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
Modified: branches/SAMBA_4_0/packaging/debian/samba4-common.conffiles
===================================================================
--- branches/SAMBA_4_0/packaging/debian/samba4-common.conffiles 2005-06-27 07:02:39 UTC (rev 7941)
+++ branches/SAMBA_4_0/packaging/debian/samba4-common.conffiles 2005-06-27 10:00:43 UTC (rev 7942)
@@ -1 +1 @@
-etc/samba4/smb.conf
+/etc/samba4/smb.conf
Added: branches/SAMBA_4_0/packaging/debian/samba4-common.install
===================================================================
--- branches/SAMBA_4_0/packaging/debian/samba4-common.install 2005-06-27 07:02:39 UTC (rev 7941)
+++ branches/SAMBA_4_0/packaging/debian/samba4-common.install 2005-06-27 10:00:43 UTC (rev 7942)
@@ -0,0 +1,2 @@
+etc/samba4
+etc/samba4/smb.conf
Added: branches/SAMBA_4_0/packaging/debian/smb.conf
===================================================================
--- branches/SAMBA_4_0/packaging/debian/smb.conf 2005-06-27 07:02:39 UTC (rev 7941)
+++ branches/SAMBA_4_0/packaging/debian/smb.conf 2005-06-27 10:00:43 UTC (rev 7942)
@@ -0,0 +1,2 @@
+[global]
+# Example configuration file
More information about the samba-cvs
mailing list