[Pkg-samba-maint] r1247 - trunk/samba/debian
Christian Perrier
bubulle at alioth.debian.org
Mon Feb 12 22:06:09 CET 2007
Author: bubulle
Date: 2007-02-12 22:06:09 +0100 (Mon, 12 Feb 2007)
New Revision: 1247
Modified:
trunk/samba/debian/changelog
trunk/samba/debian/rules
Log:
Fix FTBFS for GNU/kFreeBSD
Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog 2007-02-11 09:56:29 UTC (rev 1246)
+++ trunk/samba/debian/changelog 2007-02-12 21:06:09 UTC (rev 1247)
@@ -1,11 +1,13 @@
-samba (3.0.24-3) UNRELEASED; urgency=low
+samba (3.0.24-3) UNRELEASED_experimental; urgency=low
* Merge some Ubuntu changes:
- do not expose the Samba version anymore
- default workgroup set to WORKGROUP (default workgroup of
Windows workstations)
+ * Fix FTBFS on GNU/kFreeBSD. Thanks to Petr Salinger for the patch
+ Closes: #394830
- -- Christian Perrier <bubulle at debian.org> Sun, 11 Feb 2007 10:52:51 +0100
+ -- Christian Perrier <bubulle at debian.org> Mon, 12 Feb 2007 22:03:47 +0100
samba (3.0.24-2) unstable; urgency=low
Modified: trunk/samba/debian/rules
===================================================================
--- trunk/samba/debian/rules 2007-02-11 09:56:29 UTC (rev 1246)
+++ trunk/samba/debian/rules 2007-02-12 21:06:09 UTC (rev 1247)
@@ -51,18 +51,17 @@
--with-shared-modules=idmap_rid,idmap_ad \
--with-automount \
--with-ldap \
- --with-cifsmount \
--with-python=python
ifeq ($(DEB_HOST_ARCH_OS),linux)
conf_args += \
- --with-smbmount \
+ --with-smbmount --with-cifsmount \
--with-acl-support \
--with-quotas
mount_cifs = yes
smbfs = yes
else
- conf_args += --without-quotas
+ conf_args += --without-quotas --without-smbmount --without-cifsmount
mount_cifs = no
smbfs = no
endif
@@ -109,7 +108,11 @@
dh_clean
-install: DH_OPTIONS=
+ifeq ($(smbfs),no)
+ DH_EXTRAS=-Nsmbfs
+endif
+
+install: DH_OPTIONS=$(DH_EXTRAS)
install: build
dh_testdir
dh_testroot
@@ -185,9 +188,6 @@
# Build architecture-dependent files here.
# Pass -a to all debhelper commands in this target to reduce clutter.
-ifeq ($(smbfs),no)
- DH_EXTRAS=-Nsmbfs
-endif
binary-arch: DH_OPTIONS=-a $(DH_EXTRAS)
binary-arch: build install
More information about the Pkg-samba-maint
mailing list