[PATCH] clean up packaging/debian/ (update)
Steinar H. Gunderson
sgunderson at bigfoot.com
Mon Dec 12 14:00:17 GMT 2005
Hi,
Here's an updated version of the patch I sent yesterday -- it now also fixes
several lintian warnings, and puts more files in right packages. :-) (I've
tested, and basic provisioning actually works fine now.)
/* Steinar */
--
Homepage: http://www.sesse.net/
-------------- next part --------------
Index: packaging/debian/samba4-server.install
===================================================================
--- packaging/debian/samba4-server.install (revision 12192)
+++ packaging/debian/samba4-server.install (working copy)
@@ -1 +1,3 @@
usr/sbin/smbd
+usr/bin/smbstatus
+usr/bin/smbscript
Index: packaging/debian/control
===================================================================
--- packaging/debian/control (revision 12192)
+++ packaging/debian/control (working copy)
@@ -2,14 +2,9 @@
Section: net
Priority: optional
Maintainer: Jelmer Vernooij <jelmer at samba.org>
-Standards-Version: 3.6.1.0
-Build-Depends: build-essential, libgtk2.0-dev, libgconf2-dev, libldap-dev, debhelper (>> 4.0.0), libparse-yapp-perl, perl
+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
-Package: samba4
-Architecture: all
-Description: Samba4 misc
- Files common for all programs in Samba
-
Package: samba4-common
Architecture: all
Description: Common samba files
@@ -17,7 +12,7 @@
Package: samba4-client
Architecture: any
-Depends: ${shlibs:Depends},
+Depends: ${shlibs:Depends}
Description: Client utilities from Samba4
Client utilities for NetBIOS, SMB and RPC.
@@ -41,9 +36,9 @@
Description: Graphical Samba client utilities
Contains GTK+ programs for maintaining:
.
- * Remote SAM databases
- * Local and remote registries
- * DCE/RPC endpoints
+ * Remote SAM databases
+ * Local and remote registries
+ * DCE/RPC endpoints
Package: winregistry-tools
Architecture: any
@@ -53,7 +48,7 @@
Package: libparse-pidl-perl
Architecture: any
-Depends: perl
+Depends: ${perl:Depends}
Description: IDL compiler written in Perl
FIXME
Index: packaging/debian/compat
===================================================================
--- packaging/debian/compat (revision 0)
+++ packaging/debian/compat (revision 0)
@@ -0,0 +1 @@
+4
Index: packaging/debian/diversions
===================================================================
--- packaging/debian/diversions (revision 12191)
+++ packaging/debian/diversions (working copy)
@@ -1 +0,0 @@
-smbd smb.samba3 samba
Index: packaging/debian/samba4-swat.install
===================================================================
--- packaging/debian/samba4-swat.install (revision 0)
+++ packaging/debian/samba4-swat.install (revision 0)
@@ -0,0 +1 @@
+usr/share/samba/swat
Index: packaging/debian/samba4-client.install
===================================================================
--- packaging/debian/samba4-client.install (revision 12192)
+++ packaging/debian/samba4-client.install (working copy)
@@ -1,3 +1,5 @@
-usr/bin/smbclient
usr/bin/net
usr/bin/nmblookup
+usr/bin/setntacl
+usr/bin/setnttoken
+usr/bin/smbclient
Index: packaging/debian/samba4-dev.install
===================================================================
--- packaging/debian/samba4-dev.install (revision 0)
+++ packaging/debian/samba4-dev.install (revision 0)
@@ -0,0 +1,3 @@
+usr/include
+usr/share/man/man3/talloc.3
+usr/share/man/man3/ldb.3
Index: packaging/debian/rules
===================================================================
--- packaging/debian/rules (revision 12192)
+++ packaging/debian/rules (working copy)
@@ -7,7 +7,8 @@
package=samba4
-configure:
+configure: configure-stamp
+configure-stamp:
dh_testdir
cd $(SOURCEPATH) && ./autogen.sh
cd $(SOURCEPATH) && ./configure --with-fhs \
@@ -17,6 +18,7 @@
--enable-static \
--sysconfdir=/etc \
--libdir=/etc/samba4 \
+ --with-configdir=/etc/samba4 \
--with-privatedir=/etc/samba4 \
--with-piddir=/var/run/samba4 \
--localstatedir=/var \
@@ -27,29 +29,31 @@
cd $(SOURCEPATH)/pidl && perl Makefile.PL verbose INSTALLDIRS=vendor PREFIX=/usr
touch $@
-build: configure
+build: build-stamp
+build-stamp: configure
dh_testdir
$(MAKE) -C $(SOURCEPATH) proto
-$(MAKE) -C $(SOURCEPATH) pch
$(MAKE) -C $(SOURCEPATH) all
- $(MAKE) -C $(SOURCEPATH)/pidl all doc
+ $(MAKE) -C $(SOURCEPATH)/pidl all
touch $@
clean:
dh_testdir
+ dh_testroot
dh_clean
- rm -f build configure
+ $(RM) debian/tmp
-$(MAKE) -C $(SOURCEPATH) clean
+ $(RM) build-stamp configure-stamp
binary-indep: build install
- dh_testdir -i
- dh_testroot -i
+ dh_testdir
+ dh_testroot
dh_install -i --sourcedir=debian/tmp
dh_installdocs -i
dh_installchangelogs -i
dh_compress -i
dh_fixperms -i
- dh_python -i
dh_installdeb -i
dh_gencontrol -i
dh_md5sums -i
@@ -61,20 +65,22 @@
install: build
dh_clean -k
dh_installdirs
+ mkdir -p $(CURDIR)/debian/tmp/usr/share/man/man1
+ mkdir -p $(CURDIR)/debian/tmp/etc/samba4
$(MAKE) -C $(SOURCEPATH) install DESTDIR=$(CURDIR)/debian/tmp
$(MAKE) -C $(SOURCEPATH) manpages installman DESTDIR=$(CURDIR)/debian/tmp
- mkdir -p $(CURDIR)/debian/tmp/etc/samba4
cp $(CURDIR)/debian/smb.conf $(CURDIR)/debian/tmp/etc/samba4
+ cp $(SOURCEPATH)/setup/provision $(CURDIR)/debian/tmp/usr/lib/samba/setup
$(MAKE) -C $(SOURCEPATH)/pidl install DESTDIR=$(CURDIR)/debian/tmp
binary-arch: build install
- dh_testdir -a
- dh_testroot -a
+ dh_testdir
+ dh_testroot
dh_install -a --sourcedir=debian/tmp
+ dh_installdocs -a
dh_installchangelogs -a
- dh_installdocs -a
dh_strip -a
- dh_python -a
+ dh_perl -a
dh_compress -a
dh_fixperms -a
dh_makeshlibs -a
@@ -86,4 +92,4 @@
binary: binary-arch binary-indep
-.PHONY: binary binary-arch binary-indep clean
+.PHONY: configure build install binary binary-arch binary-indep clean
Index: packaging/debian/libparse-pidl-perl.install
===================================================================
--- packaging/debian/libparse-pidl-perl.install (revision 12192)
+++ packaging/debian/libparse-pidl-perl.install (working copy)
@@ -1,2 +1,4 @@
usr/bin/pidl
usr/share/perl5
+usr/share/man/man3/*.3pm
+usr/share/man/man1/pidl.1p
Index: packaging/debian/samba4-common.dirs
===================================================================
--- packaging/debian/samba4-common.dirs (revision 12192)
+++ packaging/debian/samba4-common.dirs (working copy)
@@ -1,3 +1,4 @@
+etc/samba4/tls
+usr/lib/samba
var/cache/samba
-etc/samba4
-usr/lib/samba
+var/run/samba4
Index: packaging/debian/samba4-common.files
===================================================================
--- packaging/debian/samba4-common.files (revision 12191)
+++ packaging/debian/samba4-common.files (working copy)
@@ -1,3 +0,0 @@
-usr/lib/samba/lowcase.dat
-usr/lib/samba/upcase.dat
-usr/lib/valid.dat
Index: packaging/debian/samba4-common.install
===================================================================
--- packaging/debian/samba4-common.install (revision 12192)
+++ packaging/debian/samba4-common.install (working copy)
@@ -1 +1,4 @@
etc/samba4/smb.conf
+usr/lib/samba/*.dat
+usr/lib/samba/setup
+usr/lib/samba/js
Index: packaging/debian/samba4-common.conffiles
===================================================================
--- packaging/debian/samba4-common.conffiles (revision 12191)
+++ packaging/debian/samba4-common.conffiles (working copy)
@@ -1 +0,0 @@
-/etc/samba4/smb.conf
Index: packaging/debian/copyright
===================================================================
--- packaging/debian/copyright (revision 12192)
+++ packaging/debian/copyright (working copy)
@@ -15,9 +15,8 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
On Debian GNU/Linux systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL'.
More information about the samba-technical
mailing list