[Pkg-cyrus-sasl2-commits] r297 - in /cyrus-sasl-2.1/trunk/debian: changelog rules

[fabbe at users.alioth.debian.org]

Author: fabbe
Date: Mon Jan  7 15:29:14 2008
New Revision: 297

URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/?sc=1&rev=297
Log:
Fix FTBFS because the saslfinger utility wasn't installed correctly; install it directly from the build script instead of using the installer. We gain more control and it's just simple copying to known locations.

Modified:
    cyrus-sasl-2.1/trunk/debian/changelog
    cyrus-sasl-2.1/trunk/debian/rules

Modified: cyrus-sasl-2.1/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/changelog?rev=297&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/changelog (original)
+++ cyrus-sasl-2.1/trunk/debian/changelog Mon Jan  7 15:29:14 2008
@@ -10,8 +10,10 @@
   * debian/control, debian/patches/0017_db4.6.dpatch,
     debian/sasl2-bin.postinst: Build against libdb4.6. Thanks to Martin Pitt
     for the suggestion and patch. (Closes: #458861)
-
- -- Fabian Fagerholm <fabbe at paniq.net>  Mon, 07 Jan 2008 12:43:13 +0200
+  * debian/rules: Install saslfinger directly since we have better control
+    to do it in the build scripts.
+
+ -- Fabian Fagerholm <fabbe at paniq.net>  Mon, 07 Jan 2008 17:22:41 +0200
 
 cyrus-sasl2 (2.1.22.dfsg1-16) unstable; urgency=low
 

Modified: cyrus-sasl-2.1/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/rules?rev=297&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/rules (original)
+++ cyrus-sasl-2.1/trunk/debian/rules Mon Jan  7 15:29:14 2008
@@ -217,8 +217,6 @@
 	dh_clean -k 
 
 	$(MAKE) install DESTDIR=$(TMPPKG)
-	ls $(TMPPKG)/*
-	(cd debian/saslfinger; DESTDIR=$(TMPPKG) sh ./install.sh)
 
 	# Alter the default location and names of files to fit Debian
 	# policy and better integrate with the Debian system.
@@ -246,6 +244,12 @@
 
 	# Install the sasl-sample-client and -server man pages.
 	dh_installman -psasl2-bin sasl-sample-client.8 sasl-sample-server.8
+
+	# Install saslfinger
+	install -m 644 -D $(CURDIR)/debian/saslfinger/saslfinger.1 \
+		$(TMPPKG)/usr/share/man/man1/saslfinger.1
+	install -m 755 -D $(CURDIR)/debian/saslfinger/saslfinger \
+		$(TMPPKG)/usr/bin/saslfinger
 
 ###
 # Build architecture-dependent files.