xserver-common 1.14, 1.15: Apply calibrate-only-if-ts.patch (from 1.13).

diff --git a/packages/xserver-common/xserver-common_1.14.bb b/packages/xserver-common/xserver-common_1.14.bb
index d608231..48320ba 100644 (file)
--- a/packages/xserver-common/xserver-common_1.14.bb
+++ b/packages/xserver-common/xserver-common_1.14.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts and support files"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
-PR = "r1"
+PR = "r2"
 
 PACKAGE_ARCH = "all"
 
@@ -10,7 +10,8 @@ PACKAGE_ARCH = "all"
 inherit gpe
 
 SRC_URI_append = " file://setDPI.sh \
-                   file://xserver-imageon.patch;patch=1"
+                   file://xserver-imageon.patch;patch=1 \
+                   file://calibrate-only-if-ts.patch;patch=1"
 
 do_install_append() {
        install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"

diff --git a/packages/xserver-common/xserver-common_1.15.bb b/packages/xserver-common/xserver-common_1.15.bb
index d608231..48320ba 100644 (file)
--- a/packages/xserver-common/xserver-common_1.15.bb
+++ b/packages/xserver-common/xserver-common_1.15.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts and support files"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
-PR = "r1"
+PR = "r2"
 
 PACKAGE_ARCH = "all"
 
@@ -10,7 +10,8 @@ PACKAGE_ARCH = "all"
 inherit gpe
 
 SRC_URI_append = " file://setDPI.sh \
-                   file://xserver-imageon.patch;patch=1"
+                   file://xserver-imageon.patch;patch=1 \
+                   file://calibrate-only-if-ts.patch;patch=1"
 
 do_install_append() {
        install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"