diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-03-17 12:58:57 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-03-17 12:58:57 +0000 |
| commit | 561451583daeead691d8d182b87c3f70a2307dca (patch) | |
| tree | 6f2f1aea93ba44adb9c2eac90167316ec71e6665 | |
| parent | b4aa0687354eb9568ed513199c5b2ecf9aa62f0b (diff) | |
| parent | 6c5ef88d2b582b6886fb662c2ee172f1291a8099 (diff) | |
merge of '4dcbd44e13d7c1ffae39402b269ac0265f6049db'
and 'b9d878678330e8fde2184c15a027c58026fe4fba'
| -rw-r--r-- | packages/xserver-common/xserver-common_1.14.bb | 5 | ||||
| -rw-r--r-- | packages/xserver-common/xserver-common_1.15.bb | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/packages/xserver-common/xserver-common_1.14.bb b/packages/xserver-common/xserver-common_1.14.bb index d608231348..48320ba006 100644 --- 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 d608231348..48320ba006 100644 --- 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" |