From: Mark Wooding <mdw@distorted.org.uk>
Date: Fri, 10 Jan 2014 14:46:06 +0000 (+0000)
Subject: Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/misc
X-Git-Tag: 1.2.9~2
X-Git-Url: https://git.distorted.org.uk/~mdw/misc/commitdiff_plain/ed9fbd4e74d974c1961bcacf7a271bf7f170c9b8?hp=8fe55a253066dac15e7f36325500d1d99043bf9a

Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/misc

* 'master' of git.distorted.org.uk:~mdw/publish/public-git/misc:
  space.c: Fix trailing-newline misreporting in `-c' mode.
  space.[c1]: Document the `-v' option finally.
---

diff --git a/Makefile.am b/Makefile.am
index 64eeabf..f660e70 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -305,6 +305,7 @@ EXTRA_DIST		+= debian/rules
 EXTRA_DIST		+= debian/copyright
 EXTRA_DIST		+= debian/changelog
 EXTRA_DIST		+= debian/control
+EXTRA_DIST		+= debian/compat
 
 ## What to install where.
 EXTRA_DIST		+= debian/inst
diff --git a/debian/.gitignore b/debian/.gitignore
index bbb9628..d7c93da 100644
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -20,4 +20,3 @@ inplace
 *.install
 stamp-*
 tmp
-compat
diff --git a/debian/changelog b/debian/changelog
index ca7d1a7..30fff97 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nsict-utils (1.2.8.3) experimental; urgency=low
+
+  * hush: Don't lose backslashes in output lines.
+
+ -- Mark Wooding <mdw@distorted.org.uk>  Fri, 14 Jun 2013 12:32:10 +0100
+
 nsict-utils (1.2.8.2) experimental; urgency=low
 
   * hush: Close file descriptors around the command, so that we don't wait
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
index 09a461e..55fa6dd 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: nsict-utils
 Section: utils
 Priority: extra
 Maintainer: Mark Wooding <mdw@distorted.org.uk>
-Build-Depends: tinycdb, cdbs, python, python-cdb,
+Build-Depends: tinycdb, debhelper (>= 9), python, python-cdb,
  catacomb-dev (>= 2.1.1), mlib-dev (>= 2.0.4), libspamc-dev, libcdb-dev
 Standards-Version: 3.1.1
 
@@ -134,16 +134,19 @@ Description: Update files in place safely.
 
 Package: stamp
 Architecture: any
+Depends: ${shlibs:Depends}
 Section: utils
 Description: Like cat, but prefixing each line with a datestamp.
 
 Package: getpass
 Architecture: any
+Depends: ${shlibs:Depends}
 Section: utils
 Description: Read a password without echoing; write it to stdout.
 
 Package: space
 Architecture: any
+Depends: ${shlibs:Depends}
 Section: utils
 Description: Identify and fix problematic whitespace in text files.
  The space program won't send you to the moon, but it will identify
@@ -153,6 +156,7 @@ Description: Identify and fix problematic whitespace in text files.
 
 Package: x86-model
 Architecture: any-i386 any-amd64
+Depends: ${shlibs:Depends}
 Section: utils
 Description: Shows basic model information about x86 processors.
  The cpuid program is probably better for most people.
diff --git a/debian/rules b/debian/rules
index 27cc80f..f04c6f8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,20 +1,10 @@
 #! /usr/bin/make -f
 
-CDBS = /usr/share/cdbs/1
+DH_OPTIONS = --parallel --builddir=debian/build
+%:; dh $@ $(DH_OPTIONS)
 
-include $(CDBS)/class/autotools.mk
-include $(CDBS)/rules/debhelper.mk
-
-###--------------------------------------------------------------------------
-### General settings.
-
-DEB_BUILDDIR = $(CURDIR)/build
-
-###--------------------------------------------------------------------------
-### Correct configuration.
-
-DEB_CONFIGURE_EXTRA_FLAGS = \
-	--with-perlmoddir=/usr/share/perl5
+override_dh_auto_configure:
+	dh_auto_configure -- --with-perlmoddir=/usr/share/perl5
 
 ###--------------------------------------------------------------------------
 ### Installation.
@@ -22,15 +12,21 @@ DEB_CONFIGURE_EXTRA_FLAGS = \
 ### Rather than have lots (and /lots/) of little *.install files, we just
 ### have one big list of everything and split it out as we go.
 
-clean::; rm -f debian/*.install
-
-$(addprefix install/, $(DEB_ALL_PACKAGES)):: install/%: debian/%.install
-
-debian/%.install: debian/inst
-	while read file pkg dir; do \
-	  if [ "$$pkg" = "$*" ]; then \
-	    echo "debian/tmp$$dir/$$file"; \
-	  fi; \
-	done <debian/inst >$@.new && mv $@.new $@
+override_dh_clean:
+	dh_clean
+	rm -f debian/*.install debian/*.stamp
+
+override_dh_install: debian/install-files.stamp
+	dh_install
+
+debian/install-files.stamp: debian/inst
+	rm -f debian/*.install debian/*.install.new
+	pkgs=" "; while read file pkg dir; do \
+	  case "$$pkgs" in *" $$pkg "*) ;; *) pkgs="$$pkgs$$pkg ";; esac; \
+	  echo "debian/tmp$$dir/$$file" >>debian/$$pkg.install.new; \
+	done <debian/inst; \
+	for pkg in $$pkgs; do \
+	  mv debian/$$pkg.install.new debian/$$pkg.install; \
+	done
 
 ###----- That's all, folks --------------------------------------------------
diff --git a/hush.in b/hush.in
index 4359527..d5aebcb 100755
--- a/hush.in
+++ b/hush.in
@@ -145,10 +145,11 @@ EOF
 ## stage of a pipeline, where we actually wanted the status of the first.  So
 ## we write that to another pipe (fd 5) and pick it out using command
 ## substitution.
+copy () { while IFS= read -r line; do printf "%s %s\n" "$1" "$line"; done; }
 rc=$(
   { { { { set +e; $lbuf "$cmd" "$@" 3>&- 4>&- 5>&-; echo $? >&5; } |
-	while IFS= read line; do echo "| $line"; done >&4; } 2>&1 |
-      while IFS= read line; do echo "* $line"; done >&4; } 4>&1 |
+	copy "|" >&4; } 2>&1 |
+      copy "*" >&4; } 4>&1 |
     cat -u >&3; } 5>&1 </dev/null
 )