Re: Syncing foo2zjs
Le mardi, 30 septembre 2014 16.29:01, vous avez écrit :
> Can this change get overtaken into Debian? Or do we have to live with
> the difference of the Debian package recommending tix and the Ubuntu
> package suggesting it?
It can; we already have this type of differences for mscompress.
I've gone ahead and implemented the attached patch, I'll upload
soon'ish.
OdyX
>From 3a8e1f27daeb9f51893f94939ad9545331cffdfb Mon Sep 17 00:00:00 2001
From: Didier Raboud <odyx@debian.org>
Date: Tue, 30 Sep 2014 16:56:07 +0200
Subject: [PATCH] Put tix to Recommends on Debian and to Suggests on Ubuntu and
derivatives
Drops the need of a hand-merge by Ubuntu
---
debian/control | 3 ++-
debian/rules | 7 +++++++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index ac93a93..fa24166 100644
--- a/debian/control
+++ b/debian/control
@@ -41,7 +41,8 @@ Description: printer driver for ZjStream-based printers
Package: printer-driver-foo2zjs-common
Architecture: all
Depends: ${misc:Depends}
-Recommends: tix, tk, printer-driver-foo2zjs (>= ${source:Version})
+Recommends: ${debian:tix}, tk, printer-driver-foo2zjs (>= ${source:Version})
+Suggests: ${ubuntu:tix}
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 8638ecf..c2bcb6e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -76,6 +76,13 @@ 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
+endif
dh_gencontrol
override_dh_auto_clean:
--
2.1.1
Reply to: