Changed version check to accept failure of uscan.

Moved uscan dependencies to Recommends.

diff --git a/debian/control b/debian/control
index 3809beba274438dd4a441324728c6eedb675d9dd..c8af314409abd0828ca610c825b0c6f7027586c5 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,8 @@ Build-Depends: debhelper (>= 4.1.16), gcc (>> 3), libx11-dev, libxext-dev, libsm
 Package: ion3
 Section: non-free/x11
 Architecture: any
 Package: ion3
 Section: non-free/x11
 Architecture: any

-Depends: ${shlibs:Depends}, xterm | x-terminal-emulator, debconf, devscripts, libwww-perl, xbase-clients
+Depends: ${shlibs:Depends}, xterm | x-terminal-emulator, debconf, xbase-clients
+Recommends: devscripts, libwww-perl

 Suggests: menu (>= 2.1.9), docker, ion3-scripts
 Conflicts: ion (<< 0.0.20020207-7), ion3-old
 Recommends: xfonts-75dpi | xfonts-75dpi-transcoded | xfonts-100dpi | xfonts-100dpi-transcoded
 Suggests: menu (>= 2.1.9), docker, ion3-scripts
 Conflicts: ion (<< 0.0.20020207-7), ion3-old
 Recommends: xfonts-75dpi | xfonts-75dpi-transcoded | xfonts-100dpi | xfonts-100dpi-transcoded

diff --git a/debian/ion3.postinst b/debian/ion3.postinst
index bfa57184775cb7d74d6259625a2df124b06d8a18..9ec35675f488db5d7d7ceccd0ce3cd83c53adcf7 100644 (file)
--- a/debian/ion3.postinst
+++ b/debian/ion3.postinst
@@ -13,9 +13,10 @@ if [ "$1" = configure ] \
     # it is not.  I freely admit that this is a horrible abuse of
     # debconf, but it seems slightly less unpleasant than maintaining
     # a renamed version. - benh
     # it is not.  I freely admit that this is a horrible abuse of
     # debconf, but it seems slightly less unpleasant than maintaining
     # a renamed version. - benh

-    uscan_output=$(uscan 2>&1 --no-conf --report-status \
-                  --package ion3 --upstream-version "$UPSTREAM_VERSION" \
-                  --watchfile /usr/share/ion3/debian/watch)
+    uscan_output="$(uscan 2>&1 --no-conf --report-status \
+                   --package ion3 --upstream-version "$UPSTREAM_VERSION" \
+                   --watchfile /usr/share/ion3/debian/watch \
+                    || true)"

     case "$uscan_output" in
        *"up to date"*)
            question=''
     case "$uscan_output" in
        *"up to date"*)
            question=''