X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=debian%2Frules;h=70877a89783693029880ab6cd6471faae7595c95;hp=cea6176ad37d2dad1a80c428a50238d0e3eb539f;hb=72913e3a0498e2099800de53871b696c72feda1b;hpb=1d47db69329115bac31b3a282b04374375a2a8e8

diff --git a/debian/rules b/debian/rules
index cea6176..70877a8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,8 @@
 #!/usr/bin/make -f
 # Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
 
-#export DH_COMPAT=5
 export DH_VERBOSE=1
 
-# You can use gcc 2.7.2 if it's installed,
-#   but I don't think that's necessary any more.
-#SETGCC	:= CC=$(notdir $(shell which gcc272 gcc 2>/dev/null | sed '1q'))
-
 # Temporary root
 DEBTMP	:= $(shell pwd)/debian/tmp
 
@@ -15,17 +10,20 @@ build: build-stamp
 build-stamp:
 	# Debian source diffs don't reflect removals.
 	# This kludge will suffice until the next upstream version. *sigh*
-	rm -f debian/nfs-common.config		\
+	rm -f debian/nfs-common.conffiles	\
+	      debian/nfs-common.config		\
+	      debian/nfs-common.files		\
 	      debian/nfs-common.templates	\
+	      debian/nfs-kernel-server.conffiles\
 	      debian/nfs-kernel-server.config	\
-	      debian/nfs-kernel-server.templates
+	      debian/nfs-kernel-server.templates\
+	      debian/nhfsstone.files
 
 	dh_testdir
-	# Add here commands to compile the package.
 	-test -r /usr/share/misc/config.sub && cp -f /usr/share/misc/config.sub config.sub
 	-test -r /usr/share/misc/config.guess && cp -f /usr/share/misc/config.guess config.guess
 	autoconf
-	$(SETGCC) ./configure \
+	./configure \
 		--mandir='$${prefix}/share/man' \
 		--enable-secure-statd
 	$(MAKE)
@@ -35,6 +33,7 @@ clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
+	rm -rf $(DEBTMP)
 	# Add here commands to clean up after the build process.
 	-test -r /usr/share/misc/config.sub && rm -f config.sub
 	-test -r /usr/share/misc/config.guess && rm -f config.guess
@@ -42,52 +41,40 @@ clean:
 	rm -f config.log configure
 	dh_clean
 
-# Build architecture-independent files here.
 binary-indep: build
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
 binary-arch: build
 	dh_testdir
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	dh_install
+	mkdir $(DEBTMP)
 	# Add here commands to install the files into debian/tmp
 	$(MAKE) install_prefix='$(DEBTMP)' install
-	dh_movefiles
+	dh_install --sourcedir=debian/tmp/
 	# Fixups Start Here #
 	cd debian && \
 	  for f in lockd statd showmount; do \
-	    mv tmp/usr/sbin/*$$f nfs-common/sbin; \
 	    perl -pi -e "s#/usr(/sbin/(rpc\\.)?$$f)#\$$1#g" \
 		nfs-common/usr/share/man/man8/$$f.8; \
 	  done; \
-	  rm -f tmp/usr/sbin/*quota*; \
-	  rm -f tmp/usr/share/man/man8/*quota*; \
-	  rm -rf tmp/var/lib/nfs/*; \
-	  cp --preserve=timestamps etc.exports tmp/etc/exports
+	  cp --preserve=timestamps etc.exports nfs-kernel-server/etc/exports; \
+	  cp --preserve=timestamps idmapd.conf nfs-common/etc/; \
+	  cp --preserve=timestamps gssapi_mech.conf nfs-common/etc/; \
 	# Fixups End Here #
 	dh_installdocs -A
 	dh_installexamples
-#	dh_installmenu
 	dh_installinit -n
-#	dh_installcron
-#	dh_installmanpages
-#	dh_undocumented
+	dh_installman
+	dh_link
 	dh_installchangelogs ChangeLog
 	dh_strip
 	dh_compress
 	dh_fixperms
 	dh_installdeb
-#	dh_makeshlibs
 	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
 
-source diff:                                                                  
-	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary