Control: tags 812252 pending

Dear maintainer,

I've prepared an NMU for less (versioned as 481-2.1) and uploaded it to
DELAYED/5.  Please feel free to tell me if I should delay it longer.

This patch is similar in intent to that provided by Frederik Möllers
four weeks ago, but I did the reconciliation the other way round (i.e.
moving the contents of debian/less.postinst into debian/postinst etc.
rather than vice versa), since the package-name-less files are
longer-standing and since this resulted in a much shorter and
easier-to-read patch.

I care about this because I'm starting to get reports about this
directed to me as man-db maintainer, and it obviously makes a difference
to how usable man(1) appears to be out of the box.

Regards,

-- 
Colin Watson                                       [cjwat...@debian.org]
diff -Nru less-481/debian/changelog less-481/debian/changelog
--- less-481/debian/changelog	2016-01-11 12:12:45.000000000 +0000
+++ less-481/debian/changelog	2016-02-23 10:51:49.000000000 +0000
@@ -1,3 +1,11 @@
+less (481-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Reconcile multiple postinst scripts so that less registers a pager
+    alternative again (closes: #812252).
+
+ -- Colin Watson <cjwat...@debian.org>  Tue, 23 Feb 2016 10:51:48 +0000
+
 less (481-2) unstable; urgency=medium
 
   * Fix "files with the same name installed in / and /usr"
diff -Nru less-481/debian/less.postinst less-481/debian/less.postinst
--- less-481/debian/less.postinst	2016-01-11 12:08:57.000000000 +0000
+++ less-481/debian/less.postinst	1970-01-01 01:00:00.000000000 +0100
@@ -1,12 +0,0 @@
-#!/bin/sh
-set -e
-
-if [ "$1" = 'configure' ]; then
-  for file in lessfile lesspipe lesskey lessecho less; do
-    if [ ! -e /usr/bin/$file ]; then
-      ln -s /bin/$file /usr/bin/$file
-    fi
-  done
-fi
-
-#DEBHELPER#
diff -Nru less-481/debian/less.postrm less-481/debian/less.postrm
--- less-481/debian/less.postrm	2016-01-11 12:08:57.000000000 +0000
+++ less-481/debian/less.postrm	1970-01-01 01:00:00.000000000 +0100
@@ -1,12 +0,0 @@
-#!/bin/sh
-set -e
-
-if [ "$1" = 'remove' ]; then
-  for file in lessfile lesspipe lesskey lessecho less; do
-    if [ -L /usr/bin/$file ]; then
-      rm /usr/bin/$file
-    fi
-  done
-fi
-
-#DEBHELPER#
diff -Nru less-481/debian/postinst less-481/debian/postinst
--- less-481/debian/postinst	2014-09-08 05:08:25.000000000 +0100
+++ less-481/debian/postinst	2016-02-23 10:50:17.000000000 +0000
@@ -24,6 +24,12 @@
 
 case "$1" in
     configure)
+        for file in lessfile lesspipe lesskey lessecho less; do
+          if [ ! -e /usr/bin/$file ]; then
+            ln -s /bin/$file /usr/bin/$file
+          fi
+        done
+
         update-alternatives --quiet --install /usr/bin/pager pager \
 	    /bin/less 77 --slave /usr/share/man/man1/pager.1.gz \
 	    pager.1.gz /usr/share/man/man1/less.1.gz
diff -Nru less-481/debian/postrm less-481/debian/postrm
--- less-481/debian/postrm	1970-01-01 01:00:00.000000000 +0100
+++ less-481/debian/postrm	2016-01-11 12:08:57.000000000 +0000
@@ -0,0 +1,12 @@
+#!/bin/sh
+set -e
+
+if [ "$1" = 'remove' ]; then
+  for file in lessfile lesspipe lesskey lessecho less; do
+    if [ -L /usr/bin/$file ]; then
+      rm /usr/bin/$file
+    fi
+  done
+fi
+
+#DEBHELPER#

Reply via email to