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 64eeabfb69dad364fd546647eab3de63257ea255..f660e70f672f936f2eb72956ca9eb55f469d440d 100644 (file)
--- 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 bbb9628b87b351310b601548d86e53e36c41c1d1..d7c93da8374baf66be2f75aaf4a7cf70b7c1e473 100644 (file)
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -20,4 +20,3 @@ inplace
 *.install
 stamp-*
 tmp
-compat

diff --git a/debian/changelog b/debian/changelog
index ca7d1a7c729eca1c01d53960a79278c49f1485ef..30fff971b3610aefee5e9a575fd9bec3d8e64ba4 100644 (file)
--- 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 (file)
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9

diff --git a/debian/control b/debian/control
index 09a461ec33333d168a24fa36b5b55040f8e7c799..55fa6dd08bc653b9a1e05d86d0b8a89cd38a1eff 100644 (file)
--- 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 27cc80f7a4bc720b4bb8dce7602332824c6711e2..f04c6f86885e6ec27454257f10a63a63ac5de4b8 100755 (executable)
--- 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 435952706e174f93b900a21e2206ef4a7a1f6150..d5aebcb2d40bd7a5d77ae3420c127deb49e0a5b3 100755 (executable)
--- 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
 )