# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1335631695 -7200
# Node ID 48a3c0a87ff7178597349d0612674c7f0b4d04f0
# Parent  bf822c13792ca97e421bd525011de9281534b105
Up wireshark (1.6.7)

diff -r bf822c13792c -r 48a3c0a87ff7 linux/stuff/bootloader.sh
--- a/linux/stuff/bootloader.sh	Sat Apr 28 18:23:39 2012 +0200
+++ b/linux/stuff/bootloader.sh	Sat Apr 28 18:48:15 2012 +0200
@@ -116,7 +116,7 @@
 	bs=/tmp/bs$$
 
 	# Get and patch boot sector
-	# See http://hg.slitaz.org/wok/file/66e38bd6a132/linux/stuff/linux-header.u
+	# See http://hg.slitaz.org/wok/raw-file/66e38bd6a132/linux/stuff/linux-header.u
 	[ -n "$DEBUG" ] && echo "Read bootsector..." 1>&2
 	ddq if=$KERNEL bs=512 count=1 of=$bs
 
diff -r bf822c13792c -r 48a3c0a87ff7 linux/stuff/linux-header.u
--- a/linux/stuff/linux-header.u	Sat Apr 28 18:23:39 2012 +0200
+++ b/linux/stuff/linux-header.u	Sat Apr 28 18:48:15 2012 +0200
@@ -21,7 +21,7 @@
  #ifndef SVGA_MODE
  #define SVGA_MODE ASK_VGA
  #endif
-@@ -45,48 +51,366 @@
+@@ -45,48 +51,362 @@
  
  	.global bootsect_start
  bootsect_start:
@@ -370,10 +370,6 @@
 +        jmp	read_sectorslp
 +
 +putcdot:
-+# REMOVE ME START
-+# pushw	%ss
-+# popw	%es
-+# REMOVE ME STOP
 +	movb	$0x2e+3, %al 		# loading... message 2e = .
 +putclf:
 +	subb	$3, %al
diff -r bf822c13792c -r 48a3c0a87ff7 webkit-r/receipt
--- a/webkit-r/receipt	Sat Apr 28 18:23:39 2012 +0200
+++ b/webkit-r/receipt	Sat Apr 28 18:48:15 2012 +0200
@@ -11,7 +11,8 @@
          xorg-libXdamage gcc-lib-base"
 BUILD_DEPENDS="icu icu-dev gperf libxslt-dev glib-dev autoconf automake \
                sqlite-dev libtool m4 bison flex curl-dev gtk-doc libsoup-dev \
-               gst-plugins-base-dev gstreamer-dev util-linux-uuid-dev"
+               gst-plugins-base-dev gstreamer-dev util-linux-uuid-dev \
+               jpeg-dev libjpeg"
 MAINTAINER="pankso@slitaz.org"
 TARBALL="WebKit-r${VERSION}.tar.bz2"
 WEB_SITE="http://webkit.org/"
diff -r bf822c13792c -r 48a3c0a87ff7 wireshark/receipt
--- a/wireshark/receipt	Sat Apr 28 18:23:39 2012 +0200
+++ b/wireshark/receipt	Sat Apr 28 18:48:15 2012 +0200
@@ -1,13 +1,13 @@
 # SliTaz package receipt.
 
 PACKAGE="wireshark"
-VERSION="1.6.5"
+VERSION="1.6.7"
 CATEGORY="network"
 SHORT_DESC="Wireshark is an award-winning network protocol analyzer."
 MAINTAINER="pankso@slitaz.org"
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WEB_SITE="http://www.wireshark.org/"
-WGET_URL="http://media-2.cacetech.com/wireshark/src/$TARBALL"
+WGET_URL="http://wiresharkdownloads.riverbed.com/wireshark/src/$TARBALL"
 TAGS="network analyzer"
 
 DEPENDS="gnutls libgpg-error libcap gtk+ pcre xorg-libXdamage libcomerr3 attr \