Author: jelmer
Date: 2009-06-02 12:30:09 +0000 (Tue, 02 Jun 2009)
New Revision: 2797
Added:
branches/samba/experimental/debian/samba-common-bin.files
branches/samba/experimental/debian/samba-common-bin.postinst
Modified:
branches/samba/experimental/debian/README.debian
branches/samba/experimental/debian/changelog
branches/samba/experimental/debian/control
branches/samba/experimental/debian/rules
branches/samba/experimental/debian/samba-common.files
branches/samba/experimental/debian/samba-common.postinst
branches/samba/experimental/debian/samba-common.prerm
Log:
Split binaries out of samba-common into samba-common-bin. Closes:
#524661
Modified: branches/samba/experimental/debian/README.debian
===================================================================
--- branches/samba/experimental/debian/README.debian 2009-05-31 16:05:00 UTC (rev 2796)
+++ branches/samba/experimental/debian/README.debian 2009-06-02 12:30:09 UTC (rev 2797)
@@ -22,7 +22,8 @@
Currently, the Samba sources produce the following binary packages:
samba: A LanManager like file and printer server for Unix.
-samba-common: Samba common files used by both the server and the client.
+samba-common: Samba common configuration/data files used by both Samba 3 and Samba 4.
+samba-common-bin: Samba common binaries used by both the server and the client.
smbclient: A LanManager like simple client for Unix.
swat: Samba Web Administration Tool
samba-doc: Samba documentation.
Modified: branches/samba/experimental/debian/changelog
===================================================================
--- branches/samba/experimental/debian/changelog 2009-05-31 16:05:00 UTC (rev 2796)
+++ branches/samba/experimental/debian/changelog 2009-06-02 12:30:09 UTC (rev 2797)
@@ -1,3 +1,10 @@
+samba (2:3.4.0~pre1-2) UNRELEASED; urgency=low
+
+ * Split binaries out of samba-common into samba-common-bin. Closes:
+ #524661
+
+ -- Jelmer Vernooij <jelmer at debian.org> Tue, 02 Jun 2009 14:07:37 +0200
+
samba (2:3.4.0~pre1-1) experimental; urgency=low
* New upstream pre-release
Modified: branches/samba/experimental/debian/control
===================================================================
--- branches/samba/experimental/debian/control 2009-05-31 16:05:00 UTC (rev 2796)
+++ branches/samba/experimental/debian/control 2009-06-02 12:30:09 UTC (rev 2797)
@@ -38,10 +38,10 @@
This package is not required for connecting to existing SMB/CIFS servers
(see smbclient) or for mounting remote filesystems (see smbfs).
-Package: samba-common
+Package: samba-common-bin
Architecture: any
-Depends: libpam-modules, ucf, ${shlibs:Depends}, ${misc:Depends}
-Replaces: samba (<< 3.0.20b-1)
+Depends: libpam-modules, ${shlibs:Depends}, ${misc:Depends}, samba-common (>= 2:3.4.0pre1-2)
+Replaces: samba (<< 3.0.20b-1), samba-common (<< 2:3.4.0pre1-2)
Description: common files used by both the Samba server and client
Samba is an implementation of the SMB/CIFS protocol for Unix systems,
providing support for cross-platform file and printer sharing with
@@ -50,6 +50,19 @@
This package contains files and programs needed by Samba when used as
either a client or a server.
+Package: samba-common
+Architecture: all
+Depends: ucf, ${misc:Depends}
+Replaces: samba (<< 3.0.20b-1), samba4-common (<< 4.0.0~alpha7-1)
+Conflicts: samba4-common (<< 4.0.0~alpha7-1)
+Recommends: samba-common-bin
+Description: common files used by both the Samba server and client
+ Samba is an implementation of the SMB/CIFS protocol for Unix systems,
+ providing support for cross-platform file and printer sharing with
+ Microsoft Windows, OS X, and other Unix systems.
+ .
+ This package contains common files used by both Samba 3 and Samba 4.
+
Package: samba-tools
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -165,7 +178,7 @@
Section: libdevel
Priority: extra
Architecture: any
-Depends: libsmbclient (= ${binary:Version}), ${misc:Depends}
+Depends: libsmbclient (= ${binary:Version}), ${misc:Depends}, samba-common (>= 2:3.4.0pre1-2)
Description: development files for libsmbclient
This package provides the development files (static library and headers)
required for building applications against libsmbclient, a library that
Modified: branches/samba/experimental/debian/rules
===================================================================
--- branches/samba/experimental/debian/rules 2009-05-31 16:05:00 UTC (rev 2796)
+++ branches/samba/experimental/debian/rules 2009-06-02 12:30:09 UTC (rev 2797)
@@ -152,10 +152,6 @@
mv $(DESTDIR)/usr/bin/testparm $(DESTDIR)/usr/bin/testparm.samba3
mv $(DESTDIR)/usr/share/man/man1/testparm.1 $(DESTDIR)/usr/share/man/man1/testparm.samba3.1
- mv $(DESTDIR)/usr/share/samba/lowcase.dat $(DESTDIR)/usr/share/samba/lowcase.dat.samba3
- mv $(DESTDIR)/usr/share/samba/upcase.dat $(DESTDIR)/usr/share/samba/upcase.dat.samba3
- mv $(DESTDIR)/usr/share/samba/valid.dat $(DESTDIR)/usr/share/samba/valid.dat.samba3
-
# Starting with Samba 3.0.6 libsmbclient.so is installed in
# /usr/lib/samba. We don't want it there since it is not in the
# default library path. Here we move it to /usr/lib/.
@@ -195,7 +191,7 @@
ln -s ../../../bin/smbspool $(DESTDIR)/usr/lib/cups/backend/smb
cp debian/smb.conf* $(DESTDIR)/usr/share/samba/
- install -m755 debian/panic-action $(DESTDIR)/usr/share/samba/panic-action.samba3
+ install -m755 debian/panic-action $(DESTDIR)/usr/share/samba/panic-action
# Install samba-common's conffiles - they'll get moved later to their
# correct place by dh_movefiles.
cp debian/gdbcommands $(DESTDIR)/etc/samba/
@@ -244,8 +240,8 @@
done
dh_installchangelogs -Nlibpam-smbpass
DH_OPTIONS= dh_installchangelogs -plibpam-smbpass source3/pam_smbpass/CHANGELOG
- DH_OPTIONS= dh_strip -psamba -psmbclient -pwinbind -psamba-common --dbg-package=samba-dbg
- DH_OPTIONS= dh_strip -Nsamba -Nsmbclient -Nwinbind -Nsamba-common
+ DH_OPTIONS= dh_strip -psamba -psmbclient -pwinbind -psamba-common-bin --dbg-package=samba-dbg
+ DH_OPTIONS= dh_strip -Nsamba -Nsmbclient -Nwinbind -Nsamba-common-bin
dh_link
dh_compress
dh_fixperms
Added: branches/samba/experimental/debian/samba-common-bin.files
===================================================================
--- branches/samba/experimental/debian/samba-common-bin.files (rev 0)
+++ branches/samba/experimental/debian/samba-common-bin.files 2009-06-02 12:30:09 UTC (rev 2797)
@@ -0,0 +1,12 @@
+usr/bin/net.samba3
+usr/bin/nmblookup.samba3
+usr/bin/smbpasswd
+usr/bin/testparm.samba3
+usr/share/man/man1/nmblookup.samba3.1
+usr/share/man/man1/testparm.samba3.1
+usr/share/man/man5/lmhosts.5
+usr/share/man/man5/smb.conf.5
+usr/share/man/man5/smbpasswd.5
+usr/share/man/man7/samba.7
+usr/share/man/man8/net.samba3.8
+usr/share/man/man8/smbpasswd.8
Added: branches/samba/experimental/debian/samba-common-bin.postinst
===================================================================
--- branches/samba/experimental/debian/samba-common-bin.postinst (rev 0)
+++ branches/samba/experimental/debian/samba-common-bin.postinst 2009-06-02 12:30:09 UTC (rev 2797)
@@ -0,0 +1,17 @@
+#!/bin/sh
+#
+#
+
+set -e
+
+if [ "$1" = "configure" ]
+then
+ update-alternatives --install /usr/bin/nmblookup nmblookup /usr/bin/nmblookup.samba3 0 \
+ --slave /usr/share/man/man1/nmblookup.1.gz nmblookup.1.gz /usr/share/man/man1/nmblookup.samba3.1.gz
+ update-alternatives --install /usr/bin/net net /usr/bin/net.samba3 10 \
+ --slave /usr/share/man/man8/net.8.gz net.8.gz /usr/share/man/man8/net.samba3.8.gz
+ update-alternatives --install /usr/bin/testparm testparm /usr/bin/testparm.samba3 10 \
+ --slave /usr/share/man/man1/testparm.1.gz testparm.1.gz /usr/share/man/man1/testparm.samba3.1.gz
+fi
+
+#DEBHELPER#
Modified: branches/samba/experimental/debian/samba-common.files
===================================================================
--- branches/samba/experimental/debian/samba-common.files 2009-05-31 16:05:00 UTC (rev 2796)
+++ branches/samba/experimental/debian/samba-common.files 2009-06-02 12:30:09 UTC (rev 2797)
@@ -1,20 +1,8 @@
etc/samba/
etc/dhcp3/
etc/pam.d/
-usr/bin/net.samba3
-usr/bin/nmblookup.samba3
-usr/bin/smbpasswd
-usr/bin/testparm.samba3
-usr/share/man/man1/nmblookup.samba3.1
-usr/share/man/man1/testparm.samba3.1
-usr/share/man/man5/lmhosts.5
-usr/share/man/man5/smb.conf.5
-usr/share/man/man5/smbpasswd.5
-usr/share/man/man7/samba.7
-usr/share/man/man8/net.samba3.8
-usr/share/man/man8/smbpasswd.8
-usr/share/samba/lowcase.dat.samba3
-usr/share/samba/panic-action.samba3
+usr/share/samba/lowcase.dat
+usr/share/samba/panic-action
usr/share/samba/smb.conf*
-usr/share/samba/upcase.dat.samba3
-usr/share/samba/valid.dat.samba3
+usr/share/samba/upcase.dat
+usr/share/samba/valid.dat
Modified: branches/samba/experimental/debian/samba-common.postinst
===================================================================
--- branches/samba/experimental/debian/samba-common.postinst 2009-05-31 16:05:00 UTC (rev 2796)
+++ branches/samba/experimental/debian/samba-common.postinst 2009-06-02 12:30:09 UTC (rev 2797)
@@ -4,21 +4,6 @@
set -e
-if [ "$1" = "configure" ]
-then
- update-alternatives --install /usr/bin/nmblookup nmblookup /usr/bin/nmblookup.samba3 0 \
- --slave /usr/share/man/man1/nmblookup.1.gz nmblookup.1.gz /usr/share/man/man1/nmblookup.samba3.1.gz
- update-alternatives --install /usr/bin/net net /usr/bin/net.samba3 10 \
- --slave /usr/share/man/man8/net.8.gz net.8.gz /usr/share/man/man8/net.samba3.8.gz
- update-alternatives --install /usr/bin/testparm testparm /usr/bin/testparm.samba3 10 \
- --slave /usr/share/man/man1/testparm.1.gz testparm.1.gz /usr/share/man/man1/testparm.samba3.1.gz
- for N in valid.dat upcase.dat lowcase.dat
- do
- update-alternatives --install /usr/share/samba/$N $N /usr/share/samba/$N.samba3 0
- done
- update-alternatives --install /usr/share/samba/panic-action samba-panic-action /usr/share/samba/panic-action.samba3 0
-fi
-
# Do debconf stuff here
. /usr/share/debconf/confmodule
Modified: branches/samba/experimental/debian/samba-common.prerm
===================================================================
--- branches/samba/experimental/debian/samba-common.prerm 2009-05-31 16:05:00 UTC (rev 2796)
+++ branches/samba/experimental/debian/samba-common.prerm 2009-06-02 12:30:09 UTC (rev 2797)
@@ -7,11 +7,6 @@
update-alternatives --remove nmblookup /usr/bin/nmblookup.samba3
update-alternatives --remove net /usr/bin/net.samba3
update-alternatives --remove testparm /usr/bin/testparm.samba3
- for N in valid.dat upcase.dat lowcase.dat
- do
- update-alternatives --remove $N /usr/share/samba/$N.samba3
- done
- update-alternatives --remove samba-panic-action /usr/share/samba/panic-action.samba3
;;
esac