From: Ben Hutchings <ben@decadent.org.uk>
Date: Tue, 7 Aug 2007 00:22:56 +0000 (+0000)
Subject: Changed version check to accept failure of uscan.
X-Git-Tag: 20070720-2~1
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=af7f6afaa2e3c8d3daeb6e3e5f32f8f0b5b75757;p=ion3.git

Changed version check to accept failure of uscan.
Moved uscan dependencies to Recommends.
---

diff --git a/debian/control b/debian/control
index 3809beb..c8af314 100644
--- 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
-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
diff --git a/debian/ion3.postinst b/debian/ion3.postinst
index bfa5718..9ec3567 100644
--- 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
-    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=''