From 3b2a4f64dcac62ae59cbba65178b3942681f77fa Mon Sep 17 00:00:00 2001
From: Dustin Kirkland <kirkland@ubuntu.com>
Date: Sun, 28 Feb 2016 23:45:29 -0600
Subject: [PATCH] * debian/control:   - suggest pastebinit, drop w3m

---
 debian/changelog |  3 ++-
 debian/control   |  2 +-
 usr/bin/manifest | 10 ++++++++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5f72874f..78ec09f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 byobu (5.104) unreleased; urgency=medium
 
-  * UNRELEASED
+  * debian/control:
+    - suggest pastebinit, drop w3m
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Sun, 28 Feb 2016 23:24:33 -0600
 
diff --git a/debian/control b/debian/control
index 869cdb7e..02455bb1 100644
--- a/debian/control
+++ b/debian/control
@@ -28,11 +28,11 @@ Suggests:
  gnome-terminal,
  gnupg,
  lsb-release,
+ pastebinit,
  po-debconf,
  ttf-ubuntu-font-family (>= 0.80-0ubuntu1~medium),
  update-notifier-common,
  vim,
- w3m,
  wireless-tools
 Provides:
  screen-profiles,
diff --git a/usr/bin/manifest b/usr/bin/manifest
index 6140aeb9..1a389b2b 100755
--- a/usr/bin/manifest
+++ b/usr/bin/manifest
@@ -19,11 +19,17 @@
 
 set -e
 
+if ! command -v pastebinit >/dev/null 2>&1; then
+	echo "ERROR: pastebinit not found.  Hint:" 1>&2
+	echo "  sudo apt install pastebinit" 1>&2
+	exit 1
+fi
+
 export_packages() {
 	if [ "$OBJECT" = "-" ]; then
 		dpkg -l
 	elif echo "$OBJECT" | grep -qs ".*://.*"; then
-		dpkg -l | lzma -9 -f -c | base64 | pastebinit -b "$OBJECT"
+		dpkg -l | gzip -9 | base64 | pastebinit -b "$OBJECT"
 	else
 		dpkg -l > "$OBJECT"
 	fi
@@ -33,7 +39,7 @@ import_packages() {
 	if [ "$OBJECT" = "-" ]; then
 		sudo apt install $(cat /dev/stdin | grep "^ii\s" | col2)
 	elif echo "$OBJECT" | grep -qs ".*://.*"; then
-		sudo apt install $(wget -q -O- "$OBJECT" | grep -A 999999999 '<div class="paste"><pre>' | grep -B 999999999 "^</pre>" | sed -e "s/.*<pre>//" -e "s/^<\/pre>.*//" | base64 -d | lzma -d | grep "^ii\s" | col2)
+		sudo apt install $(wget -q -O- "$OBJECT" | grep -A 999999999 '<div class="paste"><pre>' | grep -B 999999999 "^</pre>" | sed -e "s/.*<pre>//" -e "s/^<\/pre>.*//" | base64 -d | gunzip | grep "^ii\s" | col2)
 	else
 		sudo apt install $(cat "$OBJECT" | grep "^ii\s" | col2)
 	fi