[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#886179: foo2zjs: Don't recommend tk



From 9a278faf4c76d6cd88ed67a1a3b72a3ba3df9d96 Mon Sep 17 00:00:00 2001
From: Jeremy Bicha <jbicha@debian.org>
Date: Tue, 2 Jan 2018 16:09:54 -0500
Subject: [PATCH] Don't recommend tk on Ubuntu

Closes: #886179
---
 debian/control |  4 ++--
 debian/rules   | 15 ++++++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/debian/control b/debian/control
index 13ef4f5..fe135b7 100644
--- a/debian/control
+++ b/debian/control
@@ -41,8 +41,8 @@ Description: printer driver for ZjStream-based printers
 Package: printer-driver-foo2zjs-common
 Architecture: all
 Depends: ${misc:Depends}
-Recommends: ${debian:tix}, tk, printer-driver-foo2zjs (>= ${source:Version})
-Suggests: ${ubuntu:tix}
+Recommends: ${debian:tix}, ${debian:tk}, printer-driver-foo2zjs (>= ${source:Version})
+Suggests: ${ubuntu:tix}, ${ubuntu:tk}
 Enhances: printer-driver-foo2zjs (>= ${source:Version})
 Breaks: udev (<< 136-1), cups (<< 1.5.0-3~), foo2zjs (<< 20111023dfsg0-1~), printer-driver-foo2zjs (<< 20131225dfsg0-5~)
 Replaces: foo2zjs (<< 20111023dfsg0-1~), printer-driver-foo2zjs (<< 20131225dfsg0-5~)
diff --git a/debian/rules b/debian/rules
index 00368ff..bb4d3bb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -72,16 +72,17 @@ override_dh_gencontrol:
 ifeq ($(derives_from_ubuntu),yes)
 	# Ubuntu considers mscompress to be a Depends of printer-driver-foo2zjs
 	echo "ubuntu:mscompress=mscompress" >> debian/printer-driver-foo2zjs.substvars
+	# Ubuntu considers tix to be a Suggests of printer-driver-foo2zjs
+	echo "ubuntu:tix=tix" >> debian/printer-driver-foo2zjs-common.substvars
+	# Ubuntu considers tk to be a Suggests of printer-driver-foo2zjs
+	echo "ubuntu:tk=tk" >> debian/printer-driver-foo2zjs-common.substvars
 else
 	# Debian considers mscompress to be a Recommends of printer-driver-foo2zjs
 	echo "debian:mscompress=mscompress" >> debian/printer-driver-foo2zjs.substvars
-endif
-ifeq ($(derives_from_ubuntu),yes)
-	# Ubuntu considers tix to be a Suggest of printer-driver-foo2zjs
-	echo "ubuntu:tix=tix" >> debian/printer-driver-foo2zjs.substvars
-else
-	# Debian considers tix to be a Depends of printer-driver-foo2zjs
-	echo "debian:tix=tix" >> debian/printer-driver-foo2zjs.substvars
+	# Debian considers tix to be a Recommends of printer-driver-foo2zjs
+	echo "debian:tix=tix" >> debian/printer-driver-foo2zjs-common.substvars
+	# Debian considers tix to be a Recommends of printer-driver-foo2zjs
+	echo "debian:tk=tk" >> debian/printer-driver-foo2zjs-common.substvars
 endif
 	dh_gencontrol
 
-- 
2.14.1


Reply to: