[oe-commits] org.oe.dev merge of '686e9c3c9548df9c0c138bec3dbfc29bd7d8c301'

[hrw commit]

merge of '686e9c3c9548df9c0c138bec3dbfc29bd7d8c301'
     and '9ad4a40895cac3d0144289560f4f5fc76596d11a'

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 86581f7de9bc72fe5e21778b4442cc0e59e96fbf
ViewMTN: http://monotone.openembedded.org/revision/info/86581f7de9bc72fe5e21778b4442cc0e59e96fbf
Files:
1
conf/checksums.ini
conf/distro/generic.conf
packages/ezx/ezxd/ezxd.init
packages/ezx/ezxd_svn.bb
Diffs:

#
# mt diff -r686e9c3c9548df9c0c138bec3dbfc29bd7d8c301 -r86581f7de9bc72fe5e21778b4442cc0e59e96fbf
#
# 
# 
# patch "conf/checksums.ini"
#  from [2364f2c99d1f0c82e3aaa429b57206bbcdd64cfc]
#    to [75d2658af051ce6ee032da90880a92b443c0b2cf]
# 
# patch "conf/distro/generic.conf"
#  from [d41e94c2db44f74181c78c031835b9fb8d602ce3]
#    to [4c7db192371c90fef979ed8017dcb610a2842914]
# 
============================================================
--- conf/checksums.ini	2364f2c99d1f0c82e3aaa429b57206bbcdd64cfc
+++ conf/checksums.ini	75d2658af051ce6ee032da90880a92b443c0b2cf
@@ -399,8 +399,8 @@ sha256=ceaa67f19a1c5462f5e739fcd3b53dd42
 sha256=ceaa67f19a1c5462f5e739fcd3b53dd42b0173d9deee579c55e5088801559e43
 
 [ftp://ftp.freebsd.org/pub/FreeBSD//ports/packages/archivers/rpm2cpio-1.2_2.tbz]
-md5=801fd27c30c2e68ab4f193f15f81abb3
-sha256=ecfcc4b5b6658f07eb01cee4d081e8a127b95c9b50a6dc94b622c09522545c53
+md5=d4950dc6918ca79a4abab306b6188512
+sha256=5ec970d34b4e22feea0333dae3b5f5ee0e38295d89e306b4929b910f4a2aae25
 
 [ftp://ftp.freeciv.org/freeciv/stable/freeciv-1.14.1.tar.bz2]
 md5=d328f65e7fca5252f27161f5f9e97a03
@@ -7023,8 +7023,8 @@ sha256=9d5e27f290bbb954d512f37912d39a94a
 sha256=9d5e27f290bbb954d512f37912d39a94ae03536a7ba3ef4dacec4df5f2476f47
 
 [http://releases.0x539.de/obby/obby-0.4.1.tar.gz]
-md5=84c35d0cc6b603442e5ba0083fc1b8bb
-sha256=c297862f85270b388e3b5668ad897025fa46b91eac5bd2495efb131de572a9bc
+md5=b79146369fc76a61d6d4056a937c71c8
+sha256=b69a259795762881a5384072085bb501d77c6fb974e0b7a16ca573565ffe3629
 
 [http://releases.chipx86.com/libsexy/libsexy/libsexy-0.1.10.tar.gz]
 md5=c009b0c89e5cf91dba17261f4cccfc4c
@@ -7615,8 +7615,8 @@ sha256=fed674a5ae64cb65328eecc752403e5e7
 sha256=fed674a5ae64cb65328eecc752403e5e75e9ce486c19d86c5fa633afb23e0969
 
 [http://subversion.tigris.org/downloads/subversion-1.3.1.tar.bz2]
-md5=cdb0c533b6983e8e1d447e277403e5bf
-sha256=efda6906a11a7fce514f400a5235b290efbe3458309bf8f547a2d49e10c56b1e
+md5=07b95963968ae345541ca99d0e7bf082
+sha256=4f10334d72266815ff427eb25e0e574efcc684dcf01e0229b7d02f63b068d39d
 
 [http://subversion.tigris.org/downloads/subversion-1.4.0.tar.bz2]
 md5=f0c5fef69fccfb12ef6c8598f484ed0e
@@ -8351,8 +8351,8 @@ sha256=148bc83e4ab6e87a6f26b60efdffc1258
 sha256=148bc83e4ab6e87a6f26b60efdffc1258752a42079783e6f2b080f287e8b15fc
 
 [http://www.galago-project.org/files/releases/source/libnotify/libnotify-0.4.2.tar.gz]
-md5=ab588f9ce651feddab6a8225c102d24c
-sha256=e5bce6201e04fda4badcfb265405133ecbc26d413f2f4e0efd3053ad2845c022
+md5=25585318503079a513af7064bb59c04d
+sha256=9e95499badd1b0da67b1422caa4198dbe61c961300b7001173eace18b8b2c38e
 
 [http://www.galago-project.org/files/releases/source/libnotify/libnotify-0.4.3.tar.gz]
 md5=5c81a26b461b2abd4c02a918b8486539
============================================================
--- conf/distro/generic.conf	d41e94c2db44f74181c78c031835b9fb8d602ce3
+++ conf/distro/generic.conf	4c7db192371c90fef979ed8017dcb610a2842914
@@ -74,7 +74,7 @@ PREFERRED_PROVIDER_tslib ?= "tslib"
 #
 PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
 PREFERRED_PROVIDER_tslib ?= "tslib"
-require conf/distro/include/preferred-xorg-versions-X11R7.1.inc
+require conf/distro/include/preferred-xorg-versions-X11R7.2.inc
 
 #
 # GPE


#
# mt diff -r9ad4a40895cac3d0144289560f4f5fc76596d11a -r86581f7de9bc72fe5e21778b4442cc0e59e96fbf
#
# 
# 
# patch "packages/ezx/ezxd/ezxd.init"
#  from [f7c1fdf056b8ad78416819cfa54762a3187fcb85]
#    to [65a66a4dd80193c3ae0fbfd40048f78a1b6c0a59]
# 
# patch "packages/ezx/ezxd_svn.bb"
#  from [da9cb81d38e8d11e3e0ab84d48abfb9575ddf6aa]
#    to [4799fe4237a081c436a74620de1334f3e8d9cb4d]
# 
============================================================
--- packages/ezx/ezxd/ezxd.init	f7c1fdf056b8ad78416819cfa54762a3187fcb85
+++ packages/ezx/ezxd/ezxd.init	65a66a4dd80193c3ae0fbfd40048f78a1b6c0a59
@@ -42,16 +42,10 @@ start_it_up()
   # We need to sleep here because opening the mux devices takes some time
   sleep 15
   echo "$NAME."
-  if [ -d $EVENTDIR ]; then
-      run-parts --arg=start $EVENTDIR
-  fi
 }
 
 shut_it_down()
 {
-  if [ -d "$EVENTDIR" ]; then
-      run-parts --arg=stop $EVENTDIR
-  fi
   echo -n "Stopping $DESC: "
   start-stop-daemon --stop  --quiet --pidfile $PIDFILE 
    
============================================================
--- packages/ezx/ezxd_svn.bb	da9cb81d38e8d11e3e0ab84d48abfb9575ddf6aa
+++ packages/ezx/ezxd_svn.bb	4799fe4237a081c436a74620de1334f3e8d9cb4d
@@ -1,10 +1,10 @@ PV = "0.0+svnr${SRCREV}"
 DESCRIPTION = "Open implementation of motorola's tapisrv, replaces opentapi"
 LICENSE = "GPLv2"
 SECTION = "devel"
 AUTHOR = "Daniel Ribeiro"
 
 PV = "0.0+svnr${SRCREV}"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "svn://svn.openezx.org/trunk/src/userspace/;module=ezxd;proto=http \
            file://ezxd.init \