Merge branch '2.7' into 2.8

This commit is contained in:
Juergen Daubert 2012-10-24 11:23:02 +02:00
commit 6231fc5c79
6 changed files with 15 additions and 15 deletions

View File

@ -26,19 +26,19 @@ lrwxrwxrwx root/root usr/lib/cairo/libcairo-trace.so.0 -> libcairo-trace.so.0.0.
-rwxr-xr-x root/root usr/lib/cairo/libcairo-trace.so.0.0.0
-rw-r--r-- root/root usr/lib/libcairo-gobject.a
-rwxr-xr-x root/root usr/lib/libcairo-gobject.la
lrwxrwxrwx root/root usr/lib/libcairo-gobject.so -> libcairo-gobject.so.2.11200.4
lrwxrwxrwx root/root usr/lib/libcairo-gobject.so.2 -> libcairo-gobject.so.2.11200.4
-rwxr-xr-x root/root usr/lib/libcairo-gobject.so.2.11200.4
lrwxrwxrwx root/root usr/lib/libcairo-gobject.so -> libcairo-gobject.so.2.11200.6
lrwxrwxrwx root/root usr/lib/libcairo-gobject.so.2 -> libcairo-gobject.so.2.11200.6
-rwxr-xr-x root/root usr/lib/libcairo-gobject.so.2.11200.6
-rw-r--r-- root/root usr/lib/libcairo-script-interpreter.a
-rwxr-xr-x root/root usr/lib/libcairo-script-interpreter.la
lrwxrwxrwx root/root usr/lib/libcairo-script-interpreter.so -> libcairo-script-interpreter.so.2.11200.4
lrwxrwxrwx root/root usr/lib/libcairo-script-interpreter.so.2 -> libcairo-script-interpreter.so.2.11200.4
-rwxr-xr-x root/root usr/lib/libcairo-script-interpreter.so.2.11200.4
lrwxrwxrwx root/root usr/lib/libcairo-script-interpreter.so -> libcairo-script-interpreter.so.2.11200.6
lrwxrwxrwx root/root usr/lib/libcairo-script-interpreter.so.2 -> libcairo-script-interpreter.so.2.11200.6
-rwxr-xr-x root/root usr/lib/libcairo-script-interpreter.so.2.11200.6
-rw-r--r-- root/root usr/lib/libcairo.a
-rwxr-xr-x root/root usr/lib/libcairo.la
lrwxrwxrwx root/root usr/lib/libcairo.so -> libcairo.so.2.11200.4
lrwxrwxrwx root/root usr/lib/libcairo.so.2 -> libcairo.so.2.11200.4
-rwxr-xr-x root/root usr/lib/libcairo.so.2.11200.4
lrwxrwxrwx root/root usr/lib/libcairo.so -> libcairo.so.2.11200.6
lrwxrwxrwx root/root usr/lib/libcairo.so.2 -> libcairo.so.2.11200.6
-rwxr-xr-x root/root usr/lib/libcairo.so.2.11200.6
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/cairo-fc.pc
-rw-r--r-- root/root usr/lib/pkgconfig/cairo-ft.pc

View File

@ -1 +1 @@
a64bb8774a1e476e5cdd69e635794dfb cairo-1.12.4.tar.xz
645b7c1421ed52260d0853e3215c1d8f cairo-1.12.6.tar.xz

View File

@ -4,8 +4,8 @@
# Depends on: fontconfig, libpng, xorg-libxext, xorg-libxrender, xorg-libpixman, xorg-xcb-util, glib
name=cairo
version=1.12.4
release=2
version=1.12.6
release=1
source=(http://cairographics.org/releases/$name-$version.tar.xz)
build() {

View File

@ -1,5 +1,5 @@
c5ccf58f5f9f57aba75c8b72219eb6e6 exports
167ea3a16eb6f33b3642e920147bb265 idmapd.conf
b5ce905faebc7f12e50f04d8a9574fe3 nfs
1477840e1c19e0ac95c538db8b401d90 nfs
8be543ca270c2234ff18f8c8d35e0d37 nfs-utils-1.2.6.tar.bz2
071bb2c4e2104599f0bba55a8ce35f37 nfsserver

View File

@ -5,7 +5,7 @@
name=nfs-utils
version=1.2.6
release=1
release=2
source=(http://downloads.sourceforge.net/project/nfs/$name/$version/$name-$version.tar.bz2 \
exports idmapd.conf nfs nfsserver)

View File

@ -14,7 +14,7 @@ start)
/bin/mount -a -t nfs
;;
stop)
/bin/umount -a -t nfs
/bin/umount -a -t nfs,nfs4
killall -q /usr/sbin/rpc.statd
killall -q /usr/sbin/rpc.idmapd
/bin/umount $PIPEFS