commiting updates from 3.0

7 files changed, 23 insertions, 15 deletions

diff --git a/packaging/Debian/README b/packaging/Debian/README
index 6435a5a042a..95c75d5fc51 100644
--- a/packaging/Debian/README
+++ b/packaging/Debian/README
@@ -1,12 +1,12 @@
 Building Samba Packages for Debian GNU/Linux
 --------------------------------------------
 
-Building Debian packages is not as hard as some people might think. The
-following instructions will allow you to build your own Samba Debian
-packages. These instructions, and the files in packaging/Debian/, are
-current as of Samba 3.0.0rc4, and allow you to build Debian packages
+Building Debian packages is not as hard as some people might think.
+The following instructions will allow you to build your own Samba
+Debian packages. These instructions and the files in packaging/Debian/
+are current as of Samba 3.0.0, and allow you to build Debian packages
 for Debian unstable (so you need some development packages available
-only in Debian unstable.) If you are using something newer than 3.0.0rc4
+only in Debian unstable.) If you are using something newer than 3.0.0
 you might want to try to follow the instructions to see if patches
 apply cleanly. If some patches don't apply cleanly please e-mail
 samba@packages.debian.org since we might have fixed patches that we have
diff --git a/packaging/Debian/debian/README.build-upstream b/packaging/Debian/debian/README.build-upstream
index 6435a5a042a..95c75d5fc51 100644
--- a/packaging/Debian/debian/README.build-upstream
+++ b/packaging/Debian/debian/README.build-upstream
@@ -1,12 +1,12 @@
 Building Samba Packages for Debian GNU/Linux
 --------------------------------------------
 
-Building Debian packages is not as hard as some people might think. The
-following instructions will allow you to build your own Samba Debian
-packages. These instructions, and the files in packaging/Debian/, are
-current as of Samba 3.0.0rc4, and allow you to build Debian packages
+Building Debian packages is not as hard as some people might think.
+The following instructions will allow you to build your own Samba
+Debian packages. These instructions and the files in packaging/Debian/
+are current as of Samba 3.0.0, and allow you to build Debian packages
 for Debian unstable (so you need some development packages available
-only in Debian unstable.) If you are using something newer than 3.0.0rc4
+only in Debian unstable.) If you are using something newer than 3.0.0
 you might want to try to follow the instructions to see if patches
 apply cleanly. If some patches don't apply cleanly please e-mail
 samba@packages.debian.org since we might have fixed patches that we have
diff --git a/packaging/Debian/debian/changelog b/packaging/Debian/debian/changelog
index 61d72506567..0561f063fa6 100644
--- a/packaging/Debian/debian/changelog
+++ b/packaging/Debian/debian/changelog
@@ -1,8 +1,14 @@
-samba (3.0.0beta2+3.0.0rc4-1) unstable; urgency=low
+samba (3.0.0-1) unstable; urgency=low
 
   * Local build.
 
- -- Debian User <user@somewhere.com>  Thu, 11 Sep 2003 16:15:27 -0400
+ -- Debian User <somebody@somewhere.com>  Tue, 23 Sep 2003 21:50:26 -0400
+
+samba (3.0.0beta2+3.0.0rc4-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Eloy A. Paris <peloy@debian.org>  Sat, 13 Sep 2003 08:47:56 -0400
 
 samba (3.0.0beta2+3.0.0rc3-1) unstable; urgency=low
 
diff --git a/packaging/Debian/debian/patches/fhs.patch b/packaging/Debian/debian/patches/fhs.patch
index 1c90499a835..652641216b6 100644
--- a/packaging/Debian/debian/patches/fhs.patch
+++ b/packaging/Debian/debian/patches/fhs.patch
@@ -366,7 +366,7 @@ diff -uNr samba-3.0.0beta2.orig/source/param/loadparm.c samba-3.0.0beta2/source/
  	char *szLockDir;
  	char *szPidDir;
  	char *szRootdir;
-@@ -1082,8 +1082,13 @@
+@@ -1083,8 +1083,13 @@
  	{"config file", P_STRING, P_GLOBAL, &Globals.szConfigFile, NULL, NULL, FLAG_HIDE}, 
  	{"preload", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_ADVANCED}, 
  	{"auto services", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_ADVANCED}, 
diff --git a/packaging/Debian/debian/patches/samba.patch b/packaging/Debian/debian/patches/samba.patch
index 2ea25bb3282..8707ec517ba 100644
--- a/packaging/Debian/debian/patches/samba.patch
+++ b/packaging/Debian/debian/patches/samba.patch
@@ -49,7 +49,7 @@ diff -uNr samba-3.0.0beta1.orig/source/script/installbin.sh samba-3.0.0beta1/sou
 diff -uNr samba-3.0.0beta1.orig/source/smbd/service.c samba-3.0.0beta1/source/smbd/service.c
 --- samba-3.0.0beta1.orig/source/smbd/service.c	2003-06-07 12:57:39.000000000 -0500
 +++ samba-3.0.0beta1/source/smbd/service.c	2003-06-30 20:12:57.000000000 -0500
-@@ -885,6 +885,9 @@
+@@ -887,6 +887,9 @@
  	file_close_conn(conn);
  	dptr_closecnum(conn);
  
@@ -59,7 +59,7 @@ diff -uNr samba-3.0.0beta1.orig/source/smbd/service.c samba-3.0.0beta1/source/sm
  	/* execute any "postexec = " line */
  	if (*lp_postexec(SNUM(conn)) && 
  	    change_to_user(conn, vuid))  {
-@@ -904,8 +907,5 @@
+@@ -906,8 +909,5 @@
  		smbrun(cmd,NULL);
  	}
  
diff --git a/packaging/Debian/debian/rules b/packaging/Debian/debian/rules
index 8b35736116c..73e5d16bc19 100755
--- a/packaging/Debian/debian/rules
+++ b/packaging/Debian/debian/rules
@@ -108,6 +108,7 @@ build: patch-stamp configure-stamp build-stamp
 build-stamp:
 	dh_testdir
 
+	$(MAKE) -C source headers
 	$(MAKE) -C source all nsswitch/libnss_wins.so python_ext
 
 	touch build-stamp
diff --git a/packaging/RedHat/samba.spec.tmpl b/packaging/RedHat/samba.spec.tmpl
index 26e86aa61dd..fa4b7b070b5 100644
--- a/packaging/RedHat/samba.spec.tmpl
+++ b/packaging/RedHat/samba.spec.tmpl
@@ -426,6 +426,7 @@ fi
 %{prefix}/share/swat/lang/*/images/*
 %{prefix}/share/swat/lang/*/include/*.html
 %{prefix}/share/swat/using_samba/*
+%attr(755,root,root) %{prefix}/lib/samba/*.msg
 %config(noreplace) /etc/samba/lmhosts
 %config(noreplace) /etc/samba/smb.conf
 %config(noreplace) /etc/samba/smbusers