Merge branch '2.2' into 2.3

2006-12-24 12:53:57 +01:00 · 2006-12-24 12:53:57 +01:00 · 22a7c80560
commit 22a7c80560
parent 3259fdac4f d01d5a5b5f
14 changed files with 21 additions and 19 deletions
--- a/dbus/.md5sum
+++ b/dbus/.md5sum
@ -1,3 +1,3 @@
 23bc5ff22fe4f9a208d65fbbfd489ad9  30-dbus.launch
 0552a9b54beb4a044951b7cdbc8fc855  dbus-1.0.2.tar.gz
-0dc978461c9f75b6203f7c0cd0481b22  rc.dbus
+f3d2047d1a05cc0c6fcb5afaea4605a5  rc.dbus
--- a/dbus/Pkgfile
+++ b/dbus/Pkgfile
@ -5,7 +5,7 @@

 name=dbus
 version=1.0.2
-release=2
+release=3
 source=(http://dbus.freedesktop.org/releases/dbus/$name-$version.tar.gz \
 	rc.dbus 30-dbus.launch)

--- a/dbus/rc.dbus
+++ b/dbus/rc.dbus
@ -5,6 +5,10 @@

 case $1 in
 	start)
+		if [ ! -f /var/lib/dbus/machine-id ]
+		then
+			/usr/bin/dbus-uuidgen --ensure
+		fi
 		/usr/sbin/dbus-daemon --system
 		;;
 	stop)
--- a/git/.md5sum
+++ b/git/.md5sum
@ -1,2 +1,2 @@
-c4f72d96f62ae97c6e8d5cdb4afd55ca  git-1.4.4.2.tar.bz2
-27a9192d91af69ae27691e360649cd7d  git-manpages-1.4.4.2.tar.bz2
+a4c2c27f7ea3137a5be7edaecfb9db21  git-1.4.4.3.tar.bz2
+007a5d3a5d3787b2538c03b14b4466bb  git-manpages-1.4.4.3.tar.bz2
--- a/git/Pkgfile
+++ b/git/Pkgfile
@ -5,7 +5,7 @@
 # Nice to have: tk

 name=git
-version=1.4.4.2
+version=1.4.4.3
 release=1
 source=(http://www.kernel.org/pub/software/scm/$name/$name-{,manpages-}$version.tar.bz2)

--- a/imagemagick/.md5sum
+++ b/imagemagick/.md5sum
@ -1 +1 @@
-55c64bb056b8172ef6eeaf182dccae70  ImageMagick-6.3.1-2.tar.bz2
+c34dfc6ee070c481e1cba305623fc358  ImageMagick-6.3.1-3.tar.bz2
--- a/imagemagick/Pkgfile
+++ b/imagemagick/Pkgfile
@ -5,7 +5,7 @@
 # Depends on: freetype ghostscript lcms libungif libxml2

 name=imagemagick
-version=6.3.1-2
+version=6.3.1-3
 release=2
 source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-$version.tar.bz2)

--- a/mpg123/.md5sum
+++ b/mpg123/.md5sum
@ -1 +1 @@
-13b505ec04e5afb10399c89f24e99f0e  mpg123-0.61.tar.bz2
+f7c13eec5c1d2fbc670ce7b19b811253  mpg123-0.62.tar.bz2
--- a/mpg123/Pkgfile
+++ b/mpg123/Pkgfile
@ -4,13 +4,14 @@
 # Depends on:  alsa-lib

 name=mpg123
-version=0.61
+version=0.62
 release=1
 source=(http://www.mpg123.de/download/$name-$version.tar.bz2)

 build() {
    cd $name-$version
    ./configure --prefix=/usr \
+                --mandir=/usr/man \
                --with-cpu=i586 \
                --with-optimization=2 \
                --with-audio=alsa \
--- a/sylpheed/.md5sum
+++ b/sylpheed/.md5sum
@ -1 +1 @@
-68709cd07d2416c7aaeacf2c6921b1a2  sylpheed-2.2.10.tar.bz2
+e46f13162a7fc28120ed87ebfb304a57  sylpheed-2.3.0.tar.bz2
--- a/sylpheed/Pkgfile
+++ b/sylpheed/Pkgfile
@ -4,17 +4,13 @@
 # Depends on:  gtk, openssl

 name=sylpheed
-version=2.2.10
+version=2.3.0
 release=1
-source=(http://sylpheed.sraoss.jp/sylpheed/v2.2/$name-$version.tar.bz2)
+source=(http://sylpheed.sraoss.jp/sylpheed/v2.3/$name-$version.tar.bz2)

 build () {
    cd $name-$version
-    ./configure --prefix=/usr \
-                --disable-nls \
-                --enable-ssl \
-                --enable-ipv6 \
-                --enable-gpgme
+    ./configure --prefix=/usr
    make
    make DESTDIR=$PKG install
    
--- a/wine/.footprint
+++ b/wine/.footprint
@ -492,6 +492,7 @@ drwxr-xr-x	root/root	usr/lib/wine/
 -rwxr-xr-x	root/root	usr/lib/wine/dciman32.dll.so
 -rw-r--r--	root/root	usr/lib/wine/ddeml.dll16
 -rwxr-xr-x	root/root	usr/lib/wine/ddraw.dll.so
+-rwxr-xr-x	root/root	usr/lib/wine/ddrawex.dll.so
 -rwxr-xr-x	root/root	usr/lib/wine/devenum.dll.so
 -rwxr-xr-x	root/root	usr/lib/wine/dinput.dll.so
 -rwxr-xr-x	root/root	usr/lib/wine/dinput8.dll.so
--- a/wine/.md5sum
+++ b/wine/.md5sum
@ -1 +1 @@
-7b5aca2682acc01cd94872072f7a7f1c  wine-0.9.27.tar.bz2
+f907d653229dfb4e53e0f48523fc45ca  wine-0.9.28.tar.bz2
--- a/wine/Pkgfile
+++ b/wine/Pkgfile
@ -5,7 +5,7 @@
 # Depends on: fontforge

 name=wine
-version=0.9.27
+version=0.9.28
 release=1
 source=(http://dl.sourceforge.net/sourceforge/$name/wine-$version.tar.bz2)