Author: jelmer Date: 2005-12-12 19:33:09 +0000 (Mon, 12 Dec 2005) New Revision: 12197
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=12197 Log: Some improvements to the Debian package. Thanks to Steinar Gunderson Added: branches/SAMBA_4_0/packaging/debian/compat branches/SAMBA_4_0/packaging/debian/samba4-dev.install branches/SAMBA_4_0/packaging/debian/samba4-swat.install Modified: branches/SAMBA_4_0/packaging/debian/control branches/SAMBA_4_0/packaging/debian/diversions branches/SAMBA_4_0/packaging/debian/libparse-pidl-perl.install branches/SAMBA_4_0/packaging/debian/rules branches/SAMBA_4_0/packaging/debian/samba4-common.conffiles branches/SAMBA_4_0/packaging/debian/samba4-common.dirs branches/SAMBA_4_0/packaging/debian/samba4-common.files branches/SAMBA_4_0/packaging/debian/samba4-common.install Changeset: Added: branches/SAMBA_4_0/packaging/debian/compat =================================================================== --- branches/SAMBA_4_0/packaging/debian/compat 2005-12-12 18:55:54 UTC (rev 12196) +++ branches/SAMBA_4_0/packaging/debian/compat 2005-12-12 19:33:09 UTC (rev 12197) @@ -0,0 +1 @@ +4 Modified: branches/SAMBA_4_0/packaging/debian/control =================================================================== --- branches/SAMBA_4_0/packaging/debian/control 2005-12-12 18:55:54 UTC (rev 12196) +++ branches/SAMBA_4_0/packaging/debian/control 2005-12-12 19:33:09 UTC (rev 12197) @@ -2,14 +2,9 @@ Section: net Priority: optional Maintainer: Jelmer Vernooij <[EMAIL PROTECTED]> -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 Modified: branches/SAMBA_4_0/packaging/debian/diversions =================================================================== --- branches/SAMBA_4_0/packaging/debian/diversions 2005-12-12 18:55:54 UTC (rev 12196) +++ branches/SAMBA_4_0/packaging/debian/diversions 2005-12-12 19:33:09 UTC (rev 12197) @@ -1 +0,0 @@ -smbd smb.samba3 samba Modified: branches/SAMBA_4_0/packaging/debian/libparse-pidl-perl.install =================================================================== --- branches/SAMBA_4_0/packaging/debian/libparse-pidl-perl.install 2005-12-12 18:55:54 UTC (rev 12196) +++ branches/SAMBA_4_0/packaging/debian/libparse-pidl-perl.install 2005-12-12 19:33:09 UTC (rev 12197) @@ -1,2 +1,5 @@ usr/bin/pidl usr/share/perl5 +usr/share/man/man3/*.3pm +usr/share/man/man1/pidl.1p + Modified: branches/SAMBA_4_0/packaging/debian/rules =================================================================== --- branches/SAMBA_4_0/packaging/debian/rules 2005-12-12 18:55:54 UTC (rev 12196) +++ branches/SAMBA_4_0/packaging/debian/rules 2005-12-12 19:33:09 UTC (rev 12197) @@ -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,20 @@ 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 $(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_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 +90,4 @@ binary: binary-arch binary-indep -.PHONY: binary binary-arch binary-indep clean +.PHONY: configure build install binary binary-arch binary-indep clean Modified: branches/SAMBA_4_0/packaging/debian/samba4-common.conffiles =================================================================== --- branches/SAMBA_4_0/packaging/debian/samba4-common.conffiles 2005-12-12 18:55:54 UTC (rev 12196) +++ branches/SAMBA_4_0/packaging/debian/samba4-common.conffiles 2005-12-12 19:33:09 UTC (rev 12197) @@ -1 +0,0 @@ -/etc/samba4/smb.conf Modified: branches/SAMBA_4_0/packaging/debian/samba4-common.dirs =================================================================== --- branches/SAMBA_4_0/packaging/debian/samba4-common.dirs 2005-12-12 18:55:54 UTC (rev 12196) +++ branches/SAMBA_4_0/packaging/debian/samba4-common.dirs 2005-12-12 19:33:09 UTC (rev 12197) @@ -1,3 +1,3 @@ +etc/samba4/tls +usr/lib/samba var/cache/samba -etc/samba4 -usr/lib/samba Modified: branches/SAMBA_4_0/packaging/debian/samba4-common.files =================================================================== --- branches/SAMBA_4_0/packaging/debian/samba4-common.files 2005-12-12 18:55:54 UTC (rev 12196) +++ branches/SAMBA_4_0/packaging/debian/samba4-common.files 2005-12-12 19:33:09 UTC (rev 12197) @@ -1,3 +0,0 @@ -usr/lib/samba/lowcase.dat -usr/lib/samba/upcase.dat -usr/lib/valid.dat Modified: branches/SAMBA_4_0/packaging/debian/samba4-common.install =================================================================== --- branches/SAMBA_4_0/packaging/debian/samba4-common.install 2005-12-12 18:55:54 UTC (rev 12196) +++ branches/SAMBA_4_0/packaging/debian/samba4-common.install 2005-12-12 19:33:09 UTC (rev 12197) @@ -1 +1,3 @@ etc/samba4/smb.conf +usr/lib/samba/*.dat +usr/lib/samba/setup Added: branches/SAMBA_4_0/packaging/debian/samba4-dev.install =================================================================== --- branches/SAMBA_4_0/packaging/debian/samba4-dev.install 2005-12-12 18:55:54 UTC (rev 12196) +++ branches/SAMBA_4_0/packaging/debian/samba4-dev.install 2005-12-12 19:33:09 UTC (rev 12197) @@ -0,0 +1,3 @@ +usr/include +usr/share/man/man3/talloc.3 +usr/share/man/man3/ldb.3 Added: branches/SAMBA_4_0/packaging/debian/samba4-swat.install =================================================================== --- branches/SAMBA_4_0/packaging/debian/samba4-swat.install 2005-12-12 18:55:54 UTC (rev 12196) +++ branches/SAMBA_4_0/packaging/debian/samba4-swat.install 2005-12-12 19:33:09 UTC (rev 12197) @@ -0,0 +1,2 @@ +usr/share/samba/swat +usr/lib/samba/js
