From 91b479aeda6b6793ed9a2b8f41af19376342e5d3 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 20 Dec 2005 14:15:35 +0000 Subject: r12397: Change the 'samba4' prefix in the Debian packages back to 'samba' (This used to be commit 2002ba90c58c5ae69d242986834d07f499e46253) --- packaging/debian/changelog | 10 ++++- packaging/debian/control | 26 +++++------ packaging/debian/init.d | 2 +- packaging/debian/rules | 14 +++--- packaging/debian/samba-client.install | 5 +++ packaging/debian/samba-common.conffiles | 0 packaging/debian/samba-common.dirs | 4 ++ packaging/debian/samba-common.files | 0 packaging/debian/samba-common.install | 3 ++ packaging/debian/samba-dev.install | 3 ++ packaging/debian/samba-gtk-frontends.install | 4 ++ packaging/debian/samba-server | 27 ++++++++++++ packaging/debian/samba-server.install | 3 ++ packaging/debian/samba-server.samba.init | 63 +++++++++++++++++++++++++++ packaging/debian/samba-swat.install | 1 + packaging/debian/samba-testsuite.install | 10 +++++ packaging/debian/samba4-client.install | 5 --- packaging/debian/samba4-common.conffiles | 0 packaging/debian/samba4-common.dirs | 4 -- packaging/debian/samba4-common.files | 0 packaging/debian/samba4-common.install | 3 -- packaging/debian/samba4-dev.install | 3 -- packaging/debian/samba4-gtk-frontends.install | 4 -- packaging/debian/samba4-server.config | 27 ------------ packaging/debian/samba4-server.install | 3 -- packaging/debian/samba4-server.postinst | 8 ++-- packaging/debian/samba4-server.samba4.init | 63 --------------------------- packaging/debian/samba4-server.templates | 8 ++-- packaging/debian/samba4-swat.install | 1 - packaging/debian/samba4-testsuite.install | 10 ----- 30 files changed, 160 insertions(+), 154 deletions(-) create mode 100644 packaging/debian/samba-client.install create mode 100644 packaging/debian/samba-common.conffiles create mode 100644 packaging/debian/samba-common.dirs create mode 100644 packaging/debian/samba-common.files create mode 100644 packaging/debian/samba-common.install create mode 100644 packaging/debian/samba-dev.install create mode 100644 packaging/debian/samba-gtk-frontends.install create mode 100644 packaging/debian/samba-server create mode 100644 packaging/debian/samba-server.install create mode 100644 packaging/debian/samba-server.samba.init create mode 100644 packaging/debian/samba-swat.install create mode 100644 packaging/debian/samba-testsuite.install delete mode 100644 packaging/debian/samba4-client.install delete mode 100644 packaging/debian/samba4-common.conffiles delete mode 100644 packaging/debian/samba4-common.dirs delete mode 100644 packaging/debian/samba4-common.files delete mode 100644 packaging/debian/samba4-common.install delete mode 100644 packaging/debian/samba4-dev.install delete mode 100644 packaging/debian/samba4-gtk-frontends.install delete mode 100644 packaging/debian/samba4-server.config delete mode 100644 packaging/debian/samba4-server.install delete mode 100644 packaging/debian/samba4-server.samba4.init delete mode 100644 packaging/debian/samba4-swat.install delete mode 100644 packaging/debian/samba4-testsuite.install (limited to 'packaging') diff --git a/packaging/debian/changelog b/packaging/debian/changelog index 8e83134f47..087d074519 100644 --- a/packaging/debian/changelog +++ b/packaging/debian/changelog @@ -1,8 +1,14 @@ -samba4 (3.9.0+SVN7941-1) unstable; urgency=low +samba (3.9.0+SVN12395-1) unstable; urgency=low + + * New snapshot, drop 4 suffix + + -- Jelmer Vernooij Tue, 20 Dec 2005 13:38:26 +0100 + +samba4 (3.9.0+SVN12312-1) unstable; urgency=low * New upstream snapshot. - -- Jelmer Vernooij Mon, 27 Jun 2005 11:25:57 +0200 + -- Jelmer Vernooij Mon, 27 Jun 2005 11:25:57 +0200 samba4 (3.9.0-SVN-build-6710-1) unstable; urgency=low diff --git a/packaging/debian/control b/packaging/debian/control index b1ff5403a6..83ebdf579a 100644 --- a/packaging/debian/control +++ b/packaging/debian/control @@ -1,11 +1,11 @@ -Source: samba4 +Source: samba Section: net Priority: optional Maintainer: Jelmer Vernooij Standards-Version: 3.6.2 Build-Depends: libgtk2.0-dev, libgconf2-dev, libldap-dev, debhelper (>> 4.0.0), libparse-yapp-perl, perl, docbook-xsl, xsltproc, po-debconf -Package: samba4-common +Package: samba-common Architecture: all Description: Samba 4 common files used by both the server and the client The Samba software suite is a collection of programs that @@ -19,10 +19,10 @@ Description: Samba 4 common files used by both the server and the client regard to upgrades between versions. . This package contains the common files that are used by both the server - (provided in the samba4-server package) and the client (provided in the - samba4-client package). + (provided in the samba-server package) and the client (provided in the + samba-client package). -Package: samba4-client +Package: samba-client Architecture: any Depends: ${shlibs:Depends} Description: client utilities from Samba 4 @@ -40,9 +40,9 @@ Description: client utilities from Samba 4 particular it includes the command line utilities smbclient, net, and some ACL tools. -Package: samba4-testsuite +Package: samba-testsuite Architecture: any -Depends: ${shlibs:Depends}, samba4-common +Depends: ${shlibs:Depends}, samba-common Description: test suite from Samba 4 The Samba software suite is a collection of programs that implements the SMB protocol for unix systems, allowing you to serve @@ -57,10 +57,10 @@ Description: test suite from Samba 4 This package contains programs for testing the reliability and speed of SMB servers, Samba in particular. -Package: samba4-server +Package: samba-server Architecture: any -Recommends: samba4-swat -Depends: ${shlibs:Depends}, samba4-common, debconf +Recommends: samba-swat +Depends: ${shlibs:Depends}, samba-common, debconf Description: LanManager-like file and printer server for Unix (version 4) The Samba software suite is a collection of programs that implements the SMB protocol for unix systems, allowing you to serve @@ -74,7 +74,7 @@ Description: LanManager-like file and printer server for Unix (version 4) . This package contains smbd, the Samba file, print and domain server. -Package: samba4-gtk-frontends +Package: samba-gtk-frontends Architecture: any Depends: ${shlibs:Depends} Description: graphical Samba client utilities @@ -129,7 +129,7 @@ Description: IDL compiler written in Perl which takes in IDL files and can output C code for various uses. It is primarily of interest to developers. -Package: samba4-dev +Package: samba-dev Architecture: any Depends: libparse-pidl-perl, libc6-dev, pkg-config (>= 0.14.0) Description: tools for extending Samba @@ -166,7 +166,7 @@ Description: tools for maintaining LDB database files are primarily useful for debugging and developing Samba or other applications using LDB. -Package: samba4-swat +Package: samba-swat Architecture: all Description: data files for SWAT The Samba software suite is a collection of programs that diff --git a/packaging/debian/init.d b/packaging/debian/init.d index 2b3549b3b2..a0c7969a8b 100644 --- a/packaging/debian/init.d +++ b/packaging/debian/init.d @@ -43,7 +43,7 @@ case "$1" in start-stop-daemon --start --verbose --exec $DAEMON ;; *) - echo "Usage: /etc/init.d/samba4 {start|stop|restart|force-reload}" + echo "Usage: /etc/init.d/samba {start|stop|restart|force-reload}" exit 1 ;; esac diff --git a/packaging/debian/rules b/packaging/debian/rules index 771e7c065c..7938256cf7 100755 --- a/packaging/debian/rules +++ b/packaging/debian/rules @@ -5,7 +5,7 @@ SOURCEPATH=../source -package=samba4 +package=samba configure: configure-stamp configure-stamp: @@ -17,10 +17,10 @@ configure-stamp: --enable-shared \ --enable-static \ --sysconfdir=/etc \ - --libdir=/etc/samba4 \ - --with-configdir=/etc/samba4 \ - --with-privatedir=/etc/samba4 \ - --with-piddir=/var/run/samba4 \ + --libdir=/etc/samba \ + --with-configdir=/etc/samba \ + --with-privatedir=/etc/samba \ + --with-piddir=/var/run/samba \ --localstatedir=/var \ --with-pam \ --with-syslog \ @@ -66,7 +66,7 @@ install: build dh_clean -k dh_installdirs mkdir -p $(CURDIR)/debian/tmp/usr/share/man/man1 - mkdir -p $(CURDIR)/debian/tmp/etc/samba4 + mkdir -p $(CURDIR)/debian/tmp/etc/samba $(MAKE) -C $(SOURCEPATH) install DESTDIR=$(CURDIR)/debian/tmp $(MAKE) -C $(SOURCEPATH) manpages installman DESTDIR=$(CURDIR)/debian/tmp cp $(SOURCEPATH)/setup/provision $(CURDIR)/debian/tmp/usr/lib/samba/setup @@ -83,7 +83,7 @@ binary-arch: build install dh_compress -a dh_fixperms -a dh_makeshlibs -a - dh_installinit -a --name=samba4 + dh_installinit -a --name=samba dh_installdebconf -a dh_installdeb -a dh_shlibdeps -a diff --git a/packaging/debian/samba-client.install b/packaging/debian/samba-client.install new file mode 100644 index 0000000000..7740164cd1 --- /dev/null +++ b/packaging/debian/samba-client.install @@ -0,0 +1,5 @@ +usr/bin/net +usr/bin/nmblookup +usr/bin/setntacl +usr/bin/setnttoken +usr/bin/smbclient diff --git a/packaging/debian/samba-common.conffiles b/packaging/debian/samba-common.conffiles new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packaging/debian/samba-common.dirs b/packaging/debian/samba-common.dirs new file mode 100644 index 0000000000..8731c3dce2 --- /dev/null +++ b/packaging/debian/samba-common.dirs @@ -0,0 +1,4 @@ +etc/samba/tls +usr/lib/samba +var/cache/samba +var/run/samba diff --git a/packaging/debian/samba-common.files b/packaging/debian/samba-common.files new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packaging/debian/samba-common.install b/packaging/debian/samba-common.install new file mode 100644 index 0000000000..9b853066d5 --- /dev/null +++ b/packaging/debian/samba-common.install @@ -0,0 +1,3 @@ +usr/lib/samba/*.dat +usr/lib/samba/setup +usr/lib/samba/js diff --git a/packaging/debian/samba-dev.install b/packaging/debian/samba-dev.install new file mode 100644 index 0000000000..ba6f8f3baf --- /dev/null +++ b/packaging/debian/samba-dev.install @@ -0,0 +1,3 @@ +usr/include +usr/share/man/man3/talloc.3 +usr/share/man/man3/ldb.3 diff --git a/packaging/debian/samba-gtk-frontends.install b/packaging/debian/samba-gtk-frontends.install new file mode 100644 index 0000000000..0bb395b143 --- /dev/null +++ b/packaging/debian/samba-gtk-frontends.install @@ -0,0 +1,4 @@ +usr/bin/gregedit +usr/bin/gwsam +usr/bin/gepdump +usr/share/man/man1/gregedit.1 diff --git a/packaging/debian/samba-server b/packaging/debian/samba-server new file mode 100644 index 0000000000..f2db73992e --- /dev/null +++ b/packaging/debian/samba-server @@ -0,0 +1,27 @@ +#! /bin/sh + +set -e + +. /usr/share/debconf/confmodule + +db_title "Samba Server" + +db_input medium samba4-server/setup-pdc || true +db_go || true + +db_get samba4-server/setup-pdc + +if [ "$RET" = "true" ]; then + db_input medium samba4-server/realm || true + db_go || true + + db_input medium samba4-server/domain || true + db_go || true + + db_input medium samba4-server/password || true + db_go || true + + db_input medium samba4-server/done || true + db_go || true +fi + diff --git a/packaging/debian/samba-server.install b/packaging/debian/samba-server.install new file mode 100644 index 0000000000..a61f283dd8 --- /dev/null +++ b/packaging/debian/samba-server.install @@ -0,0 +1,3 @@ +usr/sbin/smbd +usr/bin/smbstatus +usr/bin/smbscript diff --git a/packaging/debian/samba-server.samba.init b/packaging/debian/samba-server.samba.init new file mode 100644 index 0000000000..9b276dd658 --- /dev/null +++ b/packaging/debian/samba-server.samba.init @@ -0,0 +1,63 @@ +#! /bin/sh + +# +# Start/stops the Samba daemon (smbd). +# Adapted from the Samba 3 packages. +# + +SMBDPID=/var/run/samba/smbd.pid + +# clear conflicting settings from the environment +unset TMPDIR + +# See if the daemon and the config file are there +test -x /usr/sbin/smbd -a -r /etc/samba/smb.conf || exit 0 + +. /lib/lsb/init-functions + +case "$1" in + start) + log_daemon_msg "Starting Samba 4 daemon" "smbd" + + if ! start-stop-daemon --start --quiet --oknodo --exec /usr/sbin/smbd -- -D; then + log_end_msg 1 + exit 1 + fi + + log_end_msg 0 + ;; + stop) + log_daemon_msg "Stopping Samba 4 daemon" "smbd" + + start-stop-daemon --stop --quiet --pidfile $SMBDPID + # Wait a little and remove stale PID file + sleep 1 + if [ -f $SMBDPID ] && ! ps h `cat $SMBDPID` > /dev/null + then + # Stale PID file (smbd was succesfully stopped), + # remove it (should be removed by smbd itself IMHO.) + rm -f $SMBDPID + fi + + log_end_msg 0 + + ;; + reload) + log_daemon_msg "Reloading /etc/samba/smb.conf" "smbd only" + + start-stop-daemon --stop --signal HUP --pidfile $SMBDPID + + log_end_msg 0 + ;; + restart|force-reload) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "Usage: /etc/init.d/samba {start|stop|reload|restart|force-reload}" + exit 1 + ;; +esac + +exit 0 diff --git a/packaging/debian/samba-swat.install b/packaging/debian/samba-swat.install new file mode 100644 index 0000000000..0280407980 --- /dev/null +++ b/packaging/debian/samba-swat.install @@ -0,0 +1 @@ +usr/share/samba/swat diff --git a/packaging/debian/samba-testsuite.install b/packaging/debian/samba-testsuite.install new file mode 100644 index 0000000000..ff068e02d5 --- /dev/null +++ b/packaging/debian/samba-testsuite.install @@ -0,0 +1,10 @@ +usr/bin/smbtorture +usr/bin/ndrdump +usr/bin/gentest +usr/bin/locktest +usr/bin/masktest +usr/share/man/man1/smbtorture.1 +usr/share/man/man1/ndrdump.1 +usr/share/man/man1/gentest.1 +usr/share/man/man1/locktest.1 +usr/share/man/man1/masktest.1 diff --git a/packaging/debian/samba4-client.install b/packaging/debian/samba4-client.install deleted file mode 100644 index 7740164cd1..0000000000 --- a/packaging/debian/samba4-client.install +++ /dev/null @@ -1,5 +0,0 @@ -usr/bin/net -usr/bin/nmblookup -usr/bin/setntacl -usr/bin/setnttoken -usr/bin/smbclient diff --git a/packaging/debian/samba4-common.conffiles b/packaging/debian/samba4-common.conffiles deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packaging/debian/samba4-common.dirs b/packaging/debian/samba4-common.dirs deleted file mode 100644 index 61432f3de0..0000000000 --- a/packaging/debian/samba4-common.dirs +++ /dev/null @@ -1,4 +0,0 @@ -etc/samba4/tls -usr/lib/samba -var/cache/samba -var/run/samba4 diff --git a/packaging/debian/samba4-common.files b/packaging/debian/samba4-common.files deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packaging/debian/samba4-common.install b/packaging/debian/samba4-common.install deleted file mode 100644 index 9b853066d5..0000000000 --- a/packaging/debian/samba4-common.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib/samba/*.dat -usr/lib/samba/setup -usr/lib/samba/js diff --git a/packaging/debian/samba4-dev.install b/packaging/debian/samba4-dev.install deleted file mode 100644 index ba6f8f3baf..0000000000 --- a/packaging/debian/samba4-dev.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/include -usr/share/man/man3/talloc.3 -usr/share/man/man3/ldb.3 diff --git a/packaging/debian/samba4-gtk-frontends.install b/packaging/debian/samba4-gtk-frontends.install deleted file mode 100644 index 0bb395b143..0000000000 --- a/packaging/debian/samba4-gtk-frontends.install +++ /dev/null @@ -1,4 +0,0 @@ -usr/bin/gregedit -usr/bin/gwsam -usr/bin/gepdump -usr/share/man/man1/gregedit.1 diff --git a/packaging/debian/samba4-server.config b/packaging/debian/samba4-server.config deleted file mode 100644 index f2db73992e..0000000000 --- a/packaging/debian/samba4-server.config +++ /dev/null @@ -1,27 +0,0 @@ -#! /bin/sh - -set -e - -. /usr/share/debconf/confmodule - -db_title "Samba Server" - -db_input medium samba4-server/setup-pdc || true -db_go || true - -db_get samba4-server/setup-pdc - -if [ "$RET" = "true" ]; then - db_input medium samba4-server/realm || true - db_go || true - - db_input medium samba4-server/domain || true - db_go || true - - db_input medium samba4-server/password || true - db_go || true - - db_input medium samba4-server/done || true - db_go || true -fi - diff --git a/packaging/debian/samba4-server.install b/packaging/debian/samba4-server.install deleted file mode 100644 index a61f283dd8..0000000000 --- a/packaging/debian/samba4-server.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/sbin/smbd -usr/bin/smbstatus -usr/bin/smbscript diff --git a/packaging/debian/samba4-server.postinst b/packaging/debian/samba4-server.postinst index 544cc7f555..b29d2518cc 100644 --- a/packaging/debian/samba4-server.postinst +++ b/packaging/debian/samba4-server.postinst @@ -4,16 +4,16 @@ set -e . /usr/share/debconf/confmodule -db_get samba4-server/setup-pdc || true +db_get samba-server/setup-pdc || true if [ "$RET" = "true" ]; then - db_get samba4-server/realm + db_get samba-server/realm REALM="$RET" - db_get samba4-server/domain + db_get samba-server/domain DOMAIN="$RET" - db_get samba4-server/password + db_get samba-server/password PASSWORD="$RET" db_stop diff --git a/packaging/debian/samba4-server.samba4.init b/packaging/debian/samba4-server.samba4.init deleted file mode 100644 index 0c8b8a069a..0000000000 --- a/packaging/debian/samba4-server.samba4.init +++ /dev/null @@ -1,63 +0,0 @@ -#! /bin/sh - -# -# Start/stops the Samba daemon (smbd). -# Adapted from the Samba 3 packages. -# - -SMBDPID=/var/run/samba4/smbd.pid - -# clear conflicting settings from the environment -unset TMPDIR - -# See if the daemon and the config file are there -test -x /usr/sbin/smbd -a -r /etc/samba4/smb.conf || exit 0 - -. /lib/lsb/init-functions - -case "$1" in - start) - log_daemon_msg "Starting Samba 4 daemon" "smbd" - - if ! start-stop-daemon --start --quiet --oknodo --exec /usr/sbin/smbd -- -D; then - log_end_msg 1 - exit 1 - fi - - log_end_msg 0 - ;; - stop) - log_daemon_msg "Stopping Samba 4 daemon" "smbd" - - start-stop-daemon --stop --quiet --pidfile $SMBDPID - # Wait a little and remove stale PID file - sleep 1 - if [ -f $SMBDPID ] && ! ps h `cat $SMBDPID` > /dev/null - then - # Stale PID file (smbd was succesfully stopped), - # remove it (should be removed by smbd itself IMHO.) - rm -f $SMBDPID - fi - - log_end_msg 0 - - ;; - reload) - log_daemon_msg "Reloading /etc/samba/smb.conf" "smbd only" - - start-stop-daemon --stop --signal HUP --pidfile $SMBDPID - - log_end_msg 0 - ;; - restart|force-reload) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "Usage: /etc/init.d/samba4 {start|stop|reload|restart|force-reload}" - exit 1 - ;; -esac - -exit 0 diff --git a/packaging/debian/samba4-server.templates b/packaging/debian/samba4-server.templates index d8ee5d7e03..2c0e59a746 100644 --- a/packaging/debian/samba4-server.templates +++ b/packaging/debian/samba4-server.templates @@ -1,4 +1,4 @@ -Template: samba4-server/setup-pdc +Template: samba-server/setup-pdc Type: boolean Default: false _Description: Set up Samba 4 as a PDC? @@ -10,20 +10,20 @@ _Description: Set up Samba 4 as a PDC? it serves the data from the zone file in that directory before you can use your Active Directory domain. -Template: samba4-server/realm +Template: samba-server/realm Type: string _Description: Realm What Kerberos realm will your server be in? In many cases, this will be the same as your DNS domain name (ie. YOUR.REALM). -Template: samba4-server/domain +Template: samba-server/domain Type: string _Description: Domain What will be the domain of your server? This is also known as the "workgroup" of your server, and is typically a short name without any dots (ie. DOMAIN). -Template: samba4-server/password +Template: samba-server/password Type: password _Description: Administrator password You will need a password for the "Administrator" account. Note that in the diff --git a/packaging/debian/samba4-swat.install b/packaging/debian/samba4-swat.install deleted file mode 100644 index 0280407980..0000000000 --- a/packaging/debian/samba4-swat.install +++ /dev/null @@ -1 +0,0 @@ -usr/share/samba/swat diff --git a/packaging/debian/samba4-testsuite.install b/packaging/debian/samba4-testsuite.install deleted file mode 100644 index ff068e02d5..0000000000 --- a/packaging/debian/samba4-testsuite.install +++ /dev/null @@ -1,10 +0,0 @@ -usr/bin/smbtorture -usr/bin/ndrdump -usr/bin/gentest -usr/bin/locktest -usr/bin/masktest -usr/share/man/man1/smbtorture.1 -usr/share/man/man1/ndrdump.1 -usr/share/man/man1/gentest.1 -usr/share/man/man1/locktest.1 -usr/share/man/man1/masktest.1 -- cgit