* Don't strip binaries for debian package if built with

  DEB_BUILD_OPTIONS=nostrip. Closes: #437577
* Include Michael Tokarev's lckdo program and replace / conflict with the
  current lckdo package. (Robert Edmonds) Closes: #432906
* lckdo: Don't clear other flags when setting close on exec.

4 files changed, 12 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index 52e97b5..a87665b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
 moreutils (0.23) UNRELEASED; urgency=low
 
   * Add pointer to join from combine's man page. Closes: #435516
+  * Don't strip binaries for debian package if built with
+    DEB_BUILD_OPTIONS=nostrip. Closes: #437577
+  * Include Michael Tokarev's lckdo program and replace / conflict with the
+    current lckdo package. (Robert Edmonds) Closes: #432906
+  * lckdo: Don't clear other flags when setting close on exec.
 
- -- Joey Hess <joeyh@debian.org>  Wed, 01 Aug 2007 13:45:23 -0400
+ -- Joey Hess <joeyh@debian.org>  Wed, 05 Sep 2007 21:21:29 -0400
 
 moreutils (0.22) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 7fb0cb9..06b7339 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,8 @@ Package: moreutils
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
 Suggests: libtime-duration-perl, libtimedate-perl
+Conflicts: lckdo
+Replaces: lckdo
 Description: additional unix utilities
  This is a growing collection of the unix tools that nobody thought
  to write thirty years ago.
@@ -25,3 +27,4 @@ Description: additional unix utilities
   - zrun: automatically uncompress arguments to command
   - mispipe: pipe two commands, returning the exit status of the first
   - isutf8: check if a file or standard input is utf-8
+  - lckdo: execute a program with a lock held
diff --git a/debian/copyright b/debian/copyright
index 22e443e..6b65c16 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -19,6 +19,8 @@ zrun is Copyright (c) Chung-chieh Shan, under the terms of the GPL, version
 mispipe is Copyright (c) Nathanael Nerode, under the terms of the GPL,
 version 2 or later. (It's also dual-licensed under the MIT/Expat licence.)
 
+lckdo is public domain code released by Michael Tokarev.
+
 Everything else is copyright 2006 by Joey Hess, under the terms of GPL.
 The full text of the GNU GPL can be found in /usr/share/common-licenses/GPL
 on Debian systems.
diff --git a/debian/rules b/debian/rules
index 10f0e79..5964448 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,7 @@ binary-arch: build
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	$(MAKE) PREFIX=debian/moreutils install
+	$(MAKE) PREFIX=debian/moreutils INSTALL_BIN=install install
 	dh_installdocs README
 	dh_installchangelogs
 	dh_perl