# HG changeset patch
# User border
# Date 1357187285 18000
# Node ID c9439823a4b33f1b3658d8c33358ba163d6679c3
# Parent  2f557044d140afb127cf6257d10731e42355dd20# Parent  d8b4a8ab06328e4c27ad4aabe5671757f4bed0ea
merging

diff -r 2f557044d140 -r c9439823a4b3 clamtk/receipt
--- a/clamtk/receipt	Wed Jan 02 23:24:27 2013 -0500
+++ b/clamtk/receipt	Wed Jan 02 23:28:05 2013 -0500
@@ -19,8 +19,9 @@
 	install -Dm755  $src/clamtk $fs/usr/bin/clamtk
 
 	# libs
+	PERL_VER=$(grep ^VERSION= $WOK/perl/receipt | cut -d "=" -f2 | sed -e 's/"//g')
 	for n in $src/lib/* ; do
-		install -Dm644 $n $fs/usr/share/perl5/site_perl/ClamTk/`basename $n`
+		install -Dm644 $n $fs/usr/lib/perl5/$PERL_VER/ClamTk/`basename $n`
 	done
   
 	#localization
diff -r 2f557044d140 -r c9439823a4b3 syslinux/stuff/iso2exe/README
--- a/syslinux/stuff/iso2exe/README	Wed Jan 02 23:24:27 2013 -0500
+++ b/syslinux/stuff/iso2exe/README	Wed Jan 02 23:28:05 2013 -0500
@@ -32,7 +32,7 @@
 - text	 	launch SliTaz in RAM with text mode
 - install	SliTaz UMSDOS like installation
 
-If the prognam name includes one of the supported modes, the according mode is
+If the program name includes one of the supported modes, the according mode is
 assumed. Example 'C:\> slitazlive.exe' starts SliTaz in RAM with graphics.
 
 
diff -r 2f557044d140 -r c9439823a4b3 xpad/receipt
--- a/xpad/receipt	Wed Jan 02 23:24:27 2013 -0500
+++ b/xpad/receipt	Wed Jan 02 23:28:05 2013 -0500
@@ -1,22 +1,23 @@
 # SliTaz package receipt.
 
 PACKAGE="xpad"
-VERSION="4.0"
+VERSION="4.1"
 CATEGORY="utilities"
-SHORT_DESC="Desktop note pad using GTK+ toolkit."
+SHORT_DESC="Sticky note application for X"
 MAINTAINER="pankso@slitaz.org"
-DEPENDS="gtk+ xorg-libXdamage xorg-libSM"
-BUILD_DEPENDS="pkg-config intltool"
+WEB_SITE="https://launchpad.net/xpad"
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://xpad.sourceforge.net/"
-WGET_URL="http://launchpad.net/xpad/trunk/4.0/+download/$TARBALL"
-HANDBOOK_URL='http://www.slitaz.org/doc/handbook/utilities.html#xpad'
+WGET_URL="https://launchpad.net/xpad/trunk/$VERSION/+download/$TARBALL"
+HANDBOOK_URL="http://www.slitaz.org/doc/handbook/utilities.html#xpad"
+
+DEPENDS="gtk+ util-linux-uuid xorg-libICE xorg-libSM"
+BUILD_DEPENDS="gtk+-dev xorg-libSM-dev wget"
 
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
-	./configure $CONFIGURE_ARGS && 
+	sed -i '/#include <glib\/glist.h>/d' src/xpad-undo.c
+	./configure $CONFIGURE_ARGS &&
 	make && make install
 }
 
diff -r 2f557044d140 -r c9439823a4b3 xpad/stuff/xpad.desktop
--- a/xpad/stuff/xpad.desktop	Wed Jan 02 23:24:27 2013 -0500
+++ b/xpad/stuff/xpad.desktop	Wed Jan 02 23:28:05 2013 -0500
@@ -1,13 +1,31 @@
 [Desktop Entry]
-Encoding=UTF-8
-Name=Xpad Sticky Notes
-Name[zh_CN]=桌面笔记本
-Name[fr]=Feuille de notes Xpad
-Name[pt]=Xpad Anotações
-Name[zh_TW]=Xpad 自粘性便條
+Name=Xpad
+GenericName=Sticky Notes
+GenericName[da]=Selvklæbende noter
+GenericName[de]=Klebezettel
+GenericName[es]=Notas pegajosas
+GenericName[fr]=Notes autocollantes
+GenericName[hu]=Ragadós jegyzetek
+GenericName[it]=Note Adesive
+GenericName[ru]=Cтикеры
+GenericName[sv]=Klistriga anteckningar
+GenericName[zh_CN]=自粘性备注
+GenericName[zh_TW]=自粘性便條
+Comment=Jot down notes for later
+Comment[da]=Krads noter ned til senere brug
+Comment[de]=Notizen für später notieren
+Comment[es]=Anotar más tarde
+Comment[fr]=Garder les notes pour plus tard
+Comment[hu]=Jegyzetek felvitele későbbi használatra
+Comment[it]=Prendi delle note per più tardi
+Comment[pt]=Anotar para mais tarde
+Comment[ru]=Заметки/стикеры на вашем рабочем столе
+Comment[sv]=Plita ner anteckningar för senare användning
+Comment[zh_CN]=简要记录备注以备日后使用
+Comment[zh_TW]=大略記下備註以供之後使用
 Exec=xpad
+Icon=xpad
 Terminal=false
-Icon=xpad
 StartupNotify=true
 StartupWMClass=xpad
 Type=Application