Date: Sunday, December 6, 2009 @ 00:12:39
Author: eric
Revision: 60680
Merged revisions 60678 via svnmerge from
svn+ssh://gerolde.archlinux.org/srv/svn-packages/gpm/trunk
........
r60678 | eric | 2009-12-06 00:11:49 -0500 (Sun, 06 Dec 2009) | 2 lines
upgpkg: gpm 1.20.6-5
Fixed gpm.sh such that disable-paste is only run when gpm is running
........
Modified:
gpm/repos/testing-x86_64/ (properties)
gpm/repos/testing-x86_64/ChangeLog
gpm/repos/testing-x86_64/PKGBUILD
gpm/repos/testing-x86_64/gpm.sh
-----------+
ChangeLog | 5 +++++
PKGBUILD | 6 +++---
gpm.sh | 2 +-
3 files changed, 9 insertions(+), 4 deletions(-)
Property changes on: gpm/repos/testing-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
- /gpm/trunk:1-60455
+ /gpm/trunk:1-60679
Modified: testing-x86_64/ChangeLog
===================================================================
--- testing-x86_64/ChangeLog 2009-12-06 05:12:11 UTC (rev 60679)
+++ testing-x86_64/ChangeLog 2009-12-06 05:12:39 UTC (rev 60680)
@@ -1,5 +1,10 @@
2009-12-05 Eric Belanger <e...@archlinux.org>
+ * gpm 1.20.6-5
+ * Fixed gpm.sh such that disable-paste is only run when gpm is running
+
+2009-12-05 Eric Belanger <e...@archlinux.org>
+
* gpm 1.20.6-4
* Added profile for extra security on multi-user-console (close
FS#17243)
* Removed the need of texinfo depends
Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2009-12-06 05:12:11 UTC (rev 60679)
+++ testing-x86_64/PKGBUILD 2009-12-06 05:12:39 UTC (rev 60680)
@@ -4,7 +4,7 @@
pkgname=gpm
pkgver=1.20.6
-pkgrel=4
+pkgrel=5
pkgdesc="A mouse server for the console and xterm"
arch=('i686' 'x86_64')
url="http://unix.schottelius.org/gpm/";
@@ -16,9 +16,9 @@
source=(http://unix.schottelius.org/gpm/archives/${pkgname}-${pkgver}.tar.bz2 \
gpm gpm.conf.d gpm.sh)
md5sums=('6b534da16dc1b28ba828dea89e520f6f' '945ecde0836687e05c13ea837092ea6c'\
- '63e599950946e5f5a649432510aacf4c' 'f711818433d955852de32a9a0560aa74')
+ '63e599950946e5f5a649432510aacf4c' 'e391fe4599ce102615f9cd449c380d41')
sha1sums=('f3bb9272878b7934968381c8b25edab359114150'
'19e1feb1493373512a77801699df012d186336ea'\
- 'e483f893b4e6b9e1221a208527d728ffefe5438e'
'002a8a246f9f37f140d38b8da51b353cf0668f96')
+ 'e483f893b4e6b9e1221a208527d728ffefe5438e'
'88fe5ff10916c68a87abc8418a56eb0073f69fa9')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
Modified: testing-x86_64/gpm.sh
===================================================================
--- testing-x86_64/gpm.sh 2009-12-06 05:12:11 UTC (rev 60679)
+++ testing-x86_64/gpm.sh 2009-12-06 05:12:39 UTC (rev 60680)
@@ -1,3 +1,3 @@
case $( /usr/bin/tty ) in
- /dev/tty[0-9]*) /usr/bin/disable-paste ;;
+ /dev/tty[0-9]*) [ -n "$(pgrep gpm)" ] && /usr/bin/disable-paste ;;
esac
