From 78ae4f9378cfc7e884a054088cbd088a2b18a6c8 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Wed, 1 Sep 2004 21:03:29 +0000 Subject: r2176: syncing necessary changes for 3.0.7 svn merge -r 1942:1946 $SVNURL/branches/SAMBA_3_0 svn merge -r 1946:1948 $SVNURL/branches/SAMBA_3_0 svn merge -r 1948:1964 $SVNURL/branches/SAMBA_3_0 svn merge -r 1967:1968 $SVNURL/branches/SAMBA_3_0 svn merge -r 1980:2001 $SVNURL/branches/SAMBA_3_0 svn merge -r 2001:2006 $SVNURL/branches/SAMBA_3_0 svn merge -r 2006:2007 $SVNURL/branches/SAMBA_3_0 svn merge -r 2007:2009 $SVNURL/branches/SAMBA_3_0 svn merge -r 2009:2013 $SVNURL/branches/SAMBA_3_0 svn merge -r 2013:2014 $SVNURL/branches/SAMBA_3_0 svn merge -r 2014:2015 $SVNURL/branches/SAMBA_3_0 svn merge -r 2015:2016 $SVNURL/branches/SAMBA_3_0 svn merge -r 2016:2018 $SVNURL/branches/SAMBA_3_0 svn merge -r 2022:2023 $SVNURL/branches/SAMBA_3_0 svn merge -r 2026:2027 $SVNURL/branches/SAMBA_3_0 svn merge -r 2057:2068 $SVNURL/branches/SAMBA_3_0 svn merge -r 2068:2070 $SVNURL/branches/SAMBA_3_0 svn merge -r 2076:2077 $SVNURL/branches/SAMBA_3_0 svn merge -r 2080:2082 $SVNURL/branches/SAMBA_3_0 svn merge -r 2082:2083 $SVNURL/branches/SAMBA_3_0 svn merge -r 2083:2086 $SVNURL/branches/SAMBA_3_0 svn merge -r 2086:2090 $SVNURL/branches/SAMBA_3_0 svn merge -r 2090:2091 $SVNURL/branches/SAMBA_3_0 svn merge -r 2091:2093 $SVNURL/branches/SAMBA_3_0 svn merge -r 2093:2111 $SVNURL/branches/SAMBA_3_0 svn merge -r 2116:2131 $SVNURL/branches/SAMBA_3_0 svn merge -r 2131:2133 $SVNURL/branches/SAMBA_3_0 svn merge -r 2133:2135 $SVNURL/branches/SAMBA_3_0 svn merge -r 2150:2152 $SVNURL/branches/SAMBA_3_0 svn merge -r 2147:2150 $SVNURL/branches/SAMBA_3_0 svn merge -r 2155:2157 $SVNURL/branches/SAMBA_3_0 svn merge -r 2163:2175 $SVNURL/branches/SAMBA_3_0 --- packaging/Debian/debian-stable/changelog | 13 +++++++++++++ packaging/Debian/debian-stable/files | 11 ----------- packaging/Debian/debian-stable/patches/documentation.patch | 4 ++-- packaging/Debian/debian-stable/rules | 3 ++- packaging/Debian/debian-stable/samba.docs | 1 - 5 files changed, 17 insertions(+), 15 deletions(-) delete mode 100644 packaging/Debian/debian-stable/files (limited to 'packaging') diff --git a/packaging/Debian/debian-stable/changelog b/packaging/Debian/debian-stable/changelog index ee4b7200ea0..f27fa2317ed 100644 --- a/packaging/Debian/debian-stable/changelog +++ b/packaging/Debian/debian-stable/changelog @@ -1,3 +1,16 @@ +samba (3.0.6-1) stable; urgency=low + + * samba 3.0.6 release + + -- Simo Sorce Fri, 20 August 2004 10:19:00 +0200 + +samba (3.0.5-1) stable; urgency=low + + * samba 3.0.5 release + * Security Fix Release + + -- Simo Sorce Tue, 27 July 2004 15:15:00 +0200 + samba (3.0.4-1) stable; urgency=low * samba 3.0.4 release diff --git a/packaging/Debian/debian-stable/files b/packaging/Debian/debian-stable/files deleted file mode 100644 index 8821a7e7385..00000000000 --- a/packaging/Debian/debian-stable/files +++ /dev/null @@ -1,11 +0,0 @@ -samba-doc_3.0.2-1_all.deb doc optional -samba_3.0.2-1_i386.deb net optional -samba-common_3.0.2-1_i386.deb net optional -smbclient_3.0.2-1_i386.deb net optional -swat_3.0.2-1_i386.deb net optional -smbfs_3.0.2-1_i386.deb otherosfs optional -libpam-smbpass_3.0.2-1_i386.deb admin extra -libsmbclient_3.0.2-1_i386.deb libs extra -libsmbclient-dev_3.0.2-1_i386.deb libdevel extra -winbind_3.0.2-1_i386.deb net optional -python2.2-samba_3.0.2-1_i386.deb python optional diff --git a/packaging/Debian/debian-stable/patches/documentation.patch b/packaging/Debian/debian-stable/patches/documentation.patch index b82552ef4df..ab64790fc97 100644 --- a/packaging/Debian/debian-stable/patches/documentation.patch +++ b/packaging/Debian/debian-stable/patches/documentation.patch @@ -18,7 +18,7 @@ .TP 3 \(bu --/usr/local/samba/bin/swat +-/usr/local/samba/sbin/swat +/usr/sbin/swat .TP \(bu @@ -48,7 +48,7 @@ +In \fI/etc/inetd\&.conf\fR you should add a line like this (not needed for Debian since the maintainer scripts do it. You need to uncomment the line, though, because it is added commented out for security reasons): .PP --\fBswat stream tcp nowait\&.400 root /usr/local/samba/bin/swat swat\fR +-\fBswat stream tcp nowait\&.400 root /usr/local/samba/sbin/swat swat\fR +\fBswat stream tcp nowait.400 root /usr/sbin/swat swat\fR .PP diff --git a/packaging/Debian/debian-stable/rules b/packaging/Debian/debian-stable/rules index 676162a39f1..91e77e6d0fd 100755 --- a/packaging/Debian/debian-stable/rules +++ b/packaging/Debian/debian-stable/rules @@ -135,9 +135,10 @@ install: build # libsmbclient files are not installed by the standard # 'make install' - do it manually. $(MAKE) -C source installclientlib DESTDIR=$(DESTDIR) - mv $(DESTDIR)/usr/lib/libsmbclient.so $(DESTDIR)/usr/lib/libsmbclient.so.0.1 + mv $(DESTDIR)/usr/lib/samba/libsmbclient.so $(DESTDIR)/usr/lib/libsmbclient.so.0.1 ln -s libsmbclient.so.0.1 $(DESTDIR)/usr/lib/libsmbclient.so.0 ln -s libsmbclient.so.0.1 $(DESTDIR)/usr/lib/libsmbclient.so + mv $(DESTDIR)/usr/lib/samba/libsmbclient.a $(DESTDIR)/usr/lib/libsmbclient.a # Install other stuff not installed by "make install" install -m 0755 debian/mksmbpasswd.awk $(DESTDIR)/usr/sbin/mksmbpasswd diff --git a/packaging/Debian/debian-stable/samba.docs b/packaging/Debian/debian-stable/samba.docs index d38ff256ee0..9a5a9fc6bfc 100644 --- a/packaging/Debian/debian-stable/samba.docs +++ b/packaging/Debian/debian-stable/samba.docs @@ -1,4 +1,3 @@ Manifest README -REVISION WHATSNEW.txt -- cgit