diff -Nru gdisk-0.8.10/debian/changelog gdisk-0.8.10/debian/changelog
--- gdisk-0.8.10/debian/changelog	2015-03-04 17:35:40.000000000 +0100
+++ gdisk-0.8.10/debian/changelog	2015-03-04 16:27:17.000000000 +0100
@@ -1,3 +1,10 @@
+gdisk (0.8.10-1.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Fix spurious "1" exit condition (upstream commit a920398)
+
+ -- Ulrike Uhlig <u@451f.org>  Wed, 04 Mar 2015 16:25:37 +0100
+
 gdisk (0.8.10-1) unstable; urgency=medium

   * New upstream release:
diff -Nru gdisk-0.8.10/debian/patches/gdisk.diff gdisk-0.8.10/debian/patches/gdisk.diff
--- gdisk-0.8.10/debian/patches/gdisk.diff	1970-01-01 01:00:00.000000000 +0100
+++ gdisk-0.8.10/debian/patches/gdisk.diff	2015-02-24 23:01:54.000000000 +0100
@@ -0,0 +1,32 @@
+--- a/gdisk.cc
++++ b/gdisk.cc
+@@ -15,6 +15,7 @@
+    GPTDataTextUI theGPT;
+    string device = "";
+    UnicodeString uString;
++   int isError = 0;
+
+    cout << "GPT fdisk (gdisk) version " << GPTFDISK_VERSION << "\n\n";
+
+@@ -47,16 +48,20 @@
+             device = (string) argv[1];
+          } else { // 3 arguments, but none is "-l"
+             cerr << "Usage: " << argv[0] << " [-l] device_file\n";
++            isError = 1;
+          } // if/elseif/else
+          if (device != "") {
+             theGPT.JustLooking();
+             if (theGPT.LoadPartitions(device))
+                theGPT.DisplayGPTData();
++            else
++               isError = 1;
+          } // if
+          break;
+       default:
+          cerr << "Usage: " << argv[0] << " [-l] device_file\n";
++         isError = 1;
+          break;
+    } // switch
+-   return 1 ;
++   return (isError);
+ } // main
diff -Nru gdisk-0.8.10/debian/patches/series gdisk-0.8.10/debian/patches/series
--- gdisk-0.8.10/debian/patches/series	2015-03-04 17:35:40.000000000 +0100
+++ gdisk-0.8.10/debian/patches/series	2015-03-04 16:24:10.000000000 +0100
@@ -4,3 +4,5 @@
 kfreebsd_character_devices.diff
 fix-change_disk_uid-test.diff
 enable_make_test.diff
+gdisk.diff
+support.diff
diff -Nru gdisk-0.8.10/debian/patches/support.diff gdisk-0.8.10/debian/patches/support.diff
--- gdisk-0.8.10/debian/patches/support.diff	1970-01-01 01:00:00.000000000 +0100
+++ gdisk-0.8.10/debian/patches/support.diff	2015-03-04 16:25:15.000000000 +0100
@@ -0,0 +1,19 @@
+--- a/support.cc
++++ b/support.cc
+@@ -319,11 +319,11 @@
+ void WinWarning(void) {
+    #ifdef _WIN32
+    cout << "\a************************************************************************\n"
+-   << "Most versions of Windows cannot boot from a GPT disk, and most varieties\n"
+-   << "prior to Vista cannot read GPT disks. Therefore, you should exit now\n"
+-   << "unless you understand the implications of converting MBR to GPT or creating\n"
+-   << "a new GPT disk layout!\n"
+-   << "************************************************************************\n\n";
++        << "Most versions of Windows cannot boot from a GPT disk except on a UEFI-based\n"
++        << "computer, and most varieties prior to Vista cannot read GPT disks. Therefore,\n"
++        << "you should exit now unless you understand the implications of converting MBR\n"
++        << "to GPT or creating a new GPT disk layout!\n"
++        << "************************************************************************\n\n";
+    cout << "Are you SURE you want to continue? ";
+    if (GetYN() != 'Y')
+       exit(0);
diff -Nru gdisk-0.8.10/debian/.pc/applied-patches gdisk-0.8.10/debian/.pc/applied-patches
--- gdisk-0.8.10/debian/.pc/applied-patches	1970-01-01 01:00:00.000000000 +0100
+++ gdisk-0.8.10/debian/.pc/applied-patches	2015-02-24 22:58:39.000000000 +0100
@@ -0,0 +1 @@
+ncursesw5.diff
diff -Nru gdisk-0.8.10/debian/.pc/.quilt_patches gdisk-0.8.10/debian/.pc/.quilt_patches
--- gdisk-0.8.10/debian/.pc/.quilt_patches	1970-01-01 01:00:00.000000000 +0100
+++ gdisk-0.8.10/debian/.pc/.quilt_patches	2015-02-24 22:58:32.000000000 +0100
@@ -0,0 +1 @@
+patches
diff -Nru gdisk-0.8.10/debian/.pc/.quilt_series gdisk-0.8.10/debian/.pc/.quilt_series
--- gdisk-0.8.10/debian/.pc/.quilt_series	1970-01-01 01:00:00.000000000 +0100
+++ gdisk-0.8.10/debian/.pc/.quilt_series	2015-02-24 22:58:32.000000000 +0100
@@ -0,0 +1 @@
+series
diff -Nru gdisk-0.8.10/debian/.pc/.version gdisk-0.8.10/debian/.pc/.version
--- gdisk-0.8.10/debian/.pc/.version	1970-01-01 01:00:00.000000000 +0100
+++ gdisk-0.8.10/debian/.pc/.version	2015-02-24 22:58:32.000000000 +0100
@@ -0,0 +1 @@
+2