diff -u units-1.87/debian/postrm units-1.87/debian/postrm --- units-1.87/debian/postrm +++ units-1.87/debian/postrm @@ -1,3 +1,21 @@ -#!/bin/sh +#! /bin/sh +# +# This is the postrm script for the Debian GNU/Linux units package +# +# Written by John G. Hasler + set -e -if [ -x /usr/bin/update-menus ]; then /usr/bin/update-menus; fi + +#DEBHELPER# + +case "$1" in + purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + if [ -x /usr/bin/update-menus ] + then + update-menus + fi + ;; + *) + echo "postrm called with unknown argument \`$1'" >&2 + ;; +esac diff -u units-1.87/debian/control units-1.87/debian/control --- units-1.87/debian/control +++ units-1.87/debian/control @@ -3,14 +3,14 @@ Priority: optional -Maintainer: John Hasler -Standards-Version: 3.8.0 -Build-Depends: libreadline5-dev | libreadline-dev, texi2html, texinfo +Maintainer: John G. Hasler +Standards-Version: 3.8.3 +Build-Depends: libreadline-dev | libreadline6-dev | libreadline5-dev, texi2html, texinfo Package: units Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, dpkg (>= 1.15.4) | install-info Description: converts between different systems of units GNU 'units' program converts quantities expressed in various scales to their equivalents in other scales. The 'units' program can only handle multiplicative scale changes directly. It uses a functional - notation for nonlinear conversions such a Fahrenheit temperature + notation for "nonlinear" conversions such a Fahrenheit temperature to Celsius temperature. diff -u units-1.87/debian/rules units-1.87/debian/rules --- units-1.87/debian/rules +++ units-1.87/debian/rules @@ -49,7 +49,6 @@ install -d debian/units/DEBIAN/ debian/units/usr/share/doc/units/ debian/units/usr/share/menu install -m 755 debian/postinst debian/units/DEBIAN/ install -m 755 debian/postrm debian/units/DEBIAN/ - install -m 755 debian/prerm debian/units/DEBIAN/ $(MAKE) INSTALL_PROGRAM=$(INSTALLER) \ prefix=debian/units/usr datadir=debian/units/usr/share/misc \ diff -u units-1.87/debian/postinst units-1.87/debian/postinst --- units-1.87/debian/postinst +++ units-1.87/debian/postinst @@ -2,3 +2,23 @@ +# +# This is the postinst script for the Debian GNU/Linux units package +# +# Written by John G. Hasler + set -e -install-info --quiet --section utilities "Console utilities" /usr/share/info/units.info.gz -if [ -x /usr/bin/update-menus ]; then update-menus; fi + +#DEBHELPER# + +case "$1" in + configure) + if [ -x "`which update-menus 2>/dev/null`" ]; then + update-menus + fi + ;; + abort-remove|abort-deconfigure|abort-upgrade) + # Nothing to undo + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + ;; +esac reverted: --- units-1.87/debian/prerm +++ units-1.87.orig/debian/prerm @@ -1,6 +0,0 @@ -#!/bin/sh -set -e -install-info --quiet --remove /usr/share/info/units.info.gz -if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/units ]; then - rm -f /usr/doc/units -fi diff -u units-1.87/debian/changelog units-1.87/debian/changelog --- units-1.87/debian/changelog +++ units-1.87/debian/changelog @@ -1,3 +1,15 @@ +units (1.87-2) unstable; urgency=low + + * Deleted debian/prerm, fixed debian/postinst and postrm. + Added debian/compat (level 7), Edited debian/control + Brought standards-version up to 3.8.3, updated libreadline + build dependency, added dpkg (>= 1.15.4) | install-info to depends: + + * Replaced "more" with "/usr/bin/pager" at line 55 in units.c + Closes: #548597 Please use /usr/bin/pager as default pager + + -- John G. Hasler Wed, 07 Oct 2009 21:34:00 -0500 + units (1.87-1) unstable; urgency=low * New upstream release only in patch2: unchanged: --- units-1.87.orig/units.info +++ units-1.87/units.info @@ -1,6 +1,7 @@ -This is units.info, produced by makeinfo version 4.8 from +This is units.info, produced by makeinfo version 4.13 from ./units.texinfo. +INFO-DIR-SECTION Math START-INFO-DIR-ENTRY * units: (units). Units conversion. END-INFO-DIR-ENTRY @@ -219,8 +220,8 @@ * 2.1133764 / 0.47317647 -and then exit. The output tells you that 2 liters is about 2.1 -quarts, or alternatively that a quart is about 0.47 times 2 liters. +and then exit. The output tells you that 2 liters is about 2.1 quarts, +or alternatively that a quart is about 0.47 times 2 liters. If the conversion is successful, then `units' will return success (0) to the calling environment. If `units' is given non-conformable units @@ -325,9 +326,9 @@ You want: cents / inch * 13.888889 / 0.072 -And the second example shows how the dollar sign in the units -conversion can precede the five. Be careful: `units' will interpret -`$5' with no space as equivalent to dollars^5. +And the second example shows how the dollar sign in the units conversion +can precede the five. Be careful: `units' will interpret `$5' with no +space as equivalent to dollars^5. Outside of the SI system, it is often desirable to add values of different units together. You may also wish to use `units' as a @@ -683,9 +684,9 @@ When adding new units, be sure to use the `-c' option to check that the new units reduce properly. If you create a loop in the units definitions, then `units' will hang when invoked with the `-c' options. -You will need to use the `--check-verbose' option which prints out -each unit as it checks them. The program will still hang, but the last -unit printed will be the unit which caused the infinite loop. +You will need to use the `--check-verbose' option which prints out each +unit as it checks them. The program will still hang, but the last unit +printed will be the unit which caused the infinite loop. If you define any units which contain `+' characters, carefully check them because the `-c' option will not catch non-conformable sums. @@ -1021,20 +1022,20 @@  Tag Table: -Node: Top549 -Node: Overview1461 -Ref: Overview-Footnote-12225 -Node: Interactive use2419 -Node: Command line use7946 -Node: Unit expressions9173 -Ref: Temperature Conversion Example16698 -Node: Invoking units18413 -Node: Unit definitions22974 -Node: Defining new units25847 -Node: Nonlinear units29294 -Node: Localization35381 -Node: Environment vars36255 -Node: Readline support37149 -Node: Index38556 +Node: Top572 +Node: Overview1484 +Ref: Overview-Footnote-12248 +Node: Interactive use2442 +Node: Command line use7969 +Node: Unit expressions9196 +Ref: Temperature Conversion Example16721 +Node: Invoking units18436 +Node: Unit definitions22997 +Node: Defining new units25870 +Node: Nonlinear units29317 +Node: Localization35404 +Node: Environment vars36278 +Node: Readline support37172 +Node: Index38579  End Tag Table only in patch2: unchanged: --- units-1.87.orig/units.texinfo +++ units-1.87/units.texinfo @@ -12,15 +12,13 @@ @syncodeindex op cp @c noman + +@dircategory Math @ifinfo -@format -START-INFO-DIR-ENTRY +@direntry * units: (units). Units conversion. -END-INFO-DIR-ENTRY -@end format -@end ifinfo +@end direntry -@ifinfo This file documents the @sc{gnu} @code{units} command for unit conversion. This is edition @value{EDITION} for @code{units} Version @value{VERSION}. only in patch2: unchanged: --- units-1.87.orig/units.man +++ units-1.87/units.man @@ -1,5 +1,5 @@ .\"Do not edit this file. It was created from units.texinfo -.\"using texi2man version 1.01 on Wed Sep 26 21:26:21 EDT 2007 +.\"using texi2man version 1.01 on Sun Oct 11 14:33:37 CDT 2009 .\"If you want a typeset version, you will probably get better .\"results with the original file. .\" only in patch2: unchanged: --- units-1.87.orig/units.c +++ units-1.87/units.c @@ -52,7 +52,7 @@ #define HELPCOMMAND "help" /* Command to request help at prompt */ #define SEARCHCOMMAND "search" /* Command to request text search of units */ #define UNITMATCH "?" /* Command to request conformable units */ -#define DEFAULTPAGER "more" /* Default pager program */ +#define DEFAULTPAGER "/usr/bin/pager" /* Default pager program */ #define DEFAULTLOCALE "en_US" /* Default locale */ #define MAXINCLUDE 5 /* Max depth of include files */ #define MAXFILES 25 /* Max number of units files on command line */ only in patch2: unchanged: --- units-1.87.orig/debian/compat +++ units-1.87/debian/compat @@ -0,0 +1 @@ +7