debian/changelog | 7 +++++++
debian/control | 3 +++
debian/rules | 3 ++-
debian/scripts/vars.i386 | 6 +++++-
4 files changed, 17 insertions(+), 2 deletions(-)
New commits:
commit ebe0873b6062871b3dd4f3503f1220e9037d01b8
Author: Maarten Lankhorst <maarten.lankho...@canonical.com>
Date: Mon Sep 15 10:42:24 2014 +0200
Lower geode to suggests. (LP: #1368158)
Explicitly add inkscape to build-depends.
diff --git a/debian/changelog b/debian/changelog
index c275b14..8a9ff90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg (1:7.7+7ubuntu2) utopic; urgency=medium
+
+ * Lower geode to suggests. (LP: #1368158)
+ * Explicitly add inkscape to build-depends.
+
+ -- Maarten Lankhorst <maarten.lankho...@ubuntu.com> Mon, 15 Sep 2014
09:36:48 +0200
+
xorg (1:7.7+7ubuntu1) utopic; urgency=medium
[ Timo Aaltonen ]
diff --git a/debian/control b/debian/control
index 44c7de2..9090ed1 100644
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,7 @@ Build-Depends:
po-debconf,
# xsf-docs:
asciidoc,
+ inkscape,
Vcs-Git: git://git.debian.org/git/pkg-xorg/debian/xorg
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/debian/xorg.git
@@ -55,6 +56,8 @@ Depends:
${misc:Depends},
Recommends:
${F:XServer-Xorg-Video-Recommends},
+Suggests:
+ ${F:XServer-Xorg-Video-Suggests},
Replaces: xserver-xorg-driver-all
Conflicts: xserver-xorg-driver-all
Description: X.Org X server -- output driver metapackage
diff --git a/debian/rules b/debian/rules
index 676942e..7bd6397 100755
--- a/debian/rules
+++ b/debian/rules
@@ -139,7 +139,8 @@ binary-arch: build install
dh_gencontrol --
-VF:XServer-Xorg-Video-Depends=$(XSERVER_XORG_VIDEO_DEPENDS) \
-VF:XServer-Xorg-Input-Depends=$(XSERVER_XORG_INPUT_DEPENDS) \
-VF:XServer-Xorg-Video-Recommends=$(XSERVER_XORG_VIDEO_RECOMMENDS) \
-
-VF:XServer-Xorg-Input-Recommends=$(XSERVER_XORG_INPUT_RECOMMENDS)
+
-VF:XServer-Xorg-Input-Recommends=$(XSERVER_XORG_INPUT_RECOMMENDS) \
+
-VF:XServer-Xorg-Video-Suggests=$(XSERVER_XORG_VIDEO_SUGGESTS)
dh_md5sums
dh_builddeb
touch $@-stamp
diff --git a/debian/scripts/vars.i386 b/debian/scripts/vars.i386
index 8cd7d79..922e152 100644
--- a/debian/scripts/vars.i386
+++ b/debian/scripts/vars.i386
@@ -24,11 +24,15 @@ XSERVER_XORG_VIDEO_DEPENDS=" \
XSERVER_XORG_VIDEO_RECOMMENDS=" \
- xserver-xorg-video-geode, \
xserver-xorg-video-qxl, \
"
+XSERVER_XORG_VIDEO_SUGGESTS=" \
+ xserver-xorg-video-geode, \
+"
+
+
XSERVER_XORG_INPUT_DEPENDS="xserver-xorg-input-evdev, \
xserver-xorg-input-vmmouse, \
xserver-xorg-input-synaptics, \
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1xtrto-00026d...@moszumanska.debian.org
